Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/store/modules/globalConfig.js

@@ -539,6 +539,21 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      23: {
+        id: 23,
+        name: '血浆胆红素吸附',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
     },
     anticoagulants_confit: { // 抗凝剂
@@ -1890,6 +1905,10 @@ const global_config = {
         id: 36,
         name: '轴'
       },
+      {
+        id: 37,
+        name: '辆'
+      },
     ],
     body_fluid: [{
       id: 1,

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -563,6 +563,13 @@
                           >
                             血浆胆红素吸附+HDF
                           </div>
+                           <div
+                            class="under_line"
+                            style="width: 100px;text-align: center;font-weight:600;"
+                            v-if="record.prescription.mode_id == 23"
+                          >
+                            血浆胆红素吸附
+                          </div>
                         </div>
                       </div>
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -15,8 +15,8 @@
           <span class="content">{{
             replacement_total != "0" ? replacement_total : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40" class="unit">{{ replacement_total != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 40" class="unit">{{ replacement_total != "0" ? "ml" : "" }}</span>
 
         </li>
 
@@ -57,8 +57,8 @@
           <label>总量: </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{anticoagulant_zongliang != "0" ? anticoagulant_zongliang : ""}}</span>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 ">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
@@ -106,8 +106,8 @@
           <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 != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9555" 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 == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555" 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 != 36 && 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.org_id != 9555" 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 == 36 || 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.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>
@@ -135,8 +135,8 @@
           <label>首剂 : </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_shouji != "0" ? anticoagulant_shouji : "" }}</span>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
-          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 " >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
-          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
+          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+          <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span >
@@ -225,8 +225,8 @@
           <label>维持 : </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+          <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 ||  this.$store.getters.xt_user.template_info.template_id == 40)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
           <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
@@ -312,7 +312,7 @@
           <span class="content" v-if="this.prescription.anticoagulant_stop_time_hour == 0 && this.prescription.anticoagulant_stop_time_min == 0 "></span>
           <span class="unit"></span>
         </li>
-       
+
         <li v-if="isShow('病情')">
           <label>病情: </label>
           <span class="content">{{getIllness(this.prescription.illness)}}</span>
@@ -349,6 +349,28 @@
           <span class="content">{{this.prescription.bilirubin_adsorption_column}}</span>
         </li>
 
+        <li v-if="isShow('吸氧')">
+          <label>吸氧:</label>
+          <span class="content">
+            <span v-if="this.prescription.oxygen_uptake == 1">需</span>
+            <span v-if="this.prescription.oxygen_uptake == 2">无</span>
+           </span>
+        </li>
+
+       <li v-if="isShow('吸氧')">
+          <label>吸氧流量(L/分):</label>
+          <span class="content">
+            <span>{{this.prescription.oxygen_flow}}</span>
+           </span>
+        </li>
+       
+        <li v-if="isShow('吸氧')">
+          <label>吸氧时长(h):</label>
+          <span class="content">
+            <span>{{this.prescription.oxygen_time}}</span>
+           </span>
+        </li>
+       
       </ul>
     </div>
     <div style="color:#34495e;margin: 12px 100px 0 100px;">备注: <span style="color:#409eff;">{{ note }}</span></div>
@@ -577,7 +599,7 @@ export default {
               if(arr[i] == this.preparestock[j].specification_name){
                 if(this.preparestock[j].commdity_code!=""){
                   arr[i] = arr[i]+"("+this.preparestock[j].commdity_code+")"
-                } 
+                }
               }
            }
          }
@@ -664,7 +686,7 @@ export default {
     displace_speed:function(){
       return this.getValueStr('displace_speed','displace_speed')
     },
-   
+
   },
   created() {
 

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

@@ -87,7 +87,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 == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
+                  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 == 36 || 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.org_id == 9555 )">
             <el-form-item label="目标超滤量(ml)：">
               <el-input
                 type="number"
@@ -99,7 +99,7 @@
 
 
           <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 != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
+                  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 != 36 && 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.org_id != 9555 ">
             <el-form-item label="目标超滤量(L)：">
               <el-input
                 type="number"
