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

src/api/advice.js

@@ -1,91 +1,89 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
 export function getAdviceConfig(type) {
   return request({
-    url: "/api/getadviceconfigs?type=" + type,
-    method: "get"
-  });
+    url: '/api/getadviceconfigs?type=' + type,
+    method: 'get'
+  })
 }
 
 export function getAllAdviceConfig() {
   return request({
-    url: "/api/getalladviceconfig",
-    method: "get"
-  });
+    url: '/api/getalladviceconfig',
+    method: 'get'
+  })
 }
 
 export function CreateDoctorAdvice(id, advice, mode) {
-
   return request({
-    url: "/api/patients/advice/create?id=" + id + "&mode=" + mode,
-    method: "post",
+    url: '/api/patients/advice/create?id=' + id + '&mode=' + mode,
+    method: 'post',
     data: advice,
     headers: {
       Permission: 3
     }
-  });
+  })
 }
 
 export function EditDoctorAdvice(patient, id, advice, mode) {
   return request({
     url:
-      "/api/patients/advice/edit?id=" +
+      '/api/patients/advice/edit?id=' +
       id +
-      "&patient=" +
+      '&patient=' +
       patient +
-      "&mode=" +
+      '&mode=' +
       mode,
-    method: "Put",
+    method: 'Put',
     data: advice,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
-export function ExecDoctorAdvice(patient, id, time, mode,origin) {
-
+export function ExecDoctorAdvice(patient, id, time, mode, origin) {
   var params = {
     id: id,
     patient: patient,
     execution_time: time,
     mode: mode,
-    origin:origin,
-  };
- 
+    origin: origin
+  }
+
   return request({
-    url: "/api/patients/advice/exec",
-    method: "Post",
+    url: '/api/patients/advice/exec',
+    method: 'Post',
     params: params,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
-export function  CheckDoctorAdvice(patient, id, mode,origin) {
+export function CheckDoctorAdvice(patient, id, mode, origin) {
   var params = {
     id: id,
     patient: patient,
     mode: mode,
-    origin:origin,
+    origin: origin
     // execution_time: time,
-  };
+  }
   return request({
-    url: "/api/patients/advice/check",
-    method: "Post",
+    url: '/api/patients/advice/check',
+    method: 'Post',
     params: params,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function getDoctorAdviceList(params) {
   return request({
-    url: "/api/patients/advices",
-    method: "Get",
+    url: '/api/patients/advices',
+    method: 'Get',
     params: params
-  });
+  })
 }
 
 // export function StopDoctorAdvice(id, reason,mode) {
@@ -100,407 +98,400 @@ export function getDoctorAdviceList(params) {
 
 export function StopGroupAdvice(groupno, reason, mode) {
   return request({
-    url: "/api/patients/advice/stopgroup?groupno=" + groupno + "&mode=" + mode,
-    method: "Post",
+    url: '/api/patients/advice/stopgroup?groupno=' + groupno + '&mode=' + mode,
+    method: 'Post',
     data: reason,
     headers: {
       Permission: 3
     }
-  });
+  })
 }
 
 export function DeleteDoctorAdvice(id, mode) {
   return request({
-    url: "/api/patients/advice/delete?id=" + id + "&mode=" + mode,
-    method: "Delete",
+    url: '/api/patients/advice/delete?id=' + id + '&mode=' + mode,
+    method: 'Delete',
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function CreateDrugDic(data) {
   return request({
-    url: "/api/drugdic/create",
-    method: "post",
+    url: '/api/drugdic/create',
+    method: 'post',
     data: data
-  });
+  })
 }
 export function UpdateDrugDic(id, data) {
   return request({
-    url: "/api/drugdic/update?id=" + id,
-    method: "put",
+    url: '/api/drugdic/update?id=' + id,
+    method: 'put',
     data: data
-  });
+  })
 }
 export function DeleteDrugDic(id) {
   return request({
-    url: "/api/drugdic/delete?id=" + id,
-    method: "delete"
-  });
+    url: '/api/drugdic/delete?id=' + id,
+    method: 'delete'
+  })
 }
 
 export function CreateDrugWay(data) {
   return request({
-    url: "/api/drugway/create",
-    method: "post",
+    url: '/api/drugway/create',
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function UpdateDrugWay(id, data) {
   return request({
-    url: "/api/drugway/update?id=" + id,
-    method: "put",
+    url: '/api/drugway/update?id=' + id,
+    method: 'put',
     data: data
-  });
+  })
 }
 export function DeleteDrugWay(id) {
   return request({
-    url: "/api/drugway/delete?id=" + id,
-    method: "delete"
-  });
+    url: '/api/drugway/delete?id=' + id,
+    method: 'delete'
+  })
 }
 
 export function CreateExecutionFrequency(data) {
   return request({
-    url: "/api/executionfrequency/create",
-    method: "post",
+    url: '/api/executionfrequency/create',
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function UpdateExecutionFrequency(id, data) {
   return request({
-    url: "/api/executionfrequency/update?id=" + id,
-    method: "put",
+    url: '/api/executionfrequency/update?id=' + id,
+    method: 'put',
     data: data
-  });
+  })
 }
 export function DeleteExecutionFrequency(id) {
   return request({
-    url: "/api/executionfrequency/delete?id=" + id,
-    method: "delete"
-  });
+    url: '/api/executionfrequency/delete?id=' + id,
+    method: 'delete'
+  })
 }
 export function CreateAdviceTemplate(data) {
   return request({
-    url: "/api/advicetemplate/create",
-    method: "post",
+    url: '/api/advicetemplate/create',
+    method: 'post',
     data: data
-  });
+  })
 }
 
