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

src/xt_pages/dialysis/PatientBox.vue

@@ -540,6 +540,7 @@ export default {
 
           var schedual = resp.data.schedual; // 患者排班信息
           var prescription = resp.data.prescription; // 透析处方
+          console.log("透析处方=============================================",prescription)
           if (prescription != null) {
             if (prescription.body_fluid == -2) {
               prescription.body_fluid = 0;

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -157,8 +157,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469  &&  this.$store.getters.xt_user.template_info.org_id != 10471 &&  this.$store.getters.xt_user.template_info.org_id != 10460 &&  this.$store.getters.xt_user.template_info.org_id != 10644 &&  this.$store.getters.xt_user.template_info.org_id != 10667 &&  this.$store.getters.xt_user.template_info.org_id != 10723"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 ||  this.$store.getters.xt_user.template_info.org_id == 10460 ||  this.$store.getters.xt_user.template_info.org_id == 10644  ||  this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10441 && this.$store.getters.xt_user.template_info.org_id != 10445 && this.$store.getters.xt_user.template_info.org_id != 9829 &&  this.$store.getters.xt_user.template_info.org_id != 10440  &&  this.$store.getters.xt_user.template_info.org_id != 10469  &&  this.$store.getters.xt_user.template_info.org_id != 10471 &&  this.$store.getters.xt_user.template_info.org_id != 10460 &&  this.$store.getters.xt_user.template_info.org_id != 10644 &&  this.$store.getters.xt_user.template_info.org_id != 10667 &&  this.$store.getters.xt_user.template_info.org_id != 10723 &&  this.$store.getters.xt_user.template_info.org_id != 10731"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id==10441 || this.$store.getters.xt_user.template_info.org_id==10445 || this.$store.getters.xt_user.template_info.org_id == 9829 ||  this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 ||  this.$store.getters.xt_user.template_info.org_id == 10460 ||  this.$store.getters.xt_user.template_info.org_id == 10644  ||  this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723 || this.$store.getters.xt_user.template_info.org_id == 10731" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

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

@@ -32,7 +32,7 @@
               <span style="display: inline-block;" v-if="this.$store.getters.xt_user.template_info.org_id==0||this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id ==10721">
                 衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
               </span>&nbsp;&nbsp;
-              <div v-if="org_id == 0 ||org_id ==10702 || org_id ==10598 || org_id ==10721" style="display: inline-block;">
+              <div style="display: inline-block;">
                 体重增长：
                 <span v-if="predialysis!=null && last_record!=null">
                   {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
@@ -46,6 +46,7 @@
               <span style="display: inline-block;" v-if="this.$store.getters.xt_user.template_info.org_id!=10702">
                 透前血压:  {{predialysis&&predialysis.systolic_blood_pressure?predialysis.systolic_blood_pressure:""  }} / {{ predialysis&&predialysis.diastolic_blood_pressure?predialysis.diastolic_blood_pressure:"" }} mmHg
               </span>
+            
             </div>
             <!-- <span style="position: absolute;left: 48%;top: 3%"  :modal = 'false'>
               衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:""}}kg
@@ -101,13 +102,13 @@
                         </el-form-item>
                     </el-col>
 
-                   <el-col :span="8" v-if="isShows('置换流量') &&  this.$store.getters.xt_user.template_info.org_id != 10340">
+                   <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-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">
+                    <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-input v-model="dialysisPrescription.replacement_flow"></el-input>
                         </el-form-item>
@@ -135,7 +136,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 || this.$store.getters.xt_user.template_info.org_id == 10460 || this.$store.getters.xt_user.template_info.org_id == 10644 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 9829|| this.$store.getters.xt_user.template_info.org_id == 10440 || this.$store.getters.xt_user.template_info.org_id == 10469|| this.$store.getters.xt_user.template_info.org_id == 10471 || this.$store.getters.xt_user.template_info.org_id == 10460 || this.$store.getters.xt_user.template_info.org_id == 10644 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10723 || this.$store.getters.xt_user.template_info.org_id == 10731)">
                         <el-form-item label="目标超滤量(ml)："
                         prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
                             <el-input
@@ -149,7 +150,7 @@
 
 
                     <el-col :span="8"
-                            v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460 && this.$store.getters.xt_user.template_info.org_id != 10644  && this.$store.getters.xt_user.template_info.org_id != 10667 && this.$store.getters.xt_user.template_info.org_id != 10723">
+                            v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id!=10441 && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469&& this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10460 && this.$store.getters.xt_user.template_info.org_id != 10644  && this.$store.getters.xt_user.template_info.org_id != 10667 && this.$store.getters.xt_user.template_info.org_id != 10723 && this.$store.getters.xt_user.template_info.org_id != 10731">
                         <el-form-item
                         label="目标超滤量(L)：" prop="target_ultrafiltration" :rules="isCheckmust('目标超滤量')">
                             <el-input
@@ -3104,6 +3105,8 @@ mu
           this.getPatientBefor()
         }
 
