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

src/api/advice.js

@@ -259,9 +259,9 @@ export function CreateGroupAdvice(id, groupno, advices, mode) {
     })
   }
 }
-export function DeleteGroupAdvice(groupno, mode) {
+export function DeleteGroupAdvice(groupno, mode,patient_id,advice_date) {
   return request({
-    url:'/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+    url:'/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode+"&patient_id="+patient_id+"&advice_date="+advice_date,
     method: 'delete',
     headers: {
       Permission: 3
@@ -420,10 +420,10 @@ export function DeleteNewDoctorAdvice(id, mode) {
   })
 }
 
-export function DeleteNewGroupAdvice(groupno, mode) {
+export function DeleteNewGroupAdvice(groupno, mode,patient_id,advice_date) {
   return request({
     url:
-      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode+'&patient_id='+patient_id+"&advice_date="+advice_date,
     method: 'delete',
     headers: {
       Permission: 3

src/api/drug/drug.js

@@ -964,4 +964,14 @@ export function getSelfDrugWarhouseInfo(params){
     method:"get",
     params:params,
   })
+}
+
+
+export function getDrugPurchaseQueryList(params){
+
+  return request({
+    url:"/api/drug/getdrugpurchasequerylist",
+    method:"get",
+    params:params
+  })
 }

src/api/his/his.js

@@ -895,6 +895,13 @@ export function summary2(params) {
     params: params
   })
 }
+export function list_batch(id) {
+  return request({
+    url: '/api/batch/orderlist?id='+id,
+    method: 'get',
+    // params: params
+  })
+}
 
 
 

src/router/modules/dialysis.js

@@ -1199,6 +1199,18 @@ export default {
         noCache: true
       }
     },
+    {//84
+      path: '/dialysis/print/batch/eightyfour',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_eightyfour'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_eightyfour',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/flow',
       component: () => import('@/xt_pages/dialysis/dialysisFlow'),

src/router/modules/outpatientCharges.js

@@ -85,5 +85,13 @@ export default {
         name: 'outpatientChargesPrint',
         meta: { title: 'outpatientChargesPrint', noCache: true }
     },
+    {
+      path: '/listTemplate/batch_listPrint',
+      component: () => import('@/xt_pages/outpatientCharges/listTemplate/batch_listPrint'),
+      hidden: true,
+      is_menu: false,
+      name: 'outpatientChargesPrint',
+      meta: { title: 'outpatientChargesPrint', noCache: true }
+  },
   ]
 }

src/store/modules/globalConfig.js

@@ -68295,7 +68295,12 @@ const global_config = {
       {
         id: 3,
         name: '离异'
+      },
+      {
+        id: 4,
+        name: '丧偶'
       }
+      
     ],
     reimbursement_ways: [ // 报销方式
       {

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -445,6 +445,9 @@
         :visible.sync="dialogVisibleOne"
          width="40%">
        <span>
+        <div style="margin-bottom: 10px;">
+         <span >追溯码个数:{{getTotal() }} 个</span>
+        </div>
         <el-input
           ref="Datefrom"
           @keyup.native="changeText"
@@ -551,10 +554,30 @@ export default {
       drug_id:0,
       newArrList:[],
       baseList:[],
+      textAreaList:[]
     };
   },
 
   methods: {
+    getTotal(){
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+            if(textAreaList[i]!=""){
+              arr.push(textAreaList[i])
+            }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+      
+      }
+
+    },
     // 追溯码
     getDrugCode(id,DataSources,DrugCode,index){
       

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -305,6 +305,9 @@
         :visible.sync="dialogVisibleOne"
          width="40%">
        <span>
+        <div style="margin-bottom: 10px;">
+         <span >追溯码个数:{{getTotal() }} 个</span>
+        </div>
         <el-input
           ref="inputRef"
           @keyup.native="changeText"
@@ -419,10 +422,11 @@ export default {
       patientList:[],
       drug_id:0,
       total_count:0,
-      newArrList:[]
+      newArrList:[],
+      textAreaList:[]
     };
   },
-  watch: {},
+ 
   created() {
     this.init();
     this.gettodaynumber();
@@ -433,6 +437,26 @@ export default {
     // this.selectedbydefault();
   },
   methods: {
+    getTotal(){
+
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+             if(textAreaList[i]!=""){
+               arr.push(textAreaList[i])
+             }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+       
+      }
+     
+    },
     openDialog(){
       this.$nextTick(() => {
         this.$refs.inputRef.focus()
@@ -1363,6 +1387,8 @@ export default {
        
         var textarea = ""
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+
+      
          
         if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610){
 
@@ -1481,7 +1507,7 @@ export default {
        
       }
 
-
+      this.getTotal()
     },
     
     hasDuplicates(arr) {
@@ -1511,6 +1537,9 @@ export default {
 
 
   },
+  watch:{
+
+  }
   
 };
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue

@@ -597,7 +597,7 @@
                                   (record.dialysis_order &&
                                     monitor_record.operate_time ==
                                     record.dialysis_order.start_time)
-                                ">【开始透析】
+                                ">
                                 </template>
 
                                 {{ monitor_record.end }} {{ monitor_record.symptom }} &nbsp;{{
@@ -1045,7 +1045,7 @@
                         kg
                       </div>
 
-                      <div class="inline_block" style="flex: 1">
+                      <!-- <div class="inline_block" style="flex: 1">
                         <span>透析中入量(g):</span>
                         <div class="under_line" style="width: 70px; text-align: center">
                           {{
@@ -1056,7 +1056,7 @@
                           }}
                         </div>
                         {{ getUnit(record) }}
-                      </div>
+                      </div> -->
 
                       <div class="inline_block" style="flex: 1">
                         实际超滤量:
@@ -1467,7 +1467,7 @@ export default {
               this.records[i].monitor_records[j].end = ""
               if (this.records[i].dialysis_order && this.records[i].monitor_records[j].operate_time == this.records[i].dialysis_order.end_time) {
                 if (this.org_id != 10683) {
-                  this.records[i].monitor_records[j].end = "【结束透析】";
+                  this.records[i].monitor_records[j].end = "";
                 }
 
                 tempmonitorflag = false;
@@ -1475,13 +1475,13 @@ export default {
               if (this.org_id != 10515 && this.org_id != 0) {
                 if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
                   if (this.org_id != 10683) {
-                    this.records[i].monitor_records[j].end = "【结束透析】";
+                    this.records[i].monitor_records[j].end = "";
                   }
 
                 }
                 if (this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == "") {
                   if (this.org_id != 10683) {
-                    this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
+                    this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = ""
                   }
 
                 }

src/xt_pages/dialysis/batch_print/batch_print_order_eightythree.vue

@@ -253,7 +253,17 @@
                         :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('无绦纶套') != -1 ? true : false"
                         showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
                       <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('人造血管') != -1 ? true : false"
-                        showValue="人造血管"></label-box>
+                        showValue="人造血管"></label-box>&nbsp;
+                      其他:
+                      <div style="display: inline-block;" 
+                        v-if="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('内瘘') == -1 &&
+                        QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('无绦纶套') == -1 &&
+                        QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('带隧道带绦纶套') == -1 &&
+                        QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('人造血管') == -1"
+                      >
+                        {{ QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id) }}
+                      </div>
+
                     </div>&nbsp;&nbsp;
                     <div style="display: inline-block;line-height: 30px;">
                       穿刺者:

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -2568,7 +2568,7 @@
                       </div>
                     </div>
 
-                    <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                    <div class="row" style="padding: 2px 0; line-height: 23px; display: flex" v-if="org_id!=10735 && org_id!=0">
                       <div class="inline_block" style="flex: 1; display: inline-block">
                         宣教知识：
                         <div class="under_line" style="
@@ -2850,12 +2850,12 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="flex: 1" v-if="org_id == 10579">
+                      <!-- <div class="inline_block" style="flex: 1" v-if="org_id == 10579">
                         患者签名：
                         <div class="under_line" style="width: 80px; text-align: center">
 
                         </div>
-                      </div>
+                      </div> -->
                       <div class="inline_block" style="flex: 1">
                         治疗医生：
                         <div class="under_line" style="width: 80px; text-align: center">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -569,6 +569,15 @@
             >批量打印</el-button
           >
         </template>
+        <template v-if="this.template_id == 84">
+          <el-button
+            size="small"
+            icon="el-icon-printer"
+            :disabled="selecting_schs.length == 0"
+            @click="batchPrintAction"
+            type="primary"
+          >批量打印</el-button>
+        </template>
       </div>
     </div>
     <div class="app-container">
@@ -2801,6 +2810,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/eightyTwo" });
       } else if (this.template_id == 83) {
         this.$router.push({ path: "/dialysis/print/batch/eightythree" });
+      } else if (this.template_id == 84) {
+        this.$router.push({ path: "/dialysis/print/batch/eightyfour" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -173,13 +173,13 @@
         </li> -->
 
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721&& this.$store.getters.xt_user.template_info.org_id != 10752">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10757">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
         </li>
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10752">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10757">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || 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 == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || 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 == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  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 == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702 ||  this.$store.getters.xt_user.template_info.org_id == 10697 ||  this.$store.getters.xt_user.template_info.org_id == 10635 ||  this.$store.getters.xt_user.template_info.org_id == 10721 ||  this.$store.getters.xt_user.template_info.org_id == 10727 ||  this.$store.getters.xt_user.template_info.org_id == 10751 || this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10742) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && 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 != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  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!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  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!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702  &&  this.$store.getters.xt_user.template_info.org_id!= 10697 &&  this.$store.getters.xt_user.template_info.org_id!= 10635 &&  this.$store.getters.xt_user.template_info.org_id!= 10721 &&  this.$store.getters.xt_user.template_info.org_id!= 10727&&  this.$store.getters.xt_user.template_info.org_id!= 10751 &&  this.$store.getters.xt_user.template_info.org_id!= 10752 &&  this.$store.getters.xt_user.template_info.org_id!= 10742"  >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || 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 == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || 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 == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  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 == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702 ||  this.$store.getters.xt_user.template_info.org_id == 10697 ||  this.$store.getters.xt_user.template_info.org_id == 10635 ||  this.$store.getters.xt_user.template_info.org_id == 10721 ||  this.$store.getters.xt_user.template_info.org_id == 10727 ||  this.$store.getters.xt_user.template_info.org_id == 10751 || this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10757) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && 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 != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  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!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  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!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702  &&  this.$store.getters.xt_user.template_info.org_id!= 10697 &&  this.$store.getters.xt_user.template_info.org_id!= 10635 &&  this.$store.getters.xt_user.template_info.org_id!= 10721 &&  this.$store.getters.xt_user.template_info.org_id!= 10727&&  this.$store.getters.xt_user.template_info.org_id!= 10751 &&  this.$store.getters.xt_user.template_info.org_id!= 10752 &&  this.$store.getters.xt_user.template_info.org_id!= 10742 && this.$store.getters.xt_user.template_info.org_id!= 10757"  >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -49,7 +49,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
-              v-if="(this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || 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 == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693  || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10742) && this.$store.getters.xt_user.template_info.org_id != 10624"  >
+              v-if="(this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || 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 == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693  || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10757) && this.$store.getters.xt_user.template_info.org_id != 10624"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">

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

@@ -1197,7 +1197,9 @@
            this.$message.error("已执行的医嘱无法删除!")
            return
         }
-        this.DeleteGroupAdvice(this.groupSelectRow.groupno)
+        console.log("groupno====================",this.groupSelectRow)
+       
+        this.DeleteGroupAdvice(this.groupSelectRow.groupno,this.groupSelectRow.patient_id,this.groupSelectRow.advice_date)
 
         // this.$confirm('确认删除些条医嘱内容?', '删除医嘱内容', {
         //   confirmButtonText: '确定',
@@ -1846,7 +1848,8 @@
       }
       ,
 
-      DeleteGroupAdvice(groupno) {
+      DeleteGroupAdvice(groupno,patient_id,advice_date) {
+
         this.$confirm('确认删除这组医嘱?', '医嘱删除', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1859,7 +1862,7 @@
             ) {
               mode = '5'
             }
-            DeleteGroupAdvice(groupno, mode).then(response => {
+            DeleteGroupAdvice(groupno, mode,patient_id,advice_date).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 if(response.data.code == 600000008){

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

@@ -161,7 +161,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721 && this.$store.getters.xt_user.template_info.org_id != 10742 && this.$store.getters.xt_user.template_info.org_id != 10740 && this.$store.getters.xt_user.template_info.org_id != 10745 && this.$store.getters.xt_user.template_info.org_id != 10752">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721 && this.$store.getters.xt_user.template_info.org_id != 10742 && this.$store.getters.xt_user.template_info.org_id != 10740 && this.$store.getters.xt_user.template_info.org_id != 10745 && this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10757">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -171,7 +171,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10740 || this.$store.getters.xt_user.template_info.org_id==10742  || this.$store.getters.xt_user.template_info.org_id==10745 || this.$store.getters.xt_user.template_info.org_id==10752">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10740 || this.$store.getters.xt_user.template_info.org_id==10742  || this.$store.getters.xt_user.template_info.org_id==10745 || this.$store.getters.xt_user.template_info.org_id==10752|| this.$store.getters.xt_user.template_info.org_id==10757">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -2798,7 +2798,7 @@ mu
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
         console.log("除非=======================")
 
-        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10726|| this.$store.getters.xt_user.template_info.org_id==10752){
+        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10726|| this.$store.getters.xt_user.template_info.org_id==10752 ||  this.$store.getters.xt_user.template_info.org_id==10697){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
@@ -3339,7 +3339,7 @@ mu
         this.pre = pre
         // console.log("pre1", pre);
         this.getPermission()
-        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752){
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10697|| this.$store.getters.xt_user.template_info.org_id == 10757){
           this.getPatientBefor()
         }
 
@@ -5190,7 +5190,7 @@ mu
           var prescription = response.data.data.prescription
           if(patientBefor!=undefined){
 
-            if(this.$store.getters.xt_user.template_info.org_id == 10727  ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745||this.$store.getters.xt_user.template_info.org_id == 10751){
+            if(this.$store.getters.xt_user.template_info.org_id == 10727  ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745||this.$store.getters.xt_user.template_info.org_id == 10751||this.$store.getters.xt_user.template_info.org_id == 10697||this.$store.getters.xt_user.template_info.org_id == 10757){
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               
                  this.dialysisPrescription.target_ultrafiltration = ((patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(0))*1000

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 || org_id == 10752 ) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 ) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,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!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757)
               || org_id == 10387
             "
           >
@@ -529,7 +529,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==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751 || org_id == 10752)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751 || org_id == 10752 || org_id == 10757)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,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!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 && org_id!=10752) ||
+              && 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!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757) ||
               org_id == 10387
             "
           >
@@ -784,7 +784,7 @@
                 org_id!=10558 &&
                 org_id!=10517 && 
                 org_id!=10414 && 
-                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10721) ||
+                org_id!=10598 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10721 && org_id!=10731) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||
@@ -820,7 +820,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 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644 || org_id == 10721) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id == 10478 || org_id == 10551 || org_id ==10558 || org_id ==10517 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id == 10644 || org_id == 10721 || org_id == 10731 || org_id == 10731) &&
               template_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -1689,7 +1689,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745 || org_id == 10751 || org_id == 10752) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757) &&
                 org_id!=10387
             "
           >
@@ -1737,7 +1737,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757)
               || org_id == 10387
             "
           >
@@ -1810,7 +1810,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745 || org_id == 10751 || org_id == 10752)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1893,7 +1893,8 @@
               org_id!=10742 &&
               org_id!=10745 &&
               org_id!=10751 &&
-              org_id!=10752
+              org_id!=10752 &&
+              org_id!=10757
               )
               || org_id == 10387 || org_id == 10694
             "
@@ -2012,7 +2013,7 @@
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206 || org_id == 10731) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -2046,7 +2047,7 @@
                 org_id != 9919 &&
                 org_id != 10191 &&
                 org_id != 10551 &&
-                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567 && org_id!=10644 && org_id!=10206) ||
+                template_id != 43 && org_id!=10558 && org_id!=10346 && org_id!=10598 && org_id!=10414 && org_id !=10694 && org_id != 10697&& org_id != 10567 && org_id!=10644 && org_id!=10206 && org_id!=10731) ||
                 org_id == 9779 ||
                 template_id == 11 ||
                 template_id == 20 ||

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,11 +20,11 @@
           <th v-if="isShow('血流量1')" 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('跨膜压1')" 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 == 10617  || 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 == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745" 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!=10617 && 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!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745"  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  || 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 == 10617  || 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 == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 || this.$store.getters.xt_user.template_info.org_id == 10757" 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!=10617 && 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!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10757"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </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 == 10617 || 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 == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752) && 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!=10617 && 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!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752 ) || 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 == 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 == 10617 || 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 == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10757) && 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!=10617 && 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!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10757 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>