-export function UpdateAdviceTemplate(id, data,drug_id) {
-
+export function UpdateAdviceTemplate(id, data, drug_id) {
   return request({
-    url: "/api/advicetemplate/update?id=" + id+"&drug_id="+drug_id,
-    method: "put",
+    url: '/api/advicetemplate/update?id=' + id + '&drug_id=' + drug_id,
+    method: 'put',
     data: data
-  });
+  })
 }
 export function DeleteAdviceTemplate(id, template_id, parent_id) {
   return request({
     url:
-      "/api/advicetemplate/delete?id=" +
+      '/api/advicetemplate/delete?id=' +
       id +
-      "&template_id=" +
+      '&template_id=' +
       template_id +
-      "&parent_id=" +
+      '&parent_id=' +
       parent_id,
-    method: "delete"
-  });
+    method: 'delete'
+  })
 }
 
-export function postAdviceTemplate(params, name,sort, advice_type) {
+export function postAdviceTemplate(params, name, sort, advice_type) {
   return request({
     url:
-      "/api/advicetemplate/create?template_name=" +
+      '/api/advicetemplate/create?template_name=' +
       name +
-      "&advice_type=" +
-      advice_type
-      +"&sort="+sort,
-    method: "post",
+      '&advice_type=' +
+      advice_type +
+      '&sort=' + sort,
+    method: 'post',
     data: params
-  });
+  })
 }
 
 export function CreateGroupAdvice(id, groupno, advices, mode) {
-
   if (advices.remind > 0) {
     return request({
       url:
-        "/api/patients/advice/creategroup?id=" +
+        '/api/patients/advice/creategroup?id=' +
         id +
-        "&groupno=" +
+        '&groupno=' +
         groupno +
-        "&mode=" +
+        '&mode=' +
         mode,
-      method: "post",
+      method: 'post',
       data: advices,
       headers: {
         Permission: 2
       }
-    });
+    })
   } else {
     return request({
       url:
-        "/api/patients/advice/creategroup?id=" +
+        '/api/patients/advice/creategroup?id=' +
         id +
-        "&groupno=" +
+        '&groupno=' +
         groupno +
-        "&mode=" +
+        '&mode=' +
         mode,
-      method: "post",
+      method: 'post',
       data: advices,
       headers: {
         Permission: 2
       }
-    });
+    })
   }
 }
 export function DeleteGroupAdvice(groupno, mode) {
   return request({
     url:
-      "/api/patients/advice/deletegroup?groupno=" + groupno + "&mode=" + mode,
-    method: "delete",
+      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+    method: 'delete',
     headers: {
       Permission: 3
     }
-  });
+  })
 }
 
 export function getAllAdviceTemplate() {
   return request({
-    url: "/api/advicetemplate/list",
-    method: "get"
-  });
+    url: '/api/advicetemplate/list',
+    method: 'get'
+  })
 }
 
 export function CreateSingleAdviceTemplate(advices) {
   return request({
-    url: "/api/advicetemplate/add",
-    method: "post",
+    url: '/api/advicetemplate/add',
+    method: 'post',
     params: advices
-  });
+  })
 }
 export function DeleteParentAdviceTemplate(id) {
   return request({
-    url: "/api/adviceparenttemplate/delete?template_id=" + id,
-    method: "delete"
-  });
+    url: '/api/adviceparenttemplate/delete?template_id=' + id,
+    method: 'delete'
+  })
 }
 
 export function CreateSubAdvice(params) {
-
   return request({
-    url: "/api/subadvice/create",
-    method: "post",
+    url: '/api/subadvice/create',
+    method: 'post',
     params: params
-  });
+  })
 }
 
 export function updateTemplateName(params) {
   return request({
-    url: "/api/template/modify",
-    method: "post",
+    url: '/api/template/modify',
+    method: 'post',
     params: params
-  });
+  })
 }
 
 export function getDoctorAdviceConfig() {
   return request({
-    url: "/api/adviceconfig/get",
-    method: "get"
-  });
+    url: '/api/adviceconfig/get',
+    method: 'get'
+  })
 }
 
 export function postDoctorAdviceConfig(params) {
   return request({
-    url: "/api/adviceconfig/isopen",
-    method: "post",
+    url: '/api/adviceconfig/isopen',
+    method: 'post',
     params: params
-  });
+  })
 }
 
 export function getDoctorInitConfig() {
   return request({
-    url: "/api/advicetemplate/init/get",
-    method: "get"
-  });
+    url: '/api/advicetemplate/init/get',
+    method: 'get'
+  })
 }
 
 export function PostInitAdviceTemplate(params) {
   return request({
-    url: "/api/advicetemplate/init/commit",
-    method: "post",
+    url: '/api/advicetemplate/init/commit',
+    method: 'post',
     params: params
-  });
+  })
 }
 
 export function getPrintInfo(data) {
   return request({
-    url: "/api/advicetemplate/getprintinfo",
-    method: "post",
+    url: '/api/advicetemplate/getprintinfo',
+    method: 'post',
     data: data
-  });
+  })
 }
 
 export function EditNewDoctorAdvice(patient, id, advice, mode) {
   return request({
     url:
-      "/api/patients/advice/edit?id=" +
+      '/api/patients/advice/edit?id=' +
       id +
-      "&patient=" +
+      '&patient=' +
       patient +
-      "&mode=" +
+      '&mode=' +
       mode,
-    method: "Put",
+    method: 'Put',
     data: advice,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function CreateNewDoctorAdvice(id, advice, mode) {
-
   return request({
-    url: "/api/patients/advice/create?id=" + id + "&mode=" + mode,
-    method: "post",
+    url: '/api/patients/advice/create?id=' + id + '&mode=' + mode,
+    method: 'post',
     data: advice,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function CreateNewGroupAdvice(id, groupno, advices, mode) {
   if (advices.remind > 0) {
     return request({
       url:
-        "/api/patients/advice/creategroup?id=" +
+        '/api/patients/advice/creategroup?id=' +
         id +
-        "&groupno=" +
+        '&groupno=' +
         groupno +
-        "&mode=" +
+        '&mode=' +
         mode,
-      method: "post",
+      method: 'post',
       data: advices,
       headers: {
         Permission: 3
       }
-    });
+    })
   } else {
     return request({
       url:
-        "/api/patients/advice/creategroup?id=" +
+        '/api/patients/advice/creategroup?id=' +
         id +
-        "&groupno=" +
+        '&groupno=' +
         groupno +
-        "&mode=" +
+        '&mode=' +
         mode,
-      method: "post",
+      method: 'post',
       data: advices,
       headers: {
         Permission: 3
       }
-    });
+    })
   }
 }
 
 export function DeleteNewDoctorAdvice(id, mode) {
   return request({
-    url: "/api/patients/advice/delete?id=" + id + "&mode=" + mode,
-    method: "Delete",
+    url: '/api/patients/advice/delete?id=' + id + '&mode=' + mode,
+    method: 'Delete',
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function DeleteNewGroupAdvice(groupno, mode) {
   return request({
     url:
-      "/api/patients/advice/deletegroup?groupno=" + groupno + "&mode=" + mode,
-    method: "delete",
+      '/api/patients/advice/deletegroup?groupno=' + groupno + '&mode=' + mode,
+    method: 'delete',
     headers: {
       Permission: 3
     }
-  });
+  })
 }
 
 export function StopDoctorAdvice(id, reason, mode) {
   return request({
-    url: "/api/patients/advice/stop?id=" + id + "&mode=" + mode,
-    method: "Post",
+    url: '/api/patients/advice/stop?id=' + id + '&mode=' + mode,
+    method: 'Post',
     data: reason,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function ExecGroupAdvice(groupno, time, mode) {
   return request({
     url:
-      "/api/patients/advice/execgroup?groupno=" +
+      '/api/patients/advice/execgroup?groupno=' +
       groupno +
-      "&execution_time=" +
+      '&execution_time=' +
       time +
-      "&mode=" +
+      '&mode=' +
       mode,
-      method: "Post",
-      headers: {
+    method: 'Post',
+    headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function CheckGroupAdvice(groupno, mode) {
   var params = {
     groupno: groupno,
     mode: mode
-  };
+  }
   return request({
-    url: "/api/patients/advice/checkgroup",
-    method: "Post",
+    url: '/api/patients/advice/checkgroup',
+    method: 'Post',
     params: params,
     headers: {
       Permission: 2
     }
-  });
+  })
 }
 
 export function getPatientSchedules(id, params) {
   return request({
-    url: "/api/patients/advices/getpatientschedules?id=" + id,
-    method: "get",
+    url: '/api/patients/advices/getpatientschedules?id=' + id,
+    method: 'get',
     params: params
-  });
+  })
 }
 
 export function SaveEditAdvices(params) {
   return request({
-    url: "/api/patients/advices/saveditadvices",
-    method: "get",
+    url: '/api/patients/advices/saveditadvices',
+    method: 'get',
     params: params
-  });
+  })
 }
 
-
-
-
 export function GetLastOrNextDoctorAdvice(params) {
   return request({
-    url: "/api/doctoradvice/get",
-    method: "get",
+    url: '/api/doctoradvice/get',
+    method: 'get',
     params: params
-  });
+  })
 }
 
-export function getSchedualDoctors (params) {
-  
+export function getSchedualDoctors(params) {
+  console.log('中国国323322332232323232323', params)
   return request({
     url: '/api/schedule/advices',
     method: 'get',
@@ -508,15 +499,11 @@ export function getSchedualDoctors (params) {
   })
 }
 
-export function getDoctorAdviceCount(params){
-  
+export function getDoctorAdviceCount(params) {
   return request({
-    url:"/api/schedule/getdoctoradvicecount",
-    method:"get",
-    params:params
+    url: '/api/schedule/getdoctoradvicecount',
+    method: 'get',
+    params: params
   })
 }
 
-
-
-

src/api/patient.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import { fromTextArea } from 'codemirror'
 
 export function fetchList(params) {
   return request({
@@ -247,6 +248,7 @@ export function EditLapseto(patient_id, data) {
 }
 
 export function PostSearch(keyword) {
+  console.log('keyword2222222', keyword)
   return request({
     url: '/api/patients/search?keyword=' + keyword,
     method: 'post'

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -112,8 +112,8 @@
           <span class="content">{{
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
           }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
         <li v-if="isShow('葡萄糖')">
           <label>葡萄糖 : </label>

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -67,7 +67,8 @@
 
         <li v-if="isShow('体液过多症状')">
           <label>体液过多症状 : </label>
-          <span class="content">{{ getHumorExcessiveSymptom(this.record.humor_excessive_symptom) }}</span>
+          <!-- <span class="content">{{ getHumorExcessiveSymptom(this.record.humor_excessive_symptom) }}</span> -->
+          <span>{{this.record.humor_excessive_symptom}}</span>
         </li>
 
         <li v-if="isShow('其他感染情况')">

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

@@ -67,8 +67,6 @@
           </el-col>
 
 
-
-
           <el-col :span="8">
             <el-form-item label="体温(℃)：" v-if="isShow('体温')">
               <el-input type="number" v-model="assessmentBeforeDislysis.temperature"></el-input>
@@ -97,7 +95,7 @@
               <el-input type="number" v-model="assessmentBeforeDislysis.pulse_frequency"></el-input>
             </el-form-item>
           </el-col>
-
+<!-- 
           <el-col :span="8">
             <el-form-item label="体液过多症状： " v-if="isShow('体液过多症状')">
               <el-select v-model="assessmentBeforeDislysis.humor_excessive_symptom">
@@ -106,6 +104,13 @@
                            :key="item.id"></el-option>
               </el-select>
             </el-form-item>
+          </el-col> -->
+
+          <el-col :span="8">
+            <el-form-item label="体液过多症状：" v-if="isShow('体液过多症状')">
+              <el-input v-model="assessmentBeforeDislysis.humor_excessive_symptom" readonly
+                        @focus="showInnerDialog('19')"></el-input>
+            </el-form-item>
           </el-col>
 
           <el-col :span="8">
@@ -402,34 +407,6 @@
             </el-form-item>
           </el-col>
 
-
-
-
-
-
-
-
-
-          <!--          <el-col :span="8" v-if="isShow('血管通路(内瘘)')">-->
-          <!--            <el-form-item label="血管通路(内瘘):">-->
-          <!--              <div>-->
-          <!--                <el-input v-model="assessmentBeforeDislysis.blood_access_internal_fistula"-->
-          <!--                          @focus="showInnerDialog('9')"></el-input>-->
-          <!--              </div>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
-
-
-
-
-
-
-
-
-
-
-
           <el-col :span="8">
 
             <el-form-item label="位置： " v-if="isShow('位置')">
@@ -443,18 +420,6 @@
             </el-form-item>
           </el-col>
 
-
-
-
-          <!--          <el-col :span="8" v-if="isShow('导管')">-->
-          <!--            <el-form-item label="导管:">-->
-          <!--              <div>-->
-          <!--                <el-input v-model="assessmentBeforeDislysis.ductus_arantii" @focus="showInnerDialog('10')"></el-input>-->
-          <!--              </div>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
-
           <el-col :span="8" v-if="isShow('其他中心静脉导管')">
             <el-form-item label="其他中心静脉导管:">
               <div>
@@ -462,13 +427,7 @@
               </div>
             </el-form-item>
           </el-col>
-          <!-- </el-row>
-
-
-          <el-row :gutter="20"> -->
-
-
-
+         
           <el-col :span="8">
             <el-form-item label="感染： " v-if="isShow('感染')">
               <el-select v-model="assessmentBeforeDislysis.is_infect">
@@ -1089,6 +1048,16 @@
             this.InnerDialogProps.isShowTextArea = false
 
             break
+
+           case '19': // 内瘘
+
+            this.InnerDialogProps.values = this.humor_excessive_symptom_array
+            this.InnerDialogProps.titles = '体液过多症状'
+            this.InnerDialogProps.type = 'humor_excessive_symptom'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.humor_excessive_symptom
+            this.InnerDialogProps.isShowTextArea = false
+
+            break
          
         }
       },
@@ -1153,11 +1122,15 @@
           case 'catheter_maintenance':
            this.assessmentBeforeDislysis.catheter_maintenance = val.value.join(',')
            break
+          case 'humor_excessive_symptom':
+           this.assessmentBeforeDislysis.humor_excessive_symptom = val.value.join(',')
+           break  
         }
       },
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
-      }, handleComfirm: function() {
+      }, 
+      handleComfirm: function() {
 
         var arr = this.assessmentBeforeDislysis
         for (let i = 0; i < this.machineType.length; i++) {
@@ -1165,15 +1138,11 @@
             arr.machine_type = this.machineType[i].name
           }
         }
-        // console.log('arr', arr)
         const ParamsQuery = arr
-        // console.log('paramsquery', ParamsQuery)
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
         ParamsQuery['mode'] = '1'
 
-        // console.log(this.predialysis_evaluation)
-
         if (this.predialysis_evaluation.id == 0) {
           ParamsQuery['mode'] = '1'
         } else {
@@ -1226,7 +1195,8 @@
         }
         this.dialogFormVisible = true
         this.isVisibility = false
-      }, submitDryWeight() {
+      },
+     submitDryWeight() {
         const params = {
           id: this.patient.id,
           dry_weight: this.weight_adjust.weight,
@@ -1245,7 +1215,8 @@
             this.isVisibility = true
           }
         })
-      }, cancleDryWeight() {
+      },
+     cancleDryWeight() {
         this.dialogFormVisible = false
         this.isVisibility = true
       },

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

@@ -87,7 +87,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"
@@ -98,7 +98,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -23,10 +23,23 @@
     </div>
     </div>
     <div class="app-container">
-      <!-- <div class="filter-container">
-        <el-input style="width: 400px;" v-model="searchKey" class="filter-item"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-      </div>-->
+      <div class="filter-container">
+      <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model.trim="listQuery.keyword"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="false"
+          placeholder="患者姓名"
+          @select="handleSelect"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+          </template>
+       </el-autocomplete>
+       <el-button type="primary" @click="toSeach">搜索</el-button>
+      </div>
       <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询:</span>
@@ -46,6 +59,7 @@
 
         <!-- <el-button type="primary" :disabled="selecting_schs.length == 0" @click="batchPrintAction">打印</el-button> -->
       </div>
+
       <div class="cell clearfix">
         <label class="title"> <span class="name">排班班次</span> : </label>
         <div class="time">
@@ -359,7 +373,7 @@ import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getPrintTemplate } from "@/api/data";
 import { getSchedualDoctors } from '@/api/advice'
-
+import { PostSearch } from '@/api/patient'
 export default {
   name: "Patient",
   data() {
@@ -404,6 +418,8 @@ export default {
       showOne:false,
       deliveryWay:[],
       delivery_way:0,
+      patient_id:0,
+      org_id:0,
     };
   },
   created() {
@@ -425,6 +441,7 @@ export default {
     this.getTemplateInfo();
     this.requestSchedualDoctors(this.time)
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
+
   },
   methods: {
     getTemplateInfo() {
@@ -506,7 +523,7 @@ export default {
          var partition_type = this.listQuery.partition_type
 
         console.log("班次",schedule_type,"分区",partition_type)
-        getSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type}).then(rs => {
+        getSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
@@ -973,6 +990,29 @@ export default {
         this.selecting_schs = val;
     },
 
+    querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+        PostSearch(key).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            console.log('searcharrya', searchArray)
+            cb(searchArray)
+          }
+        })
+        return searchArray
+      },
+     handleSelect(val) {
+       this.patient_id = val.id
+       this.requestSchedualDoctors(this.time)
+      },
+     toSeach(){
+       this.patient_id = 0
+       this.requestSchedualDoctors(this.time)
+     }
   },
   components: {
     BreadCrumb

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -603,6 +603,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 45">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container" style="min-height:0;">
       <!--<div class="order-print-btn"-->
@@ -903,6 +913,11 @@
             v-if="org_template_info.template_id == 44"
           >
           </DialysisPrintOrderFortyFour>
+          <DialysisPrintOrderFortyFive
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 45"
+          >
+          </DialysisPrintOrderFortyFive>
         </div>
       </el-container>
     </div>
@@ -966,9 +981,11 @@ import DialysisPrintOrderFortyOne from "./template/DialysisPrintOrderFortyOne";
 import DialysisPrintOrderFortyTwo from "./template/DialysisPrintOrderFortyTwo";
 import DialysisPrintOrderFortyThree from "./template/DialysisPrintOrderFortyThree";
 import DialysisPrintOrderFortyFour from "./template/DialysisPrintOrderFortyFour";
+import DialysisPrintOrderFortyFive from "./template/DialysisPrintOrderFortyFive";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFortyFive,
     DialysisPrintOrderFortyFour,
     DialysisPrintOrderFortyThree,
     DialysisPrintOrderFortyTwo,
@@ -1489,6 +1506,13 @@ export default {
           style: style9,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 45) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

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/DialysisPrintOrderFourteen.vue

@@ -174,7 +174,13 @@
                 <tbody>
                   <tr>
                     <td width="100">体液过多症状:</td>
-                    <td width="50">
+                    <td width="400">
+                       <div class="under-line">
+                          &nbsp;
+                          <span>{{ predialysis.humor_excessive_symptom ? predialysis.humor_excessive_symptom : '' }}</span>
+                        </div>
+                    </td>
+                    <!-- <td width="50">
                       <div>
                         <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('无') > -1 : false" showValue="无"></label-box>
                       </div>
@@ -186,17 +192,19 @@
                         <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('颜面浮肿') >-1 : false" showValue="颜面浮肿"></label-box>
                         &nbsp;
                       </div>
-                    </td>
+                    </td> -->
 
-                    <td width="50"><label-box :isChecked="predialysis.humor_excessive_symptom ? ['无','下肢水肿','颜面浮肿'].indexOf(getHumorExcessiveSymptom(predialysis.humor_excessive_symptom)) == -1 : false" showValue="其它"></label-box></td>
-                    <td width="140">
+                    <!-- <td width="50"><label-box :isChecked="predialysis.humor_excessive_symptom ? ['无','下肢水肿','颜面浮肿'].indexOf(getHumorExcessiveSymptom(predialysis.humor_excessive_symptom)) == -1 : false" showValue="其它"></label-box></td> -->
+                    <!-- <td width="140">
                       <div class="under-line">
                         &nbsp;
                         <span v-if="predialysis.humor_excessive_symptom && ['无','下肢水肿','颜面浮肿'].indexOf(getHumorExcessiveSymptom(predialysis.humor_excessive_symptom)) == -1">
                           {{ getHumorExcessiveSymptom(predialysis.humor_excessive_symptom) }}
                         </span>
                       </div>
-                    </td>
+                    </td> -->
+                    <td></td>
+                    <td></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

@@ -182,16 +182,21 @@
                           <!-- <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('无') > -1 : false" showValue="无"></label-box> -->
                         </div>
                       </td>
-                      <td width="180">
-                        <div>
+                      <td width="400">
+                        <!-- <div>
                           <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom) == '下肢水肿' : false" showValue="下肢水肿"></label-box>
                           &nbsp;
                           <label-box :isChecked="predialysis.humor_excessive_symptom ? getHumorExcessiveSymptom(predialysis.humor_excessive_symptom).indexOf('颜面浮肿') >-1 : false" showValue="颜面浮肿"></label-box>
                           &nbsp;
+                        </div> -->
+                         <div class="under-line">
+                          &nbsp;
+                          <span>{{ predialysis.humor_excessive_symptom ? predialysis.humor_excessive_symptom : '' }}</span>
                         </div>
+
                       </td>
 
-                      <td width="50"><label-box :isChecked="predialysis.humor_excessive_symptom ? ['无','下肢水肿','颜面浮肿'].indexOf(getHumorExcessiveSymptom(predialysis.humor_excessive_symptom)) == -1 : false" showValue="其它"></label-box></td>
+                      <!-- <td width="50"><label-box :isChecked="predialysis.humor_excessive_symptom ? ['无','下肢水肿','颜面浮肿'].indexOf(getHumorExcessiveSymptom(predialysis.humor_excessive_symptom)) == -1 : false" showValue="其它"></label-box></td>
                       <td width="140">
                         <div class="under-line">
                           &nbsp;
@@ -199,7 +204,9 @@
                             {{ getHumorExcessiveSymptom(predialysis.humor_excessive_symptom) }}
                           </span>
                         </div>
-                      </td>
+                      </td> -->
+                      <td></td>
+                      <td></td>
                       <td></td>
                     </tr>
                   </tbody>
@@ -1422,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;

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">
+                                              <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">
                                                <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">
+                                              <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">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2658,7 +2658,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 ){
+        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){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
@@ -2933,7 +2933,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 ){
+        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 ){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -283,7 +283,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-import { getCancelStockConfig, postCancelStock,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber } from "@/api/stock";
+import { postCancelStock,GetAllConfig,GetAllGoodInfoByID,postSearchGoodList,getStockBatchNumber } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
 

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -427,7 +427,8 @@
           }
         }
         return name;
