Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -467,12 +467,12 @@
 
 
          <li v-if="isShow('置换流量') && this.$store.getters.xt_user.template_info.org_id!=10340">
-          <label>置换流量(L/h): </label>
+          <label>置换液流量(L/h): </label>
           <span class="content">{{this.prescription.replacement_flow}}</span>
         </li>
 
         <li v-if="isShow('置换流量') && this.$store.getters.xt_user.template_info.org_id==10340">
-          <label>置换流量(ml/min): </label>
+          <label>置换液流量(ml/min): </label>
           <span class="content">{{this.prescription.replacement_flow}}</span>
         </li>
 
@@ -620,10 +620,10 @@
           <span class="content">{{this.prescription.sodium_curve}}</span>
         </li>
 
-        <li v-if="isShow('开始钠')">
+        <!-- <li v-if="isShow('开始钠')">
           <label>开始钠: </label>
           <span class="content">{{this.prescription.start_sodium}}</span>
-        </li>
+        </li> -->
 
         <li v-if="isShow('透析液流速')">
           <label>透析液流速(ml/h): </label>

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

@@ -103,13 +103,13 @@
                     </el-col>
 
                    <el-col :span="8" v-if="isShows('置换流量') &&  this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id != 10731">
-                        <el-form-item label="置换流量(L/h)：" prop="replacement_flow" :rules="isCheckmust('置换流量')">
+                        <el-form-item label="置换液流量(L/h)：" prop="replacement_flow" :rules="isCheckmust('置换流量')">
                             <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
                         </el-form-item>
                     </el-col>
 
                     <el-col :span="8" v-if="isShows('置换流量')  &&  (this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10731)">
-                        <el-form-item label="置换流量(ml/min)：" prop="replacement_flow" :rules="isCheckmust('置换流量')">
+                        <el-form-item label="置换液流量(ml/min)：" prop="replacement_flow" :rules="isCheckmust('置换流量')">
                             <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
                         </el-form-item>
                     </el-col>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1196,7 +1196,7 @@ export default {
         { value: '2302', label: '异地就医(2302)' },
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
-        { value: '0', label: '自费' },
+        { value: '999999', label: '自费' },
         { value: '118801', label: '118801' },
 
 
@@ -1792,7 +1792,7 @@ export default {
           this.newLoading = false
         })
       } else {
-        if((this.org_id == 10644 && this.other_prescriptions[0].med_type == "1112") || (this.org_id == 10644 && this.other_prescriptions[0].med_type == "1111") || (this.org_id == 0 && this.other_prescriptions[0].med_type == "1111") || (this.org_id == 0 && this.other_prescriptions[0].med_type == "1112")) {
+        if((this.org_id == 10644 && this.other_prescriptions[0].med_type == "1112") || (this.org_id == 10644 && this.other_prescriptions[0].med_type == "1111") || (this.other_prescriptions[0].med_type == "999999") ) {
           upload(form).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -5810,10 +5810,8 @@ export default {
             case 140104:
               return '门诊特殊病(140104)' + '处方' + index
               break
-            case 140104:
-              return '门诊特殊病(140104)' + '处方' + index
-              break
-            case 0:
+
+            case 999999:
               return '自费' + '处方' + index
               break
             case 118801:

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -30,7 +30,7 @@
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
-          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id==10537 || org_id == 0"
+          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id==10537"
         ></printThree>
         <printFour
           v-if="org_id == 9504 || org_id == 10028 || org_id == 10088 "
@@ -69,7 +69,7 @@
       <!-- 顺有好 -->
       <printSixtheen :info="info" v-if="org_id == 10697"></printSixtheen>
       <!-- 杏康 -->
-      <printSeventheen  :info="info" v-if=" org_id == 10721"></printSeventheen>
+      <printSeventheen  :info="info" v-if=" org_id == 10721 || org_id == 0"></printSeventheen>
       <printOne :info="info" v-if=" org_id != 9990 &&
             org_id != 10138 && org_id != 9504 && org_id != 10028 &&
             org_id != 10610 && org_id !=10537 && org_id !=10697 &&
@@ -81,7 +81,7 @@
             org_id != 10138 && org_id != 9504 &&  org_id != 10028 && org_id !=10697 &&
             org_id != 10278 && org_id != 10610 && org_id !=10537 && org_id != 10387 &&
             org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
-            org_id != 10510 &&org_id != 10633 && org_id != 10721   && this.paramsObj.balance_accounts_type == 2">
+            org_id != 10510 &&org_id != 10633 && org_id != 10721   &&org_id != 0  && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
     </div>
   </div>
@@ -1714,6 +1714,10 @@ export default {
 
                 }
                 that.info['Z_list'] = list
+                console.log(" that.info")
+                console.log(that.info.Z_list)
+                console.log(" that.info")
+
 
                 //获取所有项目类型进行去重
                 let med_chrgitm_types = []

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -251,7 +251,6 @@
             }
           }
         }
-
         for (let i = 0; i < targetPrescriptions.length; i++) {
           var prescription = targetPrescriptions[i];
           for (let b = 0; b < prescription.doctor_advice.length; b++) {
@@ -362,17 +361,20 @@
           }
         }
 
+
+
         if(this.srcPrescriptions.length == 1){
           if(this.srcPrescriptions[0].advices.length == 0 && this.srcPrescriptions[0].project.length == 0){
             this.srcPrescriptions = [];
             this.srcPrescriptions = prescriptions;
             this.$emit('call', this.srcPrescriptions)
           }else{
-
+            this.srcPrescriptions = [];
             this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
             this.$emit('call', this.srcPrescriptions)
           }
         }else{
+          this.srcPrescriptions = [];
           this.srcPrescriptions =  this.srcPrescriptions.concat(prescriptions);
           this.$emit('call', this.srcPrescriptions)
         }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -670,7 +670,7 @@ export default {
         { value: 2302, label: '异地就医(2302)' },
         { value: 1111, label: '精一' },
         { value: 1112, label: '精二' },
-        { value: 0, label: '自费' },
+        { value: 999999, label: '自费' },
         { value: 118801, label: '118801' }
 
 

src/xt_pages/user/components/PatientSidebar.vue

@@ -179,10 +179,10 @@ export default {
             //   name: '3-3',
             //   label: '体格检查新'
             // },
-            // {
-            //   name: '3-5',
-            //   label: '病程记录新'
-            // },
+            {
+              name: '3-5',
+              label: '病程记录新'
+            },
             {
               name: '1-11',
               label: '首次病程记录'

src/xt_pages/user/courseOfDisease_new.vue

@@ -20,7 +20,7 @@
                 ref="phy_table"
                 :data="tableData"
                 :highlight-current-row="true"
-                @row-click="rowclick"
+                @current-change="getCurrentChangeOne"
                 style="width: 100%">
                 
                 <el-table-column prop="index" label="序号" width="50">
@@ -35,7 +35,7 @@
                 </el-table-column>
                 <el-table-column prop="doctor" label="医生">
                   <template slot-scope="scope">
-                    {{ getDocName(scope.row.doctor_id) }}
+                    {{ getDocName(scope.row.recorder) }}
                   </template>
                 </el-table-column>
               </el-table>