Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>

.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/xt_vue.iml" filepath="$PROJECT_DIR$/.idea/xt_vue.iml" />
-    </modules>
-  </component>
-</project>

.idea/xt_vue.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

config/dev.env.js

@@ -6,8 +6,9 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',//'"http://localhost:9529"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
-  SSO_HOST: '"https://testsso.sgjyun.com"',
+  BASE_API:  '"http://api.xt.test.sgjyun.com"',// //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
+  // BASE_API:'"http://localhost:9529"',
+  SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',
   MIRCO_MALL_HOST: '"http://mall.test.sgjyun.com"',

config/index.js

@@ -11,16 +11,15 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {},
-
     // Various Dev Server settings
 
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
-
-    // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+     host: 'xt.test.sgjyun.com',
+    // host:'localhost',
+    port:9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,

src/api/advice.js

@@ -299,3 +299,5 @@ export function postDoctorAdviceConfig(params) {
 
 
 
+
+

src/api/dialysis.js

@@ -239,6 +239,14 @@ export function postDelMonitorInfo(params) {
 
 
 
+export function CreateGroupAdvice(id, groupno, advices){
+  return request({
+    url:'/api/advice_remind/create?id='+id + '&groupno=' + groupno,
+    method:'post',
+    data:advices,
+  })
+
+}
 
 
 

src/api/dialysis_record.js

@@ -43,7 +43,7 @@ export function editMonitor(patient_id, schedule_date, data) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, puncture_nurse_id, start_time, lood_drawing) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -81,3 +81,18 @@ export function postDelMonitorInfo(params) {
   })
 }
 
+
+
+
+
+export function getLongAdvice(params) {
+  return request({
+    url:'api/dialysis/advice_remind',
+    method:'Get',
+    params:params,
+  })
+}
+
+
+
+

src/store/getters.js

@@ -22,6 +22,8 @@ const getters = {
 
   xt_permission: state => state.xt_permission,
   xt_user: state => state.xt_user,
+  schedule_type_selected: state => state.xt_user.schedule_type_selected,
+  zone_selected: state => state.xt_user.zone_selected,
 
   xt_role_temps: state => state.xt_role_temps,
 

src/store/modules/xt_user.js

@@ -14,6 +14,8 @@ import { getFiledConfigList, setFiledConfigList } from '@/utils/data_config' //
 const xt_user = {
   state: {
     org_id: 0,
+    schedule_type_selected: 0,
+    zone_selected: 0,
     app_id: 0,
     user: {
       id: 0,
@@ -59,6 +61,12 @@ const xt_user = {
   },
 
   mutations: {
+    SET_SCHEDULE_TYPE_SELECTED: (state, schedule_type_selected) => {
+      state.schedule_type_selected = schedule_type_selected
+    },
+    SET_ZONE_SELECTED: (state, zone_selected) => {
+      state.zone_selected = zone_selected
+    },
     SET_FILEDS_LIST: (state, configlist) => {
       state.fileds = configlist
     },
@@ -172,6 +180,12 @@ const xt_user = {
   },
 
   actions: {
+    SetScheduleTypeSelected({commit }, schedule_type_selected) {
+      commit('SET_SCHEDULE_TYPE_SELECTED', schedule_type_selected)
+    },
+    SetZoneSelected({ commit }, zone_selected) {
+      commit('SET_ZONE_SELECTED', zone_selected)
+    },
     SetSubscibePatients({
       commit,
       state

src/xt_pages/data/druguseTemplate.vue

@@ -324,14 +324,14 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="单次用量 :" prop="single_dose">
+                    <el-form-item label="开药数量 :" prop="prescribing_number">
                       <el-col :span="9">
-                        <el-input v-model="templateForm.single_dose"></el-input>
+                        <el-input v-model="templateForm.prescribing_number"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
                         <el-select
-                          v-model="templateForm.single_dose_unit"
+                          v-model="templateForm.prescribing_number_unit"
                           filterable
                           clearable
                           allow-create
@@ -347,15 +347,16 @@
                       </el-col>
                     </el-form-item>
                   </el-col>
+
                   <el-col :span="12">
-                    <el-form-item label="开药数量 :" prop="prescribing_number">
+                    <el-form-item label="单次用量 :" prop="single_dose">
                       <el-col :span="9">
-                        <el-input v-model="templateForm.prescribing_number"></el-input>
+                        <el-input v-model="templateForm.single_dose"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
                         <el-select
-                          v-model="templateForm.prescribing_number_unit"
+                          v-model="templateForm.single_dose_unit"
                           filterable
                           clearable
                           allow-create
@@ -491,14 +492,14 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="单次用量 :" prop="single_dose">
+                    <el-form-item label="开药数量 :" prop="prescribing_number">
                       <el-col :span="9">
-                        <el-input v-model="templateFormEdit.single_dose"></el-input>
+                        <el-input v-model="templateFormEdit.prescribing_number"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
                         <el-select
-                          v-model="templateFormEdit.single_dose_unit"
+                          v-model="templateFormEdit.prescribing_number_unit"
                           filterable
                           clearable
                           allow-create
@@ -514,15 +515,16 @@
                       </el-col>
                     </el-form-item>
                   </el-col>
+
                   <el-col :span="12">
-                    <el-form-item label="开药数量 :" prop="prescribing_number">
+                    <el-form-item label="单次用量 :" prop="single_dose">
                       <el-col :span="9">
-                        <el-input v-model="templateFormEdit.prescribing_number"></el-input>
+                        <el-input v-model="templateFormEdit.single_dose"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
                         <el-select
-                          v-model="templateFormEdit.prescribing_number_unit"
+                          v-model="templateFormEdit.single_dose_unit"
                           filterable
                           clearable
                           allow-create
@@ -730,14 +732,14 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="单次用量 :" prop="single_dose">
+                    <el-form-item label="开药数量 :" prop="prescribing_number">
                       <el-col :span="9">
-                        <el-input v-model="templateForm.single_dose"></el-input>
+                        <el-input v-model="templateForm.prescribing_number"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
                         <el-select
-                          v-model="templateForm.single_dose_unit"
+                          v-model="templateForm.prescribing_number_unit"
                           filterable
                           clearable
                           allow-create
@@ -753,15 +755,16 @@
                       </el-col>
                     </el-form-item>
                   </el-col>
+
                   <el-col :span="12">
-                    <el-form-item label="开药数量 :" prop="prescribing_number">
+                    <el-form-item label="单次用量 :" prop="single_dose">
                       <el-col :span="9">
-                        <el-input v-model="templateForm.prescribing_number"></el-input>
+                        <el-input v-model="templateForm.single_dose"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
                         <el-select
-                          v-model="templateForm.prescribing_number_unit"
+                          v-model="templateForm.single_dose_unit"
                           filterable
                           clearable
                           allow-create
@@ -1462,6 +1465,7 @@
         const params = {
           'data': this.adviceTableData
         }
+        this.form.name =  encodeURIComponent(this.form.name)
         postAdviceTemplate(params, this.form.name, this.form.advice_type).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -71,7 +71,7 @@
                       <check-box text="平车"
                                  :checked="isCheckBoxChecked(record.receive_assessment, 'way', 4)"></check-box>
                     </div>
-                    <div class="inline_block" style="margin-left: 30px;">
+                    <div class="inline_block" style="margin-left: 15px;">
                       意识：
                       <check-box text="清醒"
                                  :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 1)"></check-box>
@@ -79,6 +79,8 @@
                                  :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 2)"></check-box>
                       <check-box text="昏迷"
                                  :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 3)"></check-box>
+                      <check-box text="模糊"
+                                 :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 4)"></check-box>
                     </div>
                     <div class="inline_block" style="margin-left: 30px;">
                       体温：

src/xt_pages/dialysis/batch_print/batch_print_order_five.vue

@@ -99,6 +99,8 @@
                       <check-box text="清醒" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 1)"></check-box>
                       <check-box text="嗜睡" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 2)"></check-box>
                       <check-box text="昏迷" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 3)"></check-box>
+                      <check-box text="模糊" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 4)"></check-box>
+
                     </div>
                     <div class="inline_block"  style="margin-left: 5px;">
                      活动性出血：

src/xt_pages/dialysis/batch_print/batch_print_order_five_one.vue

@@ -99,6 +99,8 @@
                       <check-box text="清醒" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 1)"></check-box>
                       <check-box text="嗜睡" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 2)"></check-box>
                       <check-box text="昏迷" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 3)"></check-box>
+                      <check-box text="模糊" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 4)"></check-box>
+
                     </div>
                     <div class="inline_block"  style="margin-left: 5px;">
                      活动性出血：

src/xt_pages/dialysis/batch_print/batch_print_order_four.vue

@@ -79,6 +79,8 @@
                                  :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 2)"></check-box>
                       <check-box text="昏迷"
                                  :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 3)"></check-box>