-      }, handleEdit: function(index, row) {
+      }, 
+      handleEdit: function(index, row) {
         this.canCelShow = false
         const tempObj = {}
         tempObj['id'] = 0
@@ -676,6 +677,7 @@
             return
          }
          this.getDrugBatchNumber(val.id)
+         console.log("val2323232323223",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id  = val.id
@@ -683,7 +685,7 @@
              this.recordInfo.recordData[i].drug_type = val.drug_type
              this.recordInfo.recordData[i].name  = val.dose +val.dose_unit+"*"+val.min_number+ val.min_unit+"/"+val.max_unit
              this.recordInfo.recordData[i].last_price = val.last_price
-             this.recordInfo.recordData[i].price = val.price
+             this.recordInfo.recordData[i].price = val.last_price
              this.recordInfo.recordData[i].manufacturer =  val.manufacturer
              this.recordInfo.recordData[i].number =  val.number
              this.recordInfo.recordData[i].max_unit = val.max_unit

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -130,8 +130,7 @@
               </el-table-column>
               <el-table-column prop="address" label="损耗数量" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.last_stock_max_number>0">{{scope.row.last_stock_max_number}}{{scope.row.warehousing_unit}}</span>
-                   <span v-if="scope.row.last_stock_min_number>0">{{scope.row.last_stock_min_number}}{{scope.row.min_unit}}</span>
+                  <span v-if="scope.row.count>0">{{scope.row.count}}{{scope.row.min_unit}}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="address" label="药损比" align="center">

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -557,6 +557,7 @@
               }
             }
             for(let i=0;i<this.recordInfo.recordData.length;i++){
+              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
               if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
               }