@@ -199,14 +199,14 @@
 
           <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
 
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157' :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                         v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
             </el-form-item>
 
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987' :label="'首剂(mg) : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157' :label="'首剂(mg) : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -216,13 +216,13 @@
 
 
           <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
-            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987">
+            <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                         v-model="dialysisPrescription.no_anticoagulant_weichi"></el-input>
             </el-form-item>
-            <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987">
+            <el-form-item :label="'维持(mg/h) : '" v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -231,13 +231,13 @@
           </el-col>
 
           <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id != 10157' :label="'总量(' + anticoagulant.zongliang_unit + ') : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                         v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
             </el-form-item>
-            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987' :label="'总量(mg) : '">
+            <el-form-item v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10157' :label="'总量(mg) : '">
               <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                         v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
               <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -258,7 +258,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29"
+          <el-col :span="8" v-if="isShows('置换量') && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 40" 
                   v-show="zhiShow">
             <el-form-item label="置换量(L)：">
               <el-input
@@ -582,8 +582,33 @@
                 <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
              </el-form-item>
           </el-col>
-         
 
+          <el-col :span="8" v-if="isShows('吸氧')">
+              <el-form-item label="吸氧：">
+                <el-select v-model="dialysisPrescription.oxygen_uptake" placeholder="请选择" @change="changeOxygenList">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <el-option
+                  v-for="(item, index) in  oxygenList "
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          
+           <el-col :span="8" v-if="isShows('吸氧') && oxygenShow == true">
+             <el-form-item label="吸氧流量(L/分)：">
+                <el-input v-model="dialysisPrescription.oxygen_flow"></el-input>
+             </el-form-item>
+          </el-col>
+         
+         <el-col :span="8" v-if="isShows('吸氧') && oxygenShow == true">
+             <el-form-item label="吸氧时长(h）：">
+                <el-input v-model="dialysisPrescription.oxygen_time"></el-input>
+             </el-form-item>
+          </el-col>
        
         </el-row>
 
@@ -1085,6 +1110,9 @@
           replacement_flow:"",
           plasma_separator:"",
           bilirubin_adsorption_column:"",
+          oxygen_uptake:"",
+          oxygen_flow:"",
+          oxygen_time:"",
         },
 
         anticoagulant: {
@@ -1111,9 +1139,24 @@
         illnessList:[],
         plasmaSeparatorList:[],
         bilirubinAdsorptionColumn:[],
+        oxygenList:[
+         {id:1,name:"需"},
+         {id:2,name:"无"}
+        ],
+        oxygenShow:false,
       }
     },
     methods: {
+      changeOxygenList(val){
+          if(val == 1){
+            this.oxygenShow = true
+          }
+          if(val == 2){
+            this.oxygenShow = false
+            this.prescription.oxygen_flow = ""
+            this.prescription.oxygen_time = ""
+          }
+       },
       changeTime:function(val){
         this.advice_start_time = val
 
@@ -3623,7 +3666,7 @@
         this.irrigations = irrigation
         console.log("透析器",this.dialyzers)
         console.log("灌流器",this.irrigations)
-      }
+      },
     },
     created(){
       

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

@@ -599,7 +599,7 @@
          } 
 
          if(str.indexOf('透析时长')!=-1 && this.prescription!=null){
-            arr.push("透析时长:"+(this.prescription.dialysis_duration?this.prescription.dialysis_duration:""))
+            arr.push("透析时长:"+(this.prescription.dialysis_duration_hour?this.prescription.dialysis_duration_hour:"") +"小时"+this.prescription.dialysis_duration_minute+"分")
          }
 
         if(str.indexOf('透析时长')!=-1 && this.prescription==null){
@@ -944,8 +944,8 @@
           this.prescription.calcium = ""
           this.dialys_mode = this.dialys_mode + this.getMode(this.prescription.mode_id)
           this.prescription.mode_id= ""
-          this.long_time = this.long_time + (this.prescription.dialysis_duration?this.prescription.dialysis_duration:"")
-          this.prescription.dialysis_duration=""
+          this.long_time = this.long_time + (this.prescription.dialysis_duration_hour?this.prescription.dialysis_duration_hour:"") +"小时" +this.prescription.dialysis_duration_minute +"分"
+          this.prescription.dialysis_duration_hour=""
           this.target_ultrafiltration = this.target_ultrafiltration + (this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:"")
           this.prescription.target_ultrafiltration = ""
           this.anticoagulant = this.anticoagulant + this.getAnticoagulant(this.prescription.anticoagulant)
@@ -989,7 +989,7 @@
               this.checkListOne.push("透析模式:"+this.getMode(this.prescription.mode_id))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("透析时长")!=-1){
-              this.checkListOne.push("透析时长:"+(this.prescription.dialysis_duration?this.prescription.dialysate_formulation:""))
+              this.checkListOne.push("透析时长:"+(this.prescription.dialysis_duration_hour?this.prescription.dialysis_duration_hour:""))
            }
            if(this.double_check.dialysis_parameter_desc.indexOf("目标超滤量")!=-1){
               this.checkListOne.push("目标超滤量:"+(this.prescription.target_ultrafiltration?this.prescription.target_ultrafiltration:""))

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

@@ -167,6 +167,7 @@
                   template_id == 36 ||
                   template_id == 38 ||
                   template_id == 39 ||
+                  template_id == 40 ||
                   org_id == 9555)
             "
           >
