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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1197,6 +1197,18 @@
                               : "/"
                           }}
                         </div>
+                        <span v-if="record.prescription.anticoagulant == 5"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 6"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 7"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 8"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 4"
                           >mg</span
                         >
@@ -1242,6 +1254,16 @@
                               : 0
                           }}
                         </div>
+                       
+                        <span v-if="record.prescription.anticoagulant == 6"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 7"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 8"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 5"
                           >ml/h</span
                         >
@@ -1271,6 +1293,18 @@
                               : "/"
                           }}
                         </div>
+                        <span v-if="record.prescription.anticoagulant == 5"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 6"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 7"
+                          >iu</span
+                        >
+                        <span v-if="record.prescription.anticoagulant == 8"
+                          >iu</span
+                        >
                         <span v-if="record.prescription.anticoagulant == 4"
                           >mg</span
                         >
@@ -1459,7 +1493,7 @@
                             v-if="
                              (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
-                              record.prescription.mode_id == 12 || org_id == 0)&&org_id!=10478 && org_id!=10206
+                              record.prescription.mode_id == 12 || org_id == 0)&&org_id!=10478 && org_id!=10206 && org_id!=10598
                             "
                             width="50"
                           >
@@ -1681,7 +1715,7 @@
                               (record.prescription.mode_id == 2 ||
                               record.prescription.mode_id == 5 ||
                               record.prescription.mode_id == 12 || org_id == 0)
-                              && org_id!=10478 && org_id!=10206
+                              && org_id!=10478 && org_id!=10206 && org_id!=10598
                             "
                             style="width: 50px"
                           >

src/xt_pages/dialysis/details/NavIgation.vue

@@ -683,7 +683,7 @@ export default {
     },
     showAssessmentBefore: function() {
      
-      console.log("透前评估进入23232323我我哦",this.record_date)
+      // console.log("透前评估进入23232323我我哦",this.record_date)
       this.$refs.assessmentBefore.show(this.predialysis_evaluation,this.last_dryWeight_dislysis,this.last_predialysis_evaluation,this.lastAssessment,this.record_date);
     },
     showDoubleCheck: function() {

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

@@ -1258,8 +1258,21 @@
             
             if(this.$store.getters.xt_user.template_info.org_id == 10375  || this.$store.getters.xt_user.template_info.org_id == 10571  || this.$store.getters.xt_user.template_info.org_id == 0){
               console.log("尽量",last_predialysis_evaluation)
+              console.log("正常",this.assessmentBeforeDislysis.blood_access_part_opera_id)
               if(this.assessmentBeforeDislysis.blood_access_part_opera_id == 0 || this.assessmentBeforeDislysis.blood_access_part_opera_id==""){
-                this.assessmentBeforeDislysis.blood_access_part_opera_id = last_predialysis_evaluation.blood_access_part_opera_id
+
+                // var blood_id = 0
+                // console.log("SHJU232323",this.blood_access_part_opera)
+                // for(let i= 0;i<this.blood_access_part_opera.length;i++){
+                //     if(last_predialysis_evaluation.blood_access_part_opera_id == this.blood_access_part_opera[i].id){
+                //       blood_id = this.blood_access_part_opera[i].name
+                //     }
+                // }
+                // console.log("blood_id-----",blood_id)
+                if(last_predialysis_evaluation.blood_access_part_opera_id >0){
+                  this.assessmentBeforeDislysis.blood_access_part_opera_id = last_predialysis_evaluation.blood_access_part_opera_id
+                }
+              
                 this.assessmentBeforeDislysis.blood_access_part_id = last_predialysis_evaluation.blood_access_part_id
               }
              
@@ -1279,16 +1292,14 @@
           }
 
         console.log("hhahhahahah",lastAssessment)
-        if (lastAssessment !=null) {
-          this.assessmentBeforeDislysis.blood_access_part_opera_id = lastAssessment.blood_access_part_opera_id
-          this.assessmentBeforeDislysis.blood_access_part_id = lastAssessment.blood_access_part_id
+        console.log("旭哥通路---",this.assessmentBeforeDislysis.blood_access_part_opera_id)
+        // if (lastAssessment !=null) {
+        //   this.assessmentBeforeDislysis.blood_access_part_opera_id = lastAssessment.blood_access_part_opera_id
+        //   this.assessmentBeforeDislysis.blood_access_part_id = lastAssessment.blood_access_part_id
            
-        }
+        // }
 
-        if(this.assessmentBeforeDislysis.blood_access_part_opera_id == 0 || this.assessmentBeforeDislysis.blood_access_part_opera_id==""){
-            
-          
-        }
+        
 
         } else {
           console.log("为首务2322323",this.assessmentBeforeDislysis.period)

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

@@ -267,7 +267,7 @@
                 org_id == 10597 ||
                 org_id == 10599 || 
                 org_id == 10612 ||
-                org_id ==10580) &&
+                org_id ==10580 || org_id ==10629) &&
                 org_id!=10387
             "
           >