@@ -585,7 +586,7 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-          
+            console.log("param23322323233222323",params)
           
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
@@ -645,7 +646,6 @@
                 response.data.data.list[i].manufacturer = response.data.data.list[i].drug.manufacturer
               }
               
-             
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
               response.data.data.list[i].retail_price = response.data.data.list[i].price.toString()
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
@@ -657,7 +657,6 @@
              
               response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{h}-{d}")
               response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{h}-{d}")
-              
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
              for(let j=0;j<this.recordInfo.recordData.length;j++){

src/xt_pages/stock/drugs/inventory.vue

@@ -317,6 +317,7 @@ export default {
                         batch_number:item.batch_number,
                         expiry_date:item.expiry_date,
                         type:0,
+                        
                       }
                     }
                   })

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -2,24 +2,6 @@
     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
-                <!-- 耗材类别：
-                <el-select v-model="value" size="small" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select>
-                停用状态：
-                <el-select v-model="value" size="small" placeholder="请选择">
-                    <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                    </el-option>
-                </el-select> -->
                 <el-input
                 size="small"
                 style="width: 200px;margin-left:10px;"

src/xt_pages/stock/drugs/query.vue

@@ -77,9 +77,9 @@
           >搜索
           </el-button>
       </div>
-      
+
        <el-table :data="tableList" border style="width: 100%">
