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/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -61,7 +61,10 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('透析频次')">
-            <el-form-item label="透析频次(次/周):">
+            <el-form-item label="透析频次(次/周):" v-if="this.$store.getters.xt_user.template_info.org_id != 10243">
+              <el-input v-model="assessmentBeforeDislysis.dialysis_count"></el-input>
+            </el-form-item>
+            <el-form-item label="透析频次:" v-else>
               <el-input v-model="assessmentBeforeDislysis.dialysis_count"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFour.vue

@@ -569,12 +569,13 @@
                         <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
                           <span v-if="advice.parent_id > 0">---></span>
                           <span>{{ advice.advice_name }}</span>
+                          <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
                           <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
                           <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
                           <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                           <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                           <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
-                          <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
+                          
                         </td>
                         <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
                       <span>{{advice.delivery_way}}</span>
@@ -1027,38 +1028,62 @@ export default {
         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.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) {