@@ -34,8 +34,8 @@
           <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!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </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 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644" 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  && this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644" 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 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731" 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  && this.$store.getters.xt_user.template_info.org_id != 10751&& this.$store.getters.xt_user.template_info.org_id != 10752) || org_id == 10558 || org_id ==10598 || org_id ==10414 || org_id == 10694 || org_id == 10697 || org_id == 10567 || org_id == 10644 || org_id == 10731" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('置换量1')" 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('SpO₂') && org_id == 9829" width="92px" > SpO₂(%) </th>

src/xt_pages/dialysis/details/index.vue

@@ -467,10 +467,13 @@
 
                 </div>
                 <div class="printCell" style="display:flex;">
-                  <span style="display: block;width: 45%;">目标脱水量：{{ main_collection.prescription.target_ultrafiltration }}
+                  <span style="display: block;width: 45%;" v-if="org_id !=10757">目标脱水量：{{ main_collection.prescription.target_ultrafiltration }}
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10138 || $store.getters.xt_user.org.id == 10460">ml</span>
                     <span v-else>L</span>
                   </span>
+                  <div style="width: 45%;" v-if="org_id ==10757 ">
+                    处方脱水量：{{main_collection.prescription.prescription_water}} L
+                  </div>
                   <span style="display: block;width: 50%;" v-if="org_id!=10598">
                     总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
@@ -545,6 +548,15 @@
                   </span>
                   </span>
                 </div>
+                <div class="printCell" style="display:flex;">
+                  <div style="" v-if="org_id ==10598">透析器:
+                   <span>{{main_collection.prescription.dialysis_dialyszers }}&nbsp;&nbsp; {{main_collection.prescription.dialysis_irrigation}}&nbsp;&nbsp; {{main_collection.prescription.dialysis_strainer}}</span>
+                  </div>
+                  <div style="" v-if="org_id ==10757 || org_id ==0">
+                    血压：{{ main_collection.assessmentbefor.systolic_blood_pressure }}/
+                    {{ main_collection.assessmentbefor.diastolic_blood_pressure }} mmHg
+                  </div>
+                </div>
                 <div class="printCell" style="display:flex;"  v-if="org_id==10598">
                   <span style="display: block;width: 45%;">处方脱水量：{{main_collection.prescription.prescription_water}}
                     <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10460">ml</span>
@@ -562,7 +574,7 @@
                     {{ getDisplaceLiquiPart(main_collection.prescription.displace_liqui_part) }}
                   </div>
                 </div>
-                <div class="printCell" style="display:flex;" v-if="org_id ==10635 || org_id == 0">
+                <div class="printCell" style="display:flex;" v-if="org_id ==10635">
                   <div style="width: 45%;">
                     处方脱水量：{{main_collection.prescription.prescription_water}} L
                   </div>
@@ -570,12 +582,7 @@
                     血流量:{{main_collection.prescription.blood_flow_volume}} ml/min
                   </div>
                 </div>
-                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 0">
-                  <div style="">透析器:
-                   <span>{{main_collection.prescription.dialysis_dialyszers }}&nbsp;&nbsp; {{main_collection.prescription.dialysis_irrigation}}&nbsp;&nbsp; {{main_collection.prescription.dialysis_strainer}}</span>
-                  </div>
 
-                </div>
               </div>
             </div>
 
@@ -2580,7 +2587,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702 || this.org_id==10721){
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587 || this.org_id ==10571 || this.org_id ==10679 || this.org_id==10702 || this.org_id==10721 || this.org_id == 10635){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0
@@ -2759,7 +2766,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702 || this.org_id == 10721){
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587 || this.org_id == 10679 || this.org_id == 10702 || this.org_id == 10721 || this.org_id == 10635){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1044,6 +1044,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 84">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1576,6 +1588,10 @@
           <DialysisPrintOrdereightythree v-bind:childResponse="childResponse"
           v-if="org_template_info.template_id == 83">
           </DialysisPrintOrdereightythree>
+          <DialysisPrintOrdereightyfour v-bind:childResponse="childResponse"
+          v-if="org_template_info.template_id == 84">
+
+          </DialysisPrintOrdereightyfour>
         </div>
       </el-container>
     </div>
@@ -1677,6 +1693,7 @@ import DialysisPrintOrdereighty from './template/DialysisPrintOrdereighty'
 import DialysisPrintOrdereightyone from './template/DialysisPrintOrdereightyone'
 import DialysisPrintOrdereightytwo from './template/DialysisPrintOrdereightytwo'
 import DialysisPrintOrdereightythree from './template/DialysisPrintOrdereightythree'
+import DialysisPrintOrdereightyfour from './template/DialysisPrintOrdereightyfour'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1764,6 +1781,7 @@ export default {
     DialysisPrintOrdereightyone,
     DialysisPrintOrdereightytwo,
     DialysisPrintOrdereightythree,
+    DialysisPrintOrdereightyfour,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2508,6 +2526,13 @@ export default {
           style: style17,
           scanStyles: false,
         });
+      } else if (this.org_template_info.template_id == 84) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style4,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({
@@ -2732,7 +2757,7 @@ export default {
             this.org_template_info = response.data.data.org_template_info;
           // }else{
           //   this.org_template_info = response.data.data.org_template_info;
-          //   this.org_template_info.template_id= 83
+          //   this.org_template_info.template_id= 84
           // }
 
 

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -426,7 +426,7 @@
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
-                        }}</span>``
+                        }}</span>
                         <!-- {{ predialysis.weight_after_last_transparency ? parseFloat(lastafterdialysis.weight_after - lastafterdialysis.additional_weight).toFixed(1) : "未称重" }} -->
                       </div>
                       kg

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2268,7 +2268,7 @@
                         </span>
                         <span v-if="org_id == 10460">
                           透析中入量