@@ -338,7 +338,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10580)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10580 && org_id!=10629)
               || org_id == 10387
             "
           >
@@ -394,7 +394,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id ==10580)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id ==10580 || org_id ==10629)
                 && org_id!=10387
             "
           >
@@ -447,7 +447,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10580) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10580 && org_id!=10629) ||
               org_id == 10387
             "
           >
@@ -511,7 +511,7 @@
                 org_id ==10410 ||
                 org_id == 10395
 
-               )
+               )&& org_id!=10598
             "
           >
             <template slot-scope="scope">
@@ -526,7 +526,7 @@
             width="120"
             v-if="
               isShow('置换率') &&
-              template_id != 6 &&
+              (template_id != 6 &&
               template_id != 10 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -539,7 +539,7 @@
               org_id !=10432 &&
               org_id !=10445 &&
               org_id!=10395 &&
-              org_id !=10410
+              org_id !=10410)|| org_id==10598
             "
           >
             <template slot-scope="scope">
@@ -576,7 +576,8 @@
                 template_id != 43 &&
                 template_id != 47 &&
                 org_id!=10558 &&
-                org_id!=10517) ||
+                org_id!=10517 && 
+                org_id!=10598) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
@@ -608,7 +609,7 @@
             width="100"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -1291,7 +1292,7 @@
                 org_id == 10597||
                 org_id == 10599 ||
                 org_id ==10612 || 
-                org_id==10580)
+                org_id==10580 || org_id ==10629)
                 && org_id!=10387
             "
           >
@@ -1356,7 +1357,8 @@
               org_id!=10597 &&
               org_id!=10599 &&
               org_id!=10612 &&
-              org_id!=10580
+              org_id!=10580 &&
+              org_id!=10629
               )
               || org_id == 10387
             "
@@ -1401,7 +1403,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10395)
-              || org_id ==10558
+              || org_id ==10558 || org_id==10598
             "
           >
             <el-form-item label="置换率(L/h)：" :prop="isName('置换率')"
@@ -1427,7 +1429,7 @@
                 org_id==10432 ||
                 org_id!=10445 ||
                 org_id!=10410 ||
-                org_id!=10395) && org_id !=10558
+                org_id!=10395) && org_id !=10558 && org_id!=10598
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
@@ -1445,7 +1447,7 @@
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -1476,7 +1478,7 @@
                 org_id != 9919 &&
                 org_id != 10191 &&
                 org_id != 10551 &&
-                template_id != 43 && org_id!=10558 && org_id!=10346) ||
+                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -15,17 +15,17 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || 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 == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10580) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && 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!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10580) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || 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 == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10580) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && 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!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10580 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || 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 == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && 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!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || 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 == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && 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!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) && org_id!=10558" width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410) || org_id == 10558" width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) && org_id!=10558 && org_id!=10598" width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410) || org_id == 10558 || org_id ==10598" width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
-          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558" width="92px"  > 置换量(ml)  </th>
-          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558" width="92px" > 置换量(L) </th>
+          <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 ) && org_id!=10558 && org_id!=10598" width="92px"  > 置换量(ml)  </th>
+          <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id ==10346 || org_id ==10517) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445) || org_id == 10558 || org_id ==10598" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量') && template_id != 27 && template_id != 60" width="92px">置换液流量(ml/h)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1237,6 +1237,14 @@
                       </div>
 
                      <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