@@ -210,6 +211,7 @@
                 template_id != 36 &&
                 template_id != 38 &&
                 template_id != 39 &&
+                template_id != 40 &&
                 org_id!=9555
             "
           >

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -14,8 +14,8 @@
           <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 || this.$store.getters.xt_user.template_info.org_id == 9555)" 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 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </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 || this.$store.getters.xt_user.template_info.org_id == 9555)" 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 && this.$store.getters.xt_user.template_info.org_id != 9555"  width="76px"> 超滤量(L) </th>
           <th v-if="isShow('超滤率') && (template_id ==6 || 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)" width="50px"> 超滤率 <br />(ml/h) </th>
           <th v-if="isShow('超滤率') && template_id !=6 && 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" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
@@ -46,7 +46,7 @@
           <td v-if="isShow('脉搏')"> {{ monitor.pulse_frequency ? monitor.pulse_frequency : "" }} </td>
           <td v-if="isShow('呼吸频率')"> {{ monitor.breathing_rate ? monitor.breathing_rate : "" }} </td>
           <td> {{ monitor.venous_pressure ? monitor.venous_pressure : "" }} /{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}  </td>
-          
+
           <td v-if="isShow('血流量')"> {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }} </td>
           <td v-if="isShow('跨膜压')"> {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
           <td v-if="isShow('超滤量')"> {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }} </td>
@@ -59,7 +59,7 @@
           <td v-if="isShow('电导度')"> {{ monitor.conductivity ? monitor.conductivity : "" }} </td>
           <td v-if="isShow('置换液流量')"> {{ monitor.displacement_flow_quantity  ? monitor.displacement_flow_quantity : "" }} </td>
           <td v-if="isShow('透析液流量')"> {{ monitor.dialysate_flow  ? monitor.dialysate_flow : "" }} </td>
-          <td v-if="isShow('肝素用量余量')"> {{ monitor.heparin ? monitor.heparin : "" }} </td> 
+          <td v-if="isShow('肝素用量余量')"> {{ monitor.heparin ? monitor.heparin : "" }} </td>
           <td v-if="isShow('抗凝剂')">
             <span v-if="monitor.monitor_anticoagulant == 1">无肝素</span>
             <span v-if="monitor.monitor_anticoagulant == 2">普通肝素</span>

src/xt_pages/dialysis/schedualPatient.vue

