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

src/api/dialysis_record.js

@@ -36,7 +36,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
     schedule_date: schedule_date,
     mode: mode
   }
-  console.log('data=====', data)
+
   return request({
     url: '/api/dislysis/monitor/edit',
     method: 'post',
@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode,washpipe_nurse,change_nurse,difficult_puncture_nurse,new_fistula_nurse) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -58,12 +58,12 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     lood_drawing: lood_drawing,
     schedual_type: schedual_type,
     mode: mode,
-    washpipe_nurse:washpipe_nurse,
-    change_nurse:change_nurse,
-    difficult_puncture_nurse:difficult_puncture_nurse,
-    new_fistula_nurse:new_fistula_nurse
+    washpipe_nurse: washpipe_nurse,
+    change_nurse: change_nurse,
+    difficult_puncture_nurse: difficult_puncture_nurse,
+    new_fistula_nurse: new_fistula_nurse
   }
-  console.log("params",params)
+  console.log('params', params)
   return request({
     url: '/api/dialysis/start_record',
     method: 'post',

src/api/his/his.js

@@ -41,6 +41,7 @@ export function getDoctors() {
 }
 
 export function createHisPrescription(data, params) {
+  console.log('param2323232323233223233223332322323', params)
   return request({
     url: '/api/hisprescription/create',
     method: 'post',
@@ -516,7 +517,6 @@ export function GetSummarySettle(params) {
   })
 }
 
-
 export function GetLabelList(params) {
   return request({
     url: '/api/his/inspectionlist/get',
@@ -525,8 +525,6 @@ export function GetLabelList(params) {
   })
 }
 
-
-
 export function GetLabelInfo(params) {
   return request({
     url: '/api/his/inspectioninfo/get',

src/xt_pages/dialysis/batch_print/batch_print_order_fortyThree.vue

@@ -454,6 +454,38 @@
                             <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                         </td>
                     </tr>
+                    <tr v-for="(advice, advice_index) in record.his_project" :key="advice_index">
+                        <td height="32px;padding:1px 1px">
+                            <span v-if="advice.start_time">
+                                {{ getTime(advice.start_time, "{h}:{i}") }}
+                            </span>
+                        </td>
+                        <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
+                            <span style="padding-left:5px;display:inline-block;">
+                              <span>{{ advice && advice.project ? advice.project.project_name : '' }}</span>
+                            </span>
+                        </td>
+
+                        <td height="32px">
+                            <span v-if="setAdminUserES(advice, 'doctor') == ''">
+                                {{getAdminUser(advice, 'doctor')}}
+                            </span>
+                            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'doctor')" alt srcset />
+                            </span>
+                        </td>
+                        <td height="32px">
+                            <span v-if="setAdminUserES(advice, 'execution_staff') == ''">
+                                {{getAdminUser(advice, 'execution_staff')}}
+                            </span>
+                            <span v-else>
+                                <img style="height:30px;" :src="setAdminUserES(advice, 'execution_staff')" alt srcset />
+                            </span>
+                        </td>
+                        <td height="32px">
+                            <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
+                        </td>
+                    </tr>
                     <!-- </template> -->
                     </tbody>
                 </table>
@@ -503,7 +535,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="row" style="border-bottom:1px solid #000;display:flex;margin-top:150px;">
+                <div class="row" style="border-bottom:1px solid #000;display:flex;margin-top:50px;">
                     <div class="inline_block" style="width:33%">
                         医生签名：
                         <div class="under_line" style="width: 70px;text-align: center;">
@@ -711,26 +743,34 @@ export default {
             if (this.records[recordIndex].patient.user_org_id == 9535) {
               this.records[recordIndex].isShowZero = true
             }
+
+            let his_project = []
+            this.records[recordIndex].his_project.map(item => {
+              if(item.type == 2){
+                his_project.push(item)
+              }
+            })
+            this.records[recordIndex].his_project = his_project
             
             var delghThree = 0
             if (
               this.records[recordIndex].his_advices &&
-              this.records[recordIndex].his_advices.length < 6
+              this.records[recordIndex].his_advices.length + this.records[recordIndex].his_project.length < 6
             ) {
-              delghThree = 6 - this.records[recordIndex].his_advices.length
+              delghThree = 6 - (this.records[recordIndex].his_advices.length + this.records[recordIndex].his_project.length)
             } else {
               delghThree = 0
             }
 
             if (delghThree > 0) {
               if (
-                typeof this.records[recordIndex].his_advices === 'undefined' ||
-                this.records[recordIndex].his_advices == null
+                typeof this.records[recordIndex].his_project === 'undefined' ||
+                this.records[recordIndex].his_project == null
               ) {
-                this.records[recordIndex].his_advices = []
+                this.records[recordIndex].his_project = []
               }
               for (let index = 0; index < delghThree; index++) {
-                this.records[recordIndex].his_advices.push([])
+                this.records[recordIndex].his_project.push([])
               }
             }
             this.records[recordIndex].his_advices = this.records[recordIndex].his_advices.sort((a,b)=>{ return a.id-b.id})

src/xt_pages/dialysis/components/dialysisParametersDialog.vue

@@ -33,6 +33,7 @@
                 <template slot-scope="scope">
                    <span v-if="scope.row.anticoagulant==1">无肝素</span>
                    <span v-if="scope.row.anticoagulant==2">普通肝素</span>
+                   <span v-if="scope.row.anticoagulant==3">低分子肝素</span>
                    <span v-if="scope.row.anticoagulant==4">阿加曲班</span>
                    <span v-if="scope.row.anticoagulant==5">枸橼酸钠</span>
                    <span v-if="scope.row.anticoagulant==6">低分子肝素钙</span>
@@ -40,6 +41,7 @@
                    <span v-if="scope.row.anticoagulant==8">依诺肝素</span>
                    <span v-if="scope.row.anticoagulant==9">达肝素</span>
                    <span v-if="scope.row.anticoagulant==10">体外抗凝</span>
+                   <span v-if="scope.row.anticoagulant==11">那曲肝素</span>
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="name"label="数量">

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -29,7 +29,7 @@
       </li>
       <li>
         <label>年龄:</label>
-        <span>{{ getAge(patient) }}</span>
+        <span>{{ tranAge(patient)}}</span>
       </li>
       <li>
         <label>透析号 : </label>
@@ -112,6 +112,7 @@ export default {
   },
   methods: {
     getAge: function(val) {
+      console.log("val323232323223322332323",val)
       if (val.id_card_no) {
         var thisLen = val.id_card_no.length
 
@@ -132,12 +133,19 @@ export default {
         return age
       }
     },
+   tranAge(val) {
+        if(val.birthday){
+          var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
+          return jsGetAge(birth, '-');
+        }
+    },
 
     stepState: function() {
       return parseInt(Math.random() * 1000 + '') % 2 == 1
     }
   },
   created() {
+    // console.log("hh23323233232332233223",this.$store.getters.xt_user.org.id)
     this.dialysis_time = this.$route.query.date ? parseTime(this.$route.query.date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}')
   }
 }

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.org_id == 9555) " >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.org_id == 9555 " >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.org_id == 9555) " >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.org_id == 9555 " >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              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.$store.getters.xt_user.template_info.org_id == 9555 "  >
+              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.$store.getters.xt_user.template_info.org_id == 9555 "  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

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

@@ -1610,7 +1610,7 @@
           'hemodialysis',
           'dialyzer_perfusion_apparatus'
         )
-        console.log('3333333', this.dialyzerPerfusionApparatus)
+        // console.log('3333333', this.dialyzerPerfusionApparatus)
         this.bloods = getDataConfig(
           'hemodialysis',
           'blood'
@@ -1968,7 +1968,7 @@
         if (his_is_open == 1) {
           this.is_open = 0
         }
-        
+
         if(this.$store.getters.xt_user.org.id == 10101){
           if (this.predialysis.id > 0 && this.predialysis.created_time > 0) {
             var date = new Date(this.predialysis.created_time * 1000)
@@ -2056,7 +2056,7 @@
             }
           }
         }
-        
+
 
         if (pre.anticoagulant == 3) {
           this.dialysisPrescription.anticoagulant = '低分子肝素'
@@ -3513,7 +3513,7 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-        
+
       },
       'dialysisPrescription.anticoagulant_shouji': function() {
         let dialysis_duration_minute = 0

src/xt_pages/dialysis/dialysisDrugs_print.vue

@@ -33,6 +33,7 @@
                                     <td>
                                       <span v-if="item.anticoagulant==1">无肝素</span>
                                       <span v-if="item.anticoagulant==2">普通肝素</span>
+                                      <span v-if="item.anticoagulant==3">低分子肝素</span>
                                       <span v-if="item.anticoagulant==4">阿加曲班</span>
                                       <span v-if="item.anticoagulant==5">枸橼酸钠</span>
                                       <span v-if="item.anticoagulant==6">低分子肝素钙</span>
@@ -40,6 +41,7 @@
                                       <span v-if="item.anticoagulant==8">依诺肝素</span>
                                       <span v-if="item.anticoagulant==9">达肝素</span>
                                       <span v-if="item.anticoagulant==10">体外抗凝</span> 
+                                      <span v-if="item.anticoagulant==11">那曲肝素</span> 
                                     </td>
                                     <td>
                                       {{item.count}}

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name"></div>
@@ -1369,6 +1369,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -1383,26 +1384,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
       <div id="dialysis-print-box-1-1" class="dialysis-print-order print-template-two print_page_main_content">
         <div style="display:inline-block;width:100%;text-align:center;">
@@ -1266,6 +1266,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -1280,26 +1281,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
       
@@ -1822,7 +1822,7 @@ export default {
           this.$message.error('透前体温未填')
         }else if(this.receiverTreatmentAccess.posture == 0){
           this.$message.error('体位未填')
-        }else if(monitors[0] && (this.monitors[0].systolic_blood_pressure.systolic_blood_pressure == 0 || this.monitors[0].systolic_blood_pressure.diastolic_blood_pressure == 0)){
+        }else if(this.monitors[0] && (this.monitors[0].systolic_blood_pressure == 0 || this.monitors[0].diastolic_blood_pressure == 0)){
           this.$message.error('透前血压未填完整')
         }else if(this.predialysis.catheter == ''){
           this.$message.error('导管穿刺口未填')
@@ -1910,46 +1910,80 @@ export default {
           this.$message.error('治疗小结未填')
         }else if(this.prescription.prescription_doctor == 0){
           this.$message.error('医生未填')
-        }else if(this.dialysisOrder.start_nurse == 0){
+        }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
           this.$message.error('责任护士未填')
-        }else if(this.dialysisOrder.puncture_nurse == 0){
+        }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
           this.$message.error('穿刺护士未填')
+        }else if (this.dialysisOrder == null && this.check.creater == 0) {
+          this.$message.error('核对护士未填')
+        }else if (this.dialysisOrder != null && this.check.creater == 0) {
+          this.$message.error('核对护士未填')
         }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
           this.$message.error('核对护士未填')
         }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
           this.$message.error('核对护士未填')
-        }else 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.type != 3){
-                    this.$message.error('存在不是护士保存的监测')
-                  }
-                }
-              })
-            }
-          })
-        }else if(this.tableAdvice.length > 0){
-          this.tableAdvice.map(item => {
-            if(item.id > 0 && item.created_time){
-              this.users.map(it => {
-                if(it.id == item.advice_doctor){
-                  if(it.type != 2){
-                    this.$message.error('存在不是医生保存的医嘱')
-                  }
-                }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                  if(it.type != 3){
-                    this.$message.error('存在不是护士执行的医嘱')
+        }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
+          let num = 0
+          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('存在不是护士保存的监测')
+                    }
                   }
-                }else if(it.id == item.checker && item.checker > 0){
-                  if(it.type != 3){
-                    this.$message.error('存在不是护士核对的医嘱')
+                })
+              }
+            })
+          }
+          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('存在不是护士核对的医嘱')
+                    }
                   }