+       
+
 
         let last_weight_after = 0
         let weight_before = 0

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2009,11 +2009,30 @@
                         >
                           <span>
                            <span v-if="org_id!=10683">
-                            {{
-                              monitor.displacement_quantity
-                                ? monitor.displacement_quantity
-                                : "0"
-                            }}
+                            <span v-if="org_id!=10644 && org_id!=0">
+                              {{
+                                monitor.displacement_quantity
+                                  ? monitor.displacement_quantity
+                                  : "0"
+                              }}
+                            </span>
+                            <span v-if="org_id==10644 || org_id == 0">
+                              <span v-if="monindex!=monitors.length-1">
+                                {{
+                                  monitor.displacement_quantity
+                                    ? monitor.displacement_quantity
+                                    : "0"
+                                }}
+                              </span>
+                              <span v-if="monindex==monitors.length-1">
+                                {{
+                                  monitor.displacement_quantity
+                                    ? monitor.displacement_quantity
+                                    : ""
+                                }}
+                              </span>
+                             
+                            </span>
                             </span>
                             <span v-if="org_id == 10683">
                               {{

src/xt_pages/user/lapsoSummary.vue

@@ -71,7 +71,7 @@
                     >
                  </el-button>
                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                <!-- <el-tooltip class="item" effect="dark" content="删除" placement="top">
                    <el-button
                     size="small"
                     type="danger"
@@ -79,7 +79,7 @@
                     @click="handleDeleteAdviceTemplate(scope.row.id, scope.$index)"
                     >
                    </el-button>
-                </el-tooltip>
+                </el-tooltip> -->
              </template>
         </el-table-column>
         </el-table>
@@ -311,7 +311,8 @@
             <el-row :gutter="20">
               <el-col :span="24" v-if="lapseto == 1">
                   <el-form-item label="转归类型:"> 
-                      <el-radio-group style="padding: 10px;" v-model="lapse_type">
+                        <el-radio-group style="padding: 10px;" v-model="lapse_type">
+                          <el-radio  label="1">转入</el-radio>
                           <el-radio  label="2">转出</el-radio>
                           <el-radio  label="3">死亡</el-radio>
                           <el-radio  label="4">院内转诊</el-radio>
@@ -454,6 +455,7 @@
                         <el-date-picker
                             v-model="record_date"
                             type="date"
+                            :disabled="true"
                              value-format="yyyy-MM-dd"
                             placeholder="选择日期">
                          </el-date-picker>

src/xt_pages/user/patients.vue

@@ -426,7 +426,9 @@
             <router-link
               :to="'/patients/patient/' + scope.row.id"
               style="color:#409eff;width:100%;display:block;"
-            >{{ scope.row.name }}
+            >
+              <span v-if="scope.row.is_infectious == 1">{{ scope.row.name }}</span> 
+              <span v-if="scope.row.is_infectious == 2" style="color: red;">{{ scope.row.name }}</span> 
             </router-link
             >
           </template>