-                          <span v-if="org_id!=10644">(ml)</span> 
+                          <span v-if="org_id!=10644">(ml)</span>
                           ：
                         </span>
                         <div class="under_line" style="width: 70px; text-align: center">
@@ -2388,7 +2388,7 @@
                       <div class="inline_block" style="flex: 1; display: inline-block">
                         治疗小结：
                         <div class="under_line" style="
-                            width: 860px;
+                            width: 85%;
                             line-height: 25px;
                             text-align: left;
                             margin-left: 2px;
@@ -2403,7 +2403,7 @@
                         </div>
                       </div>
                     </div>
-                    <div v-if="org_id != 10460 && org_id != 10624" class="row"
+                    <div v-if="org_id != 10460 && org_id != 10624 && org_id!=10735 " class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1; display: inline-block">
                         宣教知识：
@@ -2806,13 +2806,13 @@
                             " alt="" srcset="" v-else />
                         </div>
                       </div>
-                      <div class="inline_block" style="flex: 1" v-if="org_id == 10579">
+                      <!-- <div class="inline_block" style="flex: 1" v-if="org_id == 10579">
                         患者签名
                         <div class="under_line" style="width: 80px; text-align: center">
 
 
                         </div>
-                      </div>
+                      </div> -->
                       <div class="inline_block" style="flex: 1">
                         治疗医生：
                         <div v-if="org_id == 10191" class="under_line" style="width: 80px; text-align: center">

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -794,7 +794,7 @@
                                   <span v-if="prescription.anticoagulant == '肝素钠'">&nbsp;肝素钠</span>
                                 </div>
                               </td>
-                             
+
 
                               <td width="50">首剂量</td>
                               <td width="60">
@@ -843,7 +843,7 @@
                                   <span v-if="prescription.anticoagulant == '低分子量肝素钙'">mg</span>
                                   <span v-if="prescription.anticoagulant == '肝素钠'">mg</span>
                               </td>
-                             
+
                             </tr>
                           </tbody>
                         </table>
@@ -1175,10 +1175,6 @@
           </tbody>
         </table>
         <div style="page-break-after: always;"></div>
-
-
-
-
       </div>
       <div id='new-dialysis-2' class="dialysis-print-order">
         <!-- <div class="order-yy-name"></div> -->