@@ -280,13 +280,13 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
     },
     created() {
       if(sessionStorage.getItem('signInKey') != null){
-        setTimeout(() => {    
+        setTimeout(() => {
           if(sessionStorage.getItem('signInKey') == 1){
             this.$router.replace({ path: '/signIn' })
           }
         },1000)
       }else if(sessionStorage.getItem('lineUpKey') != null){
-        setTimeout(() => { 
+        setTimeout(() => {
           if(sessionStorage.getItem('lineUpKey') == 1){
             this.$router.replace({ path: '/lineUp' })
           }
@@ -317,7 +317,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         data: {type:3,page:0,size:0},
       };
       this.websocketSend(this.initData)
-      
+
 
       this.getInitData()
 
@@ -353,7 +353,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       const timer = setInterval(() => {
         // this.getInitData();
         this.requestDialysisSchedules()
-      }, 1000 * 30)
+      }, 1000 * 60)
       // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
       this.$once('hook:beforeDestroy', () => {
         clearInterval(timer)
@@ -377,7 +377,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       websocketSend(data) {
         try {
           this.websocket.send(JSON.stringify(data))
-            
+
         } catch (error) {
           this.showError = true;
           this.showIndex = 4;
@@ -524,7 +524,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           }else if(this.schedule_type_selected == 2){
             schedule_type = 2
           }
-          
+
           console.log('patient_id',patient_id)
           let org_id =  parseInt(sessionStorage.getItem("org_id"));
           let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
@@ -543,7 +543,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
                       type: 'success'
                   });
               }
-              
+
           })
       },
       handleCallChange: function(index) {
@@ -870,7 +870,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         }
         // let arr5 = JSON.parse(JSON.stringify(this.allPatient))
 
-        
+
         // if(this.callVal == 1){
         //   let arr = []
         //   arr = JSON.parse(JSON.stringify(arr5))
@@ -912,8 +912,8 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         //   }
         //   console.log('arr222222222',arr)
         // }
-        
-        
+
+
       },
       compare(property){
         return function(a,b){

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -506,7 +506,7 @@
                      {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "" }}
                   </div>
                 </td>
-                <td width="10">L)</td>
+                <td width="10">ml)</td>
                 <td width="50"><label-box :isChecked="prescription.mode_id != 5 && prescription.mode_id != 1 && prescription.mode_id != 2 ? true : false" showValue="其他"></label-box></td>
                 <td width="50">
                   <div class="under-line">&nbsp;
@@ -597,12 +597,12 @@
                 <td width="80">透析液配方:</td>
                 <td width="10">钙</td>
                 <td width="10">(</td>
-                <td width="220">
+                <td width="240">
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.25') > -1 ? true : false" showValue="1.25"></label-box>
                   &nbsp;
                   <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.5') > -1 ? true : false" showValue="1.5"></label-box>
                   &nbsp;
-                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.75') > -1 ? true : false" showValue="1.75mmol/L"></label-box>
+                  <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('1.75') > -1 ? true : false" showValue="1.75（mmol/L）"></label-box>
                   &nbsp;
                 </td>
                 <td width="10">)</td>
@@ -781,11 +781,13 @@
           <td width="40" style="line-height:20px">机温<br />℃</td>
           <td width="60" style="line-height:20px">血流量<br />ml/min</td>
           <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
+          <td width="60" style="line-height:20px">超滤量<br />ml</td>
           <!-- <td width="60">钠浓度<br/>mmol/L</td>
         <td width="80">透析液温度<br/>℃</td>
         <td width="60">置换率<br/>ml/min</td> -->
 
           <td width="" style="line-height:20px">病情变化及处理</td>
+          <td width="60" style="line-height:20px">护士签名</td>
         </tr>
 
         <tr v-for="monitor in monitors" :key="monitor.id">
@@ -837,12 +839,23 @@
           <td>
             &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
           </td>
+          <td>
+            &nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
+          </td>
           <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
         <td>&nbsp;{{monitor.dialysate_temperature}}</td>
         <td>&nbsp;{{monitor.replacement_rate}}</td> -->
           <td>
             &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
           </td>
+          <td>
+            <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
+              {{ getAdminUser(monitor.monitoring_nurse) }}
+            </span>
+            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+              <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
+            </span>
+          </td>
         </tr>
         </tbody>
       </table>
