1

src/api/advice.js

@@ -1,44 +1,45 @@
-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=' +
+    url:
+      "/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) {
@@ -47,15 +48,15 @@ export function ExecDoctorAdvice(patient, id, time, mode) {
     patient: patient,
     execution_time: time,
     mode: mode
-  }
+  };
   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) {
   var params = {
@@ -63,23 +64,23 @@ export function CheckDoctorAdvice(patient, id, mode) {
     patient: patient,
     mode: mode
     // 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) {
@@ -94,368 +95,385 @@ 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) {
   return request({
-    url: '/api/advicetemplate/update?id=' + id,
-    method: 'put',
+    url: "/api/advicetemplate/update?id=" + id,
+    method: "put",
     data: data
-  })
+  });
 }
 export function DeleteAdviceTemplate(id, template_id, parent_id) {
   return request({
-    url: '/api/advicetemplate/delete?id=' +
+    url:
+      "/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, advice_type) {
   return request({
-    url: '/api/advicetemplate/create?template_name=' +
+    url:
+      "/api/advicetemplate/create?template_name=" +
       name +
-      '&advice_type=' +
+      "&advice_type=" +
       advice_type,
-    method: 'post',
+    method: "post",
     data: params
-  })
+  });
 }
 
 export function CreateGroupAdvice(id, groupno, advices, mode) {
   if (advices.remind > 0) {
     return request({
-      url: '/api/patients/advice/creategroup?id=' +
+      url:
+        "/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=' +
+      url:
+        "/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',
+    url:
+      "/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=' +
+    url:
+      "/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=' +
+      url:
+        "/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=' +
+      url:
+        "/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',
+    url:
+      "/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=' +
+    url:
+      "/api/patients/advice/execgroup?groupno=" +
       groupno +
-      '&execution_time=' +
+      "&execution_time=" +
       time +
-      '&mode=' +
+      "&mode=" +
       mode,
-    method: 'Post',
+    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) {
-  console.log('id----', id)
   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",
     params: params
-  })
+  });
 }

src/xt_pages/data/printTemplate.vue

@@ -88,7 +88,7 @@
               >
                 <el-image
                   style="width: 200px; height: 200px"
-                  :src="require('@/assets/home/4.png')"
+                  :src="require('@/assets/home/serven.png')"
                   :preview-src-list="imgs_seven"
                 ></el-image>
               </el-tooltip>
@@ -110,7 +110,7 @@
               >
                 <el-image
                   style="width: 200px; height: 200px;margin-left:-60px"
-                  :src="require('@/assets/home/5.png')"
+                  :src="require('@/assets/home/eight.png')"
                   :preview-src-list="imgs_six"
                 ></el-image>
               </el-tooltip>
@@ -145,24 +145,24 @@
           </el-col>
 
           <!--<el-col :span="6" style="text-align: center">-->
-            <!--<div class="demo-image__preview">-->
-              <!--<el-tooltip-->
-                <!--class="item"-->
-                <!--effect="dark"-->
-                <!--content="点击查看大图"-->
-                <!--placement="top-start"-->
-                <!--:hide-after="2000"-->
-              <!--&gt;-->
-                <!--<el-image-->
-                  <!--style="width: 200px; height: 200px;margin-left:30px"-->
-                  <!--:src="require('@/assets/home/template_ten.jpg')"-->
-                  <!--:preview-src-list="imgs_ten"-->
-                <!--&gt;</el-image>-->
-              <!--</el-tooltip>-->
-            <!--</div>-->
-            <!--<el-radio v-model="radio" label="10" @change="change"-->
-            <!--&gt;模版十</el-radio-->
-            <!--&gt;-->
+          <!--<div class="demo-image__preview">-->
+          <!--<el-tooltip-->
+          <!--class="item"-->
+          <!--effect="dark"-->
+          <!--content="点击查看大图"-->
+          <!--placement="top-start"-->
+          <!--:hide-after="2000"-->
+          <!--&gt;-->
+          <!--<el-image-->
+          <!--style="width: 200px; height: 200px;margin-left:30px"-->
+          <!--:src="require('@/assets/home/template_ten.jpg')"-->
+          <!--:preview-src-list="imgs_ten"-->
+          <!--&gt;</el-image>-->
+          <!--</el-tooltip>-->
+          <!--</div>-->
+          <!--<el-radio v-model="radio" label="10" @change="change"-->
+          <!--&gt;模版十</el-radio-->
+          <!--&gt;-->
           <!--</el-col>-->
         </el-row>
       </div>