-                }
-              })
-            }
+                })
+              }
           })
+          }
+          
+          if(num == 0){
+            this.$message.success('核对完成')
+          }
+        }else{
+          this.$message.success('核对完成')
         }
       },
       getComplication(complication){

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFive.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -834,7 +834,7 @@
                           <!--<span v-if="afterdialysis.creater==0">&nbsp;</span>-->
                           <!--<img class="es-img" :src="setAdminUserES(afterdialysis.creater)" alt="" srcset="" v-else>-->
 
-                          <span v-if="dialysisOrder.start_nurse != check.modifier">
+                          <span v-if="dialysisOrder ? dialysisOrder.start_nurse != check.modifier : false">
                             <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                             {{ getAdminUser(check == null ? 0 : check.modifier) }}
                             </span>
@@ -1183,8 +1183,10 @@ export default {
         this.$message.error('透前体温未填')
       }else if(this.receiverTreatmentAccess.posture == 0){
         this.$message.error('体位未填')
-      }else if((this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0) && this.org_id == 9987){
+      }else if(this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0){
         this.$message.error('透前血压未填完整')
+      }else if(this.predialysis.pulse_frequency == ""){
+        this.$message.error('透前脉搏未填')
       }else if(this.predialysis.is_hemorrhage == 0){
         this.$message.error('出血未填')
       }else if(this.predialysis.blood_access_part_opera_name == ''){
@@ -1225,6 +1227,8 @@ export default {
         this.$message.error('医生签名未填')
       }else if(this.advices[0].length > 0 && this.advices[0][0].advice_doctor == 0 && this.org_id != 9987){
         this.$message.error('医生签名未填')
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
+        this.$message.error('上机护士未填')
       }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
         this.$message.error('实际治疗时间未填')
       }else if(this.afterdialysis.actual_ultrafiltration == 0){
@@ -1247,7 +1251,13 @@ export default {
         this.$message.error('患者去向未填')
       }else if(this.afterdialysis.patient_gose == 3 && this.afterdialysis.observation_content == ""){
         this.$message.error('交待病房护士/患者/陪人观察内容未填')
-      }else if(this.afterdialysis.creater == 0){
+      }else if (this.dialysisOrder == null && this.check.creater == 0) {
+        this.$message.error('当班责任（核对）护士未填')
+      }else if (this.dialysisOrder != null && this.check.creater == 0) {
+        this.$message.error('当班责任（核对）护士未填')
+      }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
+        this.$message.error('当班责任（核对）护士未填')
+      }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
         this.$message.error('当班责任（核对）护士未填')
       }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机护士未填')
@@ -1259,26 +1269,31 @@ export default {
               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('存在不是护士核对的医嘱')
                 }
               }

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFour.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1" style="width:940px">
       <div
         id="dialysis-print-box-1-1"
@@ -280,7 +280,7 @@
                       <div class="under_line" style="width: 60px;text-align: center">
                         {{ afterdialysis.actual_ultrafiltration ? afterdialysis.actual_ultrafiltration : "/" }}
                       </div>
-                      L
+                      ml
                     </div>
                     <div class="inline_block" style="margin-left:48px;">
                       透后体重：
