新分支

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -438,9 +438,9 @@
                 <div class="row">
                   上机医生
                   <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
-                    <span v-if="setAdminUserES(record.prescription, 'prescription_doctor') == ''">{{getAdminUser(record.prescription, 'prescription_doctor')}}</span>
+                    <span v-if="setAdminUserES(record.prescription, 'creater') == ''">{{getAdminUser(record.prescription, 'creater')}}</span>
                     <span v-else>
-                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.prescription, 'prescription_doctor')" />
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.prescription, 'creater')" />
                     </span>
                   </div>
                   冲管护士

src/xt_pages/dialysis/details/dialog/acceptsTreatmentDialog.vue

@@ -458,11 +458,25 @@ export default {
     },
     show(accepts) {
       console.log("accepts333333", accepts);
+    
+      console.log("入库时方式",this.way_arr)
+     
+      console.log("体委",this.posture_arr)
       if (accepts.id > 0) {
         accepts.tumble = accepts.tumble.toString();
+      }else{
+        console.log("hh2h3h2h3h32h23h23h32h23h")
+        // this.receiveTreatmentAsses.way = "1"
+        // this.receiveTreatmentAsses.posture ="1"
+        // this.receiveTreatmentAsses.condition = "2"
+
+        accepts.way =1
+        accepts.posture=1
+        accepts.condition =2
+
       }
       this.accepts = accepts;
-      // console.log("accepts", accepts);
+     console.log("accepts", accepts);
       // var arr = [];
       // if (this.accepts.precaution) {
       //   var precaution = this.accepts.precaution.split(",");

src/xt_pages/dialysis/dialysisFlow.vue

@@ -568,10 +568,10 @@
         });
       },
       clickCurrent(val) {
-        console.log(val);
+        console.log("val23323223",val);
         this.$router.push({
           path: "/dialysis/details",
-          query: { patient_id: val.patient_id, date: val.sch_time_int,mode_id:val.mode_id }
+          query: { patient_id: val.patient_id, date: val.schedule_date,mode_id:val.mode_id }
         });
       },
       handleSelectionChange(val) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -351,8 +351,8 @@
         <div class="row">
           上机医生
           <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
-            <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-            <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+            <span v-if="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.creater?prescription.creater:'')) }} </span>
+            <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:''))" alt="" srcset="" v-else />
           </div>
           冲管护士
           <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2416,6 +2416,7 @@ export default {
                   this.$emit('editKeepLoad', false)
                   return
                 }
+                console.log("2o23o23o23o2o23",this.prescriptions[i].advices[b])
                 if(this.prescriptions[i].advices[b].day == NaN){
                   this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}天数未填写`)
                   this.$emit('editKeepLoad', false)
@@ -2426,6 +2427,8 @@ export default {
                   this.$emit('editKeepLoad', false)
                   return
                 }
+          
+
                 if(this.prescriptions[i].advices[b].prescribing_number == ""){
                   this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}总量未填写`)
                   this.$emit('editKeepLoad', false)

src/xt_pages/outpatientTool/components/settle.vue

@@ -93,6 +93,8 @@
               <template slot-scope="scope">
                   <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
                   <div v-if="scope.row.med_type == '11'">普通门诊</div>
+                  <div v-if="scope.row.med_type == '1112'">普通门诊</div>
+                
               </template>
           </el-table-column>
           <el-table-column align="center" prop="item_name" label="医疗费总额">

src/xt_pages/user/components/PatientDetail.vue

@@ -347,6 +347,39 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+
+            <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="患者去向 : "
+                >
+                  <el-radio-group v-model="form.patient_source">
+                    <el-radio
+                     disabled
+                      v-for="item in patientSourceList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                      >{{ item.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+
+                <el-col :span="8" style="margin-bottom: 20px;">
+                <el-form-item
+                  label="备注 : "
+                  prop="sch_remark">
+                  <el-input
+                   disabled
+                    type="textarea"
+                    :rows="3"
+                    v-model="form.sch_remark"
+                    resize="none"
+                    placeholder
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+
             <el-col :span="8" style="height: 59px">
               <el-form-item
                 label="治疗状态(转归) : "
@@ -1027,7 +1060,8 @@
                 </tr>
                 <tr>
                   <td>