-      
+
         <el-table-column prop="drug_type" label="药品类型" width="180" align="center">
            <template slot-scope="scope">
              {{getDrugType(scope.row.drug_type)}}
@@ -107,15 +107,15 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span> 
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243">
-                <span> 
+             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+                <span>
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
-                </span> 
+                </span>
              </span>
              <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
            </template>
@@ -123,10 +123,10 @@
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
-               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243">
+               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
                </span>
-               
+
                <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
             </div>
            </template>
@@ -148,7 +148,7 @@
           </template>
         </el-table-column>
        </el-table>
-       
+
     <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -194,13 +194,13 @@ import { min } from 'moment'
       this.getlist()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
-      var drugTypeList = getDictionaryDataConfig('system','drug_type') 
+      var drugTypeList = getDictionaryDataConfig('system','drug_type')
       this.drugTypeList.push(...drugTypeList)
       this.org_id =  this.$store.getters.xt_user.org.id
       console.log("机构ID",this.org_id)
       this.getDrugCountList()
-     
-      
+
+
     },
     components: {
       SettingDialog,
@@ -213,7 +213,7 @@ import { min } from 'moment'
           { path: '/stock/drugs/stock/query', name: '药品库存查询' }
         ],
         keywords: '',
-       
+
         multipleSelection: [],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         start_time: '',
