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

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -1360,38 +1360,60 @@ export default {
         this.$message.error('下机护士未填')
       }else if(this.special_record == ""){
         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.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
       }else{
         this.$message.success('核对完成')
       }

src/xt_pages/dialysis/template/DialysisPrintOrderEleven.vue

@@ -1155,7 +1155,7 @@ export default {
   },
   methods: {
     checkData(){
-      if(this.receiverTreatmentAccess.condition == 0){
+      if(this.patientInfo.source == 0){
         this.$message.error('门诊或住院未填')
       }else if(this.receiverTreatmentAccess.way == 0){
         this.$message.error('入科方式未填')
@@ -1167,7 +1167,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('穿刺方式未填')
@@ -1181,21 +1181,19 @@ export default {
         this.$message.error('透前导管未填')
       }else if(this.prescription.mode_id == ""){
         this.$message.error('透析方式未填')
-      }else if(this.prescription.displace_liqui_part == 0){
+      }else if(this.prescription.displace_liqui_part == 0 && this.prescription.mode_id == 2){
         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.$message.error('置换量未填')
       }else if(this.prescription.blood_flow_volume == 0){
         this.$message.error('血流量未填')
-      }else if(this.prescription.dialysis_dialyszers == ""){
-        this.$message.error('透析器未填')
-      }else if(this.prescription.dialysis_irrigation == ""){
-        this.$message.error('灌流器未填')
+      }else if(this.prescription.dialyzer_perfusion_apparatus == ""){
+        this.$message.error('透析(滤)器未填')
       }else if(this.predialysis.dry_weight == 0){
         this.$message.error('干体重未填')
       }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
         this.$message.error('透析时间未填')
-      }else if(this.last_afterdialysis.weight_after == 0){
+      }else if(this.predialysis.weight_after_last_transparency == 0){
         this.$message.error('上次透后未填')
       }else if(this.predialysis.weight_before == 0){
         this.$message.error('透前体重未填')
@@ -1223,7 +1221,7 @@ export default {
         this.$message.error('透后脉搏未填')
       }else if(this.afterdialysis.breathing_rate == 0){
         this.$message.error('透后呼吸频率未填')
-      }else if((this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0) && this.org_id == 9987){
+      }else if(this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0){
         this.$message.error('透后血压未填完整')
       }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
         this.$message.error('实际治疗时间未填')
@@ -1259,26 +1257,62 @@ export default {
         this.$message.error('下机护士未填')
       }else if(this.prescription.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('存在不是医生保存的医嘱')
+      }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.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getDisplaceLiquiPart: function(val) {

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -1091,7 +1091,7 @@
                       <td width="50">
                           <div class="under-line">&nbsp;{{ afterdialysis.actual_displacement ? afterdialysis.actual_displacement : "" }}</div>
                       </td>
-                      <td width="20">ml</td>
+                      <td width="20">L</td>
                       <td></td>
                   </tr>
                   </tbody>

src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue

@@ -1808,7 +1808,7 @@ export default {
           this.$message.error('计划超滤总量未填')
         }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
           this.$message.error('透析时间未填')
-        }else if(this.prescription.replacement_total == 0){
+        }else if(this.prescription.replacement_total == 0 && this.prescription.mode_id == 2){
           this.$message.error('置换量未填')
         }else if(this.prescription.mode_id == ""){
           this.$message.error('透析方式未填')
@@ -1850,32 +1850,49 @@ export default {
           this.$message.error('患者去向未填')
         }else if(this.prescription.creater == 0){
           this.$message.error('医生未填')
-        }else if(this.doctor_advices.length > 0 && this.doctor_advices[0].execution_staff == 0){
+        }else if(this.doctor_advices.length = 0 || (this.doctor_advices.length > 0 && this.doctor_advices[0].execution_staff == 0)){
           this.$message.error('治疗护士未填')
         }else if(this.doctor_advices.length > 0 && (this.doctor_advices[0].execution_staff != this.check.modifier) && this.check.modifier == 0 ){
           this.$message.error('核对护士未填')
         }else if(this.doctor_advices.length > 0 && (this.doctor_advices[0].execution_staff != this.check.creater) && this.check.creater == 0 ){
           this.$message.error('核对护士未填')
         }else if(this.tableAdvice.length > 0){
+          let num = 0
           this.tableAdvice.map(item => {
-            if(item.id > 0 && item.created_time){
+            if(item.id > 0 && (item.created_time || item.start_time)){
               this.users.map(it => {
                 if(it.id == item.advice_doctor){
-                  if(it.type != 2){
+                  if(it.user_type == 3){
+                    num++
                     this.$message.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
                   }
                 }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                  if(it.type != 3){
+                  if(it.user_type == 2){
+                    num++
                     this.$message.error('存在不是护士执行的医嘱')
                   }
                 }else if(it.id == item.checker && item.checker > 0){
-                  if(it.type != 3){
+                  if(it.user_type == 2){
+                    num++
                     this.$message.error('存在不是护士核对的医嘱')
                   }
                 }
               })
             }
           })
+          if(num == 0){
+            this.$message.success('核对完成')
+          }
         }else{
           this.$message.success('核对完成')
         }

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -1149,7 +1149,7 @@ export default {
   methods: {
     checkData(){
       if(this.receiverTreatmentAccess.way == 0){
-        this.$message.error('住院方式未填')
+        this.$message.error('入院方式未填')
       }else if(this.receiverTreatmentAccess.consciousness == 0){
         this.$message.error('意识未填')
       }else if(this.predialysis.temperature == 0){
@@ -1186,7 +1186,7 @@ export default {
         this.$message.error('抗凝剂未填')
       }else if(this.prescription.dialysate_formulation_name == ""){
         this.$message.error('透析液配方未填')
-      }else if(this.prescription.replacement_total == ""){
+      }else if(this.prescription.replacement_total == "" && this.prescription.mode_id == 2){
         this.$message.error('置换量未填')
       }else if(this.prescription.mode_id == ""){
         this.$message.error('透析模式未填')
@@ -1196,7 +1196,7 @@ export default {
         this.$message.error('透析器未填')
       }else if((this.prescription.prescription_doctor == 0 && this.prescription.creater == 0) && this.org_id == 9987){
         this.$message.error('医生签名未填')
-      }else if(this.advices[0][0].advice_doctor == 0 && this.org_id != 9987){
+      }else if(this.advices[0].length > 0 && this.advices[0][0].advice_doctor == 0 && this.org_id != 9987){
         this.$message.error('医生签名未填')
       }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
         this.$message.error('实际治疗时间未填')
@@ -1218,30 +1218,49 @@ export default {
         this.$message.error('透析小结未填')
       }else if(this.afterdialysis.patient_gose == 0){
         this.$message.error('患者去向未填')
+      }else if(this.afterdialysis.patient_gose == 3 && this.afterdialysis.observation_content == ""){
+        this.$message.error('交待病房护士/患者/陪人观察内容未填')
       }else if(this.afterdialysis.creater == 0){
         this.$message.error('当班责任（核对）护士未填')
       }else if(this.dialysisOrder == null || this.dialysisOrder.finish_nurse == 0){
         this.$message.error('下机护士未填')
       }else if(this.tableAdvice.length > 0){
+        let num = 0
         this.tableAdvice.map(item => {
-          if(item.id > 0 && item.created_time){
+          if(item.id > 0 && (item.created_time || item.start_time)){
             this.users.map(it => {
               if(it.id == item.advice_doctor){
-                if(it.type != 2){
+                if(it.user_type == 3){
+                  num++
                   this.$message.error('存在不是医生保存的医嘱')
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
               }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.type != 3){
+                if(it.user_type == 2){
+                  num++
                   this.$message.error('存在不是护士执行的医嘱')
                 }
               }else if(it.id == item.checker && item.checker > 0){
-                if(it.type != 3){
+                if(it.user_type == 2){
+                  num++
                   this.$message.error('存在不是护士核对的医嘱')
                 }
               }
             })
           }
         })
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
       }else{
         this.$message.success('核对完成')
       }

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -722,7 +722,7 @@ export default {
         this.$message.error('核对护士未填')
       }else if(this.finshForm.finish_nurse == ""){
         this.$message.error('下机护士未填')
-      }else if((this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0) && this.org_id == 9987){
+      }else if(this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0){
         this.$message.error('透后血压未填完整')
       }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
         this.$message.error('实际治疗时间未填')
@@ -741,25 +741,42 @@ export default {
       }else if(this.summary.dialysis_summary == ""){
         this.$message.error('透析小结未填')
       }else if(this.tableAdvice.length > 0){
+        let num = 0
         this.tableAdvice.map(item => {
-          if(item.id > 0 && item.created_time){
+          if(item.id > 0 && (item.created_time || item.start_time)){
             this.users.map(it => {
               if(it.id == item.advice_doctor){
-                if(it.type != 2){
+                if(it.user_type == 3){
+                  num++
                   this.$message.error('存在不是医生保存的医嘱')
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
               }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.type != 3){
+                if(it.user_type == 2){
+                  num++
                   this.$message.error('存在不是护士执行的医嘱')
                 }
               }else if(it.id == item.checker && item.checker > 0){
-                if(it.type != 3){
+                if(it.user_type == 2){
+                  num++
                   this.$message.error('存在不是护士核对的医嘱')
                 }
               }
             })
           }
         })
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
       }else{
         this.$message.success('核对完成')
       }

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -1346,7 +1346,7 @@ export default {
         this.$message.error('透前体温未填')
       }else if(this.receiverTreatmentAccess.posture == 0){
         this.$message.error('体位未填')
-      }else if(this.predialysis.blood_access_part_opera_name == ''){
+      }else if(this.predialysis.blood_access_part_opera_id == 0){
         this.$message.error('内瘘波动及震颤未填')
       }else if(this.predialysis.blood_access_part_id == 0){
         this.$message.error('中心静脉导管部位未填')
@@ -1388,38 +1388,62 @@ export default {
         this.$message.error('下机护士未填')
       }else if(this.special_record == ""){
         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.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getAdminUser(id) {

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"
@@ -1295,9 +1295,9 @@ export default {
         this.$message.error('透前导管未填')
       } else if (this.prescription.mode_id == '') {
         this.$message.error('透析方式未填')
-      } else if (this.prescription.displace_liqui_part == 0) {
+      } else if (this.prescription.displace_liqui_part == 0 && this.prescription.mode_id == 2) {
         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.$message.error('置换量未填')
       } else if (this.prescription.blood_flow_volume == 0) {
         this.$message.error('血流量未填')
@@ -1307,9 +1307,9 @@ export default {
         this.$message.error('透析器未填')
       } else if (this.prescription.dialysis_irrigation == '') {
         this.$message.error('灌流器未填')
-      } else if (this.prescription.plasma_separator == '') {
+      } else if (this.prescription.plasma_separator == '' && this.org_id == 9538) {
         this.$message.error('血浆分离器未填')
-      } else if (this.prescription.bilirubin_adsorption_column == '') {
+      } else if (this.prescription.bilirubin_adsorption_column == '' && this.org_id == 9538) {
         this.$message.error('胆红素吸附柱未填')
       } else if (this.predialysis.weight_before == 0) {
         this.$message.error('透前体重未填')
@@ -1376,25 +1376,42 @@ export default {
       } else if (this.prescription.creater == 0) {
         this.$message.error('医生签名未填')
       }else if(this.tableAdvice.length > 0){
+        let num = 0
         this.tableAdvice.map(item => {
-          if(item.id > 0 && item.created_time){
+          if(item.id > 0 && (item.created_time || item.start_time)){
             this.users.map(it => {
               if(it.id == item.advice_doctor){
-                if(it.type != 2){
+                if(it.user_type == 3){
+                  num++
                   this.$message.error('存在不是医生保存的医嘱')
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
               }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.type != 3){
+                if(it.user_type == 2){
+                  num++
                   this.$message.error('存在不是护士执行的医嘱')
                 }
               }else if(it.id == item.checker && item.checker > 0){
-                if(it.type != 3){
+                if(it.user_type == 2){
+                  num++
                   this.$message.error('存在不是护士核对的医嘱')
                 }
               }
             })
           }
         })
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
       }else{
         this.$message.success('核对完成')
       }

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -503,7 +503,7 @@
                         <td width="50">电导度<br />(ms/cm)</td>
                         <td width="50">超滤量<br />(ml)</td>
                         <td v-if="prescription.mode_id == 2 || prescription.mode_id == 5" width="50">
-                          置换量<br />(ml)
+                          置换量<br />(L)
                         </td>
                         <td width="200">病情变化及处理</td>
                         <td width="100">护士签名</td>
@@ -1198,9 +1198,9 @@ export default {
         this.$message.error('透前导管未填')
       }else if(this.prescription.mode_id == ""){
         this.$message.error('透析方式未填')
-      }else if(this.prescription.displace_liqui_part == 0){
+      }else if(this.prescription.displace_liqui_part == 0 && this.prescription.mode_id == 2){
         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.$message.error('置换量未填')
       }else if(this.prescription.blood_flow_volume == 0){
         this.$message.error('血流量未填')
@@ -1276,38 +1276,60 @@ 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.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
       }else{
         this.$message.success('核对完成')
       }

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -785,13 +785,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('透后体温未填')
@@ -815,12 +815,51 @@ export default {
         this.$message.error('透析小结未填')
       }else if(this.orderForm.start_nurse == ""){
         this.$message.error('记录者未填')
-      }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
+      }else if(this.dialysisOrder != null && ((this.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0) || (this.check.creater == 0 && this.check.modifier == 0))){
         this.$message.error('二核护士未填')
-      }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
+      }else if(this.dialysisOrder != null && ((this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0) || (this.check.creater == 0 && this.check.modifier == 0))){
         this.$message.error('二核护士未填')
       }else if(this.summary.modifier == 0 && this.summary.creater == 0){
         this.$message.error('医生签名未填')
+      }else if(this.tableAdvice.length > 0){
+        let num = 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.error('存在不是医生保存的医嘱')
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
+                }
+              }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                if(it.user_type == 2){
+                  num++
+                  this.$message.error('存在不是护士执行的医嘱')
+                }
+              }else if(it.id == item.checker && item.checker > 0){
+                if(it.user_type == 2){
+                  num++
+                  this.$message.error('存在不是护士核对的医嘱')
+                }
+              }
+            })
+          }
+        })
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getNewAge(UUserCard) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -732,38 +732,62 @@ 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.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.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getHemorrhage(hemorrhage){

src/xt_pages/dialysis/template/DialysisPrintOrderTwenty.vue

@@ -1120,15 +1120,15 @@ export default {
         this.$message.error('内瘘震颤皮肤未填')
       }else if(this.predialysis.puncture_needle == ''){
         this.$message.error('针型未填')
-      }else if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('置管') > -1 : false)){
+      }else if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('置管') == -1 : false)){
         this.$message.error('置管未填')
       }else if(this.predialysis.blood_access_part_id == ''){
         this.$message.error('血管通路部位未填')
       }else if(this.predialysis.catheter_bend == 0){
         this.$message.error('导管打折未填')
-      }else if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('穿刺口') > -1 : false)){
+      }else if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('穿刺口') == -1 : false)){
         this.$message.error('穿刺口未填')
-      }else if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('导管吸壁') > -1 : false)){
+      }else if(this.predialysis.catheter == '' || (this.predialysis.catheter ? this.predialysis.catheter.indexOf('导管吸壁') == -1 : false)){
         this.$message.error('导管吸壁未填')
       }else if(this.afterdialysis.cvc_a == 0){
         this.$message.error('容量A未填')
@@ -1158,9 +1158,9 @@ export default {
         this.$message.error('医生签名未填')
       }else if(this.dialysisOrder.puncture_nurse == 0){
         this.$message.error('上机护士未填')
-      }else if(this.dialysisOrder != null && this.dialysisOrder.puncture_nurse == this.check.modifier && this.check.creater == 0){
+      }else if(this.dialysisOrder != null && ((this.dialysisOrder.puncture_nurse == this.check.modifier && this.check.creater == 0) || (this.check.modifier == 0 && this.check.creater == 0))){
         this.$message.error('核对护士未填')
-      }else if(this.dialysisOrder != null && this.dialysisOrder.puncture_nurse == this.check.creater && this.check.modifier == 0){
+      }else if(this.dialysisOrder != null && ((this.dialysisOrder.puncture_nurse == this.check.creater && this.check.modifier == 0) || (this.check.modifier == 0 && this.check.creater == 0))){
         this.$message.error('核对护士未填')
       }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
         this.$message.error('实际治疗时间未填')
@@ -1188,38 +1188,62 @@ export default {
         this.$message.error('当班责任护士未填')
       }else if(this.dialysisOrder.finish_nurse == 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.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getNewAge(UUserCard) {

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -1805,12 +1805,54 @@ export default {
           this.$message.error('医生未填')
         }else if(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.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){
+          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.error('存在不是医生保存的医嘱')
+                    }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                      if(it.user_type == 2){
+                        num++
+                        this.$message.error('存在不是护士执行的医嘱')
+                      }
+                    }else if(it.id == item.checker && item.checker > 0){
+                      if(it.user_type == 2){
+                        num++
+                        this.$message.error('存在不是护士核对的医嘱')
+                      }
+                    }
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                })
+              }
+          })
+          }
+          
+          if(num == 0){
+            this.$message.success('核对完成')
+          }
+        }else{
+          this.$message.success('核对完成')
         }
       },
       getComplication(complication){

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -1212,7 +1212,7 @@ export default {
           this.$message.error('透析小结未填')
         }else if(this.prescription.creater == 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.dialysisOrder.start_nurse == this.check.modifier && this.check.creater == 0){
           this.$message.error('核对护士未填')
@@ -1223,25 +1223,47 @@ export default {
         }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(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.error('存在不是医生保存的医嘱')
+                    }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                      if(it.user_type == 2){
+                        num++
+                        this.$message.error('存在不是护士执行的医嘱')
+                      }
+                    }else if(it.id == item.checker && item.checker > 0){
+                      if(it.user_type == 2){
+                        num++
+                        this.$message.error('存在不是护士核对的医嘱')
+                      }
+                    }
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
                   }
-                }
-              })
-            }
+                })
+              }
           })
