新分支

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -1113,7 +1113,7 @@
                           >iu</span
                         >
                         <span v-if="record.prescription.anticoagulant == 2"
-                          >iu</span
+                          >mg</span
                         >
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
@@ -1161,7 +1161,7 @@
                           >iu/h</span
                         >
                         <span v-if="record.prescription.anticoagulant == 2"
-                          >iu/h</span
+                          >mg/h</span
                         >
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg/h</span
@@ -1187,7 +1187,7 @@
                           >iu</span
                         >
                         <span v-if="record.prescription.anticoagulant == 2"
-                          >iu</span
+                          >mg</span
                         >
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
@@ -1328,13 +1328,13 @@
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
-                             (record.prescription.mode_id == 2 ||
+                             (
                               record.prescription.mode_id == 5 ||
                               record.prescription.mode_id == 12 || org_id == 0)&&org_id!=10478
                             "
                             width="50"
                           >
-                            置换量<br />(ml)
+                            置换量<br />(L)
                           </td>
                           <td v-if="org_id == 3877  || org_id == 10449" width="50">滤前压(mmHg)</td>
                           <td
@@ -2276,10 +2276,10 @@
                         v-if="org_id != 10223 || org_id!=10375"
                       >
   
-                        <span v-if="org_id!=10460">
+                        <span v-if="org_id!=10460 && org_id!=10551">
                           透析中入量  (L)：
                         </span>
-                        <span v-if="org_id==10460">
+                        <span v-if="org_id==10460 || org_id ==10551">
                           透析中入量  (ml)：
                         </span>
                         <div

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

@@ -29,7 +29,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || 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 == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || 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 == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">
@@ -349,7 +349,7 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="8" v-if="isShow('透析中入量') && org_id!=10485 && org_id!=10460">
+        <el-col :span="8" v-if="isShow('透析中入量') && org_id!=10485 && org_id!=10460  && org_id!=10551">
           <el-form-item label="透析中入量(L): " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
             <el-input v-model="form.dialysis_intakes"></el-input>
           </el-form-item>

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

@@ -566,6 +566,7 @@
                 org_id != 9919 &&
                 org_id != 10191 &&
                 org_id!=10478 &&
+                org_id!=10551 &&
                 template_id != 43 &&
                 template_id != 47) ||
                 org_id == 9779 ||
@@ -599,7 +600,7 @@
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -1427,7 +1428,7 @@
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -1457,6 +1458,7 @@
               ((template_id == 6 &&
                 org_id != 9919 &&
                 org_id != 10191 &&
+                org_id != 10551 &&
                 template_id != 43) ||
                 org_id == 9779 ||
                 template_id == 11 ||

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1020,14 +1020,9 @@
                         }}
                       </div>
 
-                     <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
-                      <span v-if="prescription.anticoagulant == 4">mg</span>
-                      <span v-if="prescription.anticoagulant == 3">iu</span>
-                      <span v-if="prescription.anticoagulant == 2">iu</span>
-                      <span v-if="prescription.anticoagulant == 1">mg</span>
-                    </span>
+                  
 
-                    <span v-if="org_id==9675 || org_id==10447 || org_id==9829 || org_id==10440 || org_id==10469 || org_id == 10471">
+                    <span>
                       <span v-if="prescription.anticoagulant == 4">iu</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1055,15 +1050,8 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
-
-                        <span v-if="prescription.anticoagulant == 5">ml/h</span>
-                          <span v-if="prescription.anticoagulant == 4">mg/h</span>
-                          <span v-if="prescription.anticoagulant == 3">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 2">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 1">mg/h</span>
-                      </span>
-                      <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                     
+                      <span>
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
                           <span v-if="prescription.anticoagulant == 3">iu/h</span>
                           <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -1128,13 +1116,8 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471">
-                      <span v-if="prescription.anticoagulant == 4">mg</span>
-                      <span v-if="prescription.anticoagulant == 3">iu</span>
-                      <span v-if="prescription.anticoagulant == 2">iu</span>
-                      <span v-if="prescription.anticoagulant == 1">mg</span>
-                     </span>
-                    <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471">
+                     
+                    <span>
                        <span v-if="prescription.anticoagulant == 2">mg</span>
                        <span v-if="prescription.anticoagulant == 3">iu</span>
                        <span v-if="prescription.anticoagulant == 4">ml</span>
@@ -1249,8 +1232,8 @@
                         <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 0">超滤量<br />(ml)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
-                        <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0" width="50">
-                          置换量<br />(ml)
+                        <td v-if="(prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0" width="50">
+                          置换量<br />(L)
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538">KT/V</td>
@@ -2176,10 +2159,10 @@
                       style="flex: 1"
                       v-if="org_id != 10223 || org_id!=10375"
                     >
-                        <span v-if="org_id!=10460">
+                        <span v-if="org_id!=10460 && org_id!=10551">
                           透析中入量(L)：
                         </span>
-                        <span v-if="org_id==10460">
+                        <span v-if="org_id==10460 || org_id ==10551">
                           透析中入量(ml)：
                         </span>
                       <div