@@ -1425,168 +1421,234 @@ export default {
   },
   methods: {
     checkData(){
+      var checkdata=[]
       if(this.receiverTreatmentAccess.way == 0){
-        this.$message.error('入科方式未填')
-      }else if(this.receiverTreatmentAccess.consciousness == 0){
-        this.$message.error('意识未填')
-      }else if(this.predialysis.is_hemorrhage == 0){
-        this.$message.error('出血未填')
-      }else if(this.predialysis.is_hemorrhage == 1 && this.predialysis.hemorrhage == ""){
-        this.$message.error('出血选项未填')
-      }else if(this.prescription.body_fluid == 0 || this.predialysis.humor_excessive_symptom == ""){
-        this.$message.error('体液过多症状未填')
-      }else if(this.predialysis.special_medicine == 0){
-        this.$message.error('透析前使用特殊药物未填')
-      }else if(this.predialysis.blood_access_part_opera_name == ''){
-        this.$message.error('通路类型未填')
-      }else if(this.predialysis.puncture_way == ''){
-        this.$message.error('穿刺方法未填')
-      }else if(this.predialysis.catheter == ''){
-        this.$message.error('导管或导管出口处未填')
-      }else if(this.predialysis.internal_fistula == ''){
-        this.$message.error('内瘘震颤未填')
-      }else if(this.predialysis.internal_fistula_skin == ''){
-        this.$message.error('内瘘皮肤情况未填')
-      }else if(this.predialysis.venous_catheterization == 0){
-        this.$message.error('中心静脉置管未填')
-      }else if(this.predialysis.blood_access_part_id == ''){
-        this.$message.error('血管通路位置未填')
-      }else if(this.predialysis.thromubus_type == 0){
-        this.$message.error('血栓未填')
-      }else if(this.predialysis.thrombus_av == ''){
-        this.$message.error('导管AV端未填')
-      }else if(this.predialysis.thromubus_a == ''){
-        this.$message.error('a端未填')
-      }else if(this.predialysis.thromubus_v == ''){
-        this.$message.error('v端未填')
-      }else if(this.predialysis.temperature == ""){
-        this.$message.error('透前体温未填')
-      }else if(this.predialysis.pulse_frequency == ""){
-        this.$message.error('透前脉搏未填')
-      }else if(this.predialysis.breathing_rate == ""){
-        this.$message.error('透前呼吸频率未填')
-      }else if(this.predialysis.systolic_blood_pressure == 0){
-        this.$message.error('收缩压未填完整')
-      }else if(this.predialysis.diastolic_blood_pressure == 0){
-        this.$message.error('舒张压未填完整')
-      }else if(this.predialysis.weight_before == 0){
-        this.$message.error('本次透前体重未填')
-      }else if(this.predialysis.dry_weight == 0){
-        this.$message.error('干体重未填')
-      }else if(this.assessmentafter.weight_after == 0){
-        this.$message.error('上次透后体重未填')
-      }else if(this.afterdialysis.weight_after == 0){
-        this.$message.error('本次透后体重未填')
-      }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
-        this.$message.error('计划时间未填')
-      }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
-        this.$message.error('机面治疗时间未填')
-      }else if(this.prescription.target_ultrafiltration == 0){
-        this.$message.error('预设超滤量未填')
-      }else if(this.afterdialysis.actual_ultrafiltration == 0){
-        this.$message.error('机面超滤量未填')
-      }else if(this.prescription.mode_id == ""){
-        this.$message.error('治疗方式未填')
-      }else if(this.prescription.dialyzer_perfusion_apparatus == ""){
-        this.$message.error('透析器或灌流器未填')
-      }else if(this.prescription.anticoagulant == 0){
-        this.$message.error('抗凝方式未填')
-      }else if(this.prescription.dialysate_formulation_name == ""){
-        this.$message.error('透析液配方未填')
-      }else if(this.afterdialysis.return_blood == 0){
-        this.$message.error('回血未填')
-      }else if(this.afterdialysis.rehydration_volume == 0){
-        this.$message.error('补液量未填')
-      }else if(this.afterdialysis.dialysis_during == 0){
-        this.$message.error('透析中进食量未填')
-      }else if(this.afterdialysis.stroke_volume == 0){
-        this.$message.error('出量未填')
-      }else if(this.prescription.prescription_doctor == 0){
-        this.$message.error('主管医生未填')
-      }else if(this.dialysisOrder.puncture_nurse == 0){
-        this.$message.error('穿刺/开管护士未填')
-      }else if(this.check.modifier == 0){
-        this.$message.error('核对护士未填')
-      }else if(this.afterdialysis.internal_fistula == ''){
-        this.$message.error('透后内瘘震颤未填')
-      }else if(this.afterdialysis.catheter == ''){
-        this.$message.error('置管口未填')
-      }else if(this.afterdialysis.blood_flow == 0){
-        this.$message.error('血流量未填')
-      }else if(this.afterdialysis.sealing_fluid_dispose == ""){
-        this.$message.error('封管液配置未填')
-      }else if(this.afterdialysis.cvc_a == 0){
-        this.$message.error('封管量A端未填')
-      }else if(this.afterdialysis.cvc_v == 0){
-        this.$message.error('封管量V端未填')
-      }else if(this.afterdialysis.catheter == ""){
-        this.$message.error('打折和吸壁未填')
-      }else if(this.afterdialysis.catheter != "" && this.afterdialysis.catheter.indexOf('打折') == -1){
-        this.$message.error('打折未填')
-      }else if(this.afterdialysis.catheter != "" && this.afterdialysis.catheter.indexOf('吸壁') == -1){
-        this.$message.error('吸壁未填')
-      }else if(this.afterdialysis.cruor == ""){
-        this.$message.error('透析器凝血未填')
-      }else if(this.afterdialysis.arterial_tube == 0){
-        this.$message.error('动脉管道未填')
-      }else if(this.afterdialysis.intravenous_tube == 0){
-        this.$message.error('静脉管道未填')
-      }else if(this.afterdialysis.complication == ""){
-        this.$message.error('透后并发症未填')
-      }else if(this.summary.special_record == ""){
-        this.$message.error('特殊记录未填')
-      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
-        this.$message.error('当班责任护士未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
-        this.$message.error('下机护士未填')
-      }else if(this.tableAdvice.length > 0){
-        let num = 0
-        if(this.tableAdvice.length > 0){
-          this.tableAdvice.map(item => {
-            if(item.id > 0 && (item.created_time || item.start_time)){
-              this.users.map(it => {
-                if(it.id == item.advice_doctor){
-                  if(it.user_type == 3){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是医生保存的医嘱')
-                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                    if(it.user_type == 2){
-                      num++
-                      this.$message.closeAll()
-                      this.$message.error('存在不是护士执行的医嘱')
-                    }
-                  }else if(it.id == item.checker && item.checker > 0){
-                    if(it.user_type == 2){
-                      num++
-                      this.$message.closeAll()
-                      this.$message.error('存在不是护士核对的医嘱')
-                    }
-                  }
-                }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士执行的医嘱')
-                  }
-                }else if(it.id == item.checker && item.checker > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士核对的医嘱')
-                  }
-                }
-              })
-            }
-        })
-        }
+        const obj='入科方式'
+        checkdata.push(obj)
+      } if(this.receiverTreatmentAccess.consciousness == 0){
+        const obj0='意识'
+        checkdata.push(obj0)
+      } if(this.predialysis.is_hemorrhage == 0){
+        const obj1='出血'
+        checkdata.push(obj1)
+      } if(this.predialysis.is_hemorrhage == 1 && this.predialysis.hemorrhage == ""){
+        const obj2='出血选项'
+        checkdata.push(obj2)
+      } if(this.prescription.body_fluid == 0 || this.predialysis.humor_excessive_symptom == ""){
+        const obj3='体液过多症状'
+        checkdata.push(obj3)
+      } if(this.predialysis.special_medicine == 0){
+        const obj4='透析前使用特殊药物'
+        checkdata.push(obj4)
+      } if(this.predialysis.blood_access_part_opera_name == ''){
+        const obj5='通路类型'
+        checkdata.push(obj5)
+      } if(this.predialysis.puncture_way == ''){
+        const obj6='穿刺方法'
+        checkdata.push(obj6)
+      } if(this.predialysis.catheter == ''){
+        const obj7='导管'
+        checkdata.push(obj7)
+      } if(this.predialysis.internal_fistula == ''){
+        const obj8='内瘘震颤'
+        checkdata.push(obj8)
+      } if(this.predialysis.internal_fistula_skin == ''){
+        const obj9='内瘘皮肤情况'
+        checkdata.push(obj9)
+      } if(this.predialysis.venous_catheterization == 0){
+        const obj10='中心静脉置管'
+        checkdata.push(obj10)
+      } if(this.predialysis.blood_access_part_id == ''){
+        const obj11='血管通路位置'
+        checkdata.push(obj11)
+      } if(this.predialysis.thromubus_type == 0){
+        const obj12='血栓'
+        checkdata.push(obj12)
+      } if(this.predialysis.thrombus_av == ''){
+        const obj13='导管AV端'
+        checkdata.push(obj13)
+      } if(this.predialysis.thromubus_a == ''){
+        const obj14='a端'
+        checkdata.push(obj14)
+      } if(this.predialysis.thromubus_v == ''){
+        const obj15='v端'
+        checkdata.push(obj15)
+      } if(this.predialysis.temperature == ""){
+        const obj16='透前体温'
+        checkdata.push(obj16)
+      } if(this.predialysis.pulse_frequency == ""){
+        const obj17='透前脉搏'
+        checkdata.push(obj17)
+      } if(this.predialysis.breathing_rate == ""){
+        const obj18='透前呼吸频率'
+        checkdata.push(obj18)
+      } if(this.predialysis.systolic_blood_pressure == 0){
+        const obj19='收缩压'
+        checkdata.push(obj19)
+      } if(this.predialysis.diastolic_blood_pressure == 0){
+        const obj20='舒张压'
+        checkdata.push(obj20)
+      } if(this.predialysis.weight_before == 0){
+        const obj21='本次透前体重'
+        checkdata.push(obj21)
+      } if(this.predialysis.dry_weight == 0){
+        const obj22='干体重'
+        checkdata.push(obj22)
+      } if(this.assessmentafter.weight_after == 0){
+        const obj23='上次透后体重'
+        checkdata.push(obj23)
+      } if(this.afterdialysis.weight_after == 0){
+        const obj24='本次透后体重'
+        checkdata.push(obj24)
+      } if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
+        const obj25='计划时间'
+        checkdata.push(obj25)
+      } if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
+        const obj26='机面治疗时间'
+        checkdata.push(obj26)
+      } if(this.prescription.target_ultrafiltration == 0){
+        const obj27='预设超滤量'
+        checkdata.push(obj27)
+      } if(this.afterdialysis.actual_ultrafiltration == 0){
+        const obj28='机面超滤量'
+        checkdata.push(obj28)
+      } if(this.prescription.mode_id == ""){
+        const obj29='治疗方式'
+        checkdata.push(obj29)
+      } if(this.prescription.dialyzer_perfusion_apparatus == ""){
+        const obj30='透析器或灌流器'
+        checkdata.push(obj30)
+      } if(this.prescription.anticoagulant == 0){
+        const obj31='抗凝方式'
+        checkdata.push(obj31)
+      } if(this.prescription.dialysate_formulation_name == ""){
+        const obj32='透析液配方'
+        checkdata.push(obj32)
+      } if(this.afterdialysis.return_blood == 0){
+        const obj33='回血'
+        checkdata.push(obj33)
+      } if(this.afterdialysis.rehydration_volume == 0){
+        const obj34='补液量'
+        checkdata.push(obj34)
+      } if(this.afterdialysis.dialysis_during == 0){
+        const obj35='透析中进食量'
+        checkdata.push(obj35)
+      } if(this.afterdialysis.stroke_volume == 0){
+        const obj36='出量'
+        checkdata.push(obj36)
+      } if(this.prescription.prescription_doctor == 0){
+        const obj37='主管医生'
+        checkdata.push(obj37)
+      } if( this.dialysisOrder ==null || this.dialysisOrder.puncture_nurse == 0){
+        const obj38='穿刺/开管护士'
+        checkdata.push(obj38)
+      } if(this.check.modifier == 0){
+        const obj39='核对护士'
+        checkdata.push(obj39)
+      } if(this.afterdialysis.internal_fistula == ''){
+        const obj40='透后内瘘震颤'
+        checkdata.push(obj40)
+      } if(this.afterdialysis.catheter == ''){
+        const obj41='置管口'
+        checkdata.push(obj41)
+      } if(this.afterdialysis.blood_flow == 0){
+        const obj42='血流量'
+        checkdata.push(obj42)
+      } if(this.afterdialysis.sealing_fluid_dispose == ""){
+        const obj43='封管液配置'
+        checkdata.push(obj43)
+      } if(this.afterdialysis.cvc_a == 0){
+        const obj44='A端'
+        checkdata.push(obj44)
+      } if(this.afterdialysis.cvc_v == 0){
+        const obj45='V端'
+        checkdata.push(obj45)
+      } if(this.afterdialysis.catheter == ""){
+        const obj46='打折和吸壁'
+        checkdata.push(obj46)
+      } if(this.afterdialysis.catheter != "" && this.afterdialysis.catheter.indexOf('打折') == -1){
+        const obj46='打折'
+        checkdata.push(obj46)
+      } if(this.afterdialysis.catheter != "" && this.afterdialysis.catheter.indexOf('吸壁') == -1){
+        const obj47='吸壁'
+        checkdata.push(obj47)
+      } if(this.afterdialysis.cruor == ""){
+        const obj48='透析器堵塞'
+        checkdata.push(obj48)
+      } if(this.afterdialysis.arterial_tube == 0){
+        const obj49='动脉管道'
+        checkdata.push(obj49)
+      } if(this.afterdialysis.intravenous_tube == 0){
+        const obj50='静脉管道'
+        checkdata.push(obj50)
+      } if(this.afterdialysis.complication == ""){
+        const obj51='透后并发症'
+        checkdata.push(obj51)
+      } if(this.summary.special_record == ""){
+        const obj52='特殊记录'
+        checkdata.push(obj52)
+      } if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
+        const obj53='当班责任护士'
+        checkdata.push(obj53)
+      } if(this.dialysisOrder.finish_nurse == 0){
+        const obj54='下机护士'
+        checkdata.push(obj54)
+      } if(this.monitors.length > 0){
+        for(let i in this.monitors){
+          if(this.monitors[i].temperature==''){
+           const obj55= '监测第'+((i*1)+1)+'行体温'
+            checkdata.push(obj55)
+          }
+          if(this.monitors[i].systolic_blood_pressure=='' || this.monitors[i].diastolic_blood_pressure==''){
+            const obj56='监测第'+((i*1)+1)+'行血压'
+            checkdata.push(obj56)
+          }
+          if(this.monitors[i].pulse_frequency==''){
+            const obj57='监测第'+((i*1)+1)+'行脉搏'
+            checkdata.push(obj57)
+          }
+          if(this.monitors[i].breathing_rate==''){
+            const obj58='监测第'+((i*1)+1)+'行呼吸'
+            checkdata.push(obj58)
+          }
+          if(this.monitors[i].arterial_pressure==''){
+            const obj59='监测第'+((i*1)+1)+'行动脉压'
+            checkdata.push(obj59)
+          }
+          if(this.monitors[i].venous_pressure==''){
+            const obj60='监测第'+((i*1)+1)+'行静脉压'
+            checkdata.push(obj60)
+          }
+          if(this.monitors[i].transmembrane_pressure==''){
+            const obj61='监测第'+((i*1)+1)+'行跨膜压'
+            checkdata.push(obj61)
+          }
+          if(this.monitors[i].ultrafiltration_volume==''){
+            const obj62='监测第'+((i*1)+1)+'行超滤量'
+            checkdata.push(obj62)
+          }if(this.monitors[i].sodium_concentration==''){
+            const obj63='监测第'+((i*1)+1)+'行钠浓度'
+            checkdata.push(obj63)
+          }if(this.monitors[i].conductivity==''){
+            const obj64='监测第'+((i*1)+1)+'行电导度'
+            checkdata.push(obj64)
+          }
+          if(this.monitors[i].blood_flow_volume==''){
+            const obj65='监测第'+((i*1)+1)+'行血流量'
+            checkdata.push(obj65)
+          }
 
-        if(num == 0){
-          this.$message.success('核对完成')
+          if(this.monitors[i].dialysate_temperature==''){
+            const obj66='监测第'+((i*1)+1)+'行液温'
+            checkdata.push(obj66)
+          }
+          if(this.monitors[i].displacement_quantity==''){
+            const obj67='监测第'+((i*1)+1)+'行置换量'
+            checkdata.push(obj67)
+          }
         }
-      }else{
-        this.$message.success('核对完成')
       }
+      this.getcheckData(checkdata)
     },
     getComplication(complication){
       if(complication.indexOf(',') == -1){
@@ -2449,6 +2511,18 @@ export default {
           // checker: 0,
         }
       )
+    },
+    getcheckData(val){
+      if(val.length >0){
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
+        this.$alert(message, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning',
+          dangerouslyUseHTMLString: true,
+        });
+      }else{
+        this.$message.success('核对完成')
+      }
     }
   },
   watch: {

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySix.vue

@@ -193,7 +193,7 @@
             <tr style="text-align:left">
               <td colspan="11" style="padding-left:5px">
                 血管通路：
-                <label-box :isChecked="predialysis.blood_access_part_opera_name == '内瘘' ? true : false" showValue="内瘘"></label-box>&nbsp;
+                <label-box :isChecked="predialysis.blood_access_part_opera_name=='内瘘' ? true : false" showValue="内瘘"></label-box>&nbsp;
                 <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('长期静脉导管') > -1 ? true : false" showValue="长期静脉导管"></label-box>&nbsp;
                 <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉') > -1 ? true : false" showValue="临时颈内静脉导管"></label-box>&nbsp;
                 <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') > -1 ? true : false" showValue="临时股静脉导管"></label-box>&nbsp;
@@ -1256,137 +1256,163 @@ export default {
   },
   methods: {
     checkData(){
+      var checkdata=[]
       if(this.predialysis.temperature == ""){
-        this.$message.error('透前体温未填')
-      }else if(this.predialysis.pulse_frequency == ""){
-        this.$message.error('透前脉搏未填')
-      }else if(this.predialysis.breathing_rate == ""){
-        this.$message.error('透前呼吸频率未填')
-      }else if(this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0){
-        this.$message.error('透前血压未填完整')
-      }else if(this.predialysis.symptom_before_dialysis == ""){
-        this.$message.error('上机前病情未填')
-      }else if(this.prescription.mode_id == ""){
-        this.$message.error('治疗方式未填')
-      }else if(this.prescription.displace_liqui_part == 0 && this.prescription.mode_id == 2){
-        this.$message.error('置换方式未填')
-      }else if(this.prescription.displace_liqui_value == 0 && this.prescription.mode_id == 2){
-        this.$message.error('置换量未填')
-      }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
-        this.$message.error('治疗时间未填')
-      }else if(this.prescription.anticoagulant == 0){
-        this.$message.error('治疗抗凝未填')
-      }else if(this.prescription.target_ultrafiltration == 0){
-        this.$message.error('处方脱水量未填')
-      }else if(this.prescription.dialysate_flow == 0){
-        this.$message.error('透析液流量未填')
-      }else if(this.prescription.blood_flow_volume == 0){
-        this.$message.error('血流量未填')
-      }else if(this.prescription.prescription_doctor == 0){
-        this.$message.error('医师签名未填')
-      }else if(this.predialysis.machine_type == ""){
-        this.$message.error('透析机未填')
-      }else if(this.prescription.dialyzer_perfusion_apparatus == ""){
-        this.$message.error('透析(滤)器未填')
-      }else if(this.prescription.calcium == 0){
-        this.$message.error('钙未填')
-      }else if(this.prescription.sodium == 0){
-        this.$message.error('钠未填')
-      }else if(this.prescription.bicarbonate == 0){
-        this.$message.error('碳酸氢根未填')
-      }else if(this.predialysis.blood_access_part_opera_name == ''){
-        this.$message.error('血管通路未填')
-      }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
-        this.$message.error('穿刺者未填')
-      }else if(this.predialysis.weight_before == 0){
-        this.$message.error('透前体重未填')
-      }else if(this.predialysis.dry_weight == 0){
-        this.$message.error('干体重未填')
-      }else if(this.afterdialysis.actual_ultrafiltration == 0){
-        this.$message.error('实际脱水量未填')
-      }else if(this.afterdialysis.weight_after == 0){
-        this.$message.error('透后体重未填')
-      }else if(this.afterdialysis.cruor == ""){
-        this.$message.error('透析器凝血未填')
-      }else if(this.afterdialysis.internal_fistula == ''){
-        this.$message.error('透后内瘘未填')
-      }else if(this.afterdialysis.catheter == ''){
-        this.$message.error('透后导管未填')
-      }else if(this.summary.dialysis_summary == ""){
-        this.$message.error('治疗小结未填')
-      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
-        this.$message.error('护士签名未填')
-      }else if (this.dialysisOrder == null && this.check.creater == 0) {
-        this.$message.error('核对护士未填')
+        const obj='透前体温'
+        checkdata.push(obj)
+      } if(this.predialysis.pulse_frequency == ""){
+        const obj1='透前脉搏'
+        checkdata.push(obj1)
+      } if(this.predialysis.breathing_rate == ""){
+        const obj2='透前呼吸频率'
+        checkdata.push(obj2)
+      } if(this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0){
+        const obj3='透前血压'
+        checkdata.push(obj3)
+      } if(this.predialysis.symptom_before_dialysis == ""){
+        const obj4='上机前病情'
+        checkdata.push(obj4)
+      } if(this.prescription.mode_id == ""){
+        const obj5='治疗方式'
+        checkdata.push(obj5)
+      } if(this.prescription.displace_liqui_part == 0 && this.prescription.mode_id == 2){
+        const obj6='置换方式'
+        checkdata.push(obj6)
+      } if(this.prescription.displace_liqui_value == 0 && this.prescription.mode_id == 2){
+        const obj7='置换量'
+        checkdata.push(obj7)
+      } if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
+        const obj8='治疗时间'
+        checkdata.push(obj8)
+      } if(this.prescription.anticoagulant == 0){
+        const obj9='治疗抗凝'
+        checkdata.push(obj9)
+      } if(this.prescription.target_ultrafiltration == 0){
+        const obj10='处方脱水量'
+        checkdata.push(obj10)
+      } if(this.prescription.dialysate_flow == 0){
+        const obj11='透析液流量'
+        checkdata.push(obj11)
+      } if(this.prescription.blood_flow_volume == 0){
+        const obj12='血流量'
+        checkdata.push(obj12)
+      } if(this.prescription.prescription_doctor == 0){
+        const obj13='医师签名'
+        checkdata.push(obj13)
+      } if(this.predialysis.machine_type == ""){
+        const obj14='透析机'
+        checkdata.push(obj14)
+      } if(this.prescription.dialyzer_perfusion_apparatus == ""){
+        const obj15='透析(滤)器'
+        checkdata.push(obj15)
+      } if(this.prescription.calcium == 0){
+        const obj16='钙'
+        checkdata.push(obj16)
+      } if(this.prescription.sodium == 0){
+        const obj17='钠'
+        checkdata.push(obj17)
+      } if(this.prescription.bicarbonate == 0){
+        const obj18='碳酸氢根'
+        checkdata.push(obj18)
+      } if(this.predialysis.blood_access_part_opera_name == ''){
+        const obj19='血管通路'
+        checkdata.push(obj19)
+      } if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
+        const obj20='穿刺者'
+        checkdata.push(obj20)
+      } if(this.predialysis.weight_before == 0){
+        const obj21='透前体重'
+        checkdata.push(obj21)
+      } if(this.predialysis.dry_weight == 0){
+        const obj22='干体重'
+        checkdata.push(obj22)
+      } if(this.afterdialysis.actual_ultrafiltration == 0){
+        const obj23='实际脱水量'
+        checkdata.push(obj23)
+      } if(this.afterdialysis.weight_after == 0){
+        const obj24='透后体重'
+        checkdata.push(obj24)
+      } if(this.afterdialysis.cruor == ""){
+        const obj25='透析器凝血'
+        checkdata.push(obj25)
+      } if(this.afterdialysis.internal_fistula == ''){
+        const obj26='透后内瘘'
+        checkdata.push(obj26)
+      } if(this.afterdialysis.catheter == ''){
+        const obj27='透后导管'
+        checkdata.push(obj27)
+      } if(this.summary.dialysis_summary == ""){
+        const obj28='治疗小结'
+        checkdata.push(obj28)
+      } if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
+        const obj29='护士签名'
+        checkdata.push(obj29)
+      } if (this.dialysisOrder == null && this.check.creater == 0) {
+        const obj30='核对护士'
+        checkdata.push(obj30)
       }else if (this.dialysisOrder != null && this.check.creater == 0) {
-        this.$message.error('核对护士未填')
+        const obj30='核对护士'
+        checkdata.push(obj30)
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
-        this.$message.error('核对护士未填')
+        const obj30='核对护士'
+        checkdata.push(obj30)
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
-        this.$message.error('核对护士未填')
-      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
-        let num = 0
+        const obj30='核对护士'
+        checkdata.push(obj30)
+      } 
         if(this.monitors.length > 0){
-          this.monitors.map(item => {
-            if(item.id > 0 && item.operate_time){
-              this.users.map(it => {
-                if(it.id == item.monitoring_nurse){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士保存的监测')
-                  }
-                }
-              })
+          for(let i in this.monitors){
+            if(this.monitors[i].venous_pressure==''){
+              const obj31='监测第'+((i*1)+1)+'行静脉压'
+              checkdata.push(obj31)
             }
-          })
+            if(this.monitors[i].replacement_rate=='' && this.prescription.mode_id==2){
+              const obj32='监测第'+((i*1)+1)+'行置换率'
+              checkdata.push(obj32)
+            }
+
+            if(this.monitors[i].ultrafiltration_rate==''){
+              const obj33='监测第'+((i*1)+1)+'行超滤率'
+              checkdata.push(obj33)
+            }
+            if(this.monitors[i].blood_flow_volume==''){
+              const obj34='监测第'+((i*1)+1)+'行血流量'
+              checkdata.push(obj34)
+            }
+            if(this.monitors[i].ultrafiltration_volume==''){
+              const obj35='监测第'+((i*1)+1)+'行脱水量'
+              checkdata.push(obj35)
+            }
+            if(this.monitors[i].temperature==''){
+            const obj36= '监测第'+((i*1)+1)+'行T'
+              checkdata.push(obj36)
+            }
+            if(this.monitors[i].systolic_blood_pressure=='' || this.monitors[i].diastolic_blood_pressure==''){
+              const obj37='监测第'+((i*1)+1)+'行Bp'
+              checkdata.push(obj37)
+            }
+            if(this.monitors[i].pulse_frequency==''){
+              const obj38='监测第'+((i*1)+1)+'行P'
+              checkdata.push(obj38)
+            }
+            if(this.monitors[i].breathing_rate==''){
+              const obj39='监测第'+((i*1)+1)+'行R'
+              checkdata.push(obj39)
+            }
+          }
         }
         if(this.tableAdvice.length > 0){
-          this.tableAdvice.map(item => {
+          this.tableAdvice.map((item) =>{
             if(item.id > 0 && (item.created_time || item.start_time)){
-              this.users.map(it => {
-                if(it.id == item.advice_doctor){
-                  if(it.user_type == 3){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是医生保存的医嘱')
-                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                    if(it.user_type == 2){
-                      num++
-                      this.$message.closeAll()
-                      this.$message.error('存在不是护士执行的医嘱')
-                    }
-                  }else if(it.id == item.checker && item.checker > 0){
-                    if(it.user_type == 2){
-                      num++
-                      this.$message.closeAll()
-                      this.$message.error('存在不是护士核对的医嘱')
-                    }
-                  }
-                }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士执行的医嘱')
-                  }
-                }else if(it.id == item.checker && item.checker > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士核对的医嘱')
-                  }
-                }
-              })
+              if(item.execution_staff ==0 || item.advice_doctor==0){
+                const obj40 = '执行人员,核对人员,医生签名'
+                checkdata.push(obj40)
+              }
             }
-        })
-        }
-        
-        if(num == 0){
-          this.$message.success('核对完成')
+          })
         }