-                    <div class="td_proj_title">传<br />染<br />病</div>
+                    <div class="td_proj_title" v-if="org_id !=10278 && org_id!=10138 && org_id!=0">传<br />染<br />病</div>
+                    <div class="td_proj_title" v-if="org_id==10138 || org_id == 10278 || org_id == 0">过<br />敏<br />史</div>
                   </td>
                   <td colspan="7">
                     <div class="td_proj_content td_align_left">
@@ -1093,7 +1127,7 @@
               <div class="proj">
                 <span class="proj_title">日期：</span>
                 <!-- {{ getTime(patientPrint.created_time) }} -->
-                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 10138|| org_id == 9675 || org_id == 10394">{{
+                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 9675 || org_id == 10394">{{
                   getTime(patientPrint.created_time)
                 }}</span>
                 <span v-else>{{ printDate }}</span>
@@ -1237,6 +1271,7 @@ const defaultForm = {
   treatment_plan: "",
   doctor:"",
   record_number:"",
+  patient_source:"",
 };
 
 export default {
@@ -1254,7 +1289,12 @@ export default {
         { id: 6, name: "军队医疗" },
         { id: 7, name: "其他" },
       ],
-
+      patientSourceList:[
+        {value:1,label:"门诊"},
+        {value:2,label:"住院"},
+        {value:3,label:"请假"},
+        {value:4,label:"备注"}
+      ],
       generic_info_fold: true,
       treat_info_fold: true,
       dialogFormVisible: false,
@@ -1573,6 +1613,8 @@ export default {
               patietInfo.first_treatment_date,
               "{y}-{m}-{d}"
             );
+            
+            this.form.patient_source = patietInfo.patient_source
 
             // this.form.initial = patietInfo.initial_dialysis + "";
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
@@ -1861,7 +1903,7 @@ export default {
               }
               this.patientPrint.contagions = printContagions.join("、");
             } else {
-              this.patientPrint.contagions = "无";
+              this.patientPrint.contagions = "阴性";
             }
 
             if (diseasesArr.length > 0) {
@@ -1907,6 +1949,8 @@ export default {
               this.patientPrint.hospital_first_dialysis_date = "";
             }
 
+          
+
             this.checkIdCardNo();
           } else {
             console.log("patient get err state");

src/xt_pages/user/components/PatientForm.vue

@@ -394,7 +394,23 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" style="margin-bottom: 20px;">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="患者去向 : "
+                >
+                  <el-radio-group v-model="form.patient_source">
+                    <el-radio
+                      v-for="item in patientSourceList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                      >{{ item.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="备注 : "
                   prop="sch_remark">
@@ -1061,6 +1077,7 @@ const defaultForm = {
   troble_shoot:2,
   zb_patient_id:"",
   doctor:"",
+  patient_source:0,
   formItem: [
     {
       id: 0,
@@ -1307,6 +1324,12 @@ export default {
       // typeOptions: null,
       // styleOptions: null,
       sourceOptions: [{ value: 1, label: "门诊" }, { value: 2, label: "住院" }],
+      patientSourceList:[
+        {value:1,label:"门诊"},
+        {value:2,label:"住院"},
+        {value:3,label:"请假"},
+        {value:4,label:"备注"}
+      ],
       lapsetoOptions: [
         { value: 1, label: "留治" },
         { value: 2, label: "转出" }
@@ -1541,6 +1564,18 @@ export default {
             this.form.user_sys_before_count = this.form.user_sys_before_count.toString();
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
             this.form.doctor = parseInt(this.form.doctor)
+            if(this.form.patient_source >0){
+              this.form.patient_source = parseInt(this.form.patient_source)
+            }else{
+              this.form.patient_source = 4
+            }
+
+            if(this.form.patient_source == "NaN"){
+              this.form.patient_source = 4
+            }
+            
+          
+            
             if(this.form.avatar.indexOf('?imageView2/2/w/500/h/500/q/90')!=-1){
                this.form.avatar = this.form.avatar
             }else{
@@ -1580,6 +1615,15 @@ export default {
             this.form.age = parseInt(this.form.age);
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
             this.form.doctor = parseInt(this.form.doctor)
+            if(this.form.patient_source >0){
+              this.form.patient_source = parseInt(this.form.patient_source)
+            }else{
+              this.form.patient_source = 4
+            }
+
+            if(this.form.patient_source == "NaN"){
+              this.form.patient_source = 4
+            }
             console.log("form233322332w",this.form)
 
             createPatient(this.form)
@@ -1911,6 +1955,10 @@ export default {
             if(this.form.doctor == 0){
               this.form.doctor = ""
             }
+
+         
+            this.form.patient_source = patietInfo.patient_source
+            
             this.checkIdCardNo();
           } else {
             this.$notify.error({

src/xt_pages/user/courseOfDisease.vue

@@ -852,7 +852,7 @@
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
       nowDate.setMonth(nowDate.getMonth() - 1)
-      nowYear = nowDate.getFullYear()
+      nowYear = nowDate.getFullYear() -1
       nowMonth = nowDate.getMonth() + 1
       nowDay = nowDate.getDate()
       this.start_time =

src/xt_pages/user/firstDisease.vue

@@ -674,12 +674,13 @@
        tableList:[],
        projectList:[],
        inspectionList:[],
+       org_id:0
       }
     },
     created() {
 
       this.patient_id = this.$route.params && this.$route.params.id
-
+      
 
       var now = new Date()
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
@@ -696,7 +697,7 @@
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
       nowDate.setMonth(nowDate.getMonth() - 1)
-      nowYear = nowDate.getFullYear()
+      nowYear = nowDate.getFullYear()-1
       nowMonth = nowDate.getMonth() + 1
       nowDay = nowDate.getDate()
       this.start_time =

src/xt_pages/user/hospitalSummary.vue

@@ -633,7 +633,7 @@
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
       nowDate.setMonth(nowDate.getMonth() - 1)
-      nowYear = nowDate.getFullYear()
+      nowYear = nowDate.getFullYear()-1
       nowMonth = nowDate.getMonth() + 1
       nowDay = nowDate.getDate()
       this.start_time =

src/xt_pages/user/patients.vue

@@ -253,6 +253,21 @@
           </ul>
         </div>
       </div>
+      <div class="cell clearfix">
+        <label class="title"><span class="name">患者去向</span> : </label>
+        <div class="time ">
+          <ul class="">
+            <li
+              :class="item.source == patientSoureType ? 'active' : ''"
+              @click="selectPatientSource(item.source)"
+              v-for="item in patientSourceList"
+              :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div>
       <div class="cell clearfix">
         <label class="title"><span class="name">其它查询</span> : </label>
         <el-select
@@ -686,6 +701,7 @@
           { value: 2, label: '未绑定' }
         ],
         sourceType: 0,
+        patientSoureType:0,
         sourceID: 0,
         lapsetoType: 1,
         sourceArr: [
@@ -695,6 +711,13 @@
           { value: 3, label: '门诊', source: 1, lapseto: 1 },
           { value: 4, label: '住院', source: 2, lapseto: 1 }
         ],
+        patientSourceList:[
+          {value:0,label:"全部",source:0,lapeseto:0},
+          {value:1,label:"门诊",source:1,lapeseto:1},
+          {value:2,label:"住院",source:2,lapeseto:2},
+          {value:3,label:"请假",source:3,lapeseto:3},
+          {value:4,label:"备注",source:4,lapeseto:4}
+       ],
         lapsetoArr: [
           { value: 0, label: '全部', source: 0, lapseto: 0 },
           { value: 1, label: '转出', source: 0, lapseto: 2 },
@@ -744,7 +767,8 @@
           contagion: '',
           reimbursement_way: '',
           isscheduling: '',
-          isprescription: ''
+          isprescription: '',
+          patientSoureType:'',
         },
         multipleSelection: [],
         bindWechatDialog: false,
@@ -1316,6 +1340,11 @@
         this.listQuery.source = source
         this.getList()
       },
+      selectPatientSource(source){
+        this.patientSoureType = source
+        this.listQuery.patientSoureType = source
+        this.getList()
+      },
       changeTimeOne(val) {
         var time = this.getTimestamp(val) - this.end_time
         if (time > 0) {
@@ -1349,7 +1378,7 @@
         this.getList()
       },
       getList() {
-
+         console.log("query23323223wo",this.listQuery)
         fetchList(this.listQuery).then(response => {
           if (response.data.state === 0) {
             this.$message.error(response.data.msg)

src/xt_pages/user/rescueRecord.vue

@@ -209,7 +209,7 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear();
+    nowYear = nowDate.getFullYear()-1;
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
     this.start_time =

src/xt_pages/user/templateSummary.vue

@@ -987,7 +987,7 @@
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
       nowDate.setMonth(nowDate.getMonth() - 1)
-      nowYear = nowDate.getFullYear()
+      nowYear = nowDate.getFullYear()-1
       nowMonth = nowDate.getMonth() + 1
       nowDay = nowDate.getDate()
       this.start_time =