+                      <check-box text="模糊"
+                                 :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 4)"></check-box>
                     </div>
                     <div class="inline_block" style="margin-left: 30px;">
                       体温：

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -87,6 +87,8 @@
                       <check-box text="清醒" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 1)"></check-box>
                       <check-box text="嗜睡" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 2)"></check-box>
                       <check-box text="昏迷" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 3)"></check-box>
+                      <check-box text="模糊" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 4)"></check-box>
+
                     </div>
                     <div class="inline_block"  style="margin-left: 5px;">
                      活动性出血：

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -84,6 +84,7 @@
                       <check-box text="清醒" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 1)"></check-box>
                       <check-box text="嗜睡" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 2)"></check-box>
                       <check-box text="昏迷" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 3)"></check-box>
+                      <check-box text="模糊" :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 4)"></check-box>
                     </div>
                     <div class="inline_block"  style="margin-left: 5px;">
                       活动性出血：

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -13,44 +13,44 @@
                 <div class="order-title" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">血液净化治疗记录单</div>
             </div>
             <div class="row">
-                <div class="inline_block" >
+              <div class="inline_block" >
                 姓名：
                 <div class="under_line" style="width: 50px;text-align: center;">{{record.patient.name}}</div>
-                </div>
-                <div class="inline_block" style="margin-left: 10px;">
+              </div>
+              <div class="inline_block" style="margin-left: 10px;">
                 性别：
                 <div class="under_line" style="width: 30px;text-align: center;">{{record.patient.gender == 1?"男":"女"}}</div>
-                </div>
-                <div class="inline_block" style="margin-left: 10px;">
+              </div>
+              <div class="inline_block" style="margin-left: 10px;">
                 年龄：
                 <div class="under_line" style="width: 30px;text-align: center;">{{getAge(record.patient)}}</div>
                 岁
-                </div>
-                <div class="inline_block">
+              </div>
+              <div class="inline_block">
                 门诊：
-                    <div class="under_line" style="width: 30px;text-align: center;">
-                        <check-box  :checked="record.patient.source == 1 "></check-box>
-                    </div>
-                </div>
-                <div class="inline_block">
+                  <div class="under_line" style="width: 30px;text-align: center;">
+                      <check-box  :checked="record.patient.source == 1 "></check-box>
+                  </div>
+              </div>
+              <div class="inline_block">
                 病区：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                        {{'/'}}
-                    </div>
-                </div>
-                <div class="inline_block">
+                  <div class="under_line" style="width: 50px;text-align: center;">
+                      {{'/'}}
+                  </div>
+              </div>
+              <div class="inline_block">
                 床号：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                        {{'/'}}
-                    </div>
-                </div>
-                <div class="inline_block">
+                  <div class="under_line" style="width: 50px;text-align: center;">
+                      {{'/'}}
+                  </div>
+              </div>
+              <div class="inline_block">
                 透析号：
-                    <div class="under_line" style="width: 70px;text-align: center;">
-                        {{'/'}}
-                    </div>
-                </div>
-                <div class="inline_block" style="margin-left: 5px;">
+                  <div class="under_line" style="width: 70px;text-align: center;">
+                    {{record.patient.dialysis_no}}
+                  </div>
+              </div>
+              <div class="inline_block" style="margin-left: 5px;">
                 住院号/门诊号：
                 <div class="under_line" style="width: 70px;text-align: left" v-if="record.patient.admission_number">
                     {{record.patient.admission_number}}
@@ -58,25 +58,24 @@
                 <div class="under_line" style="width: 70px;text-align: left" v-else>
                     {{'/'}}
                 </div>
-                </div>
-                
+              </div>
             </div>
             <div class="row" >
                 <div class="inline_block" >
-                入科方式：
-                <div class="under_line" v-if="record.receive_assessment==0" style="width: 180px;text-align: left">  </div>
-                <div class="under_line" v-if="record.receive_assessment==1" style="width: 180px;text-align: left">步行 </div>
-                <div class="under_line" v-if="record.receive_assessment==2" style="width: 180px;text-align: left">扶行 </div>
-                <div class="under_line" v-if="record.receive_assessment==3" style="width: 180px;text-align: left">轮椅 </div>
-                <div class="under_line" v-if="record.receive_assessment==4" style="width: 180px;text-align: left">平车 </div>
+                  入科方式：
+                  <div class="under_line" v-if="record.receive_assessment==0" style="width: 180px;text-align: left">  </div>
+                  <div class="under_line" v-if="record.receive_assessment==1" style="width: 180px;text-align: left">步行 </div>
+                  <div class="under_line" v-if="record.receive_assessment==2" style="width: 180px;text-align: left">扶行 </div>
+                  <div class="under_line" v-if="record.receive_assessment==3" style="width: 180px;text-align: left">轮椅 </div>
+                  <div class="under_line" v-if="record.receive_assessment==4" style="width: 180px;text-align: left">平车 </div>
                 </div>
                 <div class="inline_block" style="margin-left: 10px;">
-                诊断：
-                <div class="under_line" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
+                  诊断：
+                  <div class="under_line" style="width: 180px;text-align: left">{{record.patient.diagnose}}</div>
                 </div>
             </div>
 
-            <div class="row" :class="record.totallength> 14? 'margin-bottom-300':''"> 
+            <div class="row" :class="record.totallength> 14? 'margin-bottom-300':''">
                 <table class="proj_table">
                     <tbody>
                         <tr><td colspan="2" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">透析前情况</td></tr>
@@ -139,7 +138,7 @@
                                     <div class="inline_block" style="margin-left:10px;">
                                     血管通路：
                                     <div class="under_line" style="width: 200px;text-align: center;">
-                                        {{record.assessment_before_dislysis&&record.assessment_before_dislysis.blood_access_part_id?blood_access_part[record.assessment_before_dislysis.blood_access_part_id]['name']:'/'}} {{record.assessment_before_dislysis&&record.assessment_before_dislysis.blood_access_part_opera_name?record.assessment_before_dislysis.blood_access_part_opera_name:''}}
+                                      {{QueryPartById(record.assessment_before_dislysis&&record.assessment_before_dislysis.blood_access_part_id?record.assessment_before_dislysis.blood_access_part_id:0)}} {{record.assessment_before_dislysis&&record.assessment_before_dislysis.blood_access_part_opera_name?record.assessment_before_dislysis.blood_access_part_opera_name:''}}
                                     </div>
                                     </div>
                                 </div>
@@ -160,11 +159,11 @@
                                     <div class="inline_block" style="margin-left:10px;flex:1;">
                                       穿刺方式：
                                       <div class="under_line" style="width: 100px;text-align: center" v-if="!record.assessment_before_dislysis">
-                                            
+
                                       </div>
                                       <div v-if="record.assessment_before_dislysis" style="display: inline-block;">
                                         <div class="under_line" style="width: 100px;text-align: center" v-if="record.assessment_before_dislysis.puncture_way == 0">
-                                            
+
                                         </div>
                                         <div class="under_line" style="width: 100px;text-align: center" v-if="record.assessment_before_dislysis.puncture_way == 1">
                                             绳梯
@@ -188,11 +187,11 @@
                                     <div class="inline_block" style="flex:1;">
                                       透析方式：
                                       <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="!record.prescription">
-                                          
+
                                       </div>
                                       <div v-if="record.prescription" style="display: inline-block;">
                                         <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="!record.prescription.mode_id">
-                                            
+
                                         </div>
                                         <div class="under_line" style="width: 100px;text-align: center;font-weight:600;" v-if="record.prescription.mode_id==1">
                                             HD
@@ -338,7 +337,10 @@
                                     </div>
                                     <div class="inline_block" style="margin-left:20px;">
                                     维持：
-                                    <div class="under_line" style="width: 50px;text-align: center;">
+                                    <div v-if="record.prescription.anticoagulant == 1" class="under_line" style="width: 50px;text-align: center;">
+                                        {{record.prescription&&record.prescription.anticoagulant_weichi?record.prescription.anticoagulant_weichi:'/'}}
+                                    </div>
+                                    <div v-if="record.prescription.anticoagulant != 1" class="under_line" style="width: 50px;text-align: center;">
                                         {{record.prescription&&record.prescription.anticoagulant_weichi?record.prescription.anticoagulant_weichi:0}}
                                     </div>
                                     lu
@@ -376,7 +378,7 @@
                                             <td width="60">透析液温度(°C)</td>
                                             <td width="50">电导度<br/>(ms/cm)</td>
                                             <td width="50">超滤量<br/>(ml)</td>
-                                            <td width="200">病情变化及处理</td>                                 
+                                            <td width="200">病情变化及处理</td>
                                         </tr>
                                         <tr v-for="(monitor_record,index) in record.monitor_records" :key="index">
                                             <td>{{getTime(monitor_record.operate_time,'{h}:{i}')}}</td>
@@ -389,16 +391,16 @@
                                             <td>{{monitor_record.dialysate_temperature?monitor_record.dialysate_temperature:''}}</td>
                                             <td>{{monitor_record.sodium_concentration?monitor_record.sodium_concentration:''}}</td>
                                             <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:0}}</td>