@@ -916,8 +916,8 @@ export default {
   },
   methods: {
     checkData(){
-      if(this.receiverTreatmentAccess.condition == 0){
-        this.$message.error('门诊或住院未填')
+      if(this.predialysis.dialysis_count == 0){
+        this.$message.error('透析频率未填')
       }else if(this.predialysis.temperature == ""){
         this.$message.error('透前体温未填')
       }else if(this.predialysis.pulse_frequency == ""){
@@ -986,6 +986,12 @@ export default {
         this.$message.error('置换方式未填')
       }else if(this.prescription.mode_id == 2 && this.prescription.displace_liqui_value == 0){
         this.$message.error('置换总量未填')
+      }else if(this.prescription.mode_id == 2 && this.prescription.displace_speed == ''){
+        this.$message.error('置换液流速未填')
+      }else if(this.prescription.dialysis_dialyszers == ''){
+        this.$message.error('透析器未填')
+      }else if(this.prescription.dialysis_irrigation == ''){
+        this.$message.error('灌流器未填')
       }else if(this.predialysis.blood_access_part_opera_name == ''){
         this.$message.error('血管通路未填')
       }else if(this.predialysis.blood_access_part_id == ''){
@@ -1004,8 +1010,6 @@ export default {
         this.$message.error('钙未填')
       }else if(this.prescription.bicarbonate == 0){
         this.$message.error('碳酸氢根未填')
-      }else if(this.prescription.max_ultrafiltration_rate == 0){
-        this.$message.error('最大超滤率未填')
       }else if(this.summary.special_record == ""){
         this.$message.error('医师记录未填')
       }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
@@ -1014,7 +1018,7 @@ export default {
         this.$message.error('治疗小结未填')
       }else if(this.summary.mission == ""){
         this.$message.error('透后宣教未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }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('核对人员未填')
@@ -1024,7 +1028,7 @@ export default {
         this.$message.error('核对人员未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse != this.check.creater && this.dialysisOrder.start_nurse != this.check.modifier && this.check.creater == 0){
         this.$message.error('核对人员未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机护士未填')
       }else if(this.prescription.creater == 0){
         this.$message.error('医生签名未填')
@@ -1051,26 +1055,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1" style="width:940px">
       <div
         id="dialysis-print-box-1-1"
@@ -1012,7 +1012,7 @@ export default {
         this.$message.error('治疗小结未填')
       }else if(this.summary.mission == ""){
         this.$message.error('透后宣教未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }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('核对人员未填')
@@ -1022,42 +1022,72 @@ export default {
         this.$message.error('核对人员未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse != this.check.creater && this.dialysisOrder.start_nurse != this.check.modifier && this.check.creater == 0){
         this.$message.error('核对人员未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机护士未填')
       }else if(this.prescription.creater == 0){
         this.$message.error('医生签名未填')
-      }else 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.type != 3){
-                  this.$message.error('存在不是护士保存的监测')
+      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
+        let num = 0
+        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('存在不是护士保存的监测')
+                  }
                 }
-              }
-            })
-          }
-        })
-      }else if(this.tableAdvice.length > 0){
-        this.tableAdvice.map(item => {
-          if(item.id > 0 && item.created_time){
-            this.users.map(it => {
-              if(it.id == item.advice_doctor){
-                if(it.type != 2){
-                  this.$message.error('存在不是医生保存的医嘱')
-                }
-              }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士执行的医嘱')
-                }
-              }else if(it.id == item.checker && item.checker > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士核对的医嘱')
+              })
+            }
+          })
+        }
+        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('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getDisplaceLiquiPart: function(val) {

src/xt_pages/dialysis/template/DialysisPrintOrderFortyThree.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
       <div
         id="dialysis-print-box-1-1"
@@ -424,7 +424,27 @@
                   <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
                   </td>
               </tr>
-              <!-- </template> -->
+              <tr v-for="(advice, advice_index) in projects" :key="advice_index">
+                  <td height="32px;padding:1px 1px">
+                  <span v-if="advice.start_time">
+                      {{ getTime(advice.start_time, "{h}:{i}") }}
+                  </span>
+                  </td>
+                  <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
+                    <span>{{ advice && advice.project ? advice.project.project_name : '' }}</span>
+                  </td>
+                  <td height="32px">
+                      <span v-if="setAdminUserES(advice.doctor) == ''">{{ getAdminUser(advice.doctor) }}</span>
+                      <img style="height:30px" :src="setAdminUserES(advice.doctor)" alt="" srcset="" v-else />
+                  </td>
+                  <td height="32px">
+                      <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
+                      <img style="height:30px" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
+                  </td>
+                  <td height="32px">
+                  <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
+                  </td>
+              </tr>
               </tbody>
           </table>
           <div style="border:1px solid #000;margin-top:5px;padding:0 10px;">
@@ -473,7 +493,7 @@
                   </div>
               </div>
           </div>
-          <div class="row" style="border-bottom:1px solid #000;display:flex;margin-top:150px;">
+          <div class="row" style="border-bottom:1px solid #000;display:flex;margin-top:50px;">
             <div class="inline_block" style="width:33%">
                   医生签名：
                   <div class="under_line" style="width: 70px;text-align: center;">
@@ -656,6 +676,7 @@ export default {
         gaijiliang_unit: ''
       },
       org_id:0,
+      projects:[]
     }
   },
   methods: {
@@ -692,7 +713,7 @@ export default {
         this.$message.error('透析器未填')
       }else if(this.prescription.anticoagulant == 0){
         this.$message.error('抗凝剂未填')
-      }else if(this.prescription.blood_access_part_opera_name == ''){
+      }else if(this.predialysis.blood_access_part_opera_name == ''){
         this.$message.error('血管通路未填')
       }else if(this.prescription.mode_id == 2 && this.prescription.displace_liqui_part == 0){
         this.$message.error('置换方式未填')
@@ -702,13 +723,13 @@ export default {
         this.$message.error('血流速未填')
       }else if(this.predialysis.symptom_before_dialysis == ""){
         this.$message.error('透前病情未填')
-      }else if(this.dialysisOrder.washpipe_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.washpipe_nurse == 0){
         this.$message.error('预冲者未填')
-      }else if(this.dialysisOrder.puncture_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
         this.$message.error('穿刺者未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('上机者未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机者未填')
       }else if(this.afterdialysis.weight_after == 0){
         this.$message.error('透后体重未填')
@@ -733,25 +754,52 @@ export default {
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse != this.check.creater && this.dialysisOrder.start_nurse != this.check.modifier && this.check.creater == 0){
         this.$message.error('查对护士未填')
       }else if(this.tableAdvice.length > 0){
-        this.tableAdvice.map(item => {
-          if(item.id > 0 && item.created_time){
-            this.users.map(it => {
-              if(it.id == item.advice_doctor){
-                if(it.type != 2){
-                  this.$message.error('存在不是医生保存的医嘱')
+        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('存在不是护士核对的医嘱')
+                  }
                 }
-              }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士执行的医嘱')
-                }
-              }else if(it.id == item.checker && item.checker > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士核对的医嘱')
-                }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getDisplaceLiquiPart: function(val) {
@@ -1209,21 +1257,31 @@ export default {
         //    this.advice_groups.push(group)
         //   }
         // }
-        if (this.doctor_advices.length <= 6) {
-          var nl = 6
+
+        let projects = []
+        response.data.data.projects.map(item => {
+          if(item.type == 2){
+            projects.push(item)
+          }
+        })
+        this.projects = projects
+        if ((this.doctor_advices.length + this.projects.length) <= 6) {
+          var nl = 6 - (this.doctor_advices.length + this.projects.length)
           this.print_length = 6
 
           for (let index = 0; index < nl; index++) {
             if (
-              this.doctor_advices[index] == undefined ||
-              this.doctor_advices[index].length <= 0
+              this.projects[index] == undefined ||
+              this.projects[index].length <= 0
             ) {
-              this.doctor_advices.push([])
+              this.projects.push([])
             } else {
               continue
             }
           }
         }
+        
+        console.log('this.projects',this.projects)
 
         // this.totollength = this.doctor_advices.length + this.monitors.length
         // if (this.totollength > 18) {

src/xt_pages/dialysis/template/DialysisPrintOrderFortyTwo.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name"></div>
@@ -796,16 +796,68 @@ export default {
         this.$message.error('导管评估未填')
       }else if(this.afterdialysis.intravenous_tube == 0){
         this.$message.error('静脉管道未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }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('核对护士未填')
+      }else if (this.dialysisOrder != null && this.check.creater == 0) {
+        this.$message.error('核对护士未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
         this.$message.error('核对护士未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
         this.$message.error('核对护士未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse != this.check.creater && this.dialysisOrder.start_nurse != this.check.modifier && this.check.creater == 0){
         this.$message.error('核对护士未填')
+      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
+        let num = 0
+        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('存在不是护士保存的监测')
+                  }
+                }
+              })
+            }
+          })
+        }
+        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.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.closeAll()
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }
+              })
+            }
+        })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getMonths(t){

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -1864,26 +1864,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -1198,6 +1198,8 @@ export default {
         this.$message.error('医生签名未填')
       }else if(this.advices[0].length > 0 && this.advices[0][0].advice_doctor == 0 && this.org_id != 9987){
         this.$message.error('医生签名未填')
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
+        this.$message.error('上机护士未填')
       }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
         this.$message.error('实际治疗时间未填')
       }else if(this.afterdialysis.actual_ultrafiltration == 0){
@@ -1232,26 +1234,31 @@ export default {
               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('存在不是护士核对的医嘱')
                 }
               }

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -748,26 +748,31 @@ export default {
               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('存在不是护士核对的医嘱')
                 }
               }

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name"></div>
@@ -1397,6 +1397,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -1411,26 +1412,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
       <div
         id="dialysis-print-box-1-1"
@@ -1383,26 +1383,31 @@ export default {
               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('存在不是护士核对的医嘱')
                 }
               }

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
       <div id="dialysis-print-box-1-1" class="dialysis-print-order print-template-two print_page_main_content">
         <div style="display:inline-block;width:100%;text-align:center;">