@@ -188,15 +188,14 @@ export default {
       imgUrl_Two: require("@/assets/home/2.jpg"),
       imgUrl_Five: require("@/assets/home/5.jpg"),
 
-
       imgs_one: [
         // 'https://images.shengws.com/template_one.jpg'
         "https://images.shengws.com/fangji.jpg"
       ],
       imgs_two: ["https://images.shengws.com/template_two.jpg"],
       imgs_five: ["https://images.shengws.com/template_five.jpg"],
-      imgs_seven: ["http://images.shengws.com/7.png"],
-      imgs_six: ["https://images.shengws.com/5.png"],
+      imgs_seven: ["http://images.shengws.com/serven.png"],
+      imgs_six: ["http://images.shengws.com/eight.png"],
       imgs_eight: ["https://images.shengws.com/template_six.png"],
       imgs_ten: ["https://kuyi.shengws.com/template_ten.jpg"],
 
@@ -209,11 +208,15 @@ export default {
   methods: {
     change: function(val) {
       console.log("val是什么", val);
-      this.$confirm("切换模版后，透析记录的字段会根据打印单来显示与隐藏，是否确定切换模版", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "info"
-      })
+      this.$confirm(
+        "切换模版后，透析记录的字段会根据打印单来显示与隐藏，是否确定切换模版",
+        "提示",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "info"
+        }
+      )
         .then(() => {
           this.loading = true;
           postPrintTemplate(val).then(response => {
@@ -224,7 +227,9 @@ export default {
               // 同步
               // console.log(response.data.data.fileds)
               this.loading = false;
-               store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+              store
+                .dispatch("updateAllFiledConfigList", response.data.data.fileds)
+                .then(() => {});
               this.$message({
                 type: "success",
                 message: "切换成功"

src/xt_pages/dialysis/batch_print/batch_print_order_seven.vue

@@ -189,7 +189,7 @@
                           > 
                             {{
                               record.patient.total_dialysis
-                                ? record.patient.total_dialysis + 1
+                                ? record.patient.total_dialysis + + record.patient.user_sys_before_count
                                 : '/'
                             }}</span
                           >

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -154,8 +154,10 @@
                           style="width: 70px;text-align: center"
                         >
                           {{
-                            record.patient.total_dialysis
-                              ? record.patient.total_dialysis
+                            record.patient.total_dialysis +
+                            record.patient.user_sys_before_count
+                              ? record.patient.total_dialysis +
+                                record.patient.user_sys_before_count
                               : "/"
                           }}
                         </div>
@@ -1393,7 +1395,10 @@
                         min
                       </div>
                       <!-- 只是占位 -->
-                      <div class="inline_block" style="flex:1;visibility: hidden;">
+                      <div
+                        class="inline_block"
+                        style="flex:1;visibility: hidden;"
+                      >
                         透析器凝血：
                         <div
                           class="under_line"
@@ -1612,7 +1617,11 @@
                           style="width: 80px;text-align: left"
                           v-if="record.dialysis_order == null"
                         ></div>
-                        <div v-if="record.check" class="under_line" style="width: 80px;text-align: left">
+                        <div
+                          v-if="record.check"
+                          class="under_line"
+                          style="width: 80px;text-align: left"
+                        >
                           <div
                             style="width: 80px;text-align: left;display: inline-block;white-space: nowrap;"
                             v-if="

src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue

@@ -537,7 +537,10 @@
                   </td>
                   <td style="text-align:left;margin-left:15px" colspan="2">
                     透析次数:
-                    <span class="under-line">&nbsp;{{ total }}</span>
+                    <span class="under-line">&nbsp;{{
+                        patientInfo.total_dialysis +
+                          patientInfo.user_sys_before_count
+                      }}</span>
                   </td>
                 </tr>
                 <tr>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -211,7 +211,7 @@
           <span class="content">{{ this.record.complication }}</span>
         </li>
         <li
-          v-if="isShow('交待病房护士/患者/陪人观察内容') && patient_gose == 3"
+          v-if="patient_gose == 3 && isShow('交待病房护士/患者/陪人观察内容')"
         >
           <label>交待病房护士/患者/陪人观察内容 : </label>
           <span class="content">{{ observation_content }}</span>
@@ -712,7 +712,23 @@ export default {
     },
     isShow(name) {
       var filedList = store.getters.xt_user.fileds;
-
+      console.log("filedList", filedList);
+      var arr = [];
+      for (let j = 0; j < filedList.length; j++) {
+        if (filedList[j].module == 5) {
+          arr.push(filedList[j]);
+        }
+      }
+      var arrtwo = [];
+      for (let z = 0; z < filedList.length; z++) {
+        if (filedList[z].filed_name == "observation_content") {
+          console.log(filedList[z].filed_name_cn);
+          if (filedList[z].filed_name_cn == "交待病房护士/患者/陪人观察内容") {
+            // console.log(filedList[z]);
+          }
+        }
+      }
+      console.log("arr", arr);
       for (let i = 0; i < filedList.length; i++) {
         if (
           filedList[i].module == 5 &&

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

@@ -27,8 +27,14 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('实际超滤量')">
-
-            <el-form-item label="实际超滤量(ml): " v-if="this.template_id == 6 || this.template_id == 10 || this.template_id == 11">
+            <el-form-item
+              label="实际超滤量(ml): "
+              v-if="
+                this.template_id == 6 ||
+                  this.template_id == 10 ||
+                  this.template_id == 11
+              "
+            >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>
@@ -41,7 +47,9 @@
               <el-input v-model="form.weight_after"></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
 
+        <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('体重减少')">
             <el-form-item label="体重减少(kg): ">
               <el-input v-model="form.weight_loss"></el-input>
@@ -76,7 +84,9 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
 
+        <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('导管')">
             <el-form-item label="导管: ">
               <el-input
@@ -117,7 +127,9 @@
               ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
 
+        <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('透析过程提前其他原因')">
             <el-form-item label="透析过程提前其他原因: ">
               <el-input
@@ -161,6 +173,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :span="8" v-if="isShow('静脉管道')">
             <el-form-item label="静脉管道: ">
               <el-select v-model="form.intravenous_tube">
@@ -200,292 +213,286 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-          <el-col :span="8" v-if="isShow('拔针后穿刺点渗血')">
-            <el-form-item label="拔针后穿刺点渗血: ">
-              <el-radio-group v-model="form.puncture_point_oozing_blood">
-                <el-radio :label="1">有</el-radio>
-                <el-radio :label="2">无</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-
-          <!--          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">-->
-          <!--            <el-form-item label="压迫后内瘘震颤: ">-->
-          <!--              <el-select v-model="form.internal_fistula_tremor_ac">-->
-          <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-          <!--                <el-option-->
-          <!--                  v-for="item in internalFistulaTremorAcOptions"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.id"-->
-          <!--                  :key="item.id"-->
-          <!--                ></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
-          <el-row :gutter="20" v-if="form.patient_gose == 3 && isShow('科室')">
-            <el-col :span="24">
-              <el-form-item label="科室: ">
-                <el-input
-                  v-model="form.inpatient_department"
-                  :rows="5"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row
-            :gutter="20"
-            v-if="form.patient_gose == 3 && isShow('交待观察内容')"
-          >
-            <el-col :span="24">
-              <el-form-item label="交待观察内容: ">
-                <el-input
-                  placeholder="交待病房护士/患者/陪人观察内容"
-                  v-model="form.observation_content"
-                  :rows="5"
-                  readonly
-                  @focus="showDialog('6')"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row
-            :gutter="20"
-            v-show="form.patient_gose == 3 && isShow('其他观察内容')"
-          >
-            <el-col :span="24">
-              <el-form-item label="其他观察内容: ">
-                <el-input
-                  v-model="form.observation_content_other"
-                  :rows="5"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-col :span="8" v-if="isShow('体温')">
-            <el-form-item label="体温(℃): ">
-              <el-input v-model="form.temperature"></el-input>
-            </el-form-item>
-          </el-col>
-          <!-- </el-row>
-
-        <el-row :gutter="20"> -->
-          <el-col :span="8" v-if="isShow('收缩压')">
-            <el-form-item label="收缩压(mmHg): ">
-              <el-input v-model="form.systolic_blood_pressure"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="isShow('舒张压')">
-            <el-form-item label="舒张压(mmHg): ">
-              <el-input v-model="form.diastolic_blood_pressure"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8" v-if="isShow('呼吸频率')">
-            <el-form-item label="呼吸频率(次/min): ">
-              <el-input v-model="form.breathing_rate"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8" v-if="isShow('脉搏')">
-            <el-form-item label="脉搏(次/分): ">
-              <el-input v-model="form.pulse_frequency"></el-input>
+        </el-row>
+        <el-col :span="8" v-if="isShow('拔针后穿刺点渗血')">
+          <el-form-item label="拔针后穿刺点渗血: ">
+            <el-radio-group v-model="form.puncture_point_oozing_blood">
+              <el-radio :label="1">有</el-radio>
+              <el-radio :label="2">无</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <!--          <el-col :span="8" v-if="isShow('压迫后内瘘震颤')">-->
+        <!--            <el-form-item label="压迫后内瘘震颤: ">-->
+        <!--              <el-select v-model="form.internal_fistula_tremor_ac">-->
+        <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+        <!--                <el-option-->
+        <!--                  v-for="item in internalFistulaTremorAcOptions"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.id"-->
+        <!--                  :key="item.id"-->
+        <!--                ></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <el-row :gutter="20" v-if="form.patient_gose == 3 && isShow('科室')">
+          <el-col :span="24">
+            <el-form-item label="科室: ">
+              <el-input
+                v-model="form.inpatient_department"
+                :rows="5"
+              ></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="8" v-if="isShow('透后症状')">
-            <el-form-item label="透后症状: ">
+        </el-row>
+        <el-row
+          :gutter="20"
+          v-if="form.patient_gose == 3 && isShow('交待观察内容')"
+        >
+          <el-col :span="24">
+            <el-form-item label="交待观察内容: ">
               <el-input
-                v-model="form.symptom_after_dialysis"
+                placeholder="交待病房护士/患者/陪人观察内容"
+                v-model="form.observation_content"
+                :rows="5"
                 readonly
-                @focus="showDialog('2')"
+                @focus="showDialog('6')"
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('透析中入量')">
-            <el-form-item label="透析中入量: ">
-              <el-input v-model="form.dialysis_intakes"></el-input>
+        </el-row>
+        <el-row
+          :gutter="20"
+          v-show="form.patient_gose == 3 && isShow('其他观察内容')"
+        >
+          <el-col :span="24">
+            <el-form-item label="其他观察内容: ">
+              <el-input
+                v-model="form.observation_content_other"
+                :rows="5"
+              ></el-input>
             </el-form-item>
           </el-col>
+        </el-row>
 
-          <el-col :span="8" v-if="isShow('透析中入量单位')">
-            <el-form-item label="透析中入量单位: ">
-              <el-select v-model="form.dialysis_intakes_unit">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option
-                  v-for="item in unit"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+        <el-col :span="8" v-if="isShow('体温')">
+          <el-form-item label="体温(℃): ">
+            <el-input v-model="form.temperature"></el-input>
+          </el-form-item>
+        </el-col>
+        <!-- </el-row>
 
-          <!-- </el-row>
+        <el-row :gutter="20"> -->
+        <el-col :span="8" v-if="isShow('收缩压')">
+          <el-form-item label="收缩压(mmHg): ">
+            <el-input v-model="form.systolic_blood_pressure"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="isShow('舒张压')">
+          <el-form-item label="舒张压(mmHg): ">
+            <el-input v-model="form.diastolic_blood_pressure"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" v-if="isShow('呼吸频率')">
+          <el-form-item label="呼吸频率(次/min): ">
+            <el-input v-model="form.breathing_rate"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" v-if="isShow('脉搏')">
+          <el-form-item label="脉搏(次/分): ">
+            <el-input v-model="form.pulse_frequency"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" v-if="isShow('透后症状')">
+          <el-form-item label="透后症状: ">
+            <el-input
+              v-model="form.symptom_after_dialysis"
+              readonly
+              @focus="showDialog('2')"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" v-if="isShow('透析中入量')">
+          <el-form-item label="透析中入量: ">
+            <el-input v-model="form.dialysis_intakes"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" v-if="isShow('透析中入量单位')">
+          <el-form-item label="透析中入量单位: ">
+            <el-select v-model="form.dialysis_intakes_unit">
+              <el-option :key="0" label="请选择" :value="0"></el-option>
+              <el-option
+                v-for="item in unit"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <!-- </el-row>
 
         <el-row :gutter="20"> -->
 
-          <el-col :span="8" v-if="isShow('实际置换量')">
-            <el-form-item label="实际置换量(L): ">
-              <el-input v-model="form.actual_displacement"></el-input>
-            </el-form-item>
-          </el-col>
+        <el-col :span="8" v-if="isShow('实际置换量')">
+          <el-form-item label="实际置换量(L): ">
+            <el-input v-model="form.actual_displacement"></el-input>
+          </el-form-item>
+        </el-col>
 
-          <!-- </el-row>
+        <!-- </el-row>
 
         <el-row :gutter="20"> -->
 
-          <!-- </el-row>
+        <!-- </el-row>
 
         <el-row :gutter="20"> -->
 
-          <!--          <el-col :span="8" v-if="isShow('血管通路部位')">-->
-          <!--            <el-form-item label="血管通路部位: ">-->
-          <!--              <el-select v-model="form.blood_access_part_id">-->
-          <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-          <!--                <el-option-->
-          <!--                  v-for="item in vascularAccessOptions"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.id"-->
-          <!--                  :key="item.id"-->
-          <!--                ></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <!--          <el-col :span="8" v-if="isShow('血管通路')">-->
-          <!--            <el-form-item label="血管通路: ">-->
-          <!--              <el-select v-model="form.blood_access_part_opera_id">-->
-          <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-          <!--                <el-option-->
-          <!--                  v-for="item in vascularAccessDescOptions"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.id"-->
-          <!--                  :key="item.id"-->
-          <!--                ></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <!-- </el-row>
+        <!--          <el-col :span="8" v-if="isShow('血管通路部位')">-->
+        <!--            <el-form-item label="血管通路部位: ">-->
+        <!--              <el-select v-model="form.blood_access_part_id">-->
+        <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+        <!--                <el-option-->
+        <!--                  v-for="item in vascularAccessOptions"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.id"-->
+        <!--                  :key="item.id"-->
+        <!--                ></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8" v-if="isShow('血管通路')">-->
+        <!--            <el-form-item label="血管通路: ">-->
+        <!--              <el-select v-model="form.blood_access_part_opera_id">-->
+        <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+        <!--                <el-option-->
+        <!--                  v-for="item in vascularAccessDescOptions"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.id"-->
+        <!--                  :key="item.id"-->
+        <!--                ></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!-- </el-row>
 
         <el-row :gutter="20"> -->
 
-          <!-- </el-row>
+        <!-- </el-row>
 
 
 
           <el-row :gutter="20" > -->
 
-          <!--
+        <!--
                   </el-row>
 
 
 
 
                   <el-row :gutter="20"> -->
-          <!--          <el-col :span="8" v-if="isShow('内瘘震颤和血管杂音')">-->
-          <!--            <el-form-item label="内瘘震颤和血管杂音: ">-->
-          <!--              <el-select v-model="form.tremor_noise">-->
-          <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-          <!--                <el-option-->
-          <!--                  v-for="item in this.$store.getters.tremor_noise"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.id"-->
-          <!--                  :key="item.id"-->
-          <!--                ></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <el-col :span="8" v-if="isShow('失衡综合症')">
-            <el-form-item label="失衡综合症: ">
-              <el-select v-model="form.disequilibrium_syndrome">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="item in this.$store.getters.disequilibrium_syndrome"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!--          <el-col :span="8" v-if="isShow('失衡综合症症状')">-->
-          <!--            <el-form-item label="失衡综合症症状: ">-->
-          <!--              <el-input-->
-          <!--                v-model="form.disequilibrium_syndrome_option"-->
-          <!--                readonly-->
-          <!--                @focus="showDialog('8')"-->
-          <!--              ></el-input>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-
-          <!-- </el-row>
+        <!--          <el-col :span="8" v-if="isShow('内瘘震颤和血管杂音')">-->
+        <!--            <el-form-item label="内瘘震颤和血管杂音: ">-->
+        <!--              <el-select v-model="form.tremor_noise">-->
+        <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+        <!--                <el-option-->
+        <!--                  v-for="item in this.$store.getters.tremor_noise"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.id"-->
+        <!--                  :key="item.id"-->
+        <!--                ></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <el-col :span="8" v-if="isShow('失衡综合症')">
+          <el-form-item label="失衡综合症: ">
+            <el-select v-model="form.disequilibrium_syndrome">
+              <el-option :key="0" label="请选择" :value="0"></el-option>
+
+              <el-option
+                v-for="item in this.$store.getters.disequilibrium_syndrome"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <!--          <el-col :span="8" v-if="isShow('失衡综合症症状')">-->
+        <!--            <el-form-item label="失衡综合症症状: ">-->
+        <!--              <el-input-->
+        <!--                v-model="form.disequilibrium_syndrome_option"-->
+        <!--                readonly-->
+        <!--                @focus="showDialog('8')"-->
+        <!--              ></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <!-- </el-row>
 
 
 
           <el-row :gutter="20"  > -->
 
-          <!--          <el-col :span="8" v-if="isShow('透析器')">-->
-          <!--            <el-form-item label="透析器凝血: ">-->
-          <!--              <el-select v-model="form.dialyzer">-->
-          <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-          <!--                <el-option-->
-          <!--                  v-for="item in this.$store.getters.dialyzer"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.id"-->
-          <!--                  :key="item.id"-->
-          <!--                ></el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
-          <el-col :span="8" v-if="isShow('透析期间进食')">
-            <el-form-item label="透析期间进食: ">
-              <el-radio-group v-model="form.is_eat">
-                <el-radio :label="1">有</el-radio>
-                <el-radio :label="2">无</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-
-
-          <el-col :span="8" v-if="isShow('中心静脉封管(肝素-A端)')">
-            <el-form-item label="中心静脉封管(肝素-A端): ">
-              <el-input v-model="form.cvc_a"></el-input>
-            </el-form-item>
-          </el-col>
-
-
-          <el-col :span="8" v-if="isShow('中心静脉封管(肝素-V端)')">
-            <el-form-item label="中心静脉封管(肝素-V端): ">
-              <el-input v-model="form.cvc_v"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8" v-if="isShow('管路')">
-            <el-form-item label="管路: ">
-              <el-select v-model="form.channel">
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option
-                  v-for="item in channels"
-                  :label="item.name"
-                  :value="item.id"
-                  :key="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-
-
-        </el-row>
+        <!--          <el-col :span="8" v-if="isShow('透析器')">-->
+        <!--            <el-form-item label="透析器凝血: ">-->
+        <!--              <el-select v-model="form.dialyzer">-->
+        <!--                <el-option :key="0" label="请选择" :value="0"></el-option>-->
+
+        <!--                <el-option-->
+        <!--                  v-for="item in this.$store.getters.dialyzer"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.id"-->
+        <!--                  :key="item.id"-->
+        <!--                ></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <el-col :span="8" v-if="isShow('透析期间进食')">
+          <el-form-item label="透析期间进食: ">
+            <el-radio-group v-model="form.is_eat">
+              <el-radio :label="1">有</el-radio>
+              <el-radio :label="2">无</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" v-if="isShow('中心静脉封管(肝素-A端)')">
+          <el-form-item label="中心静脉封管(肝素-A端): ">
+            <el-input v-model="form.cvc_a"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" v-if="isShow('中心静脉封管(肝素-V端)')">
+          <el-form-item label="中心静脉封管(肝素-V端): ">
+            <el-input v-model="form.cvc_v"></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8" v-if="isShow('管路')">
+          <el-form-item label="管路: ">
+            <el-select v-model="form.channel">
+              <el-option :key="0" label="请选择" :value="0"></el-option>
+              <el-option
+                v-for="item in channels"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
       </el-form>
 
       <span slot="footer" class="dialog-footer">
@@ -562,7 +569,7 @@ export default {
       internalFistulaTremorAcOptions: [],
       patientGoseOptions: [],
       observationContentOptions: [],
-      channels:[],
+      channels: [],
 
       isVisibiltyForCruorDialog: false,
       dialogCruorTitle: "凝血",
@@ -619,10 +626,9 @@ export default {
         dialyzer: "",
         breathing_rate: "",
         dialysis_intakes_unit: 0,
-        cvc_a:0,
-        cvc_v:0,
-        channel:"",
-
+        cvc_a: 0,
+        cvc_v: 0,
+        channel: ""
       }
     };
   },
@@ -695,13 +701,10 @@ export default {
         this.form.observation_content = "";
         this.form.observation_content_other = "";
       }
-    }, "form.weight_after":function() {
-      if(this){
-
-
-
+    },
+    "form.weight_after": function() {
+      if (this) {
       }
-
     }
   },
   methods: {
@@ -974,9 +977,6 @@ export default {
       this.predialysis = predialysis;
       // console.log("透后", predialysis);
 
-
-
-
       this.getPermission();
     },
 
@@ -1078,7 +1078,7 @@ export default {
     this.observationContentOptions = this.$store.getters.observation_content;
     this.template_id = this.$store.getters.xt_user.template_info.template_id;
 
-    this.channels = this.$store.getters.channels
+    this.channels = this.$store.getters.channels;
 
     var date = this.$route.query && this.$route.query.date;
     this.record_date = uParseTime(date, "{y}-{m}-{d}");

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

@@ -650,7 +650,6 @@ export default {
             this.showAdviceForm = false;
             this.showAdvicePanel = true;
             var advice = response.data.data.advice;
-            // console.log("advice-------", advice);
             this.doctor_advices[this.currentIndex].drug_spec = advice.drug_spec;
             this.doctor_advices[this.currentIndex].drug_spec_unit =
               advice.drug_spec_unit;
@@ -1268,7 +1267,7 @@ export default {
         this.$message.error("你没有执行医嘱的权限");
         return false;
       }
-
+      this.execTimeDialogVisible = true;
       // if (this.currentAdvices.length <= 0) {
       //   return;
       //  }
@@ -1287,7 +1286,6 @@ export default {
           this.$message.error("所选医嘱已停止或执行");
           return false;
         }
-        console.log("b");
         for (let i = 0; i < adviceArr.length; i++) {
           if (
             adviceArr[i].is_selected == 1 &&
@@ -1304,7 +1302,6 @@ export default {
             currentAdviceIdArr.push(adviceArr[i].id);
           }
         }
-        console.log("c");
         this.currentAdviceIdsStr = currentAdviceIdArr.join(",");
         this.nowExecTime = new Date(adviceArr[0].start_time * 1000);
       } else {
@@ -1520,8 +1517,10 @@ export default {
             response.data.data.drugways === null
               ? []
               : response.data.data.drugways;
+
           this.executionFrequencyOptions =
             response.data.data.efs === null ? [] : response.data.data.efs;
+
           this.adviceTemplates =
             response.data.data.advice_templates === null
               ? []
@@ -1819,6 +1818,7 @@ export default {
       console.log("val是什么", val);
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      console.log("columnIndex", columnIndex);
       if (columnIndex === 0) {
         if (rowIndex % 2 === 0) {
           return {
@@ -1851,12 +1851,10 @@ export default {
   created() {
     var date = this.$route.query && this.$route.query.date;
     this.record_date = uParseTime(date, "{y}-{m}-{d}");
-
     this.form.advice_date = this.record_date;
     this.getAdviceConfig();
     this.unitsOption = getDataConfig("hemodialysis", "units");
     this.template_id = this.$store.getters.xt_user.template_info.template_id;
-    console.log("医嘱----", this.doctor_advices);
   },
   components: {
     AddGroupAdvice,

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -196,6 +196,10 @@
           </el-col>
         </el-row>
       </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="groupEditFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="SaveEditAdvices">保 存</el-button>
+      </span>
     </el-dialog>
 
     <el-dialog
@@ -512,7 +516,8 @@ import {
   EditDoctorAdvice,
   getAdviceConfig,
   getDoctorAdviceList,
-  StopDoctorAdvice
+  StopDoctorAdvice,
+  SaveEditAdvices
 } from "@/api/advice";
 import { jsGetAge, uParseTime } from "@/utils/tools";
 
@@ -797,6 +802,7 @@ export default {
               advice_type: _this.groupForm.advice_type,
               advice_date: _this.groupForm.advice_date,
               start_time: _this.groupForm.start_time,
+
               advice_name: _this.nameForm.advice_name,
               advice_desc: _this.nameForm.advice_desc,
               single_dose: "" + _this.nameForm.single_dose,
@@ -814,7 +820,6 @@ export default {
               parent_id: _this.groupSelectRow.parent_id,
               groupno: _this.groupForm.groupno
             };
-            console.log(this.groupSelectRow);
             let mode = "2";
             if (
               this.groupSelectRow.advice_doctor !=
@@ -2140,6 +2145,22 @@ export default {
         }
         this.groupForm.adviceNames.push(item);
       }
+    },
+    SaveEditAdvices() {
+      const params = {
+        start_time: this.groupForm.start_time,
+        groupno: this.groupForm.groupno,
+        date: this.$route.query.date,
+        patient_id: this.$route.query.patient_id
+      };
+      console.log("params", params);
+      SaveEditAdvices(params).then(response => {
+        if (response.data.state == 1) {
+          var advice = response.data.data.advice;
+          this.$message.success("保存成功!");
+          this.groupEditFormVisible = false;
+        }
+      });
     }
   },
   watch: {

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

@@ -691,9 +691,7 @@
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleCancle">取 消</el-button>
         <!-- <el-button type="primary" @click="handleCommit" v-if="isPermission()">保 存</el-button> -->
-        <el-button type="primary" @click="handleCommit"
-          >保 存</el-button
-        >
+        <el-button type="primary" @click="handleCommit">保 存</el-button>
         <el-button type="primary" @click="handleSolution"
           >保存为长期处方</el-button
         >
@@ -1220,7 +1218,7 @@ export default {
           }
         });
       });
-      console.log("arrFour", arrFour);
+      // console.log("arrFour", arrFour);
       this.anticoagulantsConfit = arrFour;
       this.dialysisList = this.devices;
 
@@ -1232,7 +1230,7 @@ export default {
         "hemodialysis",
         "vascular_access_desc"
       );
-      console.log("血管通路", this.blood_access_option);
+      // console.log("血管通路", this.blood_access_option);
       var date = this.$route.query && this.$route.query.date;
       this.record_date = uParseTime(date, "{y}-{m}-{d}");
 
@@ -1397,6 +1395,7 @@ export default {
             return;
           }
           const ParamsQuery = this.dialysisPrescription;
+
           ParamsQuery["patient"] = this.patient.id;
           ParamsQuery["record_date"] = this.record_date;
           ParamsQuery["mode"] = 1;
@@ -1559,10 +1558,21 @@ export default {
       if (pre.anticoagulant == 3) {
         this.dialysisPrescription.anticoagulant = "低分子肝素";
       }
+      //入口
+      var pre = pre;
+      if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12) {
+        this.zhiShow = true;
+        this.huShow = true;
+        this.totalShow = true;
+      } else {
+        this.zhiShow = false;
+        this.huShow = false;
+        this.totalShow = false;
+      }
       this.pre = pre;
       console.log("pre1", pre);
       this.getPermission();
-      
+
       let last_weight_after = 0;
       let weight_before = 0;
 
@@ -1621,7 +1631,6 @@ export default {
       //console.log("fffff", this.anticoagulant);
     },
     handleCommit: function() {
-      console.log("aaaa----", this.dialysisPrescription.anticoagulant);
       if (this.dialysisPrescription.anticoagulant == "低分子肝素") {
         this.dialysisPrescription.anticoagulant = 3;
       }
@@ -2830,12 +2839,22 @@ export default {
       this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
         1,
         this.dialysisPrescription.anticoagulant_shouji,
-        duration,
+        this.dialysisPrescription.dialysis_duration,
         this.dialysisPrescription.anticoagulant_weichi
       );
       if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
         this.dialysisPrescription.anticoagulant_zongliang = "";
       }
+
+      //this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
+      //  1,
+      //   this.dialysisPrescription.anticoagulant_shouji,
+      //  duration,
+      //  this.dialysisPrescription.anticoagulant_weichi
+      // );
+      //  if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
+      //    this.dialysisPrescription.anticoagulant_zongliang = "";
+      //  }
     },
     "dialysisPrescription.anticoagulant_shouji": function() {
       let dialysis_duration_minute = 0;
@@ -2856,15 +2875,26 @@ export default {
       duration =
         parseFloat(dialysis_duration_hour) +
         parseFloat(dialysis_duration_minute) / 60;
+
       this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
         1,
         this.dialysisPrescription.anticoagulant_shouji,
-        duration,
+        this.dialysisPrescription.dialysis_duration,
         this.dialysisPrescription.anticoagulant_weichi
       );
       if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
         this.dialysisPrescription.anticoagulant_zongliang = "";
       }
+
+      //  this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
+      //   1,
+      //    this.dialysisPrescription.anticoagulant_shouji,
+      //    duration,
+      //    this.dialysisPrescription.anticoagulant_weichi
+      //  );
+      // if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
+      //    this.dialysisPrescription.anticoagulant_zongliang = "";
+      // }
     },
     "dialysisPrescription.anticoagulant_weichi": function() {
       let dialysis_duration_minute = 0;
@@ -2891,12 +2921,22 @@ export default {
       this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
         1,
         this.dialysisPrescription.anticoagulant_shouji,
-        duration,
+        this.dialysisPrescription.dialysis_duration,
         this.dialysisPrescription.anticoagulant_weichi
       );
       if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
         this.dialysisPrescription.anticoagulant_zongliang = "";
       }
+
+      // this.dialysisPrescription.anticoagulant_zongliang = calculateAnticoagulantZL(
+      //   1,
+      //  this.dialysisPrescription.anticoagulant_shouji,
+      //   duration,
+      //   this.dialysisPrescription.anticoagulant_weichi
+      // );
+      // if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
+      //   this.dialysisPrescription.anticoagulant_zongliang = "";
+      // }
     },
     "prescription.id": function() {
       if (this.prescription.id > 0) {

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -122,7 +122,12 @@
                   </td>
                   <td style="text-align:left;margin-left:15px" colspan="2">
                     透析次数:
-                    <span class="under-line">&nbsp;{{ total }}</span>
+                    <span class="under-line"
+                      >&nbsp;{{
+                        patientInfo.total_dialysis +
+                          patientInfo.user_sys_before_count
+                      }}</span
+                    >
                   </td>
                 </tr>
                 <tr>
@@ -423,7 +428,6 @@
                     </span>
                   </td>
                 </tr>
-
               </table>
             </td>
           </tr>
@@ -808,7 +812,7 @@
                 压迫后内瘘震颤:
                 <label-box
                   :isChecked="
-                    predialysis.internal_fistula.indexOf('震颤-存在') > -1
+                    afterdialysis.internal_fistula.indexOf('震颤-存在') > -1
                       ? true
                       : false
                   "
@@ -817,7 +821,7 @@
                 &nbsp;
                 <label-box
                   :isChecked="
-                    predialysis.internal_fistula.indexOf('震颤-减弱') > -1
+                    afterdialysis.internal_fistula.indexOf('震颤-减弱') > -1
                       ? true
                       : false
                   "
@@ -826,7 +830,7 @@
                 &nbsp;
                 <label-box
                   :isChecked="
-                    predialysis.internal_fistula.indexOf('震颤-无') > -1
+                    afterdialysis.internal_fistula.indexOf('震颤-无') > -1
                       ? true
                       : false
                   "
@@ -1129,6 +1133,7 @@ export default {
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;
+
           this.adminUser = response.data.data.users;
           this.users = response.data.data.users;
           var patientInfo = response.data.data.patientInfo;

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -163,8 +163,10 @@
                       style="width: 70px;text-align: center"
                     >
                       {{
-                        patientInfo.total_dialysis
-                          ? patientInfo.total_dialysis
+                        patientInfo.total_dialysis +
+                        patientInfo.user_sys_before_count
+                          ? patientInfo.total_dialysis +
+                            patientInfo.user_sys_before_count
                           : "/"
                       }}
                     </div>
@@ -580,10 +582,10 @@
                       style="width: 100px;text-align: center"
                     >
                       {{
-                        predialysis.weight_after_last_transparency
+                        lastafterdialysis.weight_after_last_transparency
                           ? parseFloat(
-                              predialysis.weight_after_last_transparency -
-                                predialysis.additional_weight
+                              lastafterdialysis.weight_after -
+                                lastafterdialysis.additional_weight
                             ).toFixed(1)
                           : "未称重"
                       }}
@@ -965,7 +967,11 @@
                         }}
                       </td>
                       <td
-                        v-if=" monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time " >
+                        v-if="
+                          monitor.operate_time > dialysisOrder.end_time ||
+                            monitor.operate_time < dialysisOrder.start_time
+                        "
+                      >
                         {{
                           monitor.ultrafiltration_volume
                             ? monitor.ultrafiltration_volume
@@ -973,7 +979,11 @@
                         }}
                       </td>
                       <td
-                        v-if=" monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time " >
+                        v-if="
+                          monitor.operate_time <= dialysisOrder.end_time &&
+                            monitor.operate_time >= dialysisOrder.start_time
+                        "
+                      >
                         {{
                           monitor.ultrafiltration_volume
                             ? monitor.ultrafiltration_volume
@@ -981,12 +991,36 @@
                         }}
                       </td>
                       <td
-                        v-if=" (prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12 )&& (monitor.operate_time <= dialysisOrder.end_time && monitor.operate_time >= dialysisOrder.start_time) " style="width:50px" >
-                        {{  monitor.displacement_quantity ? monitor.displacement_quantity : 0 }}
+                        v-if="
+                          (prescription.mode_id == 2 ||
+                            prescription.mode_id == 5 ||
+                            prescription.mode_id == 12) &&
+                            (monitor.operate_time <= dialysisOrder.end_time &&
+                              monitor.operate_time >= dialysisOrder.start_time)
+                        "
+                        style="width:50px"
+                      >
+                        {{
+                          monitor.displacement_quantity
+                            ? monitor.displacement_quantity
+                            : 0
+                        }}
                       </td>
                       <td
-                        v-if=" (prescription.mode_id == 2 || prescription.mode_id == 5 || prescription.mode_id == 12 )&& (monitor.operate_time > dialysisOrder.end_time || monitor.operate_time < dialysisOrder.start_time) " style="width:50px" >
-                        {{  monitor.displacement_quantity ? monitor.displacement_quantity : "" }}
+                        v-if="
+                          (prescription.mode_id == 2 ||
+                            prescription.mode_id == 5 ||
+                            prescription.mode_id == 12) &&
+                            (monitor.operate_time > dialysisOrder.end_time ||
+                              monitor.operate_time < dialysisOrder.start_time)
+                        "
+                        style="width:50px"
+                      >
+                        {{
+                          monitor.displacement_quantity
+                            ? monitor.displacement_quantity
+                            : ""
+                        }}
                       </td>
                       <td style="line-height:16px;padding:0px;">
                         <div
@@ -2002,6 +2036,7 @@ export default {
       afterdialysis: {
         complications_index: ''
       },
+      lastafterdialysis: {},
       prescription: {
         dialysate_formulation_name: '',
         device: {}
@@ -2211,6 +2246,7 @@ export default {
           this.predialysis.blood_access_part_opera_id
         )
         this.afterdialysis = response.data.data.AssessmentAfterDislysis
+        this.lastafterdialysis = response.data.data.assessmentAfterDislysis
         this.operators = response.data.data.operators
         console.log('operators', this.operators)
         this.dialysisOrder =

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -190,6 +190,8 @@
               ></label-box>
               首剂：<span style="width:35px;display: inline-block;">{{
                 prescription.anticoagulant_shouji &&
+                (prescription.anticoagulant != "低分子肝素钙" &&
+                  prescription.anticoagulant != "低分子肝素钠") &&
                 prescription.anticoagulant == "普通肝素"
                   ? prescription.anticoagulant_shouji
                   : ""
@@ -204,7 +206,9 @@
               >
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span
               >&nbsp; 追加：<span style="width:35px;display: inline-block;">{{
-                prescription.anticoagulant_weichi
+                prescription.anticoagulant_weichi &&
+                (prescription.anticoagulant != "低分子肝素钙" &&
+                  prescription.anticoagulant != "低分子肝素钠")
                   ? prescription.anticoagulant_weichi
                   : ""
               }}</span
@@ -223,7 +227,7 @@
               >
               &nbsp; 总量：<span style="width:50px;display: inline-block;">{{
                 prescription.anticoagulant_zongliang &&
-                (prescription.anticoagulant != "低分子肝素钙" ||
+                (prescription.anticoagulant != "低分子肝素钙" &&
                   prescription.anticoagulant != "低分子肝素钠")
                   ? prescription.anticoagulant_zongliang
                   : ""
@@ -323,8 +327,7 @@
               血管通路：
               <label-box
                 :isChecked="
-                  predialysis.blood_access_part_opera_name.indexOf('自体内瘘') >
-                  -1
+                  predialysis.blood_access_part_opera_name.indexOf('内瘘') > -1
                     ? true
                     : false
                 "
@@ -364,9 +367,13 @@
               >&nbsp;
               <label-box
                 :isChecked="
-                  predialysis.blood_access_part_opera_name.indexOf('自体内瘘') >
+                  predialysis.blood_access_part_opera_name.indexOf('人造血管') >
                   -1
                     ? true
+                    : predialysis.blood_access_part_opera_name.indexOf(
+                        '移植血管'
+                      ) > -1
+                    ? true
                     : false
                 "
                 showValue="其他"
@@ -812,7 +819,7 @@
           <td>
             <span v-if="getTime(monitor.operate_time) != ''">
               {{
-                monitor.arterial_pressure ? monitor.arterial_pressure : "0"
+                monitor.venous_pressure ? monitor.venous_pressure : "0"
               }}</span
             >
           </td>

src/xt_pages/user/doctorAdvice.vue

@@ -514,7 +514,6 @@
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-
         :page-sizes="[10, 20, 50, 100]"
         :page-size="10"
         background
@@ -3289,7 +3288,7 @@ export default {
       getDoctorAdviceList(this.listQuery).then(response => {
         if (response.data.state == 1) {
           this.adviceTableData = response.data.data.advices;
-          console.log("数据是什么", this.adviceTableData);
+          //console.log("数据是什么", this.adviceTableData);
           var advice = response.data.data.advices;
           var one = response.data.data.advicetwo;
           console.log("advicetwo", one);