+          }
+          
+          if(num == 0){
+            this.$message.success('核对完成')
+          }
+        }else{
+          this.$message.success('核对完成')
         }
       },
       getComplication(complication){

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -1746,12 +1746,68 @@ export default {
         this.$message.error('导管特殊情况未填')
       }else if(this.afterdialysis.complication == ""){
         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){
         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.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
+                }
+              })
+            }
+        })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     otherSealingFluidDispose(sealing_fluid_dispose){

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyNine.vue

@@ -776,44 +776,68 @@ export default {
         this.$message.error('透析宣教未填')
       }else if(this.summary.dialysis_summary == ""){
         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){
         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.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.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getHemorrhage(hemorrhage){

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -1429,25 +1429,47 @@ export default {
       }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(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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getComplication(complication){

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySix.vue

@@ -1320,25 +1320,47 @@ export default {
       }else if(this.dialysisOrder != null && this.dialysisOrder.start_nurse == this.check.creater && this.check.modifier == 0){
         this.$message.error('核对护士未填')
       }else if(this.tableAdvice.length > 0){
-        this.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getNewAge(UUserCard) {

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyTwo.vue

@@ -1386,7 +1386,7 @@ export default {
         this.$message.error('患者去向未填')
       }else if(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('核对人未填')
@@ -1404,7 +1404,7 @@ export default {
         this.$message.error('治疗方式未填')
       }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
         this.$message.error('透析时间未填')
-      }else if(this.prescription.body_fluid == 0){
+      }else if(this.prescription.body_fluid == 0 && this.prescription.body_fluid_other == ""){
         this.$message.error('体液过多症状未填')
       }else if(this.prescription.dialyzer_perfusion_apparatus == ""){
         this.$message.error('透析器型号未填')
@@ -1432,38 +1432,62 @@ export default {
         this.$message.error('实际超滤量未填')
       }else if(this.afterdialysis.weight_after == 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.advices.length > 0){
-        this.advices.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.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getPartName(id) {
@@ -1733,6 +1757,7 @@ export default {
         }
 
         this.advices = response.data.data.advices;
+        this.tableAdvice = response.data.data.advices;
         this.monitors = response.data.data.monitors;
         this.summary = response.data.data.summary;
         this.org_template_info = response.data.data.org_template_info;

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -1276,7 +1276,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('透前体重未填')
@@ -1302,38 +1302,53 @@ export default {
         this.$message.error('核对护士未填')
       }else if(this.doctor_advices.length > 0 && this.doctor_advices[0].execution_staff == 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.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.error('存在不是医生保存的医嘱')
+                  }
+                  else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
+      }else{
+        this.$message.success('核对完成')
       }
     },
     getDisplaceLiquiPart: function(val) {

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -1370,7 +1370,7 @@ export default {
         this.$message.error('心理评估未填')
       }else if(this.afterdialysis.dialysis_process == 0){
         this.$message.error('透析过程未填')
-      }else if(this.afterdialysis.in_advance_reason == ""){
+      }else if(this.afterdialysis.dialysis_process == 2 && this.afterdialysis.in_advance_reason == ""){
         this.$message.error('透析过程原因未填')
       }else if(this.afterdialysis.hemostasis_minute == 0){
         this.$message.error('内瘘管拔针后压迫止血时间未填')
@@ -1436,38 +1436,60 @@ export default {
         this.$message.error('实际超滤量未填')
       }else if(this.afterdialysis.weight_after == 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.advices.length > 0){
-        this.advices.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.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.error('存在不是医生保存的医嘱')
+                  }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士执行的医嘱')
+                    }
+                  }else if(it.id == item.checker && item.checker > 0){
+                    if(it.user_type == 2){
+                      num++
+                      this.$message.error('存在不是护士核对的医嘱')
+                    }
+                  }
+                }else if(it.id == item.execution_staff && item.execution_staff > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士执行的医嘱')
+                  }
+                }else if(it.id == item.checker && item.checker > 0){
+                  if(it.user_type == 2){
+                    num++
+                    this.$message.error('存在不是护士核对的医嘱')
+                  }
                 }
-              }
-            })
-          }
+              })
+            }
         })
+        }
+        
+        if(num == 0){
+          this.$message.success('核对完成')
+        }
       }else{
         this.$message.success('核对完成')
       }
@@ -1730,6 +1752,7 @@ export default {
         }
 
         this.advices = response.data.data.advices;
+        this.tableAdvice = response.data.data.advices;
         this.monitors = response.data.data.monitors;
         this.summary = response.data.data.summary;
         this.org_template_info = response.data.data.org_template_info;