-                                          
+
                                             <td style="line-height:16px;padding:0px;">
-                                              <div style="height:40px;line-height:20px; overflow:hidden;">
+                                              <div style="min-height:40px;line-height:20px; overflow:hidden;">
                                                 <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
                                                   <template v-if="index == 0">【开始透析】</template>
-                                                  <template v-if="(index == monitor_record.length - 1) && index > 1">【结束透析】</template>
-                                                  {{monitor_record.symptom}}  &nbsp;{{monitor_record.dispose}} &nbsp;{{monitor_record.result}} 
-                                                </span> 
+                                                  {{monitor_record.end}}
+                                                  {{monitor_record.symptom}}  &nbsp;{{monitor_record.dispose}} &nbsp;{{monitor_record.result}}
+                                                </span>
                                               </div>
-                                            </td>                                      
+                                            </td>
                                         </tr>
                                         <tr v-for="(monitor_record,index) in record.monitor_records2" :key="index">
                                             <td> </td>
@@ -414,10 +416,10 @@
                                             <td style="line-height:16px;padding:0px;">
                                               <div style="height:40px;line-height:20px; overflow:hidden;">
                                                 <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
-                                                  
-                                                </span> 
+
+                                                </span>
                                               </div>
-                                            </td>                                      
+                                            </td>
                                         </tr>
                                     </tbody>
                                 </table>
@@ -453,9 +455,9 @@
                                             <td height="35px" colspan="2" class="advice-name" style="padding-left:7px;" >
                                                 <span v-if="advice.parent_id > 0">---></span>
                                                 <span >{{advice.advice_name }}</span>
-                                                <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
-                                                <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                                                <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>
+                                                <span v-if="advice.advice_desc != ''" >{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                                                <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                                                <!-- <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span> -->
                                                 <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.delivery_way}}</span>
                                                 <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.execution_frequency}}</span>
                                                 <span v-if="advice.parent_id == 0 && advice.children &&  advice.children.length == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
@@ -530,7 +532,7 @@
                   <div class="inline_block">
                   透析号：
                       <div class="under_line" style="width: 70px;text-align: center;">
-                          {{'/'}}
+                        {{record.patient.dialysis_no}}
                       </div>
                   </div>
                   <div class="inline_block" style="margin-left: 5px;">
@@ -542,7 +544,7 @@
                       {{'/'}}
                   </div>
                   </div>
-                  
+
               </div>
               <div class="row" >
                   <div class="inline_block" >
@@ -618,40 +620,57 @@
                                     {{record.assessment_after_dislysis&&record.assessment_after_dislysis.catheter?record.assessment_after_dislysis.catheter:'/'}}
                                 </div>
                                 </div>
-                            </div>
-
-                            <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                                <div class="inline_block" style="flex:1;">
+                              <div class="inline_block" style="flex:1;">
                                 实际治疗时间：
-                                <div class="under_line" style="width: 50px;text-align: center">
-                                    {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_hour?record.assessment_after_dislysis.actual_treatment_hour:'/'}}
+                                <div class="under_line" style="width: 30px;text-align: center">
+                                  {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_hour?record.assessment_after_dislysis.actual_treatment_hour:'/'}}
                                 </div>
                                 h
-                                <div class="under_line" style="width: 50px;text-align: center">
-                                    {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_minute?record.assessment_after_dislysis.actual_treatment_minute:0}}
+                                <div class="under_line" style="width: 30px;text-align: center">
+                                  {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_treatment_minute?record.assessment_after_dislysis.actual_treatment_minute:0}}
                                 </div>
                                 min
-                                </div>
+                              </div>
+                            </div>
+
+                            <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+
                                 <div class="inline_block" style="flex:1;">
+                              透后体重：
+                              <div class="under_line" style="width: 70px;text-align: center">
+                                {{record.assessment_after_dislysis&&record.assessment_after_dislysis.weight_after?record.assessment_after_dislysis.weight_after:'/'}}
+                              </div>kg
+                            </div>
+
+
+                              <div class="inline_block" style="flex:1;">
                                 透后体重：
                                 <div class="under_line" style="width: 70px;text-align: center">
-                                    {{record.assessment_after_dislysis&&record.assessment_after_dislysis.weight_after?record.assessment_after_dislysis.weight_after:'/'}}
-                                </div>
-                                </div>
+                                  {{record.assessment_after_dislysis&&record.assessment_after_dislysis.weight_loss?record.assessment_after_dislysis.weight_loss:'/'}}
+                                </div>kg
+                              </div>
+
+
+                              <div class="inline_block" style="flex:1;">
+                                透析中入量：
+                                <div class="under_line" style="width: 100px;text-align: center">
+                                  {{record.assessment_after_dislysis&&record.assessment_after_dislysis.dialysis_intakes?record.assessment_after_dislysis.dialysis_intakes:'/'}}
+                                </div> {{getUnit(record)}}
+                              </div>
+
                                 <div class="inline_block" style="flex:1;">
                                 实际超滤量：
-                                <div class="under_line" style="width: 150px;text-align: center">
+                                <div class="under_line" style="width: 100px;text-align: center">
                                     {{record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration?record.assessment_after_dislysis.actual_ultrafiltration:'/'}}
                                 </div>ml
                                 </div>
                             </div>
 
+
                             <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                                 <div class="inline_block" style="flex:1;">
                                 治疗小结：
-                                <div class="under_line" style="width: 300px;text-align: center">
-                                    {{record.summary&&record.summary.dialysis_summary?record.summary.dialysis_summary:'/'}}
-                                </div>
+                                  <div style="width: 95%;line-height: 25px;text-align: left;margin-left: 2px;text-underline-position: under; text-decoration: underline;"> {{record.summary&&record.summary.dialysis_summary?record.summary.dialysis_summary:'/'}}</div>
                                 </div>
                             </div>
                             </td>
@@ -663,7 +682,7 @@
                                     穿刺护士：
                                     <div class="under_line" style="width: 80px;text-align: center">
                                         <span v-if="setAdminUserES(record.dialysis_order==null?0:record.dialysis_order.puncture_nurse) == ''">{{getAdminUser(record.dialysis_order==null?0:record.dialysis_order.puncture_nurse)}}</span>
-                                        <img style="height:20px;" :src="setAdminUserES(dialysisOrder==null?0:record.dialysis_order.puncture_nurse)" alt="" srcset="" v-else>
+                                        <img style="height:20px;" :src="setAdminUserES(record.dialysis_order==null?0:record.dialysis_order.puncture_nurse)" alt="" srcset="" v-else>
                                     </div>
                                 </div>
                                 <div class="inline_block" style="flex:1;">
@@ -691,7 +710,7 @@
                                       </div>
                                     </div>
                                     <div class="under_line" style="width: 80px;text-align: left" v-if="!record.check">
-                                       
+
                                     </div>
                                 </div>
                                 <div class="inline_block" style="flex:1;">
@@ -715,13 +734,11 @@
                         </tr>
                     </tbody>
                 </table>
-           
-            
+              </div>
+            </div>
           </div>
         </div>
       </div>
-    </div>
-  </div>
 </template>
 
 <script>
@@ -846,7 +863,7 @@
             if(recordIndex == (this.records.length - 1)){
               this.records[recordIndex].classname = ' '
             }
-            
+
 
             this.records[recordIndex].monitor_records2 = []
             if (this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length < 7) {
@@ -864,6 +881,22 @@
               }
             }
 
+            var tempmonitorflag = true;
+            for (let index = 0; index < this.records[recordIndex].monitor_records.length; index++) {
+              const monitor = this.records[recordIndex].monitor_records[index];
+              this.records[recordIndex].monitor_records[index].end =""
+              if(Object.keys(monitor).length > 0 && index > 1){
+                if(monitor.operate_time == this.records[recordIndex].dialysis_order.end_time){
+                  this.records[recordIndex].monitor_records[index].end ="【结束透析】"
+                  tempmonitorflag = false
+                }
+                if(tempmonitorflag && index == this.records[recordIndex].monitor_records.length-1){
+                    this.records[recordIndex].monitor_records[index].end ="【结束透析】"
+                }
+              }
+
+            }
+
             this.monitor_records = this.records[recordIndex].monitor_records
 
             // this.records[recordIndex].monitor_records2 = []
@@ -912,7 +945,7 @@
               this.doctor_advices[index]['isShow'] = 2
             }
 
-            
+
 
             // if (this.doctor_advices.length > 0) {
             //   var group = this.newAdviceGroupObject()
@@ -1051,11 +1084,11 @@
             //     }
             //   }
             // }