-      }else{
-        this.$message.success('核对完成')
-      }
+      
+      this.getcheckData(checkdata)
     },
     getNewAge(UUserCard) {
       if (UUserCard != null && UUserCard != '') {
@@ -1525,7 +1551,7 @@ export default {
           if (patientInfo.gender === 2) {
             patientInfo.gender = "女";
           }
-          // console.log("patientInfo", patientInfo);
+          console.log("response.data.data", response.data.data);
           this.patientInfo = patientInfo;
           this.patientInfo.birth = uParseTime(
             this.patientInfo.birthday,
@@ -2015,7 +2041,7 @@ export default {
       if (id in this.bloodAccessParOpera) {
         return this.bloodAccessParOpera[id].name;
       }
-      return "";
+      return ''
     },
     dialysateFormulationName(id) {
       if (id in this.dialysateFormulationOptions) {
@@ -2060,6 +2086,18 @@ export default {
           // checker: 0,
         }
       );
+    },
+    getcheckData(val){
+      if(val.length >0){
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
+        this.$alert(message, '提示', {
+          confirmButtonText: '确定',
+          type: 'warning',
+          dangerouslyUseHTMLString: true,
+        });
+      }else{
+        this.$message.success('核对完成')
+      }
     }
   },
   watch: {
@@ -2112,6 +2150,7 @@ export default {
       "hemodialysis",
       "vascular_access_desc"
     );
+
     for (var key in bloodAccessParOpera) {
       this.bloodAccessParOpera[bloodAccessParOpera[key].id] =
         bloodAccessParOpera[key];

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -646,7 +646,7 @@
                                   monitor.operate_time ==
                                     dialysisOrder.start_time)&&(org_id!=10414) && (org_id!=10683)
                                 "
-                                >【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
+                                > <span v-if="org_id ==10598">引血100ml/min</span>
                                 </template>
 
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
@@ -1048,7 +1048,7 @@
                       kg
                     </div>
 
-                    <div class="inline_block" style="flex: 1">
+                    <!-- <div class="inline_block" style="flex: 1">
                       透析中入量(g):
                       <div class="under_line"
                         style="width: 70px; text-align: center"
@@ -1063,7 +1063,7 @@
                       </div>
 
                       {{ getUnit(afterdialysis.dialysis_intakes_unit) }}
-                    </div>
+                    </div> -->
 
                     <div class="inline_block" style="flex: 1">
                       实际超滤量:
@@ -2196,14 +2196,14 @@ export default {
           if (Object.keys(monitor).length > 0 && index > 1) {
             if ((this.dialysisOrder &&monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)) {
               if(this.org_id!=10683){
-                this.monitors[index].end = "【结束透析】";
+                this.monitors[index].end = "";
               }
 
               tempmonitorflag = false;
             }
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
               if(this.org_id!=10683){
-                this.monitors[index].end = "【结束透析】";
+                this.monitors[index].end = "";
               }
             }
           }

src/xt_pages/dialysis/template/DialysisPrintOrdereightythree.vue

@@ -243,7 +243,16 @@
                 <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('无绦纶套') != -1 ? true : false"
                   showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
                 <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('人造血管') != -1 ? true : false"
-                  showValue="人造血管"></label-box>
+                  showValue="人造血管"></label-box>&nbsp;
+                其他:
+                <div style="display: inline-block;" 
+                  v-if="predialysis.blood_access_part_opera_name.indexOf('内瘘') == -1 &&
+                  predialysis.blood_access_part_opera_name.indexOf('无绦纶套') == -1 &&
+                  predialysis.blood_access_part_opera_name.indexOf('带隧道带绦纶套') == -1 &&
+                  predialysis.blood_access_part_opera_name.indexOf('人造血管') == -1"
+                >
+                  {{ predialysis.blood_access_part_opera_name }}
+                </div>
               </div>&nbsp;&nbsp;
               <div style="display: inline-block;line-height: 30px;">
                 穿刺者:

src/xt_pages/hospitalStation/recordTemplate/printOne.vue

@@ -15,6 +15,7 @@
               <span v-if="patient.marital_status == 1">未婚</span>
               <span v-if="patient.marital_status == 2">已婚</span>
               <span v-if="patient.marital_status == 3">离异</span>
+              <span v-if="patient.marital_status == 4">丧偶</span>
             </div>
             <div>职业：{{getProfession(patient.profession)?getProfession(patient.profession):''}}</div>
         </div>

src/xt_pages/outpatientCharges/listTemplate/batch_listPrint.vue

@@ -0,0 +1,370 @@
+<template>
+  <div >
+    
+    <div class="position" >
+      <div style="text-align: right;flex: 1;">
+        <el-button type='primary' @click="printThisPage">打印</el-button>
+      </div>
+    </div>
+    <div class="app-container">
+      <div  id="list-print">
+        <div style="page-break-after: always;margin-bottom: 20px;" v-for="(item,index) in list_arr" :key="index">
+          <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
+          <div class="listInfo">
+            <div>患者姓名：{{item.patient.name}}</div>
+            <div>性别：{{item.patient.gender == 1 ? '男': '女'}}</div>
+            <div>身份证号：{{item.patient.id_card_no}}</div>
+            <div>年龄：{{item.patient.age }}  岁</div>
+            <div v-if="org_id!=10489">开方日期：{{getTimes(item.order.settle_accounts_date)}}</div>
+          </div>
+          <div class="listInfo">
+            <div>结算类型：{{item.order.is_medicine_insurance == 1 ? "医保" : "自费"}}</div>
+            <div>就诊流水号：{{ item.order.mdtrt_id }}</div>
+            <div>透析号：{{ item.patient.dialysis_no }}</div>
+            <div v-if="org_id ==10653 ">总金额：{{ item.order.medfee_sumamt }}</div>
+            <div v-if="org_id ==10653 ">收费日期：{{getTimes(item.order.ctime)}}</div>
+            <div v-if="org_id !=10653">发票号：{{item.order.fa_piao_number}}</div>
+          </div>
+          <div class="listInfo">
+            <div v-if="org_id !=10653">总金额：{{ item.order.medfee_sumamt }}</div>
+            <div v-if="org_id !=10653">个人支付金额：{{ item.order.psn_cash_pay }}</div>
+            <div v-if="org_id !=10653">基金支付金额：{{ item.order.fund_pay_sumamt }}</div>
+            <div v-if="org_id !=10653">收费日期：{{getTimes(item.order.ctime)}}</div>
+          </div>
+          <table class="listTable" style="text-align: center;">
+            <tr style="border-bottom: 1px solid black;">
+              <td style="width:12%" v-if="org_id==10489">开方日期</td>
+              <td style="width:20%" v-if="org_id !=10653 && org_id !=0">医保编码</td>
+              <td style="width:20%">项目名称</td>
+              <td style="width:12%">规格</td>
+              <td style="width:5%">数量</td>
+              <td style="width:5%">单位</td>
+              <td style="width:7%">单价(元)</td>
+              <td style="width:7%">金额(元)</td>
+              <td style="width:8%" v-if="org_id !=10653 && org_id !=0">自付比例</td>
+            </tr>
+            <tr v-for="(ite,inde) in item.lists" style="line-height: 30px;">
+                <td style="width:12%" v-if="org_id==10489">
+                  <span v-if="ite.code!=undefined">{{getTimes(ite.record_date) }}</span>
+                </td>
+                <td style="width:20%" v-if="org_id !=10653 && org_id !=0">{{ite.code}}</td>
+                <td style="width:20%">{{ite.name}}</td>
+                <td style="width:12%">{{ite.spec}}</td>
+                <td style="width:5%" >
+                  <span v-if="ite.code!=undefined">{{ite.count}}</span>
+                </td>
+                <td style="width:5%" >{{ite.unit}}</td>
+                <td style="width:7%">
+                  <span v-if="ite.code!=undefined">{{(ite.price*1).toFixed(2)}}</span>
+                </td>
+                <td style="width:7%">{{(ite.price * ite.count).toFixed(2)}}</td>
+                <td style="width:8%" v-if="org_id !=10653 ">
+                  <div v-if="ite.code!=undefined">
+                    {{(ite.selfpay_prop)*100}}
+                    <span v-if="ite.selfpay_prop !=''">%</span>
+                  </div>
+                  
+                </td>
+            </tr>
+          </table>
+          <div style="border-top: 1px solid black;">
+            <div style="text-align: right;">
+              合计金额:{{item.order.medfee_sumamt}}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { uParseTime } from '@/utils/tools'
+import { list_batch } from '@/api/his/his'
+import print from "print-js";
+export default {
+  // props: {
+  //   list: {
+  //     type: Array,
+  //     default: function () {
+  //       return [];
+  //     }
+  //   },
+  //   patient: {
+  //     type: Object,
+  //     default: function () {
+  //       return {};
+  //     }
+  //   }, order: {
+  //     type: Object,
+  //     default: function () {
+  //       return {};
+  //     }
+  //   }, admin: {
+  //     type: Object,
+  //     default: function () {
+  //       return {};
+  //     }
+  //   },
+  // },
+  data(){
+      return{
+          page:1,
+          pageArr:[],
+          org_id:'',
+          list:[],
+          list_id:'',
+          list_arr:[],
+      }
+  },
+  // // mounted(){
+  // //     this.getPage()
+  // // },
+  methods:{
+    getMedicineInsuranceKind(type){
+      switch (type) {
+        case "01":
+          return '甲类';
+        case "02":
+          return '乙类';
+        case "03":
+          return '自费';
+          break;
+      }
+
+    },
+    getNowTime: function () {
+      let dateTime
+      let yy = new Date().getFullYear()
+      let mm = new Date().getMonth() + 1
+      let dd = new Date().getDate()
+      let hh = new Date().getHours()
+      let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes()
+        :
+        new Date().getMinutes()
+      let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
+        :
+        new Date().getSeconds()
+      dateTime = yy + '-' + mm + '-' + dd
+      return dateTime
+    },
+    getTimes(time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    },
+    getPage(){
+
+      if(this.list.length <= 17){
+          this.page = 1
+          this.pageArr.push(this.list.length)
+      }else if(this.list.length > 17){
+          this.page = parseInt(this.list.length / 17)
+          let num = this.list.length % 17
+          for (var i=0;i<this.page;i++){
+              this.pageArr.push(17)
+          }
+          if(num != 0){
+              this.pageArr.push(num)
+          }
+      }
+      console.log('this.pageArr',this.list);
+    },
+    getlist(){
+      list_batch(this.list_id).then(res =>{
+        console.log('res',res);
+        this.list_arr = res.data.data.orders
+        for(let x in this.list_arr){
+          this.list_arr[x]['lists']=[]
+          for (let i = 0; i < this.list_arr[x].order_info.length; i++) {
+          var infos = this.list_arr[x].order_info[i]
+          let obj = {
+            med_chrgitm_type: this.getType(infos.med_chrgitm_type),
+            price: infos.pric.toFixed(4),
+            count: infos.cnt,
+            selfpay_prop:infos.selfpay_prop,
+          }
+          if (infos.advice && infos.advice.id == 0 && infos.project && infos.project.id > 0) {
+            obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
+            obj['feedetl_sn'] = infos.feedetl_sn
+            obj['type'] = infos.chrgitm_lv
+
+            if(infos.project.type == 2){
+              obj['name'] = infos.project.project.project_name
+              obj['code'] = infos.project.project.medical_code
+              obj['spec'] = ''
+              obj['unit'] =  infos.project.project.unit
+              obj['is_total']= 0
+              obj['record_date'] = infos.project.record_date
+
+            }else if (infos.project.type == 3){
+              obj['name'] = infos.project.good_info.good_name
+              obj['spec'] = ""
+              obj['code'] = infos.project.good_info.medical_insurance_number
+              obj['unit'] = infos.project.good_info.packing_unit
+              obj['is_total']= 0
+              obj['record_date'] = infos.project.record_date
+            }
+
+          }
+          if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
+            obj['type'] = infos.chrgitm_lv
+            obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
+            obj['name'] = infos.advice.drug.drug_name
+            obj['code'] = infos.advice.drug.medical_insurance_number
+            obj['unit'] = infos.advice.prescribing_number_unit
+            obj['feedetl_sn'] =  infos.feedetl_sn
+            obj['spec'] =  infos.advice.drug.dose +  infos.advice.drug.dose_unit+"*" + infos.advice.drug.min_number +  infos.advice.drug.min_unit+"/"+infos.advice.drug.max_unit
+            obj['is_total']= 0
+            obj['record_date'] = infos.advice.record_date
+            // v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>{{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
+
+
+          }
+          this.list_arr[x].lists.push(obj)
+          this.list_arr[x].lists.sort(function(a, b) {
+            return b.p_time < a.p_time ? 1 : -1
+          })
+        }
+
+          let newObj = {}
+          newObj['name'] = "合计"
+          newObj['count']= 1
+          newObj['price']= this.list_arr[x].order.medfee_sumamt.toFixed(2)
+          newObj['is_total']= 1
+          this.list_arr[x].lists.push(newObj)
+        }
+        
+      })
+    },
+    getType(med_chrgitm_type) {
+      switch (med_chrgitm_type) {
+        case '01':
+          return '床位费'
+          break
+        case '02':
+          return '诊察费'
+
+          break
+        case '03':
+          return '检查费'
+
+          break
+        case '04':
+          return '化验费'
+          break
+        case '05':
+          return '治疗费'
+
+          break
+        case '06':
+          return '手术费'
+
+          break
+        case '07':
+          return '护理费'
+
+          break
+        case '08':
+          return '材料费'
+
+          break
+        case '09':
+          return '西药费'
+
+          break
+        case '10':
+          return '中药饮片费'
+
+          break
+        case '11':
+          return '中成药费'
+
+          break
+        case '12':
+          return '一般诊疗费'
+
+          break
+        case '13':
+          return '挂号费'
+          break
+        case '14':
+          return '其他费'
+          break
+        case '0':
+          return '其他费'
+          break
+
+      }
+    },
+    printThisPage() {
+          const style =
+            '@media print {.listTitle{font-size: 20px;text-align: center;font-weight: bold;margin-bottom: 10px;} .listInfo{display: flex;font-size: 14px;justify-content: space-around;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align: left;} .listTable tr td {padding: 0 5px;}}';
+          printJS({
+            printable: "list-print",
+            type: "html",
+            style: style,
+            scanStyles: false
+          });
+      },
+  },
+  created(){
+    this.list_id = this.$route.query.list_id
+    this.getlist()
+    this.org_id = this.$store.getters.xt_user.org_id
+  },
+  // watch:{
+  //     list: {
+  //         handler(newVal) {
+  //           // this.list = newVal
+  //             this.getPage()
+  //             // this.getlist()
+  //         },
+  //         deep: true
+  //     }
+  // }
+
+}
+
+
+</script>
+
+<style lang="scss" scoped>
+.list-print{
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding:20px 10px;
+}
+.listTitle{
+  font-size: 20px;
+  text-align: center;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+.listInfo{
+  display: flex;
+  font-size: 14px;
+  justify-content: space-around;
+  margin: 10px 0;
+}
+.listTable{
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 20px;
+  font-size: 14px;
+  border-color: #000;
+  text-align: left;
+}
+.listTable tr td {
+  padding: 0 5px;
+}
+.tableBottom{
+  font-size: 12px;
+  display: flex;
+  margin-top: 20px;
+}
+.tableBottomOne{
+  margin-right: 20px;
+}
+</style>

src/xt_pages/outpatientCharges/summary.vue

@@ -62,10 +62,10 @@
                 $store.getters.xt_user.org_id == 10610 || $store.getters.xt_user.org_id == 0"
             size="small" type="primary" @click="batch_print_settlte">批量打印结算单
           </el-button>
-
+          <el-button size="small" type="primary" @click="list_click">批量打印费用清单</el-button>
 
           <el-button
-            v-if="$store.getters.xt_user.org_id == 10644 || $store.getters.xt_user.org_id == 0"
+            v-if="$store.getters.xt_user.org_id == 10644"
             size="small" type="primary" @click="batch_print_settle_10644">批量打印结算单
           </el-button>
           <el-button size="small" type="primary" @click="export_detail"
@@ -78,7 +78,6 @@
                      type="primary" @click="export_detail_ten_two">报表下载3
           </el-button>
 
-
         </div>
       </div>
 
@@ -658,7 +657,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
+import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund,list_batch } from '@/api/his/his'
 import { ModifyFapiaoCode } from '@/api/his/his_tools'
 
 // import NewStatementPrint from './newStatementPrint'
@@ -4248,6 +4247,19 @@ export default {
       }
 
 
+    },
+    list_click(){
+      console.log('selecting_schs',this.selecting_schs);
+      var list_arr=[]
+      for(let i in this.selecting_schs){
+        list_arr.push(this.selecting_schs[i].id)
+      }
+      var list_id = list_arr.join(",")
+      this.$router.push({path:'/listTemplate/batch_listPrint',query:{list_id:list_id}})
+      // list_batch(list_id).then(res =>{
+      //   console.log('res',res);
+
+      // })
     }
   },
 

src/xt_pages/outpatientDoctorStation/recordTemplate/printFour.vue

@@ -15,6 +15,7 @@
                   <span v-if="patient.marital_status == 1">未婚</span>
                   <span v-if="patient.marital_status == 2">已婚</span>
                   <span v-if="patient.marital_status == 3">离异</span>
+                  <span v-if="patient.marital_status == 4">丧偶</span>
                 </div>
                 <div>职业：{{getProfession(patient.profession)?getProfession(patient.profession):''}}</div>
                 <div>病历编号：{{patient.id?patient.id:''}}</div>

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -15,6 +15,7 @@
               <span v-if="patient.marital_status == 1">未婚</span>
               <span v-if="patient.marital_status == 2">已婚</span>
               <span v-if="patient.marital_status == 3">离异</span>
+              <span v-if="patient.marital_status == 4">丧偶</span>
             </div>
             <div>职业：{{getProfession(patient.profession)?getProfession(patient.profession):''}}</div>
         </div>

src/xt_pages/stock/drugs/drugNewQuery.vue

@@ -14,8 +14,8 @@
                <PurchaseNewDrugQuery ref="mychildfive"></PurchaseNewDrugQuery>
             </el-tab-pane>
         
-            <!-- <el-tab-pane label="进销存查询" name="second">
-              <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
+            <!-- <el-tab-pane label="进销存查询2" name="second">
+               <PurchaseDrugQuery ref="mychild"></PurchaseDrugQuery>
             </el-tab-pane>  -->
 
             <el-tab-pane label="有效期查询" name="third">
@@ -73,6 +73,7 @@ export default {
       if(val.name =="five"){
        this.$refs.mychildfive.open()
       }
+     
     }
   },
   created(){

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -440,6 +440,10 @@
       @open="openDialog"
       :visible.sync="dialogVisible"
       width="40%">
+
+      <div style="margin-bottom: 10px;">
+        <span >追溯码个数:{{getTotal() }} 个</span>
+      </div>
       <span>
         <el-input
         
@@ -595,10 +599,30 @@ export default {
       dialogVisible:false,
       currentRow:{},
       currentIndex:0,
-      textarea:""
+      textarea:"",
+      textAreaList:[]
     };
   },
   methods: {
+    getTotal(){
+      if(this.textarea!=null){
+        var  textAreaList = this.textarea.split(",")
+        console.log("textArrleti",textAreaList)
+        var arr = []
+        if(textAreaList!=null && textAreaList.length>0){
+          for(let i=0;i<textAreaList.length;i++){
+            if(textAreaList[i]!=""){
+              arr.push(textAreaList[i])
+            }
+          }
+          return  arr.length
+        }else{
+          return ""
+        }
+      
+      }
+
+    },
     openDialog(){
       this.$nextTick(() => {
         this.$refs.inputRef.focus()
@@ -1257,6 +1281,7 @@ export default {
         this.textarea = textarea
 
       }
+      this.getTotal()
    },
   },
 

src/xt_pages/stock/drugs/inventoryPrint.vue

@@ -19,10 +19,11 @@
                         <td align="center">批号</td>
                         <td style="width: 100px;" align="center">生产日期</td>
                         <td align="center">有效日期</td>
-                        <td align="center">生产企业</td>
+                        <td align="center" style="width: 100px;">生产企业</td>
                         <td align="center">国药准字</td>
                         <td align="center">单位</td>
-                        <td style="width:200px" align="center">库存量</td>
+                        <td style="width:100px" align="center">剩余库存</td>
+                        <td style="width: 100px;" align="center">盘点数量</td>
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
                         <td align="center">{{index+1}}</td>
@@ -34,7 +35,17 @@
                         <td align="center">{{getManufacturerName(item.manufacturer)}}</td>
                         <td align="center">{{item.number}}</td>
                         <td align="center">{{item.max_unit}}</td>
-                        <td align="center"></td>
+                        <td align="center">
+                          <span v-if="item.stock_max_number>0">
+                            {{ item.stock_max_number }}{{ item.max_unit }}
+                          </span>
+                           <span v-if="item.stock_min_number>0">
+                            {{ item.stock_min_number }}{{ item.min_unit }}
+                           </span>
+                        </td>
+                        <td align="center">
+
+                        </td>
                     </tr>
                 </table>
 

src/xt_pages/stock/inventoryPrint.vue

@@ -22,7 +22,8 @@
                         <td style="width: 100px;" align="center">生产企业</td>
                         <td align="center">国药准字</td>
                         <td align="center">单位</td>
-                        <td style="width:200px" align="center">库存量</td>
+                        <td style="width:100px" align="center">剩余库存</td>
+                        <td style="width:200px" align="center">盘点数量</td>
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
                         <td align="center">{{index+1}}</td>
@@ -34,6 +35,7 @@
                         <td align="center">{{getManufacturerName(item.manufacturer)}}</td>
                         <td align="center">{{item.remark}}</td>
                         <td align="center">{{item.packing_unit}}</td>
+                        <td align="center">{{ item.stock_count }}</td>
                         <td align="center"></td>
                     </tr>
                 </table>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -292,12 +292,15 @@ export default {
                if(this.org_id ==10697){
                   list[i].stock_in_price = list[i].buy_price
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
-               }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
+               }else if(this.org_id ==0){
+                list[i].stock_in_price = list[i].buy_price
+                list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
+               }else if(this.org_id == 10644 || this.org_id == 10752){
                  list[i].stock_in_price = "/"
-                 console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
-                 console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
-                 console.log("val3",this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) )
-                 console.log("val4",this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
+                //  console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
+                //  console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
+                //  console.log("val3",this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) )
+                //  console.log("val4",this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
 
                 list[i].stockMoney = parseFloat(this.getAllStockInPrice(list[i].StWarehousingInfoTwo))  +parseFloat(this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))  - parseFloat(this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty))  - parseFloat(this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)) 
                 if(list[i].stockMoney>0){
@@ -317,7 +320,10 @@ export default {
               if(this.org_id ==10697){
                list[i].addStockMoney = list[i].buy_price 
                 list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
+              }else if(this.org_id == 0){
+                list[i].addStockMoney = list[i].buy_price 
+                list[i].saleStockMoney = (list[i].buy_price *list[i].stockAdd).toFixed(2)
+              } else if(this.org_id == 10644 || this.org_id == 10752){
                 list[i].addStockMoney = "/"
                 list[i].saleStockMoney = this.getWarehouseInfoOnePrice(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
               } else{
@@ -330,7 +336,10 @@ export default {
               if(this.org_id == 10697){
                 list[i].stockOutprice = list[i].packing_price
                 list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id == 10644 || this.org_id == 10752){
+              }else if(this.org_id == 0){
+                list[i].stockOutprice = list[i].packing_price
+                list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
+              }else if(this.org_id == 10644 || this.org_id == 10752){
                 list[i].stockOutprice = "/"
                 list[i].saleOutMoney = this.getWarehosueOutInfoPrice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
                 if(list[i].saleOutMoney == "NaN"){
@@ -344,7 +353,7 @@ export default {
 
 
              
-              if(this.org_id == 10265){
+              if(this.org_id == 10265 || this.org_id == 0){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
               }else{
                 if((list[i].stockIn + list[i].stockAdd - list[i].outStock)>0 ){
@@ -358,13 +367,12 @@ export default {
               if(this.org_id ==10697){
                 list[i].overPrice = list[i].packing_price
                 list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
-              }else if(this.org_id == 0 || this.org_id ==10644 || this.org_id == 10752){
+              }else if(this.org_id == 0){
+                list[i].overPrice = list[i].GoodEndFlowInfo.buy_price
+                list[i].overMoney = (list[i].GoodEndFlowInfo.buy_price*list[i].overStock).toFixed(2)
+              } else if(this.org_id ==10644 || this.org_id == 10752){
                 list[i].overPrice = "/"
-                // console.log("stockMoney-00000000000000",list[i].stockMoney)
-                // console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)
-                // console.log("saleOutMoney-00000000000000",list[i].saleOutMoney)
                 list[i].overMoney = (parseFloat(list[i].stockMoney)  + parseFloat(list[i].saleStockMoney) - parseFloat(list[i].saleOutMoney)).toFixed(2)
-                // console.log("hahahha",list[i].overMoney)
               }else{
                 list[i].overPrice = "/"
                 list[i].overMoney = "/"

src/xt_pages/stock/stockOutOrder.vue

@@ -1217,6 +1217,7 @@ export default {
         storehouse_id: this.storehouse_id,
         way_type: this.way_type,
         check_type:this.check_type,
+        keywords: this.searchKey,
       };
       this.warehouseOutDate = [];
       getWarehouseOutList(Params).then((response) => {

src/xt_pages/upload/fast/basicInfo.vue

@@ -169,6 +169,8 @@ export default {
                 this.form.marital_status = '已婚'
             }else if(this.form.marital_status == 3){
                 this.form.marital_status = '离异'
+            }else if(this.form.marital_status == 4){
+                this.form.marital_status = '丧偶'
             }else if(this.form.marital_status == 0){
                 this.form.marital_status = ''
             }

src/xt_pages/user/components/PatientDetail.vue

@@ -662,7 +662,7 @@
 
             <div v-show="!generic_info_fold">
               <el-col :span="8">
-                <el-form-item label="别名 : " prop="alias">
+                <el-form-item label="血型 : " prop="alias">
                   <el-input v-model="form.alias" disabled></el-input>
                 </el-form-item>
               </el-col>

src/xt_pages/user/components/PatientForm.vue

@@ -704,7 +704,7 @@
 
               <div v-show="!generic_info_fold">
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                  <el-form-item label="别名 : " prop="alias">
+                  <el-form-item label="血型 : " prop="alias">
                     <el-input v-model="form.alias"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1593,6 +1593,7 @@ export default {
     // this.styleOptions = this.$store.getters.patient_types;
     // this.partitionOptions = this.$store.getters.partitions;
     this.maritalOptions = getDataConfig("patient", "marital_options");
+    console.log("maritalOptians==============",this.maritalOptions)
     this.wayOptions = getDataConfig("patient", "reimbursement_ways");
     // this.typeOptions = this.$store.getters.blood_types;
     // this.rhOptions = this.$store.getters.rh;

src/xt_pages/user/doctorAdvice.vue

@@ -2096,6 +2096,7 @@ import { fetchPatient, PostRemind } from "@/api/patient";
 import { jsGetAge, uParseTime } from "@/utils/tools";
 import { getDataConfig } from "@/utils/data";
 import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
+import patient from "../../router/modules/patient";
 let rowIndex = 1;
 const rowKey = 0;
 
@@ -2921,6 +2922,8 @@ export default {
     },
     DeleteGroupAdvice(groupno, row) {
       console.log("patinet_id =======",row)
+      var patient_id = row.patient_id
+      var advice_date = row.advice_date
       this.$confirm("确认删除这组医嘱?", "医嘱删除", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -2944,7 +2947,7 @@ export default {
             }
           }
 
-          DeleteNewGroupAdvice(groupno, mode).then(response => {
+          DeleteNewGroupAdvice(groupno, mode,patient_id,advice_date).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)``;
               return false;

src/xt_pages/user/inspection.vue

@@ -154,15 +154,16 @@
                         <span v-if="parseFloat(scope.row.value) < parseFloat(getrange(scope.row.range_min)) ">
                           {{ scope.row.value }} <span style="color: blue;" v-if="scope.row.value>0">↓</span>
                         </span>
-                        <span v-if="parseFloat(getrange(scope.row.range_min))<= parseFloat( scope.row.value) && parseFloat(scope.row.value)<= parseFloat(getrange(scope.row.range_max)) ">
+                        <span v-else-if="parseFloat(getrange(scope.row.range_min))<= parseFloat( scope.row.value) && parseFloat(scope.row.value)<= parseFloat(getrange(scope.row.range_max)) ">
                           {{ scope.row.value }}
                         </span>
-                        <span v-if="parseFloat(scope.row.value) >parseFloat(getrange(scope.row.range_max)) ">
+                        <span v-else-if="parseFloat(scope.row.value) >parseFloat(getrange(scope.row.range_max)) ">
                           {{ scope.row.value }} <span style="color: red;" v-if="scope.row.value>0">↑</span>
                         </span>
-                        <span v-if ="scope.row.range_max ==''||scope.row.range_min ==''">
+                        <span v-else-if ="scope.row.range_max ==''||scope.row.range_min ==''">
                           {{ scope.row.value }}
                         </span>
+                        <span v-else>{{ scope.row.value }}</span>
                       </span>
                       <!-- <span v-if="scope.row.value =='阳性'" style="color:red">{{ scope.row.value }}</span> -->
                       <!-- <span v-else>{{ scope.row.value }}</span> -->
@@ -1409,7 +1410,6 @@ export default {
                 this.is_open = true
               }else{
                 this.is_open = false
-
               }
             }else{
               this.is_open = false
@@ -1458,7 +1458,7 @@ export default {
                   }else{
                     console.log('执行1');
 
-                    if(this.org_id == 10702 || this.org_id == 0){
+                    if(this.org_id == 10702){
                       if(item.project_name == '血常规'|| item.project_name == '透后肾功能' ||
                           item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能' ||
                           item.project_name == '传染病检查'
@@ -1500,7 +1500,7 @@ export default {
               // item["inspect_type"] = inspectionsMap[items[index].id].inspect_type
               item.value_direction = ''
               if (item.range_type == 1) {
-                console.log('执行5',parseFloat(item.value));
+                console.log('执行5',item.value);
                 var value = parseFloat(item.value)
                 var range_min = parseFloat(item.range_min)
                 var range_max = parseFloat(item.range_max)
@@ -1519,12 +1519,9 @@ export default {
               // }
 
               console.log('fffff',this.items);
-              if(item.value.indexOf("http") <0){
-                this.isPic = true
-              }
+              if(item.value.indexOf("http") !=-1){
 
-              if(this.org_id!=10503){
-                this.isPic = false
+                this.isPic = true
               }
 
               console.log("woowwoow",this.isPic)

src/xt_pages/user/physiqueprinting.vue

@@ -54,7 +54,7 @@
                 <div style="flex: 1;">
                   首次透析日期：{{ patient.first_dialysis_date ? getTime(patient.first_dialysis_date, '{y}-{m}-{d}') : '' }}
                 </div>
-                <div style="flex: 1;">血型：{{ getBloodType(patient.blood_type) }}</div>
+                <div style="flex: 1;">血型：{{ patient.alias }}</div>
                 <div style="flex: 1;">报销方式：{{ getWayOptions(patient.reimbursement_way_id) }}</div>
               </div>
               <div style="display: flex; justify-self: start; margin-top: 5px ;width: 100%;">
@@ -137,8 +137,15 @@
               {{index+1}}.<span>{{ item }}</span><br/>
             </div>
             <div style="text-align: right;margin-bottom: 10px;">
-              <span style="font-weight: bold;">病历书写者：</span>
-              {{getDoctorName(item.doctor_id)}}
+
+             <span style="font-weight: bold;">病历书写者：</span>
+              <span v-if="getUrl(item.doctor_id)!=''">
+                <img :src="getUrl(item.doctor_id)" style="height: 50px">
+              </span>
+              <span v-if="getUrl(item.doctor_id)==''">
+                {{getDoctorName(item.doctor_id)}}
+              </span>
+             
             </div>
           </div>
           <div style="float: right;">
@@ -219,7 +226,8 @@ export default {
       },
       diagnosis: [],
       treatment_plan_list:[],
-      org_id:0
+      org_id:0,
+      signatureList:[]
     }
   },
   components: {
@@ -230,9 +238,20 @@ export default {
       fetchAllDoctorAndNurse().then(response => {
         if (response.data.state == 1) {
           this.doctorOptions = response.data.data.doctors;
+          var signature = response.data.data.signature
+          this.signatureList = signature
         }
       });
     },
+    getUrl(creator){
+      var url = ""
+      for(let i=0;i<this.signatureList.length;i++){
+         if(creator == this.signatureList[i].admin_user_id){
+             url = this.signatureList[i].url
+         }
+      }
+      return url
+    },
     getDoctorName: function(doctor_id) {
       for (let index = 0; index < this.doctorOptions.length; index++) {
         const doctor = this.doctorOptions[index]

src/xt_pages/workforce/components/tableWeeks.vue

@@ -886,7 +886,7 @@
       },
       signPrint() {
 //
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340  || this.org_id == 10375 || this.org_id ==10517 || this.org_id ==0){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340  || this.org_id == 10375 || this.org_id ==10517){
          var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []
@@ -905,7 +905,7 @@
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1+"&ids="+this.ids
           })
         }
-        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340  && this.org_id!=10375 && this.org_id!=10469 && this.org_id!=10517 && this.org_id!=0){
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340  && this.org_id!=10375 && this.org_id!=10469 && this.org_id!=10517){
           var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/remind_print_setting.vue

@@ -125,6 +125,30 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 17">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 18">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 19">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
                 </div>
 
                 <div v-if="org_id==0 || org_id ==10460">
@@ -155,13 +179,18 @@
                
                 <div v-if="org_id!=10440 && org_id!=10600">打印时间:
                      {{getTime(main_collection.schedule_date)}}   
+
+                   <span v-if="printObj.week == 1">
                      <span v-if="main_collection.schedule_week ==1">星期一</span>
                      <span v-if="main_collection.schedule_week ==2">星期二</span>
                      <span v-if="main_collection.schedule_week ==3">星期三</span>
                      <span v-if="main_collection.schedule_week ==4">星期四</span>
                      <span v-if="main_collection.schedule_week ==5">星期五</span>
                      <span v-if="main_collection.schedule_week ==6">星期六</span>
-                     <span v-if="main_collection.schedule_week ==7">星期日</span></div>
+                     <span v-if="main_collection.schedule_week ==7">星期日</span>
+                    </span>   
+                    </div>
+                  
               </div>
 
               <div class="signPrint" style="font-size:16px;" v-else>
@@ -353,6 +382,7 @@
     this.printDate = moment().format("YYYY-MM-DD HH:mm:ss")
     this.modeOptions = this.$store.getters.treatment_mode
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+    console.log("anticoagulants_confit---------------",this.anticoagulants_confit)
     this.week_type = this.$route.query.week_type
     this.week_time  = this.$route.query.week_time
     this.zone = this.$route.query.zone