@@ -1184,7 +1184,7 @@ export default {
         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.org_id == 9987){
+      }else if(this.predialysis.systolic_blood_pressure == 0 || this.predialysis.diastolic_blood_pressure == 0){
         this.$message.error('透前血压未填完整')
       }else if(this.predialysis.puncture_way == ''){
         this.$message.error('穿刺方式未填')
@@ -1285,6 +1285,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -1299,26 +1300,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
       <div
         id="dialysis-print-box-1-1"
@@ -829,26 +829,31 @@ export default {
               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('存在不是护士核对的医嘱')
                 }
               }

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div id='new-dialysis-1' class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -724,11 +724,15 @@ export default {
         this.$message.error('透后体重未填')
       }else if(this.summary.dialysis_summary == ""){
         this.$message.error('透析小结未填')
+      }else if (this.dialysisOrder == null && this.check.creater == 0) {
+        this.$message.error('核对护士未填')
+      }else if (this.dialysisOrder != null && this.check.creater == 0) {
+        this.$message.error('核对护士未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
         this.$message.error('核对护士未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
         this.$message.error('核对护士未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('上机护士未填')
       }else if(this.prescription.prescription_doctor == 0){
         this.$message.error('医师签名未填')
@@ -741,6 +745,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -755,26 +760,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -667,11 +667,15 @@ export default {
         this.$message.error('医生未填')
       }else if(this.predialysis.creater == 0){
         this.$message.error('透前评估护士未填')
+      }else if (this.dialysisOrder == null && this.check.creater == 0) {
+        this.$message.error('核对护士未填')
+      }else if (this.dialysisOrder != null && this.check.creater == 0) {
+        this.$message.error('核对护士未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
         this.$message.error('核对护士未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
         this.$message.error('核对护士未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('责任护士未填')
       }else if(this.monitors.length > 0 && this.monitors[0].blood_pressure_monitoring_site == 0){
         this.$message.error('血压检测部位未填')
@@ -699,38 +703,68 @@ export default {
         this.$message.error('下机护士未填')
       }else if(this.summary.dialysis_summary == ""){
         this.$message.error('病程记录未填')
-      }else 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.type != 3){
-                  this.$message.error('存在不是护士保存的监测')
-                }
-              }
-            })
-          }
-        })
-      }else if(this.tableAdvice.length > 0){
-        this.tableAdvice.map(item => {
-          if(item.id > 0 && item.created_time){
-            this.users.map(it => {
-              if(it.id == item.advice_doctor){
-                if(it.type != 2){
-                  this.$message.error('存在不是医生保存的医嘱')
-                }
-              }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士执行的医嘱')
+      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
+        let num = 0
+        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('存在不是护士保存的监测')
+                  }
                 }
-              }else if(it.id == item.checker && item.checker > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士核对的医嘱')
+              })
+            }
+          })
+        }
+        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('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getMonths(t){

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
       <div
         id="dialysis-print-box-1-1"
@@ -618,19 +618,19 @@ export default {
         this.$message.error('实际脱水量未填')
       }else if(this.afterdialysis.weight_after == 0){
         this.$message.error('透后体重未填')
-      }else if(this.dialysisOrder.end_time == 0){
+      }else if(this.dialysisOrder == null || (this.dialysisOrder && this.dialysisOrder.end_time == 0)){
         this.$message.error('离科时间未填')
       }else if(this.dialysisOrder.washpipe_nurse == 0){
         this.$message.error('预冲者未填')
       }else if(this.dialysisOrder.puncture_nurse == 0){
         this.$message.error('穿刺者/换药者未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('责任护士未填')
       }else if(this.check.creater == 0){
         this.$message.error('查对者未填')
       }else if(this.check.modifier == 0){
         this.$message.error('交叉核对者未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机护士未填')
       }else if(this.afterdialysis.cruor == ""){
         this.$message.error('透析器级别未填')
@@ -638,38 +638,68 @@ export default {
         this.$message.error('透析小结未填')
       }else if(this.prescription.prescription_doctor == 0){
         this.$message.error('医生签字未填')
-      }else 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.type != 3){
-                  this.$message.error('存在不是护士保存的监测')
+      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
+        let num = 0
+        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('存在不是护士保存的监测')
+                  }
                 }
-              }
-            })
-          }
-        })
-      }else if(this.tableAdvice.length > 0){
-        this.tableAdvice.map(item => {
-          if(item.id > 0 && item.created_time){
-            this.users.map(it => {
-              if(it.id == item.advice_doctor){
-                if(it.type != 2){
-                  this.$message.error('存在不是医生保存的医嘱')
-                }
-              }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士执行的医嘱')
-                }
-              }else if(it.id == item.checker && item.checker > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士核对的医嘱')
+              })
+            }
+          })
+        }
+        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('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getDisplaceLiquiPart: function(val) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyNine.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
         <div class="dialysis-print-order">
             <div class="order-yy-name">{{ orgname }}</div>
@@ -588,7 +588,7 @@ export default {
         this.$message.error('透析器型号未填')
       }else if(this.prescription.prescription_doctor == 0){
         this.$message.error('医生未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('接管护士未填')
       }else if(this.dialysisOrder.start_time == 0){
         this.$message.error('接管时间未填')
@@ -602,42 +602,72 @@ export default {
         this.$message.error('凝血分级未填')
       }else if(this.summary.dialysis_summary == ""){
         this.$message.error('补充记录未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('回血护士未填')
       }else if(this.dialysisOrder.end_time == 0){
         this.$message.error('回血时间未填')
-      }else 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.type != 3){
-                  this.$message.error('存在不是护士保存的监测')
-                }
-              }
-            })
-          }
-        })
-      }else if(this.tableAdvice.length > 0){
-        this.tableAdvice.map(item => {
-          if(item.id > 0 && item.created_time){
-            this.users.map(it => {
-              if(it.id == item.advice_doctor){
-                if(it.type != 2){
-                  this.$message.error('存在不是医生保存的医嘱')
-                }
-              }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士执行的医嘱')
+      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
+        let num = 0
+        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('存在不是护士保存的监测')
+                  }
                 }
-              }else if(it.id == item.checker && item.checker > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士核对的医嘱')
+              })
+            }
+          })
+        }
+        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('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getNewAge(UUserCard) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
       <div
         id="dialysis-print-box-1-1"
@@ -850,13 +850,13 @@ export default {
         this.$message.error('跌倒风险预防措施未填')
       }else if(this.prescription.prescription_doctor == 0){
         this.$message.error('上机医生未填')
-      }else if(this.dialysisOrder.washpipe_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.washpipe_nurse == 0){
         this.$message.error('冲管护士未填')
-      }else if(this.dialysisOrder.puncture_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
         this.$message.error('穿刺者未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('上机护士未填')
-      }else if(this.dialysisOrder.finish_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机护士未填')
       }else if(this.afterdialysis.temperature == 0){
         this.$message.error('透后体温未填')
@@ -885,25 +885,52 @@ export default {
       }else if(this.summary.special_record == ""){
         this.$message.error('病情记录未填')
       }else if(this.tableAdvice.length > 0){
-        this.tableAdvice.map(item => {
-          if(item.id > 0 && item.created_time){
-            this.users.map(it => {
-              if(it.id == item.advice_doctor){
-                if(it.type != 2){
-                  this.$message.error('存在不是医生保存的医嘱')
-                }
-              }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士执行的医嘱')
-                }
-              }else if(it.id == item.checker && item.checker > 0){
-                if(it.type != 3){
-                  this.$message.error('存在不是护士核对的医嘱')
+        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('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getNewAge(UUserCard) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirtySeven.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -673,8 +673,70 @@ export default {
         this.$message.error('静脉凝血未填')
       }else if(this.dialysis_summary == ""){
         this.$message.error('治疗小结未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('上机护士未填')
+      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
+        let num = 0
+        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('存在不是护士保存的监测')
+                  }
+                }
+              })
+            }
+          })
+        }
+        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('存在不是护士核对的医嘱')
+                  }
+                }
+              })
+            }
+        })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getCruor(cruor){

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <!-- <div class="order-yy-name">{{ orgname }}</div> -->
@@ -1213,6 +1213,10 @@ export default {
           this.$message.error('医生签名未填')
         }else if(this.dialysisOrder.puncture_nurse == 0){
           this.$message.error('穿刺护士未填')
+        }else if (this.dialysisOrder == null && this.check.creater == 0) {
+          this.$message.error('核对护士未填')
+        }else if (this.dialysisOrder != null && this.check.creater == 0) {
+          this.$message.error('核对护士未填')
         }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
           this.$message.error('核对护士未填')
         }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