@@ -897,8 +910,13 @@
             <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
           </td>
           <td>
-            <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
-            <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
+            <span v-if="advice.start_time">
+                <span v-if="advice.checker > 0">
+                    <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
+                    <img style="height:30px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
+                </span>
+                <span v-else>未核对</span>
+            </span>
           </td>
           <td>
             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
@@ -1028,6 +1046,11 @@
                         <label-box showValue="有" :isChecked="afterdialysis.is_eat == 1 ? true : false"></label-box>
                         <label-box showValue="无" :isChecked="afterdialysis.is_eat == 2 ? true : false"></label-box>
                     </td>
+                    <td width="90">实际置换总量</td>
+                    <td width="50">
+                        <div class="under-line">&nbsp;{{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "" }}</div>
+                    </td>
+                    <td width="20">ml</td>
                     <td></td>
                 </tr>
                 </tbody>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -303,6 +303,9 @@
                     <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 22">
                       血浆胆红素吸附+HDF
                     </div>
+                    <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 23">
+                      血浆胆红素吸附
+                    </div>
                   </div>
 
                   <div class="inline_block" style="margin-left:10px;flex:1;">

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1657,7 +1657,7 @@ export default {
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
-         // console.log(this.advice_groups);
+          console.log(this.advice_groups);
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/outpatientCharges/invoiceTemplate/printTwo.vue

@@ -11,7 +11,7 @@
             <div>
                 <span style="position: absolute;left:590px;top:40px;">{{ printDate.slice(0,4) }}</span>
                 <span style="position: absolute;left:630px;top:40px;">{{ printDate.slice(5,7) }}</span>
-                <span style="position: absolute;left:660px;top:40px;">{{ printDate.slice(8,11) }}</span>
+                <span style="position: absolute;left:690px;top:40px;">{{ printDate.slice(8,11) }}</span>
             </div>
         </div>
         <div style="display:flex;justify-content: space-between;">

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -130,8 +130,11 @@
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
           <span v-if="org_id!=9987" >
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span> 
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ scope.row.dialysissolution[0].dialyzer_perfusion_apparatus }}</span> 
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
+                <span v-if="org_id!=10131">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
+                <span v-if="org_id ==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span>
+              </span> 
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ getDialysisDialyszerPerfusion(scope.row.patient_id) }}</span> 
           </span>
           {{scope.row.prescription.dialysis_dialyszers}}
          <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
@@ -546,7 +549,31 @@ export default {
            
          }
       })
-    }
+    },
+    getDialysisDialyszerPerfusion(patient_id){
+        var name = ""
+        for(let i=0;i<this.scheduleData.length;i++){
+          if(patient_id == this.scheduleData[i].patient_id){
+            var arrLength = this.scheduleData[i].dialysissolution.length
+            if(arrLength > 0){
+               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialysis_dialyszers
+            }
+          }
+        }
+       return name
+    },
+     getDialysisDialyszerPerfusionOne(patient_id){
+        var name = ""
+        for(let i=0;i<this.scheduleData.length;i++){
+          if(patient_id == this.scheduleData[i].patient_id){
+            var arrLength = this.scheduleData[i].dialysissolution.length
+            if(arrLength > 0){
+               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
+            }
+          }
+        }
+       return name
+    }, 
   },
   components: {
     WeekItem

src/xt_pages/workforce/components/tableWeeks.vue

@@ -146,10 +146,13 @@
       </el-table-column>
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
         <template slot-scope="scope">
-          <span v-if="org_id!=9987">
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span> 
-             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.length>0 ">{{scope.row.dialysissolution[0].dialyzer_perfusion_apparatus}}</span>
+          <span v-if="org_id!=9987&&org_id!=10131">
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
+                <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>  
+          </span> 
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.length>0 ">{{getDialysisDialyszerPerfusion(scope.row.patient_id)}}</span>
           </span>
+          <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(scope.row.patient_id)}}</span>
            {{scope.row.prescription.dialysis_dialyszers}}
           <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
           <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