@@ -279,7 +279,7 @@ import { min } from 'moment'
                for(let z=0;z<list[i].drug_cancel_stock_info.length;z++){
                  if(list[i].drug_cancel_stock_info[z].max_unit == list[i].max_unit){
                    list[i].drug_cancel_stock_info[z].count = list[i].drug_cancel_stock_info[z].count * list[i].min_number
-                 } 
+                 }
                }
              }
              console.log("列表list232323323232323223",list)
@@ -287,7 +287,7 @@ import { min } from 'moment'
              var total = response.data.data.total
              this.total = total
              this.manufacturerList = response.data.data.manufacturerList
-           
+
            }
         })
       },
@@ -337,7 +337,7 @@ import { min } from 'moment'
           }
         }
       },
-    
+
       getSpecificationName: function(id) {
         let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
@@ -373,7 +373,7 @@ import { min } from 'moment'
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       },
-  
+
     startTimeChange: function(val) {
       window.sessionStorage.removeItem('start_time')
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -381,7 +381,7 @@ import { min } from 'moment'
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-     
+
         this.getlist()
       }
     },
@@ -392,10 +392,10 @@ import { min } from 'moment'
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-       
+
         this.getlist()
       }
-     
+
     },
       stockInCount: function(row) {
         let total = 0
@@ -430,7 +430,7 @@ import { min } from 'moment'
       search: function() {
         this.getlist()
         this.getDrugCountList()
-      }, 
+      },
       setting: function() {
         this.$refs.dialog.show()
       },
@@ -446,13 +446,13 @@ import { min } from 'moment'
           this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
          }
-       
+
          console.log("hhhhhhhadhfadf 列表",this.tableList)
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
          const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']