@@ -1221,26 +1225,68 @@ export default {
           this.$message.error('看机护士未填')
         }else if(this.dialysisOrder.finish_nurse == 0){
           this.$message.error('下机护士未填')
-        }else if(this.tableAdvice.length > 0){
-          this.tableAdvice.map(item => {
-            if(item.id > 0 && item.created_time){
-              this.users.map(it => {
-                if(it.id == item.advice_doctor){
-                  if(it.type != 2){
-                    this.$message.error('存在不是医生保存的医嘱')
-                  }
-                }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                  if(it.type != 3){
-                    this.$message.error('存在不是护士执行的医嘱')
+        }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
+          let num = 0
+          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('存在不是护士保存的监测')
+                    }
                   }
-                }else if(it.id == item.checker && item.checker > 0){
-                  if(it.type != 3){
-                    this.$message.error('存在不是护士核对的医嘱')
+                })
+              }
+            })
+          }
+          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('存在不是护士核对的医嘱')
+                    }
                   }
-                }
-              })
-            }
+                })
+              }
           })
+          }
+          
+          if(num == 0){
+            this.$message.success('核对完成')
+          }
+        }else{
+          this.$message.success('核对完成')
         }
       },
       getComplication(complication){
@@ -1508,6 +1554,7 @@ export default {
             }
 
             this.advices = response.data.data.advices
+            this.tableAdvice = response.data.data.advices;
             console.log('hhhhhhhhhhhh', this.advices)
             this.monitors = response.data.data.monitors
             console.log('哈哈哈哈哈哈哈', this.monitors)

src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -1197,6 +1197,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -1211,26 +1212,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
       
@@ -1763,7 +1763,7 @@ export default {
           this.$message.error('计划治疗时间未填')
         }else if(this.prescription.target_ultrafiltration == 0){
           this.$message.error('计划超滤总量未填')
-        }else if(this.prescription.replacement_total == ""){
+        }else if(this.prescription.replacement_total == "" && (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
           this.$message.error('置换量未填')
         }else if(this.prescription.mode_id == ""){
           this.$message.error('透析方式未填')
@@ -1803,10 +1803,14 @@ export default {
           this.$message.error('去向未填')
         }else if(this.prescription.prescription_doctor == 0){
           this.$message.error('医生未填')
-        }else if(this.dialysisOrder.start_nurse == 0){
+        }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
           this.$message.error('责任护士未填')
         }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
           this.$message.error('穿刺护士未填')
+        }else if (this.dialysisOrder == null && this.check.creater == 0) {
+          this.$message.error('核对护士未填')
+        }else if (this.dialysisOrder != null && this.check.creater == 0) {
+          this.$message.error('核对护士未填')
         }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
           this.$message.error('核对护士未填')
         }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
@@ -1820,26 +1824,31 @@ export default {
                   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('存在不是护士核对的医嘱')
                     }
                   }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <!-- <div class="order-yy-name">{{ orgname }}</div> -->
@@ -1214,16 +1214,35 @@ export default {
           this.$message.error('医生签名未填')
         }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse <= 0){
           this.$message.error('穿刺护士未填')
+        }else if (this.dialysisOrder == null && this.check.creater == 0) {
+          this.$message.error('核对护士未填')
+        }else if (this.dialysisOrder != null && this.check.creater == 0) {
+          this.$message.error('核对护士未填')
         }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
           this.$message.error('核对护士未填')
         }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
           this.$message.error('核对护士未填')
-        }else if(this.dialysisOrder.start_nurse == 0){
+        }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){
+        }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
           let num = 0