+                      <span v-if="prescription.anticoagulant == 5">ml</span>
+                      <span v-if="prescription.anticoagulant == 6">iu</span>
+                     <span v-if="prescription.anticoagulant == 7">iu</span>
+                     <span v-if="prescription.anticoagulant == 8">iu</span>
+                     <span v-if="prescription.anticoagulant == 9">iu</span>
+                     <span v-if="prescription.anticoagulant == 10">iu</span>
+                     <span v-if="prescription.anticoagulant == 11">iu</span>
+                     <span v-if="prescription.anticoagulant == 13">iu</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1283,7 +1291,13 @@
                         }}
                       </div>
                       <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
-
+                        <span v-if="prescription.anticoagulant == 6">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 7">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 8">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 9">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 10">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 11">iu/h</span>
+                        <span v-if="prescription.anticoagulant == 13">iu/h</span>
                         <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>
@@ -1356,6 +1370,14 @@
                         }}
                       </div>
                       <span v-if="org_id!=9675 && org_id!=10447 && org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">
+                        <span v-if="prescription.anticoagulant == 5">ml</span>
+                       <span v-if="prescription.anticoagulant == 6">iu</span>
+                       <span v-if="prescription.anticoagulant == 7">iu</span>
+                       <span v-if="prescription.anticoagulant == 8">iu</span>
+                       <span v-if="prescription.anticoagulant == 9">iu</span>
+                       <span v-if="prescription.anticoagulant == 10">iu</span>
+                      <span v-if="prescription.anticoagulant == 11">iu</span>
+                      <span v-if="prescription.anticoagulant == 13">iu</span>
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">mg</span>
@@ -1581,7 +1603,9 @@
                         <td width="50" v-if="org_id == 10600 || org_id ==10598">超滤率<br/>(ml/h)</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 && org_id!=10206" width="50">
-                          置换量<br />(ml)
+                          置换量<br />
+                          <span v-if="org_id!=10598">(ml)</span> 
+                          <span v-if="org_id==10598">(L)</span> 
                         </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 || org_id ==10600 || org_id ==10629">KT/V</td>

src/xt_pages/outpatientCharges/statementTemplate/printthirteen.vue

@@ -34,13 +34,13 @@
       </tr>
       <tr>
         <td width="80">姓名</td>
-        <td width="80">{{info.psn_name}}</td>
+        <td width="80">{{info.patient.name}}</td>
         <td width="80">性别</td>
-        <td width="50" v-if="info.gend == '1'">男</td>
-        <td width="50" v-if="info.gend == '2'">女</td>
+        <td width="50" v-if="info.patient.gender == 1">男</td>
+        <td width="50" v-if="info.patient.gender == 2">女</td>
 
         <td width="80">出生日期</td>
-        <td width="100">{{getBirth(info.certno)}}</td>
+        <td width="100">{{getBirth(info.patient.id_card_no)}}</td>
         <td width="90">个人电脑号</td>
         <td width="110"></td>
         <td width="80">人员类别</td>
@@ -85,7 +85,7 @@
         <td width="80">联系电话</td>
         <td width="110">{{info.patient.phone}}</td>
         <td width="80">身份证号</td>
-        <td colspan="3">{{info.certno}}</td>
+        <td colspan="3">{{info.patient.id_card_no}}</td>
       </tr>
       <tr>
         <td>门诊号</td>

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-        <!-- <el-button
+        <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">首拼</el-button>  -->
+          @click="toJiaBan">首拼</el-button>