-       
-        
+
+
          const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({
            header: tHeader,
@@ -483,7 +483,7 @@ import { min } from 'moment'
         });
       },
       getDrugType(id){
-       
+
         var name = ""
         for(let i=0;i<this.drugTypeList.length;i++){
            if(this.drugTypeList[i].id == id){
@@ -491,7 +491,7 @@ import { min } from 'moment'
              name = this.drugTypeList[i].name
            }
         }
-     
+
         return name
       },
       getManufacturerList(id){
@@ -630,10 +630,10 @@ import { min } from 'moment'
             min_str =  total%min_number + min_unit
           }
         }
-    
+
         return str + min_str
       },
-  
+
       getCountOne(drug_id){
         var count= 0
         for(let i=0;i<this.drugOutList.length;i++){
@@ -644,7 +644,7 @@ import { min } from 'moment'
         return count
       },
      getCountTwo(drug_id,min_number,max_unit,min_unit){
-      
+
        var total_count = 0
        var out_count = 0
        var count = 0
@@ -658,7 +658,7 @@ import { min } from 'moment'
        if(parseInt(count/min_number)!=0){
          str = parseInt(count/min_number) + max_unit
        }
-     
+
        if((count%min_number)!=0){
          str_min = count%min_number + min_unit
        }
@@ -683,11 +683,11 @@ import { min } from 'moment'
         if(total == 0){
            total = ""
         }
-       
+
         return total
       },
       getOverFlushInfo(arr,max_unit,min_unit,min_number){
-       
+
          var max_str=  ""
          var min_str = ""
          var total = 0
@@ -711,7 +711,7 @@ import { min } from 'moment'
            if(total%min_number!=0){
               min_str = total%min_number + min_unit
            }
-         
+
          }
         return max_str + min_str
       },
@@ -724,7 +724,7 @@ import { min } from 'moment'
             total += parseInt(arr[i].count)
           }
         }
-      
+
         if (total < min_number){
            min_str = total + min_unit
          }
@@ -739,7 +739,7 @@ import { min } from 'moment'
            if(total%min_number!=0){
               min_str = total%min_number + min_unit
            }
-         
+
          }
         return max_str + min_str
 