@@ -399,6 +402,7 @@ export default {
         this.scheduleData = [];
         if (response.data.state == 1) {
            var scheduleData = response.data.data.schdules;
+           console.log("列表",scheduleData)
            for(let i=0;i<scheduleData.length;i++){
              scheduleData[i].sort = scheduleData[i].number.sort
            }
@@ -858,7 +862,33 @@ export default {
            
          }
       })
-    }
+    },
+    getDialysisDialyszerPerfusion(patient_id){
+        var name = ""
+        for(let i=0;i<this.scheduleData.length;i++){
+          if(patient_id == this.scheduleData[i].patient_id){
+            var arrLength = this.scheduleData[i].dialysissolution.length
+            if(arrLength > 0){
+               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialysis_dialyszers
+            }
+          }
+        }
+       return name
+    },
+      getDialysisDialyszerPerfusionOne(patient_id){
+        var name = ""
+        for(let i=0;i<this.scheduleData.length;i++){
+          if(patient_id == this.scheduleData[i].patient_id){
+            var arrLength = this.scheduleData[i].dialysissolution.length
+            console.log("病人ID",patient_id,"数组",this.scheduleData[i].dialysissolution)
+            if(arrLength > 0){
+               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
+            }
+          }
+        }
+        console.log("name",name)
+       return name
+    }, 
   },
   components: {
     WeekItem

src/xt_pages/workforce/next_remind_print.vue

@@ -62,8 +62,11 @@
                 </td>
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">
                  <span v-if="org_id!=9987">
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> {{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution[0].dialyzer_perfusion_apparatus}}</span> 
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
+                        <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
+                        <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span> 
+                     </span>
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
                   </span>
                   {{main_collection.prescription.dialysis_dialyszers}} 
                   <span v-if="main_collection.prescription.dialysis_dialyszers!='' && main_collection.prescription.dialysis_irrigation!=''">/</span>
@@ -397,6 +400,30 @@
            this.printObj = list
          }
       })
+     },
+     getDialysisDialyszerPerfusion(patient_id){
+        var name = ""
+        for(let i=0;i<this.scheduleData.length;i++){
+          if(patient_id == this.scheduleData[i].patient_id){
+            var arrLength = this.scheduleData[i].dialysissolution.length
+            if(arrLength > 0){
+               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialysis_dialyszers
+            }
+          }
+        }
+       return name
+     },
+     getDialysisDialyszerPerfusionOne(patient_id){
+        var name = ""
+        for(let i=0;i<this.scheduleData.length;i++){
+          if(patient_id == this.scheduleData[i].patient_id){
+            var arrLength = this.scheduleData[i].dialysissolution.length
+            if(arrLength > 0){
+               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
+            }
+          }
+        }
+       return name
      }
     }
   }

src/xt_pages/workforce/remind_print.vue

@@ -61,8 +61,11 @@
                 </td>
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
                   <span v-if="org_id!=9987">
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> {{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution[0].dialyzer_perfusion_apparatus}}</span> 
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
+                       <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
+                       <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span> 
+                      </span>
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
                   </span>
                     {{main_collection.prescription.dialysis_dialyszers}}
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
@@ -366,6 +369,31 @@
            this.printObj = list
          }
       })
+     },
+    getDialysisDialyszerPerfusion(patient_id){
+        var name = ""
+        for(let i=0;i<this.scheduleData.length;i++){
+          if(patient_id == this.scheduleData[i].patient_id){
+            var arrLength = this.scheduleData[i].dialysissolution.length
+            if(arrLength > 0){
+               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
+            }
+          }
+        }
+       return name
+     },
+
+     getDialysisDialyszerPerfusionOne(patient_id){
+        var name = ""
+        for(let i=0;i<this.scheduleData.length;i++){
+          if(patient_id == this.scheduleData[i].patient_id){
+            var arrLength = this.scheduleData[i].dialysissolution.length
+            if(arrLength > 0){
+               name = this.scheduleData[i].dialysissolution[arrLength - 1].dialyzer_perfusion_apparatus
+            }
+          }
+        }
+       return name
      }
     },
   }