-   
+
             if (this.doctor_advices.length <= 6) {
                 var nl = 6
                 this.print_length = 6
-                
+
                 for (let index = 0; index < nl; index++) {
                 if (this.doctor_advices[index] == undefined || this.doctor_advices[index].length <= 0) {
                     this.doctor_advices.push([])
@@ -1071,7 +1104,7 @@
 
             this.records[recordIndex].totallength= this.doctor_advices.length + this.monitor_records.length
           }
-          
+
 
           this.operators = resp.data.medical_staffs
           if (this.operators.length > 0) {
@@ -1092,6 +1125,36 @@
       })
     },
     methods: {
+      getUnit:function(val){
+        if (val.assessment_after_dislysis == null){
+          return ""
+        }else if(val.assessment_after_dislysis != null){
+          switch (val.assessment_after_dislysis.dialysis_intakes_unit) {
+            case 1:
+              return "g"
+              break
+            case 2:
+              return "ml"
+              break
+
+          }
+
+        }
+
+
+      },
+      QueryPartById: function (val) {
+        let vascular_access_part_name = '/'
+        let vascular_access = getDataConfig('hemodialysis', 'vascular_access')
+
+        for (let i = 0; i < vascular_access.length; i++) {
+          if (vascular_access[i].id == val) {
+            vascular_access_part_name = vascular_access[i].name
+          }
+        }
+        return vascular_access_part_name
+
+      },
       printAction: function() {
         const style = '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}'
 

src/xt_pages/dialysis/batch_print/batch_print_order_three.vue

@@ -79,6 +79,8 @@
                                  :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 2)"></check-box>
                       <check-box text="昏迷"
                                  :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 3)"></check-box>
+                      <check-box text="模糊"
+                                 :checked="isCheckBoxChecked(record.receive_assessment, 'consciousness', 4)"></check-box>
                     </div>
                     <div class="inline_block" style="margin-left: 30px;">
                       体温：

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -137,8 +137,9 @@
 
       <el-pagination
       align="right"
+      @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[10]"
+        :page-sizes="[10,20,30,50]"
         :page-size="10"
         background
         style="margin-top:20px;"
@@ -395,6 +396,7 @@ export default {
         return "";
       }
     },