@@ -793,7 +793,7 @@ import { min } from 'moment'
          return str + str_min
       },
       getOutFlush(info,max_unit,min_unit,min_number,cancel_info){
-        
+
         var str = ""
         var str_min = ""
         //总库存

src/xt_pages/stock/inventory.vue

@@ -62,13 +62,13 @@
                     {{scope.row.manufacturer_name}}
                   </template> 
               </el-table-column>
-              <el-table-column prop="name" label="盘点前数量" width="100"  align="center">
+              <el-table-column prop="name" label="盘点前数量" width="120"  align="center">
                 <template slot-scope="scope">
                     <span><el-input style="width:80px" v-model="scope.row.stock_count" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
                   </template> 
               </el-table-column>
 
-             <el-table-column prop="name" label="盘点后数量" width="100"  align="center">
+             <el-table-column prop="name" label="盘点后数量" width="120"  align="center">
                 <template slot-scope="scope">
                   <el-input style="width:80px" v-model="scope.row.last_stock_count"></el-input>
                  </template> 
@@ -272,27 +272,27 @@ export default {
           this.page = val
           this.getlist()
         },
-   getlist(){
-    var params = {
-          keyword:this.searchKey,
-          start_time:this.start_time,
-          end_time:this.end_time,
-          inventory_status:this.inventory_status, 
-          page:this.page,
-          limit:this.limit,
-         }
-        console.log("我爱你中国parasm",params)
-       getInventoryList(params).then(response=>{
-          if(response.data.state ==1 ){
-           var list =  response.data.data.list
-           console.log("列表23232323232",list)
-           this.tableList = list
-           var total = response.data.data.total
-           this.total = total
-           this.doctorList =  response.data.data.doctorlist
+    getlist(){
+      var params = {
+            keyword:this.searchKey,
+            start_time:this.start_time,
+            end_time:this.end_time,
+            inventory_status:this.inventory_status, 
+            page:this.page,
+            limit:this.limit,
           }
-       })
-     },
+          console.log("我爱你中国parasm",params)
+        getInventoryList(params).then(response=>{
+            if(response.data.state ==1 ){
+            var list =  response.data.data.list
+            console.log("列表23232323232",list)
+            this.tableList = list
+            var total = response.data.data.total
+            this.total = total
+            this.doctorList =  response.data.data.doctorlist
+            }
+        })
+      },
      getChecker(id){
        var name = ""
        for(let i=0;i<this.doctorList.length;i++){
@@ -452,12 +452,13 @@ export default {
           
             for(let i=0;i<this.WarehouseList.length;i++){
               for(let j=0;j<newList.length;j++){
-                if(this.WarehouseList[i].drug_id == newList[j].drug_id){
+                if(this.WarehouseList[i].good_id == newList[j].good_id){
                     newList[j].child.push(this.WarehouseList[i])
                 }
               }
             }
           console.log("newList2333232323232",newList)
+          
           this.tableData = newList
           this.showSearch = false
           this.showTable = true

src/xt_pages/stock/inventoryDetails.vue

@@ -117,8 +117,14 @@ export default {
            }
           this.$router.push({path:'/stock/inventoryDetailPrint?ids='+this.ids})
         },
-        handleSizeChange(){},
-        handleCurrentChange(){},
+        handleSizeChange(val){
+          this.limit = val
+          this.getlist()
+        },
+        handleCurrentChange(val){
+          this.page = val
+          this.getlist()
+        },
         getlist(){
          var params = {
             keyword:this.searchKey,

src/xt_pages/stock/stockDamaged.vue

@@ -14,10 +14,32 @@
         type="primary"
         icon="el-icon-search"
         @click="search">搜索</el-button>
+
+         <el-date-picker
+          size="small"
+          v-model="start_time"
+          type="date"
+          style="margin-left:5px;width:140px;"
+          placeholder="选择日期"
+          @change="changeStartTime">
+          </el-date-picker>
+          <el-date-picker
+          size="small"
+          v-model="end_time"
+          type="date"
+          style="margin-left:5px;width:140px;"
+          placeholder="选择日期"
+          @change="changeEndTime">
+      </el-date-picker>
     </div>
   
-    <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
+    <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
         <el-table-column type="selection" width="55" align="center"> </el-table-column>
+        <el-table-column  prop="date" label="报损日期" align="center">
+            <template slot-scope="scope">
+              {{getTime(scope.row.ctime)}}
+            </template>
+        </el-table-column>
         <el-table-column prop="date" label="耗材名称"  align="center">
           <template  slot-scope="scope">
             {{scope.row.good_name}}
@@ -276,7 +298,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="原因:">
-                  <el-select v-model="form.type" placeholder="请选择">
+                  <el-select v-model="form.type" placeholder="请选择" @change="changeReason">
                       <el-option
                         v-for="item in reasonList"
                         :key="item.id"
@@ -730,6 +752,9 @@ export default {
           }
         }
         return count
+      },
+      changeReason(){
+
       },
       toDamagedDetail(good_id){
           var params = {
@@ -737,18 +762,25 @@ export default {
             warehousing_order:this.form.warehousing_order,
             type:this.form.type,
           }
+          console.log("para2233232",params)
          getDamageDetailByGoodId(params).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
               console.log("list233232",list)
-              this.modifyDialogVisible = true
-              this.good_name = list[0].good_name
-              this.price = list[0].buy_price
-              this.good_id = list[0].good_id
-              this.goodList = []
-              this.goodList = list
-              this.damageList = []
-              this.damageList = response.data.data.damageList
+              if (list.length>0){
+                this.modifyDialogVisible = true
+                this.good_name = list[0].good_name
+                this.price = list[0].buy_price
+                this.good_id = list[0].good_id
+                this.goodList = []
+                this.goodList = list
+                this.damageList = []
+                this.damageList = response.data.data.damageList
+              }else{
+                this.damageList = []
+                this.goodList = []
+              }
+            
             }
          })
       },

src/xt_pages/stock/stockQuery.vue

@@ -108,19 +108,19 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <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">
+          <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>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
           </span>
-          <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span> 
+          <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
          </template>
        </el-table-column>
 
        <el-table-column label="剩余库存量" align="center">
          <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">{{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> 
+          <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 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" width="260px">
@@ -171,7 +171,7 @@ export default {
 
     var start_time =  window.sessionStorage.getItem('start_time')
     var end_time =  window.sessionStorage.getItem('end_time')
-   
+
     if(start_time !=null){
       this.start_time = start_time
     }
@@ -221,7 +221,7 @@ export default {
     };
   },
   methods: {
-  
+
     GetAllGoodType: function() {
       GetAllGoodType().then(response => {
         if (response.data.state == 0) {
@@ -259,7 +259,7 @@ export default {
       this.limit = val;
       this.getlist()
       this.getStockDrugCount()
-      
+
     },
     handleCurrentChange(val) {
       this.page = val;
@@ -335,7 +335,7 @@ export default {
          const tHeader = ['耗材类型', '耗材名称', '规格&单位','进货单价','生产商','入库数量','出库数量','库存剩余量']
          const filterVal = ['type_name', 'good_name', 'unit','buy_price','prodect_name','inCount','outCount','overplus']
 
-       
+
          for(let i=0;i<this.tableList.length;i++){
            this.tableList[i].type_name = this.getGoodType(this.tableList[i].good_type_id)
            this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
@@ -347,7 +347,7 @@ export default {
           }else{
              this.tableList[i].overplus = 0
           }
-          
+
          }
          const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({
@@ -429,7 +429,7 @@ export default {
        var specification_name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
           if(val.manufacturer == this.manufacturerList[i].id){
-            manufacturer_name = this.manufacturerList[i].manufacturer_name  
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
           }
        }
       specification_name = val.specification_name + "/" + val.packing_unit
@@ -443,7 +443,7 @@ export default {
        var specification_name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
           if(val.manufacturer == this.manufacturerList[i].id){
-            manufacturer_name = this.manufacturerList[i].manufacturer_name  
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
           }
        }
       specification_name = val.specification_name + "/" + val.packing_unit

src/xt_pages/user/doctorAdvice.vue

@@ -159,19 +159,19 @@
           </template>
         </el-table-column>
 
+     、
+        
         <el-table-column
-          label="开始时间"
+          label="开嘱时间"
           width="180"
-          property="start_time"
+          property="created_time"
           align="center"
         >
           <template slot-scope="scope">
-            <span>{{
-              scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}")
-            }}</span>
+            <span v-if="org_id == 10215">{{ scope.row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
+            <span v-else>{{ scope.row.start_time | parseTime("{y}-{m}-{d} {h}:{i}") }} </span> 
           </template>
         </el-table-column>
-
         <el-table-column
           label="医嘱内容"
           property="advice_name"
@@ -2159,7 +2159,8 @@ export default {
       current_drug_name:"",
       current_drug_spec: "",
       drug_id: 0,
-      src_type:""
+      src_type:"",
+      org_id:0,
     };
   },
   methods: {
@@ -4644,7 +4645,7 @@ export default {
       this.$router.push("/patients/patients");
     }
     this.listQuery.id = this.patientID;
-
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
     // var nowDate = new Date()
     // var nowYear = nowDate.getFullYear()
     // var nowMonth = nowDate.getMonth() + 1

src/xt_pages/workforce/template.vue

@@ -370,6 +370,8 @@
         for (let key in results[0]) {
           headers.push(key)
         }
+        console.log("hhh2332323232",this.template_mode.mode)
+        console.log("result233232233223232323",results)
         if (this.template_mode.mode == 1) {
           if(results.length > 0) {