+          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('存在不是护士保存的监测')
+                    }
+                  }
+                })
+              }
+            })
+          }
           if(this.tableAdvice.length > 0){
             this.tableAdvice.map(item => {
               if(item.id > 0 && (item.created_time || item.start_time)){
@@ -1231,26 +1250,31 @@ export default {
                   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('存在不是护士核对的医嘱')
                     }
                   }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div id='new-dialysis-1' class="dialysis-print-order">
         <div class="order-yy-name" style="font-size:28px;font-weight:bold;">{{ orgname }}</div>
@@ -1750,7 +1750,7 @@ export default {
         this.$message.error('冲管护士未填')
       }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse <= 0){
         this.$message.error('穿刺护士未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('责任护士未填')
       }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
         let num = 0
@@ -1761,6 +1761,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -1775,26 +1776,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyNine.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div id='new-dialysis-1' class="dialysis-print-order" style="position:relative;">
         <img src="../../../assets/img/xuanwei.jpg" style="position: absolute;" alt="">
@@ -734,7 +734,9 @@ export default {
   },
   methods: {
     checkData(){
-      if(this.predialysis.is_hemorrhage == 0){
+      if(this.receiverTreatmentAccess.condition == 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('出血未填')
@@ -791,6 +793,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -805,26 +808,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div id='new-dialysis-1' class="dialysis-print-order">
         <div class="order-yy-name"></div>
@@ -1424,7 +1424,7 @@ export default {
         this.$message.error('透后并发症未填')
       }else if(this.summary.special_record == ""){
         this.$message.error('特殊记录未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('当班责任护士未填')
       }else if(this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机护士未填')
@@ -1437,26 +1437,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySix.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -1261,7 +1261,7 @@ export default {
         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.org_id == 9987){
+      }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('上机前病情未填')
@@ -1295,7 +1295,7 @@ export default {
         this.$message.error('碳酸氢根未填')
       }else if(this.predialysis.blood_access_part_opera_name == ''){
         this.$message.error('血管通路未填')
-      }else if(this.dialysisOrder.puncture_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
         this.$message.error('穿刺者未填')
       }else if(this.predialysis.weight_before == 0){
         this.$message.error('透前体重未填')
@@ -1313,14 +1313,33 @@ export default {
         this.$message.error('透后导管未填')
       }else if(this.summary.dialysis_summary == ""){
         this.$message.error('治疗小结未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }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('核对护士未填')
+      }else if (this.dialysisOrder != null && this.check.creater == 0) {
+        this.$message.error('核对护士未填')
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
         this.$message.error('核对护士未填')
       }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){
+      }else if(this.tableAdvice.length > 0 || this.monitors.length > 0){
         let num = 0
+        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('存在不是护士保存的监测')
+                  }
+                }
+              })
+            }
+          })
+        }
         if(this.tableAdvice.length > 0){
           this.tableAdvice.map(item => {
             if(item.id > 0 && (item.created_time || item.start_time)){
@@ -1328,26 +1347,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyTwo.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
       <div id="dialysis-print-box-1-1" :class="(this.monitors.length > 8 && this.print_length == 8) || (this.monitors.length > 9 && this.print_length == 9) ? 'margin-bottom-900 dialysis-print-order print-template-two print_page_main_content' : 'margin-bottom-50 dialysis-print-order print-template-two print_page_main_content'">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -1343,7 +1343,7 @@ export default {
       }else if(this.predialysis.puncture_way == ""){
         this.$message.error('穿刺方式未填')
       }else if(this.predialysis.venous_catheterization == 0){
-        this.$message.error('中心静脉导管未填')
+        this.$message.error('中心静脉置管未填')
       }else if(this.predialysis.blood_access_part_id == ''){
         this.$message.error('中心静脉导管位置未填')
       }else if(this.predialysis.catheter == ''){
@@ -1384,7 +1384,7 @@ export default {
         this.$message.error('透析器凝血未填')
       }else if(this.afterdialysis.patient_gose == 0){
         this.$message.error('患者去向未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('责任护士未填')
       }else if(this.dialysisOrder == null || this.dialysisOrder.puncture_nurse == 0){
         this.$message.error('穿刺者未填')
@@ -1398,7 +1398,7 @@ export default {
         this.$message.error('核对人未填')
       }else if(this.dialysisOrder.finish_nurse == 0){
         this.$message.error('收针者未填')
-      }else if(this.dialysisOrder.start_nurse == 0){
+      }else if(this.dialysisOrder == null || this.dialysisOrder.start_nurse == 0){
         this.$message.error('血透室护士签名未填')
       }else if(this.prescription.mode_id == ""){
         this.$message.error('治疗方式未填')
@@ -1416,7 +1416,7 @@ export default {
         this.$message.error('钠未填')
       }else if(this.prescription.kalium == 0){
         this.$message.error('钾未填')
-      }else if(this.prescription.displace_liqui_value == 0){
+      }else if(this.prescription.displace_liqui_value == 0 && (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
         this.$message.error('置换液后/前稀释未填')
       }else if(this.prescription.blood_access == 0){
         this.$message.error('血管通路未填')
@@ -1441,6 +1441,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -1455,26 +1456,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box">
       <div class="dialysis-print-order">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -1311,6 +1311,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -1325,17 +1326,20 @@ export default {
                 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.execution_staff && item.execution_staff > 0){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士执行的医嘱')
                   }
                 }

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <!-- <el-button type="primary" @click="checkData">一键核对</el-button> -->
+    <el-button type="primary" @click="checkData">一键核对</el-button>
     <div id="dialysis-print-box-1">
       <div id="dialysis-print-box-1-1" :class="(this.monitors.length > 8 && this.print_length == 8) || (this.monitors.length > 9 && this.print_length == 9) ? 'margin-bottom-900 dialysis-print-order print-template-two print_page_main_content' : 'margin-bottom-50 dialysis-print-order print-template-two print_page_main_content'">
         <div class="order-yy-name">{{ orgname }}</div>
@@ -1445,6 +1445,7 @@ export default {
                 if(it.id == item.monitoring_nurse){
                   if(it.user_type == 2){
                     num++
+                    this.$message.closeAll()
                     this.$message.error('存在不是护士保存的监测')
                   }
                 }
@@ -1459,26 +1460,31 @@ export default {
                 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('存在不是护士核对的医嘱')
                   }
                 }

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -287,11 +287,11 @@
                     </el-table-column>
                     <el-table-column label="库存" width="60">
                       <template slot-scope="scope">
-                        {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}
-                        <!--/ {{-->
-                        <!--scope.row.total * (scope.row.dose / scope.row.min_number)}}-->
-                        <!--{{(scope.row.total * (scope.row.dose /-->
-                        <!--scope.row.min_number))?scope.row.max_unit:''}}-->
+                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 ">
+                             <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
+                             <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
+                          </span>
+                         <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span>
                       </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
@@ -382,7 +382,12 @@
                       <template slot-scope="scope">{{ scope.row.single_dose }}</template>
                     </el-table-column>
                     <el-table-column label="库存" width="40">
-                      <template slot-scope="scope">{{ scope.row.total }}</template>
+                      <template slot-scope="scope">
+                         <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id ==10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
+                            {{scope.row.stock_count}}
+                        </span>
+                       <span v-else> {{ scope.row.total }}</span>
+                      </template>
                     </el-table-column>
                     <el-table-column label="单价" width="40">
                       <template slot-scope="scope">{{ scope.row.price }}</template>
@@ -503,6 +508,7 @@
       month_prescriptions: Array,
       isloading: false,
       loading: false,
+      org_id:Number,
       other_sick: {
         type: Array,
         default: function() {
@@ -2293,18 +2299,18 @@
             isLoading = true
             console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
             let num = 0
-            this.prescriptions.map(item => {
-              if (item.advices.length > 0) {
-                item.advices.map(it => {
-                  if (it.drug.total <= 0) {
-                    num++
-                    setTimeout(() => {
-                      this.$message.error(it.drug.drug_name + '库存不足')
-                    }, 100)
-                  }
-                })
-              }
-            })
+            // this.prescriptions.map(item => {
+            //   if (item.advices.length > 0) {
+            //     item.advices.map(it => {
+            //       if (it.drug.total <= 0) {
+            //         num++
+            //         setTimeout(() => {
+            //           this.$message.error(it.drug.drug_name + '库存不足')
+            //         }, 100)
+            //       }
+            //     })
+            //   }
+            // })
             if (num == 0) {
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
@@ -2649,20 +2655,34 @@
         this.$refs.additionalCharges.show()
       },
       selectDrugs(selection, row) {
-        console.log('selection', selection)
-        console.log('row', row)
-        if (row.total <= 0) {
-          if (selection) {
-            selection.forEach(row => {
-              if (row.total <= 0) {
-                this.$refs.multipleTable.toggleRowSelection(row)
+      if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id ==10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id ==10088 ){
+            if (row.count <= 0) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.count <= 0) {
+                    this.$refs.multipleTable.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.multipleTable.clearSelection()
               }
-            })
-          } else {
-            this.$refs.multipleTable.clearSelection()
-          }
-          this.$message.error(row.drug_name + '库存不足')
-          return
+              this.$message.error(row.drug_name + '库存不足')
+              return
+            }
+        }else{
+           if (row.total <= 0) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.total <= 0) {
+                    this.$refs.multipleTable.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.multipleTable.clearSelection()
+              }
+              this.$message.error(row.drug_name + '库存不足')
+              return
+            }
         }
         this.curDrugs = selection
       },
@@ -2909,20 +2929,39 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if (row.total <= 0) {
-          if (row.type == 3) {
-            if (selection) {
-              selection.forEach(row => {
-                if (row.total <= 0) {
-                  this.$refs.tables.toggleRowSelection(row)
-                }
-              })
-            } else {
-              this.$refs.tables.clearSelection()
+          if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 || this.org_id ==10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id ==10088){
+           if (row.stock_count <= 0) {
+            if (row.type == 3) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.stock_count <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.tables.clearSelection()
+              }
+              this.$message.error(row.project_name + '库存不足')
+              return
             }
-            this.$message.error(row.project_name + '库存不足')
-            return
           }
+        }else{
+           if (row.total <= 0) {
+            if (row.type == 3) {
+              if (selection) {
+                selection.forEach(row => {
+                  if (row.total <= 0) {
+                    this.$refs.tables.toggleRowSelection(row)
+                  }
+                })
+              } else {
+                this.$refs.tables.clearSelection()
+              }
+              this.$message.error(row.project_name + '库存不足')
+              return
+            }
+          }
+
         }
         this.teamList.push(row)
       },
@@ -2948,6 +2987,7 @@
                 total: project[i].total,
                 is_special_diseases: project[i].disease_directory,
                 project: project[i],
+                stock_count:0,
               }
 
               this.tabProject.push(obj)
@@ -2956,6 +2996,12 @@
             var good_info = response.data.data.good_info
 
             for (let i = 0; i < good_info.length; i++) {
+               good_info[i].stock_count = 0
+              if(good_info[i].good_stock_in.length >0 ){
+                for(let j=0;j<good_info[i].good_stock_in.length;j++){
+                   good_info[i].stock_count += good_info[i].good_stock_in[j].stock_count
+                }
+              }
               let obj = {
                 id: good_info[i].id,
                 project_name: good_info[i].good_name,
@@ -2972,6 +3018,7 @@
                 total: good_info[i].total,
                 is_special_diseases: good_info[i].is_special_diseases,
                 good_info: good_info[i],
+                stock_count:good_info[i].stock_count,
               }
               this.tabProject.push(obj)
             }
@@ -3154,7 +3201,9 @@
       clearSelection() {
         this.$refs.tabProjectTeam.clearSelection()
       }
-    }, mounted() {
+    }, 
+    mounted() {
+     
       this.request_record_date = this.record_date
       // this.getInitData()
       //获取所有项目
@@ -3183,6 +3232,10 @@
           }, 400)
         }
       }
+    },
+    created(){
+      console.log("中华任命工商过多水分我333323232",this.org_id)
+      console.log("jjjjjjjjjjjjjjjjjjjjjjjjjjjj",this.drugs)
     }
 
   }

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -121,6 +121,7 @@
                                    :month_prescriptions="month_prescriptions"
                                    ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                                    :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)"
+                                   :org_id="org_id"
                                    v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
 
 
@@ -941,7 +942,16 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            this.drugs = response.data.data.drugs
+            var drugs = response.data.data.drugs
+            for(let i=0;i<drugs.length;i++){
+                drugs[i].count = 0
+              if(drugs[i].stock_in.length > 0){
+                 for(let j=0;j<drugs[i].stock_in.length;j++){
+                    drugs[i].count += (drugs[i].stock_in[j].stock_max_number * drugs[i].min_number + drugs[i].stock_in[j].stock_min_number)
+                 }
+              }
+            }
+            this.drugs = drugs
             console.log("所有药品信息",this.drugs)
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
@@ -4189,7 +4199,8 @@
       // this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
       let tableHeight = document.body.clientHeight - 323
       this.tableHeight = tableHeight
-
+      this.org_id = this.$store.getters.xt_user.template_info.org_id
+     
     },
 
     mounted() {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -286,7 +286,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
@@ -383,7 +383,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10088">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2297,19 +2297,20 @@
             isLoading = true
             console.log('this.prescriptionsthis.prescriptions', this.prescriptions)
             let num = 0
-            this.prescriptions.map(item => {
-              if (item.advices.length > 0) {
-                item.advices.map(it => {
-                  if (it.drug.total <= 0) {
-                    num++
-                    setTimeout(() => {
-                      this.$message.error(it.drug.drug_name + '库存不足')
-                    }, 100)
-                  }
-                })
-              }
-            })
+            // this.prescriptions.map(item => {
+            //   if (item.advices.length > 0) {
+            //     item.advices.map(it => {
+            //       if (it.drug.total <= 0) {
+            //         num++
+            //         setTimeout(() => {
+            //           this.$message.error(it.drug.drug_name + '库存不足')
+            //         }, 100)
+            //       }
+            //     })
+            //   }
+            // })
             if (num == 0) {
+             
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
                   this.$emit('change', this.patientInfo.id)
@@ -2656,7 +2657,7 @@
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 || this.org_id == 10088){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
@@ -2931,7 +2932,7 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919 ){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 || this.org_id == 9919  || this.org_id == 10106 || this.org_id == 9504 || this.org_id ==10215 ||  this.org_id == 10088){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -688,7 +688,7 @@ export default {
             stockIn: this.recordInfo.recordData
           };
           console.log("params22222222222",params)
-         
+        
           EditDrugWarehouse(
             params,
             this.warehousing_time,

src/xt_pages/stock/drugs/inventoryPrint.vue

@@ -100,14 +100,17 @@ export default {
          }
       },
       getManufacturerName(id){
-        var name = ""
-        for(let i=0;i<this.manufacturerList.length;i++){
-          if(id == this.manufacturerList[i].id){
-             name = this.manufacturerList[i].manufacturer_name
-          }
-          return name
+       
+           var name = ""
+           for(let i=0;i<this.manufacturerList.length;i++){
+              if(id == this.manufacturerList[i].id){
+                  name = this.manufacturerList[i].manufacturer_name
+              }
+           }
+           return name
         }
-      }
+      
+      
      },
     created(){
       this.getlist()

src/xt_pages/stock/inventory.vue

@@ -217,9 +217,9 @@ export default {
                 this.dealerList = dealer
                 for(let i=0;i<this.goodList.length;i++){
                     for(let j=0;j<this.manufacturerList.length;j++){
-                    if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
-                        this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
-                    }
+                      if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                          this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                      }
                     }
                 }
 
@@ -423,6 +423,7 @@ export default {
               list[i].type = 6
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
+              list[i].manufacturer_name = ""
               for(let j=0;j<this.manufacturerList.length;j++){
                 if(list[i].manufacturer == this.manufacturerList[j].id){
                   list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name

src/xt_pages/stock/inventoryPrint.vue

@@ -96,6 +96,7 @@ export default {
          })
         },
         getManufacturerName(id){
+       
            var name = ""
            for(let i=0;i<this.manufacturerList.length;i++){
               if(id == this.manufacturerList[i].id){

src/xt_pages/stock/stockPrint.vue

@@ -42,7 +42,7 @@
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
                                    <td>
-                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245">
+                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779">
                                         <span>
                                           {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info) }}
                                           </span>
@@ -51,7 +51,7 @@
                                    </td>
                                   
                                    <td>
-                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245">{{getOverFlushInfo(item.xt_warehouse_info)}}</span>
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779">{{getOverFlushInfo(item.xt_warehouse_info)}}</span>
                                      <span v-else>{{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}</span>
                                     
                                    </td>

src/xt_pages/stock/stockQuery.vue

@@ -106,9 +106,9 @@
            <span v-if="getWareInfo(scope.row.xt_warehouse_info)>0">{{getWareInfo(scope.row.xt_warehouse_info)}}{{scope.row.packing_unit}}</span>
          </template>
        </el-table-column>
-       <el-table-column label="出库数量" align="center">
+       <el-table-column label="出库数量" align="center" v-if="showOne">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088">
             <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
@@ -117,12 +117,24 @@
          </template>
        </el-table-column>
 
-       <el-table-column label="剩余库存量" align="center">
+       <el-table-column label="出库数量" align="center" v-if="showTwo">
          <template slot-scope="scope">
-          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
+          <span>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
+         </template>
+       </el-table-column>
+
+       <el-table-column label="剩余库存量" align="center" v-if="showThree">
+         <template slot-scope="scope">
+          <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
+
+      <el-table-column label="剩余库存量" align="center" v-if="showFour">
+         <template slot-scope="scope">
+          <span>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
+         </template>
+       </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
               <el-button
@@ -218,6 +230,10 @@ export default {
       autoCountList:[],
       cancelCountList:[],
       org_id:0,
+      showOne:true,
+      showTwo:false,
+      showThree:true,
+      showFour:false
     };
   },
   methods: {
@@ -342,18 +358,23 @@ export default {
            this.tableList[i].prodect_name = this.getManufacture(this.tableList[i].manufacturer)
            this.tableList[i].inCount =  this.getWareInfo(this.tableList[i].xt_warehouse_info)
 
-        
-          if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
-             this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
+          if(this.end_time == ""){
+            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 ){
+              this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
+            }else{
+              this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
+            }
+            
+            if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9779 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id ==  10088 ){
+                this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
+            }else{
+              this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
+            }
           }else{
             this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
+            this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
           }
           
-           if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
-              this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
-           }else{
-             this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
-           }
 
          }
          const data = this.formatJson(filterVal, this.tableList)
@@ -412,8 +433,21 @@ export default {
       };
     getAllStockList(params).then(response=>{
          if(response.data.state == 1){
+         
+          if(this.end_time == ""){
+             this.showOne = true
+             this.showTwo = false
+             this.showThree = true
+             this.showFour = false
+          }
+          if(this.end_time !=""){
+            this.showOne = false
+            this.showTwo = true
+            this.showThree = false
+            this.showFour = true
+          }
           var list = response.data.data.list
-          // console.log("总库存数量",list)
+
           this.tableList = list
           var total = response.data.data.total
           this.total = total
@@ -468,13 +502,13 @@ export default {
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var outlist = response.data.data.outList
-          //  console.log("出库数量",outlist)
+        
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
-          //  console.log("autoCount",autoCount)
+        
            this.autoCountList = autoCount
            var totalCount = response.data.data.totalCount
-          //  console.log("totalcount",totalCount)
+         
            this.cancelCountList = totalCount
          }
       })
@@ -567,14 +601,13 @@ export default {
      return total
    },
    getCancelSotckInfo(arr){
-     console.log("2332323232322332",arr)
+    
      var cancle_toal = 0
      if(arr.length >0){
       for(let z=0;z<arr.length;z++){
         cancle_toal += arr[z].count
       }
      }
-     console.log("total",cancle_toal)
      return cancle_toal
    }
   }

src/xt_pages/workforce/remind_print_setting.vue

@@ -19,7 +19,7 @@
         <div class="print_main_content">
           <div class="table_panel">
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
-              <div class="signPrint">
+              <div class="signPrint" v-if="org_id != 10188">
                 <div>
                  <span v-if="printObj.zone == 1">分区/</span>
                  <span v-if="printObj.number == 1">床位号:</span>
@@ -33,7 +33,7 @@
                 <div v-if="printObj.anticoagulant == 1">抗凝剂:
                   <span v-if="org_id == 10138 ">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
                   <span v-else >
-                   <span>{{getAnticoagulant(main_collection.solution,main_collection.mode_id)}}</span>
+                   <span>{{getAnticoagulant(main_collection.dialysissolution.mode_id)}}</span>
                   </span>
                 </div>
                <div v-if="org_id == 10188">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
@@ -41,37 +41,37 @@
                 <div v-if="printObj.anticoagulant_zongliang == 1">
                   用量:
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
-                  {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'mg'}}
+                   {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
-                    {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'mg'}}
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">
-                    {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 4">
-                    {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'mg'}}
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 5">
-                     {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'mg'}}
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
                    </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 6">