+
     handleCurrentChange(val) {
       this.listQuery.page = val;
       this.getSchedualPatientList();
@@ -414,6 +416,11 @@ export default {
       }
       this.getSchedualPatientList();
     },
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.getSchedualPatientList();
+
+    },
     batchPrintAction: function() {
       var sch_ids = []
       for (let index = 0; index < this.selecting_schs.length; index++) {

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -10,7 +10,9 @@
         <li v-if="isShow('目标超滤量')">
           <label>目标超滤量 : </label>
           <span class="content">{{target_ultrafiltration != '0'?target_ultrafiltration:''}}</span>
-          <span class="unit">{{target_ultrafiltration != '0'?"L":''}}</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 6">{{target_ultrafiltration != '0'?"L":''}}</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id == 6">{{target_ultrafiltration != '0'?"ml":''}}</span>
+
         </li>
         <li v-if="isShow('首剂')">
           <label>首剂 : </label>
@@ -47,7 +49,7 @@
           <span class="unit">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
         </li>
       </ul>
-      <ul>  
+      <ul>
         <li v-if="isShow('钾')">
           <label>钾 : </label>
           <span class="content">{{kalium != '0'?kalium:""}}</span>
@@ -99,7 +101,7 @@
         </li>
       </ul>
       <ul>
-      
+
         <li v-if="isShow('透析器/灌流器')">
           <label>透析器/灌流器 : </label>
           <span class="content">{{dialyzer_perfusion_apparatus}}</span>
@@ -127,7 +129,9 @@
           <span class="unit"></span>
         </li>
         <li v-if="isShow('置换液')">
-          <label>置换液: </label>
+          <label v-if="this.$store.getters.xt_user.template_info.template_id != 6">置换液: </label>
+          <label v-if="this.$store.getters.xt_user.template_info.template_id == 6">置换方式: </label>
+
           <span class="content">{{displace_liqui}}</span>
           <span class="unit"></span>
         </li>

src/xt_pages/dialysis/details/NavIgation.vue

@@ -53,11 +53,12 @@
 
         <div class="middleLine"></div>
 
-        <dialysis-prescription-dialog title="透析处方" ref="prescription" :patient="patient" :prescription="prescription" :solution="solution"
+        <dialysis-prescription-dialog title="透析处方" ref="prescription" :patient="patient" :prescription="prescription" :solution="solution" @advice="adviceFunc"
                                       :niprocart_info="niprocart_info" :jms_info="jms_info" :fistula_needle_set_info="fistula_needle_set_info"
         :fistula_needle_set_16_info="fistula_needle_set_16_info"  :hemoperfusion_info="hemoperfusion_info" :dialyser_sterilised_info="dialyser_sterilised_info"
         :filtryzer_info="filtryzer_info" :dialyzers_info="dialyzers_info" :injector_info="injector_info" :bloodlines_info="bloodlines_info"  :tubingHemodialysis_info="tubingHemodialysis_info"
-        :safe_package_info="safe_package_info" :aliquid_info="aliquid_info" :config="config"
+        :safe_package_info="safe_package_info" :aliquid_info="aliquid_info" :config="config" :admin_users="admin_users"  :targetAdvices="longAdvices"
+                                      :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
 
         ></dialysis-prescription-dialog>
 
@@ -69,7 +70,7 @@
 
         <treatment-summary-dialog title="治疗小结" ref="treatmentSummary" :patient="patient" :treatment_summary="treatment_summary"></treatment-summary-dialog>
 
-        <doctor-advice-dialog title="临时医嘱" ref="doctor_advice" :doctor_advices="doctor_advices" :patient="patient" :admin_users="admin_users" :dialysis_order="dialysis_order"></doctor-advice-dialog>
+        <doctor-advice-dialog title="临时医嘱" ref="doctor_advice" :doctor_advices="doctor_advices" :patient="patient" :admin_users="admin_users" :dialysis_order="dialysis_order" ></doctor-advice-dialog>
 
         <computer-dialog title="透析上机" ref="computer_dialog" :dialysis_order="dialysis_order" :schedule="schedual" :admins="admin_users" :device_numbers="device_numbers"></computer-dialog>
 
@@ -109,10 +110,27 @@ export default {
   },
   data() {
     return {
-
     }
   },
   props: {
+    longAdvices: { // 临时医嘱
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    waitUploadAdvices: { // 临时医嘱
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    is_open: { // 临时医嘱
+      type: Number,
+      default: () => {
+        return 0
+      }
+    },
     patient: { // 患者信息
       type: Object,
       default: () => {
@@ -316,6 +334,10 @@ export default {
     }
   },
   methods: {
+    adviceFunc:function(){
+
+      this.$emit("advice")
+    },
     showMonitorDialog: function() {
       this.$refs.monitor_dialog.show()
     },

src/xt_pages/dialysis/details/acceptsAssessment.vue

@@ -107,7 +107,9 @@
         consciousnesses: {
           '1': '清醒',
           '2': '嗜睡',
-          '3': '昏迷'
+          '3': '昏迷',
+          '4': '模糊'
+
         },
         appetites: {
           '1': '正常',

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -35,13 +35,13 @@
           <span class="content">{{ puncture_point_haematoma_name }}</span>
         </li>
 
-        <li  v-if="isShow('穿刺处血肿')&&patient_gose==3">
+        <li v-if="isShow('穿刺处血肿')&&patient_gose==3">
           <label>科室 : </label>
           <span class="content">{{ inpatient_department }}</span>
         </li>
         <li v-if="isShow('体重减少')">
           <label>体重减少 : </label>
-          <span class="content"  v-if="weight_loss!='0'">{{ weight_loss }}</span>
+          <span class="content" v-if="weight_loss!='0'">{{ weight_loss }}</span>
           <span class="unit" v-if="weight_loss!='0'">kg</span>
         </li>
         <li v-if="isShow('舒张压')">
@@ -78,7 +78,7 @@
           <span class="content">{{ internal_fistula_tremor_ac_name }}</span>
         </li>
 
-        <li  v-if="isShow('交待病房护士/患者/陪人观察内容')&&patient_gose==3">
+        <li v-if="isShow('交待病房护士/患者/陪人观察内容')&&patient_gose==3">
           <label>交待病房护士/患者/陪人观察内容 : </label>
           <span class="content">{{ observation_content }}</span>
         </li>
@@ -105,13 +105,13 @@
         </li>
         <li v-if="isShow('透析中入量')">
           <label>透析中入量: </label>
-          <span class="content" v-if="dialysis_intakes_feed!='0'">{{ dialysis_intakes_feed }}</span>
+          <span class="content">{{ this.record.dialysis_intakes }}{{getUnit(this.record.dialysis_intakes_unit)}}</span>
         </li>
         <li v-if="isShow('血管通路操作')">
           <label>血管通路操作: </label>
           <span class="content">{{ blood_access_opera }}</span>
         </li>
-        <li  v-if="isShow('拔针后穿刺点渗血')">
+        <li v-if="isShow('拔针后穿刺点渗血')">
           <label>拔针后穿刺点渗血: </label>
           <span class="content">{{ puncture_point_oozing_blood_name }}</span>
         </li>
@@ -119,16 +119,16 @@
           <label>患者去向: </label>
           <span class="content">{{ patient_gose_name }}</span>
         </li>
-        <li  v-if="isShow('其他观察内容')&&patient_gose==3">
+        <li v-if="isShow('其他观察内容')&&patient_gose==3">
           <label>其他观察内容 : </label>
           <span class="content">{{ observation_content_other }}</span>
         </li>
-        <li  v-if="isShow('拔针后穿刺点渗血')">
+        <li v-if="isShow('拔针后穿刺点渗血')">
           <label for="bzh">拔针后穿刺点渗血: </label>
           <span id="bzh" class="content">{{puncture_point_oozing_blood_name}}</span>
         </li>
       </ul>
-      <ul >
+      <ul>
         <li v-if="isShow('透析过程')">
           <label for="tw">透析过程 : </label>
           <span class="content" id="tw" v-if="this.record.dialysis_process == 1">完成</span>
@@ -136,11 +136,10 @@
         </li>
         <li v-if="this.record.dialysis_process == 2&&isShow('透析过程提前原因')">
           <label for="tw">透析过程提前原因 : </label>
-          <span class="content" id="tw" >{{in_advance_reason}}</span>
+          <span class="content" id="tw">{{in_advance_reason}}</span>
         </li>
 
 
-
         <li v-if="isShow('内瘘管拔针后压迫止血时间')">
           <label for="ml">内瘘管拔针后压迫止血时间 : </label>
           <span id="ml" class="content" v-if="hemostasis_minute">{{hemostasis_minute}}min</span>
@@ -174,7 +173,7 @@
           <label for="hzqx">透析器: </label>
           <span id="hzqx" class="content">{{getDialyzer(this.record.dialyzer)}}</span>
         </li>
-        <li  v-if="isShow('透析期间进食')">
+        <li v-if="isShow('透析期间进食')">
           <label for="bzh">透析期间进食: </label>
           <span id="bzh" class="content">{{eat_name}}</span>
         </li>
@@ -189,19 +188,19 @@
 <script>
   import store from '@/store'
 
-export default {
-  name: 'DialysisPrescription',
-  data() {
+  export default {
+    name: 'DialysisPrescription',
+    data() {
       return {
         title: '透后评估 '
       }
-  },
-  props: {
+    },
+    props: {
       record: {
         type: Object
       }
-  },
-  computed: {
+    },
+    computed: {
       weight_after: function() {
         if (this.record.id == 0) {
           return '-'
@@ -358,8 +357,9 @@ export default {
         return this.record.catheter
       },
       puncture_point_haematoma_name: function() {
-        if (this.record.id == 0)
-          {return}
+        if (this.record.id == 0) {
+          return
+        }
       }
     }, breathing_rate: function() {
       if (this.record.id == 0) {
@@ -391,12 +391,7 @@ export default {
       }
       return this.record.actual_treatment_minute
     },
-    dialysis_intakes_feed: function() {
-      if (this.record.id == 0) {
-        return '-'
-      }
-      return this.record.dialysis_intakes
-    },
+
     observation_content_other: function() {
       if (this.record.id == 0) {
         return '-'
@@ -468,7 +463,7 @@ export default {
       }
       return this.record.actual_treatment_minute
     },
-    dialysis_intakes_feed: function() {
+    dialysis_intakes: function() {
       if (this.record.id == 0) {
         return '-'
       }
@@ -543,7 +538,7 @@ export default {
       }
       return this.record.in_advance_reason_other
     },
-  methods: {
+    methods: {
       getOpera: function(id) {
         var hemostasis_opera = this.$store.getters.hemostasis_opera
         var hemostasisOperaName = ''
@@ -562,6 +557,16 @@ export default {
           }
         }
         return tremorNoiseName
+      }, getUnit: function(val) {
+        switch (val) {
+          case 1:
+            return "g"
+            break
+          case 2:
+            return "ml"
+            break
+        }
+
       }, getDisequilibriumSyndrome: function(id) {
         var disequilibrium_syndrome = this.$store.getters.disequilibrium_syndrome
         var disequilibriumSyndromeName = ''
@@ -616,8 +621,8 @@ export default {
         }
         return false
       }
+    }
   }
-}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>

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

@@ -100,6 +100,18 @@
               <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"> -->
@@ -417,6 +429,10 @@ export default {
         symptomsOptions: [],
         internalFistulaOptions: [],
         vascularAccessOptions: [],
+        unit: [
+          {id: 1, name: 'g'},
+          {id: 2, name: 'ml'},
+        ],
         vascularAccessDescOptions: [],
         catheterOptions: [],
         complicationOptions: [],
@@ -477,7 +493,8 @@ export default {
           arterial_tube: '',
           intravenous_tube: '',
           dialyzer: '',
-          breathing_rate: ''
+          breathing_rate: '',
+          dialysis_intakes_unit:0,
 
         }
       }
@@ -568,6 +585,7 @@ export default {
         data['weight_after'] = this.form.weight_after ? parseFloat(this.form.weight_after) : 0
         data['weight_loss'] = this.form.weight_loss ? parseFloat(this.form.weight_loss) : 0
         data['temperature'] = this.form.temperature ? parseFloat(this.form.temperature) : 0
+        data['breathing_rate'] = this.form.temperature ? parseFloat(this.form.breathing_rate) : 0
         data['systolic_blood_pressure'] = this.form.systolic_blood_pressure ? parseFloat(this.form.systolic_blood_pressure) : 0
         data['diastolic_blood_pressure'] = this.form.diastolic_blood_pressure ? parseFloat(this.form.diastolic_blood_pressure) : 0
         data['pulse_frequency'] = this.form.pulse_frequency ? parseFloat(this.form.pulse_frequency) : 0
@@ -603,6 +621,8 @@ export default {
         data['disequilibrium_syndrome_option'] = this.form.disequilibrium_syndrome_option
         data['arterial_tube'] = this.form.arterial_tube ? parseFloat(this.form.arterial_tube) : 0
         data['intravenous_tube'] = this.form.intravenous_tube ? parseFloat(this.form.intravenous_tube) : 0
+        data['dialysis_intakes_unit'] = this.form.dialysis_intakes_unit
+
         data['dialyzer'] = this.form.dialyzer ? parseFloat(this.form.dialyzer) : 0
 
         data['is_eat'] = this.form.is_eat ? parseFloat(this.form.is_eat) : 0
@@ -765,7 +785,7 @@ export default {
       this.internalFistulaTremorAcOptions = this.$store.getters.internal_fistula_tremor_ac
       this.patientGoseOptions = this.$store.getters.patient_gose
       this.observationContentOptions = this.$store.getters.observation_content
-  
+
       console.log(this.patient)
 
       var date = this.$route.query && this.$route.query.date

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

@@ -16,6 +16,8 @@
         <el-radio v-model="receiveTreatmentAsses.consciousness" label="1">清醒</el-radio>
         <el-radio v-model="receiveTreatmentAsses.consciousness" label="2">嗜睡</el-radio>
         <el-radio v-model="receiveTreatmentAsses.consciousness" label="3">昏迷</el-radio>
+        <el-radio v-model="receiveTreatmentAsses.consciousness" label="4">模糊</el-radio>
+
 
       </el-form-item>
       <el-form-item label="病人食欲 : " v-if="isShow('病人食欲')">

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

@@ -691,7 +691,6 @@ export default {
         this.InnerDialogProps.visibility = false
       }, handleComfirm: function() {
         const ParamsQuery = this.assessmentBeforeDislysis
-        console.log('paramsquery是什么', ParamsQuery)
         ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
         postAssessmentBeforeDislysis(ParamsQuery).then(response => {

src/xt_pages/dialysis/details/index.vue

@@ -3,14 +3,13 @@
     <div class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div class="print" style="float:left;">
-        <!-- <el-button type="primary" @click="dialogFormVisible = true">长期医嘱</el-button> -->
-        <!-- <el-button type="primary" @click="orders = true">临时医嘱</el-button> -->
         <el-button size="small" type="primary" @click="printOrder" icon="el-icon-printer">打印</el-button>
       </div>
     </div>
     <div class="details-bg" v-loading.fullscreen.lock="loading">
       <nav-igation
         title="弹窗导航"
+        @advice="adviceFunc"
         :patient="patient"
         :schedual="schedual"
         :prescription="prescription"
@@ -43,9 +42,9 @@
         :safe_package_info="safe_package_info"
         :aliquid_info="aliquid_info"
         :config = "config"
-
-
-
+        :longAdvices="longAdvices"
+        :waitUploadAdvices="waitUploadAdvices"
+        :is_open="is_open"
       >
       </nav-igation>
 
@@ -249,7 +248,7 @@
   import AssessmentAfter from './assessmentAfter'
   import TreatmentOf from './treatmentOf'
   import OperationStaff from './operationStaff'
-  import { getDialysisScheduleDetail } from '@/api/dialysis_record'
+  import { getDialysisScheduleDetail,getLongAdvice } from '@/api/dialysis_record'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
 
@@ -285,6 +284,11 @@
         patient_id: 0,
         date: 0,
 
+        longAdvices: [],
+        waitUploadAdvices: [],
+        is_open: 0,
+        targetAdvices: [],
+
         patient: { id: 0 }, // 患者信息
         schedual: { id: 0 }, // 患者排班信息
         prescription: { id: 0 }, // 透析处方
@@ -327,6 +331,7 @@
       this.patient_id = patient_id
       this.date = date
       this.getScheduleDetail()
+      this.getLongAdvice()
     },
     computed: {
       steps: function() {
@@ -343,9 +348,9 @@
           { title: '治疗小结', finish: false }
         ]
 
-        steps[0].finish = this.prescription.id > 0
+        steps[0].finish = this.prescription.id && this.prescription.creater > 0
         steps[1].finish = this.receiver_treatment_access.id > 0
-        steps[2].finish = this.predialysis_evaluation.id > 0
+        steps[2].finish = this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.creater > 0
         steps[3].finish = this.doctor_advices.length > 0
         steps[5].finish = this.dialysis_order.id > 0
         steps[7].finish =
@@ -360,6 +365,70 @@
       }
     },
     methods: {
+      adviceFunc(){
+        this.getScheduleDetail()
+
+
+      },
+      getLongAdvice(){
+        var dateStr = parseTime(this.date, '{y}-{m}-{d}')
+        var myDate = new Date(Date.parse(dateStr));
+        var weekDay = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];
+        console.log(weekDay[myDate.getDay()])
+
+        let params = {
+          "date":dateStr+" "+"20:00:00",
+          "patient_id":this.patient_id,
+          "week": weekDay[myDate.getDay()]
+        }
+        getLongAdvice(params).then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+
+            var status = parseInt(resp.data.status)
+
+            switch (status) {
+              case 2:
+                var totalAdvice = resp.data.advices
+                var longAdvicesTwo = resp.data.advices_two
+                var waitUploadAdvices = []
+                for (let i = 0; i < totalAdvice.length; i++) {
+                  totalAdvice[i]['isCheck'] = 1
+
+                }
+
+                for (let i = 0; i < totalAdvice.length; i++) {
+                  for (let a = 0; a < longAdvicesTwo.length; a++) {
+                    if (totalAdvice[i].template_id == longAdvicesTwo[a].template_id && totalAdvice[i].frequency_type == longAdvicesTwo[a].frequency_type) {
+                      totalAdvice[i]['isCheck'] = 0
+                    }
+                  }
+                }
+
+
+                for (let i = 0; i < totalAdvice.length; i++) {
+                  if( totalAdvice[i].isCheck == 1){
+                    waitUploadAdvices.push(totalAdvice[i])
+                  }
+                }
+
+
+                this.is_open = resp.data.is_open_remind
+                this.longAdvices = totalAdvice
+                this.waitUploadAdvices = waitUploadAdvices
+                break
+
+            }
+
+
+
+          } else {
+            this.$message.error(resp.msg)
+          }
+          this.loading = false
+        })
+
+      },
       didDelMonitor(record_id) {
         var mrl = this.monitor_records.length
         for (let index = 0; index < mrl; index++) {
@@ -372,6 +441,7 @@
       getScheduleDetail: function() {
         this.loading = true
         var dateStr = parseTime(this.date, '{y}-{m}-{d}')
+        this.doctor_advices = []
         getDialysisScheduleDetail(this.patient_id, dateStr).then(rs => {
           var resp = rs.data
           if (resp.state == 1) {

src/xt_pages/dialysis/dialysisPage.vue

@@ -251,11 +251,11 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
               <template v-if="isEdit">
-                <el-button type="primary" @click="dialogFormVisible = false">取消</el-button>                
+                <el-button type="primary" @click="dialogFormVisible = false">取消</el-button>
                 <el-button type="primary" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="submitEditAdvice('adviceForm')">保 存</el-button>
               </template>
               <template v-else>
-                <el-button type="primary" @click="dialogFormVisible = false">取 消</el-button>                
+                <el-button type="primary" @click="dialogFormVisible = false">取 消</el-button>
                 <el-button type="primary" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="submitNewAdvice('adviceForm')">保 存</el-button>
                 <!--<el-button type="primary" @click="submitNewAdvice('adviceForm', 're')" v-if="adviceForm.parent_id==0">继 续</el-button>-->
               </template>
@@ -277,7 +277,7 @@
             </el-form>
             <div slot="footer" class="dialog-footer">
               <template>
-                <el-button type="primary" @click="dialogFormExecutionVisible = false">取消</el-button>                
+                <el-button type="primary" @click="dialogFormExecutionVisible = false">取消</el-button>
                 <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="submitExecuteAdvice">保 存</el-button>
               </template>
             </div>
@@ -975,6 +975,8 @@
                   <el-radio v-model="receiveTreatmentAsses.consciousness" label="1">清醒</el-radio>
                   <el-radio v-model="receiveTreatmentAsses.consciousness" label="2">嗜睡</el-radio>
                   <el-radio v-model="receiveTreatmentAsses.consciousness" label="3">昏迷</el-radio>
+                  <el-radio v-model="receiveTreatmentAsses.consciousness" label="4">模糊</el-radio>
+
                 </el-form-item>
 
                 <el-form-item label="病人食欲 : ">

src/xt_pages/dialysis/schedualPatient.vue

@@ -185,11 +185,20 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       }
     },
     created() {
+      var schedule_type_selected = this.$store.getters.schedule_type_selected
+      var zone_selected = this.$store.getters.zone_selected
+      if(schedule_type_selected){
+        this.schedule_type_selected = schedule_type_selected.schedule_type_selected
+      }
+      if(zone_selected){
+        this.zone_selected = zone_selected.zone_selected
+      }
       this.getInitData()
     },
     methods: {
       handletimeType: function(index) {
         this.schedule_type_selected = index
+        this.$store.dispatch("SetScheduleTypeSelected",{schedule_type_selected:index})
         this.search_keyword = this.search_input = ''
         // this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
         //   zone: this.zone_selected,
@@ -199,6 +208,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       },
       handleZoneChange: function(index) {
         this.zone_selected = index
+        this.$store.dispatch("SetZoneSelected",{zone_selected:index})
         this.search_keyword = this.search_input = ''
         // this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
         //   zone: this.zone_selected,

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -84,7 +84,7 @@
 
 
                     <td width="50">意识:</td>
-                    <td width="180">
+                    <td width="230">
                       <div>
                         <label-box :isChecked='receiverTreatmentAccess.consciousness==1?true:false'
                                    showValue='清醒'></label-box>
@@ -94,6 +94,8 @@
                         &nbsp;
                         <label-box :isChecked='receiverTreatmentAccess.consciousness==3?true:false'
                                    showValue='昏迷'></label-box>
+                        <label-box :isChecked='receiverTreatmentAccess.consciousness==4?true:false'
+                                   showValue='模糊'></label-box>
                       </div>
                     </td>
 

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -84,7 +84,7 @@
 
                     <td></td>
                     <td width="50">意识:</td>
-                    <td width="180">
+                    <td width="230">
                       <div>
                         <label-box :isChecked='receiverTreatmentAccess.consciousness==1?true:false'
                                    showValue='清醒'></label-box>
@@ -94,6 +94,8 @@
                         &nbsp;
                         <label-box :isChecked='receiverTreatmentAccess.consciousness==3?true:false'
                                    showValue='昏迷'></label-box>
+                        <label-box :isChecked='receiverTreatmentAccess.consciousness==4?true:false'
+                                   showValue='模糊'></label-box>
                       </div>
                     </td>
                     <td></td>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -40,7 +40,7 @@
         <div class="inline_block">
           透析号：
             <div class="under_line" style="width: 70px;text-align: center;">
-                {{'/'}}
+              {{patientInfo.dialysis_no}}
             </div>
         </div>
         <div class="inline_block" style="margin-left: 5px;">
@@ -52,7 +52,7 @@
             {{'/'}}
           </div>
         </div>
-        
+
       </div>
       <div class="row" >
         <div class="inline_block" >
@@ -70,7 +70,7 @@
       </div>
 
 
-      <div class="row" :style=" this.totollength > 14?'margin-bottom:400px;':''">
+      <div class="row" :style=" this.totollength > 13?'margin-bottom:400px;':''">
         <table class="proj_table" >
           <tbody>
             <tr><td colspan="2" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">透析前情况</td></tr>
@@ -133,7 +133,7 @@
                   <div class="inline_block" style="margin-left:10px;">
                     血管通路：
                     <div class="under_line" style="width: 200px;text-align: center;">
-                      {{predialysis.blood_access_part_id?blood_access_part[predialysis.blood_access_part_id]['name']:'/'}} {{predialysis.blood_access_part_opera_name}}
+                      {{QueryPartById(predialysis.blood_access_part_id)}} {{predialysis.blood_access_part_opera_name}}
                     </div>
                   </div>
                 </div>
@@ -199,7 +199,7 @@
                   <div class="inline_block" style="margin-left:10px;flex:1;">
                     置换方式：
                     <div class="under_line" style="width: 100px;text-align: center">
-                      /
+                      {{getDisplaceLiquiPart(prescription.displace_liqui_part)}}
                     </div>
                   </div>
                   <div class="inline_block" style="margin-left:10px;flex:1;">
@@ -322,8 +322,11 @@
                   </div>
                   <div class="inline_block" style="margin-left:20px;">
                   维持：
-                    <div class="under_line" style="width: 50px;text-align: center;">
-                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:0}}
+                    <div v-if="prescription.anticoagulant == 1"  class="under_line" style="width: 50px;text-align: center;">
+                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"/"}}
+                    </div>
+                    <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
+                      {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
                     </div>
                     lu
                   </div>
@@ -360,7 +363,7 @@
                       <td width="50">电导度<br/>(ms/cm)</td>
                       <td width="50">超滤量<br/>(ml)</td>
                       <td width="200">病情变化及处理</td>
-        
+
                       <!-- <td width="100">时间</td>
                       <td width="30">T<br>C°</td>
                       <td width="30">P<br/>次/分</td>
@@ -384,15 +387,14 @@
                       <td>{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:0}}</td>
                       <td>{{monitor.dialysate_temperature?monitor.dialysate_temperature:''}}</td>
                       <td>{{monitor.sodium_concentration?monitor.sodium_concentration:''}}</td>
-                      <td v-if="monitor.systolic_blood_pressure  > 0">{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
-                      <td v-else> </td>
+                      <td>{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
                       <td style="line-height:16px;padding:0px;">
-                        <div style="height:40px;line-height:40px; overflow:hidden;">
+                        <div style="min-height:40px;line-height:40px; overflow:hidden;">
                           <span style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
                             <template v-if="monindex == 0">【开始透析】</template>
-                            <template v-if="(monindex == monitors.length - 1) && monindex >= 1">【结束透析】</template>
-                            {{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}} 
-                          </span> 
+                            {{monitor.end}}
+                            {{monitor.symptom}}  &nbsp;{{monitor.dispose}} &nbsp;{{monitor.result}}
+                          </span>
                         </div>
                       </td>
                     </tr>
@@ -444,11 +446,11 @@
                           <span v-if="advice.parent_id > 0">---></span>
                           <span >{{advice.advice_name }}</span>
                           <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
-                          <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                          <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>
-                          <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.delivery_way}}</span>
-                          <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.execution_frequency}}</span>
-                          <span v-if="advice.parent_id == 0 && advice.children &&  advice.children.length == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
+                          <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                          <!-- <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span> -->
+                          <span v-if="advice.parent_id == 0 ">{{advice.delivery_way}}</span>
+                          <span v-if="advice.parent_id == 0  ">{{advice.execution_frequency}}</span>
+                          <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
                         </td>
                         <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
                           <span>{{advice.delivery_way}}</span>
@@ -480,7 +482,7 @@
           </tbody>
         </table>
       </div>
-      <template v-if="this.totollength > 14">
+      <template v-if="this.totollength > 13">
         <div style="display:inline-block;width:100%;text-align:center;">
           <div class="order-yy-name" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">{{orgname}}</div>
           <div class="order-title" style="letter-spacing: 0;font-weight:600;font-size:22px;display:inline-block;">血液净化治疗记录单</div>
@@ -520,7 +522,7 @@
           <div class="inline_block">
             透析号：
               <div class="under_line" style="width: 70px;text-align: center;">
-                  {{'/'}}
+                {{patientInfo.dialysis_no}}
               </div>
           </div>
           <div class="inline_block" style="margin-left: 5px;">
@@ -591,9 +593,9 @@
                 </div>
               </div>
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                <div class="inline_block" style="flex:1;">
+                <div class="inline_block" style="flex:2;">
                   凝血程度：
-                  <div class="under_line" style="width: 100px;text-align: center">
+                  <div class="under_line" style="width: 200px;text-align: center">
                     {{afterdialysis.cruor?afterdialysis.cruor:'/'}}
                   </div>
                 </div>
@@ -605,46 +607,63 @@
                 </div>
                 <div class="inline_block" style="flex:1;">
                   导管：
-                  <div class="under_line" style="width: 150px;text-align: center">
+                  <div class="under_line" style="width: 100px;text-align: center">
                     {{afterdialysis.catheter?afterdialysis.catheter:'/'}}
                   </div>
                 </div>
-              </div>
-
-              <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
-                <div class="inline_block" style="flex:1;">
+                <div class="inline_block" style="flex:1.5;">
                   实际治疗时间：
-                  <div class="under_line" style="width: 50px;text-align: center">
+                  <div class="under_line" style="width: 30px;text-align: center">
                     {{afterdialysis.actual_treatment_hour?afterdialysis.actual_treatment_hour:'/'}}
                   </div>
                   h
-                  <div class="under_line" style="width: 50px;text-align: center">
+                  <div class="under_line" style="width: 30px;text-align: center">
                     {{afterdialysis.actual_treatment_minute?afterdialysis.actual_treatment_minute:0}}
                   </div>
                   min
                 </div>
+              </div>
+
+              <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+
                 <div class="inline_block" style="flex:1;">
                   透后体重：
                   <div class="under_line" style="width: 70px;text-align: center">
                     {{afterdialysis.weight_after?afterdialysis.weight_after:'/'}}
-                  </div>
+                  </div>kg
+                </div>
+
+                <div class="inline_block" style="flex:1;">
+                  体重减少：
+                  <div class="under_line" style="width: 70px;text-align: center">
+                    {{afterdialysis.weight_loss?afterdialysis.weight_loss:'/'}}
+                  </div>kg
                 </div>
+
+                <div class="inline_block" style="flex:1;">
+                  透析中入量：
+                  <div class="under_line" style="width: 70px;text-align: center">
+                    {{afterdialysis.dialysis_intakes?afterdialysis.dialysis_intakes:'/'}}
+                  </div>{{getUnit(afterdialysis.dialysis_intakes_unit)}}
+                </div>
+
                 <div class="inline_block" style="flex:1;">
                   实际超滤量：
-                  <div class="under_line" style="width: 150px;text-align: center">
+                  <div class="under_line" style="width: 70px;text-align: center">
                     {{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:'/'}}
                   </div>ml
                 </div>
               </div>
 
+
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                 <div class="inline_block" style="flex:1;">
                   治疗小结：
-                  <div class="under_line" style="width: 300px;text-align: center">
-                    {{summary.dialysis_summary?summary.dialysis_summary:'/'}}
-                  </div>
+                  <div class="under_line" style="width: 90%;line-height: 25px;text-align: left;margin-left: 2px; display:inline-block;"> {{summary.dialysis_summary?summary.dialysis_summary:'/'}}</div>
+
                 </div>
               </div>
+
             </td>
           </tr>
           <tr>
@@ -706,7 +725,7 @@
       </div>
     </div>
 
-   
+
   </div>
 
 </template>
@@ -746,6 +765,7 @@
         dialysisOrder: {
           DeviceNumber: []
         },
+        displaceLiquiPartOptions: [],
         operatorMaps: {},
         complications: ['低血压', '高血压', '心律失常', '头晕', '头痛', '呕吐', '抽搐', '出血', '心衰', '腹痛'],
         jilurow: 0,
@@ -824,6 +844,40 @@
       }
     },
     methods: {
+       getDisplaceLiquiPart: function (val) {
+        let displace_liqui_part_name = '/'
+        let displace_liqui_part = this.displaceLiquiPartOptions
+        for (let i = 0; i < displace_liqui_part.length; i++) {
+          if (displace_liqui_part[i].id == val) {
+            displace_liqui_part_name = displace_liqui_part[i].name
+          }
+        }
+        return displace_liqui_part_name
+      },
+        replacementWaysById: function (val) {
+        let replacementWaysname = '/'
+        // let vascular_access = getDataConfig('hemodialysis', 'vascular_access')
+
+        for (let i = 0; i < this.replacementWays.length; i++) {
+          if (this.replacementWays[i].id == val) {
+            replacementWaysname = this.replacementWays[i].name
+          }
+        }
+        return replacementWaysname
+
+      },
+      QueryPartById: function (val) {
+        let vascular_access_part_name = '/'
+        let vascular_access = getDataConfig('hemodialysis', 'vascular_access')
+
+        for (let i = 0; i < vascular_access.length; i++) {
+          if (vascular_access[i].id == val) {
+            vascular_access_part_name = vascular_access[i].name
+          }
+        }
+        return vascular_access_part_name
+
+      },
       getAdminUser(id) {
         if (id == 0) {
           return ''
@@ -846,6 +900,17 @@
         }
         return ''
       },
+      getUnit:function (val) {
+        switch (val) {
+          case 1:
+            return "g"
+            break
+          case 2:
+            return "ml"
+            break
+
+        }
+      },
       printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
@@ -1007,7 +1072,7 @@
           if (this.monitors.length <= 6) {
             var nl = 6
             this.print_length = 6
-            
+
             for (let index = 0; index < nl; index++) {
               if (this.monitors[index] == undefined || this.monitors[index].length <= 0) {
                 this.monitors2.push([])
@@ -1017,7 +1082,23 @@
             }
           }
 
-     
+          var tempmonitorflag = true;
+          for (let index = 0; index < this.monitors.length; index++) {
+            const monitor = this.monitors[index];
+            this.monitors[index].end =""
+            if(Object.keys(monitor).length > 0 && index > 1){
+              if(monitor.operate_time == this.dialysisOrder.end_time){
+                this.monitors[index].end ="【结束透析】"
+                tempmonitorflag = false
+              }
+              if(tempmonitorflag && index == this.monitors.length-1){
+                  this.monitors[index].end ="【结束透析】"
+              }
+            }
+
+          }
+
+
           this.jilurow = this.monitors.length + 1
 
           this.advice_jilurow = this.advices.length + 1
@@ -1081,7 +1162,7 @@
           for (let index = 0; index < this.doctor_advices.length; index++) {
             this.doctor_advices[index]['isShow'] = 2
           }
-          
+
           // if (this.doctor_advices.length > 0) {
           //   var group = this.newAdviceGroupObject()
           //   var initGroupBlock = function(group, advice) {
@@ -1112,7 +1193,7 @@
           //       // this.doctor_advices.push(doctor_advice)
           //     }
           //   }
-            
+
           //   for (let index = 0; index < this.doctor_advices.length; index++) {
           //     const advice = this.doctor_advices[index]
           //     if (advice.groupno == 0) {
@@ -1160,11 +1241,11 @@
           //    this.advice_groups.push(group)
           //   }
           // }
-    
+
           if (this.doctor_advices.length <= 6) {
             var nl = 6
             this.print_length = 6
-            
+
             for (let index = 0; index < nl; index++) {
               if (this.doctor_advices[index] == undefined || this.doctor_advices[index].length <= 0) {
                 this.doctor_advices.push([])
@@ -1272,6 +1353,7 @@
       this.replacementWays = this.$store.getters.replacement_ways
       this.perfusionApparatus = this.$store.getters.perfusion_apparatus
       this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
+      this.displaceLiquiPartOptions = this.$store.getters.displace_liqui
 
       this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
       this.blood_access_part_opera = getDataConfig('hemodialysis', 'vascular_access_desc')

src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue

@@ -84,7 +84,7 @@
 
                     <td></td>
                     <td width="50">意识:</td>
-                    <td width="180">
+                    <td width="220">
                       <div>
                         <label-box :isChecked='receiverTreatmentAccess.consciousness==1?true:false'
                                    showValue='清醒'></label-box>
@@ -94,6 +94,8 @@
                         &nbsp;
                         <label-box :isChecked='receiverTreatmentAccess.consciousness==3?true:false'
                                    showValue='昏迷'></label-box>
+                        <label-box :isChecked='receiverTreatmentAccess.consciousness==4?true:false'
+                                   showValue='模糊'></label-box>
                       </div>
                     </td>
                     <td></td>

src/xt_pages/dialysis/template/dialysisPrintOrderFive.vue

@@ -87,6 +87,8 @@
                   <check-box text="清醒" :checked="receiverTreatmentAccess.consciousness==1?true:false"></check-box>
                   <check-box text="嗜睡" :checked="receiverTreatmentAccess.consciousness==2?true:false"></check-box>
                   <check-box text="昏迷" :checked="receiverTreatmentAccess.consciousness==3?true:false"></check-box>
+                  <check-box text="模糊" :checked="receiverTreatmentAccess.consciousness==4?true:false"></check-box>
+
                 </div>
                 <div class="inline_block"  style="margin-left: 5px;">
                   活动性出血：

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -75,8 +75,10 @@
                   <check-box text="清醒" :checked="receiverTreatmentAccess.consciousness==1?true:false"></check-box>
                   <check-box text="嗜睡" :checked="receiverTreatmentAccess.consciousness==2?true:false"></check-box>
                   <check-box text="昏迷" :checked="receiverTreatmentAccess.consciousness==3?true:false"></check-box>
+                  <check-box text="模糊" :checked="receiverTreatmentAccess.consciousness==4?true:false"></check-box>
+
                 </div>
-                <div class="inline_block"  style="margin-left: 5px;">
+                <div class="inline_block" >
                   活动性出血：
                   <check-box text="无" :checked="predialysis.is_hemorrhage==2?true:false"></check-box>
                   <check-box text="异常" :checked="predialysis.is_hemorrhage==1?true:false"></check-box>
@@ -1624,6 +1626,7 @@
       this.orgname = xtuser.org.org_name
       // this.orgname = "遂溪方济医院";
       this.modeOptions = this.$store.getters.treatment_mode
+
       this.replacementWays = this.$store.getters.replacement_ways
       this.perfusionApparatus = this.$store.getters.perfusion_apparatus
       this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit

src/xt_pages/user/doctorAdvice.vue

@@ -396,7 +396,7 @@
         <div slot="footer" class="dialog-footer">
           <el-button
             :disabled="$store.getters.xt_user.subscibe.state==3 || groupForm.adviceNames.length == 0?true:false"
-            type="primary" @click="submitgroupAdvice('groupForm')">保 存
+            type="primary" @click="submitgroupAdvice('groupForm')" :loading="addLoading">保 存
           </el-button>
         </div>
       </el-dialog>
@@ -1176,6 +1176,7 @@
     EditDoctorAdvice,
     ExecGroupAdvice,
     getAdviceConfig,
+    getAllAdviceConfig,
     getDoctorAdviceList,
     StopDoctorAdvice,
     StopGroupAdvice
@@ -1370,6 +1371,7 @@
           keywords: '',
           id: 0
         },
+        addLoading:false,
         lstableData: [],
         cqtableData: [],
         groupSelectRow: null,
@@ -1449,6 +1451,7 @@
         })
       },
       submitgroupAdvice(formName) {
+        this.addLoading = true
         this.$refs[formName].validate(valid => {
           if (valid) {
             var submitForm = {
@@ -1470,8 +1473,13 @@
             CreateGroupAdvice(this.patientID, 0, submitForm).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
+                this.addLoading = false
+
                 return false
+
               } else {
+                this.addLoading = false
+
                 this.$notify({
                   title: '成功',
                   message: '新增成功',
@@ -1592,8 +1600,7 @@
       submitStopAdvice(formName) {
         this.$refs[formName].validate(valid => {
           if (valid) {
-            // StopDoctorAdvice(this.stopForm.id, this.stopForm).then(response=>{
-            StopGroupAdvice(this.stopForm.groupno, this.stopForm).then(
+            StopDoctorAdvice(this.stopForm.id, this.stopForm).then(
               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -1607,11 +1614,20 @@
                   })
                   // this.stopResetData(this.stopForm.id);
                   var atlen = this.adviceTableData.length
+                  var _this = this
                   for (let index = atlen - 1; index >= 0; index--) {
-                    if (
-                      this.adviceTableData[index].groupno == this.stopForm.groupno
-                    ) {
-                      this.adviceTableData.splice(index, 1)
+
+                    if (this.adviceTableData[index].id == this.stopForm.id ||this.adviceTableData[index].parent_id == this.stopForm.id ) {
+
+
+                      if(_this.stopType == 0){
+                        this.adviceTableData[index].stop_state = response.data.data.advice.stop_state
+                        this.adviceTableData[index].stop_doctor =response.data.data.advice.stop_doctor
+                        this.adviceTableData[index].stop_time = response.data.data.advice.stop_time
+                      }else if(_this.stopType == 2){
+                        this.adviceTableData.splice(index, 1)
+                      }
+
                     }
                   }
                   this.dialogStopFormVisible = false
@@ -3254,8 +3270,7 @@
         if (
           columnIndex === 0 ||
           columnIndex === 1 ||
-          columnIndex === 2 ||
-          columnIndex >= 9
+          columnIndex === 2
         ) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
@@ -3311,6 +3326,19 @@
           value = value + charactors.charAt(i)
         }
         return value
+      },getAllAdviceConfig:function() {
+
+        getAllAdviceConfig().then(response => {
+          if (response.data.state == 1) {
+            this.deliveryWayOptions =
+              response.data.data.drugways === null
+                ? []
+                : response.data.data.drugways
+            this.executionFrequencyOptions =
+              response.data.data.efs === null ? [] : response.data.data.efs
+
+          }
+        })
       }
     },
     watch: {
@@ -3363,7 +3391,7 @@
 
       // this.fetchAllDoctorAndNurse();
       this.fetchAllAdminUsers()
-      // this.getAdviceConfig()
+      this.getAllAdviceConfig()
       this.getList()
       const params = {
         id: this.patientID