-                   {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                   {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 7">
-                    {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 8">
-                     {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 9">
-                     {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                   </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">
-                     {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                     </span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">
-                    {{getAnticoagulantZonliang(main_collection.solution,main_collection.mode_id)+'iu'}}
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
                    </span>
                 </div>
                 <div v-if="org_id == 10188">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
@@ -80,6 +80,38 @@
                 <div>用法:静脉注射</div>
                 <div>打印时间:{{currentDate}}</div>
               </div>
+              <div class="signPrint" style="font-size:16px;" v-else>
+                <div style="margin-left:50px;">姓名:
+                  <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
+                  <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
+                  （{{ main_collection.patient.dialysis_no }}，{{ main_collection.patient.age }}岁）
+                </div>
+                <div class="printCell">
+                  <span>
+                    床号：{{ main_collection.number.number }}
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
+                  </span>
+                  <span>{{ printDate }}</span>
+                </div>
+                <div class="printCell">
+                  <span>干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
+                  <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
+                </div>
+                <div class="printCell">
+                  <span>净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
+                  <span>首剂：{{main_collection.dialysissolution.anticoagulant_shouji}}</span>
+                </div>
+                <div class="printCell">
+                  <span>体重增加：{{ main_collection.assessmentbefor.weight_before - main_collection.lastafterweight.weight_after }}Kg</span>
+                  <span>维持：{{main_collection.dialysissolution.anticoagulant_weichi}}</span>
+                </div>
+                <div class="printCell">
+                  <span>处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}</span>
+                  <span>总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}</span>
+                </div>
+              </div>
            </div>
           </div>
         </div>
@@ -121,6 +153,7 @@
         pre_status:0,
         printObj:{},
         type:1,
+        printDate:''
       }
     },
     components: {
@@ -133,6 +166,7 @@
      console.log("机构ID",this.org_id)
      this.currentDate = this.getCurrentDate()
 
+    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
     this.week_type = this.$route.query.week_type
@@ -258,15 +292,26 @@
 
       },
       printAction: function() {
-        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } @page {margin-top:10px;}}'
-
-        printJS({
-          printable: 'print_content',
-          type: 'html',
-          documentTitle: '  ',
-          style: style,
-          scanStyles: false
-        })
+        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 180px;} @page {margin-top:10px;}}'
+        const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 170px;} @page {margin-top:10px;}}'
+        if(this.org_id == 10188){
+          printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style1,
+            scanStyles: false
+          })
+        }else{
+          printJS({
+            printable: 'print_content',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+          })
+        }
+        
       }, getSchedulesType: function(type) {
         let type_name = ''
         switch (type) {
@@ -412,14 +457,8 @@
         }
       });
      },
-      getAnticoagulant(arr,mode_id){
-       var name = ""
-       if(arr.length > 0){
-           for(let i=0;i<arr.length;i++){
-          if(mode_id == arr[i].mode_id){
-            name = arr[i].anticoagulant
-          }
-       } 
+    getAnticoagulant(name){
+     
       if(name == 0){
          name = ""
        }
@@ -447,7 +486,6 @@
        }
 
        return name
-      }
      },
      getAnticoagulantZonliang(arr,mode_id){
        var name = 0
@@ -537,4 +575,10 @@
   margin-bottom: 20px;
   padding: 20px 10px;
 }
+.printCell{
+  span{
+    display: inline-block;
+    width: 180px;
+  }
+}
 </style>