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

src/api/advice.js

@@ -519,3 +519,11 @@ export function GetOrderDoctorAdvice(params) {
     params: params
   })
 }
+
+export function getPatientSchedule(params) {
+  return request({
+    url: '/api/schedule/getpatientshedule',
+    method: 'get',
+    params: params
+  })
+}

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -68,7 +68,8 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     puncture_way: puncture_way,
     dialysis_dialyszers: dialysis_dialyszers,
     dialysis_irrigation: dialysis_irrigation,
-    blood_access_id: blood_access_id
+    blood_access_id: blood_access_id,
+    nuclein_date: nuclein_date
   }
   console.log('params', params)
   return request({

src/xt_pages/dialysis/PatientBox.vue

@@ -93,67 +93,70 @@
       </div>
       <div class="dislysisInfo">
         <p>
-          体重(前/后kg):
-          {{
-            schedule.assessment_before_dislysis
-              ? schedule.assessment_before_dislysis.weight_before
-              : ""
-          }}
-          <span
-            v-if="
-              schedule.assessment_after_dislysis &&
-              schedule.assessment_after_dislysis.weight_after > 0
-            "
-            >/{{
-              schedule.assessment_after_dislysis
-                ? schedule.assessment_after_dislysis.weight_after
-                : ""
-            }}</span
-          >
+          <span  v-if="$store.getters.xt_user.org.id!=9671 && $store.getters.xt_user.org.id!=9675 && $store.getters.xt_user.org.id!=10340 ">
+            体重(前/后kg):
+            {{schedule.assessment_before_dislysis? schedule.assessment_before_dislysis.weight_before: ""}}
+            <span v-if="schedule.assessment_after_dislysis &&schedule.assessment_after_dislysis.weight_after > 0">/{{schedule.assessment_after_dislysis? schedule.assessment_after_dislysis.weight_after: ""}}</span>
+          </span>
+          <span v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
+            核酸检测日期:<span v-if="schedule.dialysis_order!=null">{{getTimeOne(schedule.dialysis_order.nuclein_date)}}</span>
+          </span>
         </p>
         <p>
-          目标超滤量:
-          <span
-            v-if="
-              schedule.prescription &&
-              schedule.prescription.target_ultrafiltration > 0
-            "
-            >{{
-              schedule.prescription
-                ? schedule.prescription.target_ultrafiltration
-                : ""
-            }}</span
-          >
+          <span  v-if="$store.getters.xt_user.org.id!=9671 && $store.getters.xt_user.org.id!=9675 && $store.getters.xt_user.org.id!=10340 ">
+              目标超滤量:
+            <span v-if=" schedule.prescription && schedule.prescription.target_ultrafiltration > 0">
+               {{schedule.prescription? schedule.prescription.target_ultrafiltration: ""}}
+            </span>
+          </span>
+
+          <span  v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
+             抗凝剂:
+             <span v-if="schedule.prescription!=null">
+                <span v-if="schedule.prescription.anticoagulant == 1">无肝素</span>
+                <span v-if="schedule.prescription.anticoagulant == 2">普通肝素</span>
+                <span v-if="schedule.prescription.anticoagulant == 3">低分子肝素</span>
+                <span v-if="schedule.prescription.anticoagulant == 4">阿加曲班</span>
+                <span v-if="schedule.prescription.anticoagulant == 5">枸橼酸钠</span>
+                <span v-if="schedule.prescription.anticoagulant == 6">低分子肝素钙</span>
+                <span v-if="schedule.prescription.anticoagulant == 7">低分子肝素钠</span>
+                <span v-if="schedule.prescription.anticoagulant == 8">依诺肝素</span>
+                <span v-if="schedule.prescription.anticoagulant == 9">达肝素</span>
+                <span v-if="schedule.prescription.anticoagulant == 10">体外抗凝</span>
+                <span v-if="schedule.prescription.anticoagulant == 11">那屈肝素</span>
+                <span v-if="schedule.prescription.anticoagulant == 12">无抗凝剂</span>
+                <span v-if="schedule.prescription.anticoagulant == 13">那屈肝素钙</span>
+             </span>
+          </span>
         </p>
-        <p
-          :title="
-            schedule.prescription
-              ? schedule.prescription.dialyzer_perfusion_apparatus
-              : ''
-          "
-        >
-          透析器/灌流器:{{
-            schedule.prescription
-              ? schedule.prescription.dialyzer_perfusion_apparatus
-              : ""
-          }}
-          <span v-if="schedule.prescription != null">{{
-            schedule.prescription
-              ? schedule.prescription.dialysis_dialyszers
-              : ""
-          }}</span>
-          <span
-            v-if="
-              schedule.prescription != null &&
-              schedule.prescription.dialysis_irrigation != ''
-            "
-            >/</span
-          >
-          <span v-if="schedule.prescription != null">{{
-            schedule.prescription
-              ? schedule.prescription.dialysis_irrigation
-              : ""
-          }}</span>
+        <p  v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
+           总量:
+              <span v-if="schedule.prescription!=null">
+              <span v-if="schedule.prescription.anticoagulant == 1">{{schedule.prescription.anticoagulant_zongliang}}mg</span>
+              <span v-if="schedule.prescription.anticoagulant == 2">{{schedule.prescription.anticoagulant_zongliang}}mg</span>
+              <span v-if="schedule.prescription.anticoagulant == 3">{{schedule.prescription.anticoagulant_zongliang}}iu</span>
+              <span v-if="schedule.prescription.anticoagulant == 4">{{schedule.prescription.anticoagulant_zongliang}}mg</span>
+              <span v-if="schedule.prescription.anticoagulant == 5">{{schedule.prescription.anticoagulant_zongliang}}mg</span>
+              <span v-if="schedule.prescription.anticoagulant == 6">{{schedule.prescription.anticoagulant_zongliang}}iu</span>
+              <span v-if="schedule.prescription.anticoagulant == 7">{{schedule.prescription.anticoagulant_zongliang}}iu</span>
+              <span v-if="schedule.prescription.anticoagulant == 8">{{schedule.prescription.anticoagulant_zongliang}}iu</span>
+              <span v-if="schedule.prescription.anticoagulant == 9">{{schedule.prescription.anticoagulant_zongliang}}iu</span>
+              <span v-if="schedule.prescription.anticoagulant == 10">{{schedule.prescription.anticoagulant_zongliang}}iu</span>
+              <span v-if="schedule.prescription.anticoagulant == 11">{{schedule.prescription.anticoagulant_zongliang}}mg</span>
+              <span v-if="schedule.prescription.anticoagulant == 12">{{schedule.prescription.anticoagulant_zongliang}}iu</span>
+              <span v-if="schedule.prescription.anticoagulant == 13">{{schedule.prescription.anticoagulant_zongliang}}mg</span>
+             </span>
+        </p>
+
+
+        <p :title="schedule.prescription? schedule.prescription.dialyzer_perfusion_apparatus: ''">
+          透析器/灌流器:{{schedule.prescription? schedule.prescription.dialyzer_perfusion_apparatus: ""}}
+          <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_dialyszers: ""}}</span>
+          <span v-if="schedule.prescription != null &&schedule.prescription.dialysis_irrigation != ''">/</span>
+          <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_irrigation: ""}}</span>
+        </p>
+        <p v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
+           备注:{{schedule.patient.sch_remark}}
         </p>
       </div>
       <div
@@ -234,6 +237,7 @@
 </template>
 
 <script>
+import { uParseTime } from '@/utils/tools'
 import { parseTime } from "@/utils";
 import { jsGetAge } from "@/utils/tools";
 import dialysisPrescriptionDialog from "../dialysis/details/dialog/dialysisPrescriptionDialog";
@@ -344,6 +348,13 @@ export default {
   },
 
   methods: {
+    getTimeOne(val) {
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
     stateColor: function (schedual) {
       var state = this.computeState(schedual);
       if (state == 1) {
@@ -718,7 +729,7 @@ export default {
       this.$emit("advice");
     },
     open(schedual) {
-      console.log("处方23332233232",this.admin_users)
+    
       this.date = schedual.schedule_date;
       this.patient_id = schedual.patient_id;
       this.modedata = 1;
@@ -759,6 +770,7 @@ export default {
         return "modePurple";
       }
     },
+    
   },
 };
 </script>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -60,17 +60,48 @@
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 &&  this.$store.getters.xt_user.template_info.template_id != 23 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 10234">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 10234 )">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3" >
+            
+              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
+                  {{ anticoagulant_zongliang != "0" ? "mg" : "" }}
+              </span>
+              <span v-else>
+                {{ anticoagulant_zongliang != "0" ? "iu" : "" }}
+              </span>
+            </span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
+               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
+                  {{ anticoagulant_zongliang != "0" ? "mg" : "" }}
+              </span>
+              <span v-else>
+                {{ anticoagulant_zongliang != "0" ? "iu" : "" }}
+              </span>
+            </span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5">{{ anticoagulant_zongliang != "0" ? "ml" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">
+               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
+                  {{ anticoagulant_zongliang != "0" ? "mg" : "" }}
+              </span>
+              <span v-else>
+                {{ anticoagulant_zongliang != "0" ? "iu" : "" }}
+              </span>
+            </span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">
+              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
+                  {{ anticoagulant_zongliang != "0" ? "mg" : "" }}
+              </span>
+              <span v-else>
+                {{ anticoagulant_zongliang != "0" ? "iu" : "" }}
+              </span>
+            </span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9">{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
           </span>
           <span v-else>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2">
+              {{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-else>{{ anticoagulant_zongliang != "0" ? "iu" : "" }}</span>
           </span>
         </li>
@@ -111,8 +142,8 @@
           <label>目标超滤量 : </label>
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
           
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 48 && this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10345  && this.$store.getters.xt_user.template_info.org_id != 10346  && this.$store.getters.xt_user.template_info.org_id != 10395  && this.$store.getters.xt_user.template_info.template_id!=60  && this.$store.getters.xt_user.template_info.org_id != 10340  && this.$store.getters.xt_user.template_info.org_id != 10430"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 45 || this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345  || this.$store.getters.xt_user.template_info.org_id == 10346  || this.$store.getters.xt_user.template_info.org_id == 10395 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
         </li>
 
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">
@@ -149,12 +180,27 @@
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" ></span>
             <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && this.$store.getters.xt_user.template_info.template_id != 13  && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 ">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
             <span class="unit"  v-if="getValueStr('anticoagulant', 'anticoagulant') == 2  && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
+              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
+                 {{ anticoagulant_shouji != "0" ? "mg" : "" }}
+              </span>
+              <span v-else> {{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            </span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span >
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5" >{{ anticoagulant_shouji != "0" ? "mg" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span >
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6" >
+             <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
+                 {{ anticoagulant_shouji != "0" ? "mg" : "" }}
+              </span>
+              <span v-else> {{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            </span >
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7" >
+              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671">
+                 {{ anticoagulant_shouji != "0" ? "mg" : "" }}
+              </span>
+              <span v-else> {{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
+            </span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9" >{{ anticoagulant_shouji != "0" ? "iu" : "" }}</span>
           </span>
@@ -245,12 +291,27 @@
             <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1"></span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && this.$store.getters.xt_user.template_info.template_id != 13 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 38 ">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 2 && (this.$store.getters.xt_user.template_info.template_id == 13 ||  this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 40 || this.$store.getters.xt_user.template_info.template_id == 38)">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 3">
+              <span v-if="this.$store.getters.xt_user.template_info.org_id ==9671">
+              {{ anticoagulant_weichi != "0" ? "mg/h" : "" }}
+              </span> 
+              <span v-else>{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            </span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 1">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_weichi != "0" ? "mg/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5">{{ anticoagulant_weichi != "0" ? "ml/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
-            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">
+             <span v-if="this.$store.getters.xt_user.template_info.org_id ==9671">
+              {{ anticoagulant_weichi != "0" ? "mg/h" : "" }}
+              </span> 
+              <span v-else>{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            </span>
+            <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">
+             <span v-if="this.$store.getters.xt_user.template_info.org_id ==9671">
+              {{ anticoagulant_weichi != "0" ? "mg/h" : "" }}
+              </span> 
+              <span v-else>{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
+            </span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 8">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 9">{{ anticoagulant_weichi != "0" ? "iu/h" : "" }}</span>
           </span>
@@ -352,7 +413,7 @@
         </li>
 
         <li v-if="isShow('单超脱水')">
-          <label>单超脱水(L): </label>
+          <label>单超脱水(ml): </label>
           <span class="content">{{this.prescription.single_water}}</span>
         </li>
 
@@ -400,6 +461,12 @@
             <span>{{this.prescription.max_ultrafiltration_rate}}</span>
            </span>
         </li>
+
+    
+        <li v-if="isShow('曲线脱水')">
+          <label>曲线脱水(ml): </label>
+          <span class="content">{{this.prescription.drhy_water}}</span>
+        </li>
        
       </ul>
     </div>

src/xt_pages/dialysis/details/NavIgation.vue

@@ -91,6 +91,7 @@
       :stockType="stockType"
       :lastAssessment="lastAssessment"
       :mode_id="mode_id"
+    
     ></dialysis-prescription-dialog>
 
     <double-check-dialog
@@ -152,6 +153,7 @@
       :special_premission="special_premission"
       :patient="patient"
       :stockType="stockType"
+      :lastOrder="lastOrder"
     ></computer-dialog>
 
     <monitor-dialog
@@ -179,6 +181,8 @@
       ref="assessment_after_dislysis"
       :assessment_after_dislysis="assessment_after_dislysis"
       :patient="patient"
+      :prescription="prescription"
+      :predialysis_evaluation="predialysis_evaluation"
       :dialysis_order="dialysis_order"
     ></assessment-after-dislysis>
   </div>
@@ -553,6 +557,13 @@ export default {
         return 0;
       }
     },
+   lastOrder: {
+      // 患者排班信息
+      type: Object,
+      default: () => {
+        return { id: 0 };
+      }
+    },
   },
   methods: {
     getUnReadNum: function() {
@@ -645,7 +656,7 @@ export default {
       this.$refs.doctor_advice.show(this.his_is_open,this.is_advice_open);
     },
     showComputerDialog: function() {
-      this.$refs.computer_dialog.show(this.dialysis_order);
+      this.$refs.computer_dialog.show(this.dialysis_order,this.lastOrder);
     },
     showFinishDialog: function() {
       this.$refs.finish_dialog.show(this.dialysis_order);

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340" >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430"  >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -541,11 +541,14 @@
                 }
               
                  for(let i=0;i<list.length;i++){
-                   for(let j=0;j<list[i].his_prescription_template.his_prescription_info.length;j++){
+                   if(list[i].his_prescription_template.his_prescription_info!=null && list[i].his_prescription_template.his_prescription_info.length >0){
+                    for(let j=0;j<list[i].his_prescription_template.his_prescription_info.length;j++){
                      for(let z=0;z<list[i].his_prescription_template.his_prescription_info[j].project.length;z++){
                         list[i].projectList.push(list[i].his_prescription_template.his_prescription_info[j].project[z])
                      }
                    }
+                   }
+                   
                  }
                 console.log("list列表",list)
                  this.list = list 
@@ -793,10 +796,12 @@
             this.startHisDialogVisible = true
              var projectList = []
              for(let i=0;i<list.length;i++){
-                for(let j=0;j<list[i].his_prescription_template.his_prescription_info.length;j++){
-                  for(let z=0;z<list[i].his_prescription_template.his_prescription_info[j].project.length;z++){
-                    projectList.push(list[i].his_prescription_template.his_prescription_info[j].project[z])
-                  }
+                if(list[i].his_prescription_template.his_prescription_info!=null && list[i].his_prescription_template.his_prescription_info.length>0){
+                    for(let j=0;j<list[i].his_prescription_template.his_prescription_info.length;j++){
+                      for(let z=0;z<list[i].his_prescription_template.his_prescription_info[j].project.length;z++){
+                        projectList.push(list[i].his_prescription_template.his_prescription_info[j].project[z])
+                      }
+                     }
                 }
              }
              console.log("projectList",projectList)

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 "  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>
@@ -682,7 +682,21 @@ export default {
       default: () => {
         return { id: 0 }
       }
-    }
+    },
+     prescription: {
+      // 透析记录
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
+    predialysis_evaluation: {
+      // 透析记录
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    },
   },
   data() {
     return {
@@ -1179,7 +1193,7 @@ export default {
 
     // 数据开始
     show(predialysis,last_after) {
-      console.log("predialysis",predialysis)
+      console.log("透后体重2332233223wo",predialysis)
       this.isVisibility = true
       this.predialysis = predialysis
       this.form.observation_content = predialysis.observation_content
@@ -1197,6 +1211,17 @@ export default {
       if(predialysis.id > 0){
         this.form.hypopiesia = predialysis.hypopiesia.toString()
       }
+     
+      //针对长沙南雅 ，透后体重 - 目标超滤量
+      // if(predialysis.id > 0){
+      //  if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10340){
+      //    if(predialysis.weight_after == 0){
+      //      if(this.predialysis_evaluation!=null && this.prescription.target_ultrafiltration!=null){
+      //        this.form.weight_after = this.predialysis_evaluation.weight_before - (this.prescription.target_ultrafiltration/1000)
+      //      }  
+      //    }
+      //  }
+      // }
 
 
 
@@ -1223,6 +1248,13 @@ export default {
         if(last_after.id > 0){
           this.form.hypopiesia = last_after.hypopiesia.toString()
         }
+        //针对长沙南雅 ，透后体重 - 目标超滤量
+        // if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10340){
+        //    if(this.prescription!=null && this.predialysis_evaluation!=null){
+        //     this.form.weight_after = this.predialysis_evaluation.weight_before - (this.prescription.target_ultrafiltration/1000)
+        //    }
+          
+        // }
       }
 
 

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

@@ -591,6 +591,7 @@
       :patientID="patient.id"
       :adviceTableData="doctor_advices"
       :recordDate="record_date"
+      :schedulePatient="schedulePatient"
       ref="addGroupForm"
     ></add-group-advice>
 
@@ -623,7 +624,8 @@
     EditDoctorAdvice,
     ExecDoctorAdvice,
     getAdviceConfig,
-    GetLastOrNextDoctorAdvice
+    GetLastOrNextDoctorAdvice,
+    getPatientSchedule
   } from '@/api/advice'
   import { getDataConfig } from '@/utils/data'
 
@@ -780,6 +782,7 @@
         drug_id: 0,
         src_type:"",
         org_id:0,
+        schedulePatient:{},
       }
     },
     watch: {
@@ -2559,6 +2562,19 @@
        console.log("this.form.drug_id",this.form.drug_id)
 
        // this.form.id = tmp.id
+     },
+     getPatientSchedule(){
+        var params = {
+          patient_id:this.$route.query.patient_id,
+          schedule_date:this.$route.query.date,
+        }
+       getPatientSchedule(params).then(response=>{
+           if(response.data.state == 1){
+              var schedulePatient = response.data.data.schedulePatient
+              console.log("schedulePatient23332322323wo",schedulePatient)
+              this.schedulePatient = schedulePatient
+           }
+       })
      }
     },
     created() {
@@ -2576,6 +2592,7 @@
       // this.getDialysisScheduleDetail()
        //获取自备药
       this.getSelfMedicalList()
+      this.getPatientSchedule()
     },
     components: {
       AddGroupAdvice,

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

@@ -706,7 +706,12 @@ export default {
         return { id: 0 }
       }
     },
-
+    schedulePatient:{
+      type: Object,
+      default: () => {
+        return { id: 0 }
+      }
+    }
   },
   methods: {
     lili(val){
@@ -1551,6 +1556,37 @@ export default {
           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
         }
       }
+      
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340){
+         var date = new Date()
+          var year = date.getFullYear()
+          var month = date.getMonth() + 1
+          var day = date.getDate()
+
+          var hours = date.getHours()
+          var minites = date.getMinutes()
+
+          if (month < 10) {
+            month = '0' + month
+          }
+          if (day < 10) {
+            day = '0' + day
+          }
+          if (hours < 10) {
+            hours = '0' + hours
+          }
+          if (minites < 10) {
+            minites = '0' + minites
+          }
+          if (this.schedulePatient.schedule_type == 1) {
+            this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + '07:00'
+          } else if (this.schedulePatient.schedule_type == 2) {
+            this.groupForm.start_time= year + '-' + month + '-' + day + ' ' + '11:00'
+          } else if (this.schedulePatient.schedule_type == 3) {
+           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
+          }
+      }
+
     },
     selectAllTemplateAdvice(selection) {
       console.log("params",selection)

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

@@ -117,6 +117,18 @@
             </el-select>
        </el-form-item>
 
+       <el-form-item label="核酸检测日期:" style="width:300px"  v-if="isShowFiled('核酸检测日期')">
+          <el-date-picker
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择时间"
+            v-model="form.nuclein_date"
+            style="width:100%;"
+          ></el-date-picker>
+        </el-form-item>
+
+
         <el-form-item label="上机时间 :" style="width:300px"  v-if="isShowFiled('上机时间')">
           <el-date-picker
             type="datetime"
@@ -146,12 +158,13 @@
 <script>
   import axios from 'axios'
   import { GetSchedualNumber, PostModifyStartDialysis, startDialysis } from '@/api/dialysis_record'
+  import { uParseTime } from '@/utils/tools'
   import { getDataConfig } from '@/utils/data'
   import { parseTime } from '@/utils'
   import store from '@/store'
   import multiSelectBox from './MultiSelectBox'
   import request from '@/utils/request'
-
+  const moment = require('moment')
   export default {
     name: 'ComputerDialog',
     components: {
@@ -185,6 +198,7 @@
           dialysis_dialyszers:"",
           dialysis_irrigation:"",
           blood_access_id:"",
+          nuclein_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
         },
         blood_access_option:[],
         schedual_type: 0,
@@ -235,6 +249,9 @@
           return []
         }
       },
+      lastOrder:{
+        type: Object
+      },
     }, mounted() {
 
     },
@@ -303,6 +320,7 @@
         this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers
         this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation
         this.form.blood_access_id = this.dialysis_order.blood_access_id
+        this.form.nuclein_date = this.dialysis_order.id == 0?this.getTimeOne(this.lastOrder.nuclein_date): this.getTimeOne(this.dialysis_order.nuclein_date)
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -442,9 +460,16 @@
         }
         return ''
       },
-      show: function(dialysis) {
+      getTimeOne(val) {
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
+      show: function(dialysis,lastOrder) {
         this.record = dialysis
-        console.log("上机",dialysis)
+     
         this.getPermission()
         this.visible = true
 
@@ -455,7 +480,7 @@
         var nowHours = nowDate.getHours()
         var nowMinutes = nowDate.getMinutes()
         var nowSeconds = nowDate.getSeconds()
-
+        this.form.nuclein_date = this.dialysis_order.id == 0?this.getTimeOne(lastOrder.nuclein_date): this.getTimeOne(this.dialysis_order.nuclein_date)
         if (this.dialysis_order.id != 0) {
           this.form.start_time = this.getTime(this.dialysis_order.start_time, '{y}-{m}-{d} {h}:{i}')
         } else {
@@ -480,6 +505,7 @@
           } else if (hour >= 18) {
             this.schedual_type = 3
           }
+         
         } else {
 
           this.schedual_type = this.dialysis_order.schedual_type
@@ -509,7 +535,9 @@
         let mode = '1'
         var blood_drawing =  this.form.blood_drawing.toString()
         console.log("质控护士",this.form.quality_nurse_id)
-        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse,blood_drawing,this.form.quality_nurse_id,this.form.puncture_needle,this.form.puncture_way,this.form.dialysis_dialyszers,this.form.dialysis_irrigation,this.form.blood_access_id).then(rs => {
+        console.log("this.form.nuclein_date",this.form.nuclein_date)
+       
+        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse,blood_drawing,this.form.quality_nurse_id,this.form.puncture_needle,this.form.puncture_way,this.form.dialysis_dialyszers,this.form.dialysis_irrigation,this.form.blood_access_id,this.form.nuclein_date).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
@@ -550,6 +578,7 @@
         ParamsQuery["dialysis_dialyszers"] = this.form.dialysis_dialyszers
         ParamsQuery["dialysis_irrigation"] = this.form.dialysis_irrigation
         ParamsQuery["blood_access_id"] = this.form.blood_access_id
+        ParamsQuery["nuclein_date"] = this.form.nuclein_date
         ParamsQuery['mode'] = "2"
         if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
           ParamsQuery['mode'] = "3"
@@ -558,7 +587,7 @@
           var resp = rs.data
           if (resp.state == 1) {
             this.$message.success('修改成功')
-
+            this.hide()
             var resp_dialysis_order = resp.data.dialysis_order
             var this_order = this.dialysis_order
             for (const key in resp_dialysis_order) {

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

@@ -82,7 +82,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340)">
+                            v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 48 ||  this.$store.getters.xt_user.template_info.template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10345 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10249 || this.$store.getters.xt_user.template_info.org_id == 10395 ||this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10430)">
                         <el-form-item label="目标超滤量(ml)：">
                             <el-input
                                     type="number"
@@ -93,7 +93,7 @@
 
 
                     <el-col :span="8"
-                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340">
+                            v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 48 &&  this.$store.getters.xt_user.template_info.template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10345 &&  this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10249 &&  this.$store.getters.xt_user.template_info.org_id != 10395 &&  this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10430">
                         <el-form-item label="目标超滤量(L)：">
                             <el-input
                                     type="number"
@@ -101,20 +101,45 @@
                             ></el-input>
                         </el-form-item>
                     </el-col>
+                   
+                    <el-col :span="8" v-if="isShows('是否单超脱水')">
+                        <el-form-item label="是否单超脱水:">
+                           <el-select v-model="dialysisPrescription.is_water">
+                                <el-option
+                                        v-for="(item, index) in waterList"
+                                        :label="item.name"
+                                        :value="item.id"
+                                        :key="index + 'q'"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
 
-
-                    <el-col :span="8" v-if="isShows('单超时长')">
+                    <el-col :span="8" v-if="isShows('单超时长') && dialysisPrescription.is_water == 1">
                         <el-form-item label="单超时长(h)：">
                             <el-input v-model="dialysisPrescription.single_time"></el-input>
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8" v-if="isShows('单超脱水')">
-                        <el-form-item label="单超脱水(L)：">
+                    <el-col :span="8" v-if="isShows('单超脱水') && dialysisPrescription.is_water == 1">
+                        <el-form-item label="单超脱水(ml)：">
                             <el-input v-model="dialysisPrescription.single_water"></el-input>
                         </el-form-item>
                     </el-col>
 
+                  
+                    <el-col :span="8" v-if="isShows('曲线脱水')">
+                        <el-form-item label="曲线脱水(ml)：">
+                            <el-input v-model="dialysisPrescription.drhy_water"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8" v-if="isShows('曲线脱水时长')">
+                        <el-form-item label="曲线脱水时长(h)：">
+                            <el-input v-model="dialysisPrescription.dry_water_hour"></el-input>
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :span="8" v-if="isShows('透析液配方')">
                         <el-form-item label="透析液配方：">
                             <!-- <el-input type="number" v-model="dialysisPrescription.dialysate_formulation"></el-input> -->
@@ -195,7 +220,7 @@
                     </el-col>
 
                     <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 10340">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
                                     v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id!=9990'
@@ -266,14 +291,15 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
-
+                           
+                           
                         </div>
 
                     </el-col>
 
 
                     <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id == 9990">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 ">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
                                           v-if="anticoagulant.weichi != -1 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987  && this.$store.getters.xt_user.template_info.org_id != 54 && this.$store.getters.xt_user.template_info.org_id != 9990">
@@ -335,7 +361,7 @@
                     </el-col>
 
                     <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157">
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
                                     v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990'
@@ -1388,6 +1414,9 @@
           epoOptions: [],
           impulse:0,
           admin_user_id:"",
+          drhy_water:"",
+          is_water:0,
+          dry_water_hour:"",
         },
 
         anticoagulant: {
@@ -1423,6 +1452,11 @@
         epoOptions: [],
         isLoading: false,
         adminRoles:[{id:0,name:"请选择"}],
+        waterList:[
+          {id:0,name:"请选择"},
+          {id:1,name:"是"},
+          {id:2,name:"否"}
+        ]
       }
     },
     methods: {
@@ -2183,7 +2217,12 @@
         } else {
           last_weight_after = this.last_record.weight_after
         }
-        console.log("last2323232323232332",last)
+        console.log("last2323232323232332wode",this.predialysis)
+        if(this.dialysisPrescription!=null && this.dialysisPrescription.id == 0){
+            if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 ){
+              this.dialysisPrescription.sodium = 138
+            }
+        }
         if (this.predialysis == null || this.predialysis.id == 0) {
           if (last != null) {
 
@@ -2201,7 +2240,7 @@
             this.dialysisPrescription.tubing_hemodialysis = last.tubing_hemodialysis
             this.dialysisPrescription.package = last.package
             this.dialysisPrescription.a_liquid = last.a_liquid
-
+          
             weight_before = 0
 
           }

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

@@ -1861,9 +1861,12 @@ export default {
         }
 
         this.form.venous_pressure_type = resp.monitor.venous_pressure_type? resp.monitor.venous_pressure_type: 1;
-        this.form.arterial_pressure = resp.monitor.arterial_pressure
-          ? resp.monitor.arterial_pressure
-          : ""; // this.last_monitor_record.arterial_pressure;
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+           this.form.arterial_pressure = resp.monitor.arterial_pressure? resp.monitor.arterial_pressure: "-100"; // this.last_monitor_record.arterial_pressure;
+        }else{
+           this.form.arterial_pressure = resp.monitor.arterial_pressure? resp.monitor.arterial_pressure: ""
+        }
+
         this.form.arterial_pressure_type = resp.monitor.arterial_pressure_type
           ? resp.monitor.arterial_pressure_type
           : 1;
@@ -2076,9 +2079,16 @@ export default {
         this.form.ultrafiltration_rate = monitor.ultrafiltration_rate
           ? monitor.ultrafiltration_rate
           : "";
-        this.form.arterial_pressure = monitor.arterial_pressure
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+          this.form.arterial_pressure = monitor.arterial_pressure
+          ? monitor.arterial_pressure
+          : "-100";
+        }else{
+         this.form.arterial_pressure = monitor.arterial_pressure
           ? monitor.arterial_pressure
           : "";
+        }
+       
         this.form.arterial_pressure_type = monitor.arterial_pressure_type
           ? monitor.arterial_pressure_type
           : "";

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -68,6 +68,12 @@
           <span class="content">{{ stage }}</span>
         </li>
       </ul>
+      <ul>
+        <li v-if="isShow('核酸检测日期')">
+          <label>核酸检测日期 : </label>
+          <span class="content">{{getTimeOne(this.record.nuclein_date)}}</span>
+        </li>
+      </ul>
       <ul>
         <li v-if="isShow('上机时间')">
           <label>上机时间 : </label>
@@ -80,6 +86,7 @@
 </template>
 
 <script>
+  import { uParseTime } from '@/utils/tools'
   import { parseTime } from '@/utils'
   import store from '@/store'
   import { getDataConfig } from '@/utils/data'
@@ -221,7 +228,14 @@
           }
         }
         return false
-      }
+      },
+      getTimeOne(val) {
+        if(val == ""){
+        return ""
+        }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+        }
+       },
 
     }
   }

src/xt_pages/dialysis/details/index.vue

@@ -334,7 +334,7 @@
                 </div>
                 <div class="printCell" style="display:flex;justify-content: space-around;">
                   <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
-                    <span v-if="$store.getters.xt_user.org.id == 10278">ml</span> 
+                    <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10138">ml</span> 
                     <span v-else>L</span>
                   </span>
                   <span style="display: block;width: 50%;">
@@ -446,6 +446,7 @@
         :lastAssessment="lastAssessment"
         :stockType="stockType"
         :his_doctor_advices="his_doctor_advices"
+        :lastOrder="lastOrder"
       >
       </nav-igation>
 
@@ -870,6 +871,7 @@ export default {
       anticoagulants_confit:null,
       printDate:'',
       assessmentAfterDislysis:{},
+      lastOrder:{},
     }
   },
   created() {
@@ -980,9 +982,8 @@ export default {
 
       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 &&
-        this.predialysis_evaluation.creater > 0
+      // steps[2].finish =this.predialysis_evaluation.id > 0 && this.predialysis_evaluation.creater > 0
+      steps[2].finish =this.predialysis_evaluation.id > 0
       steps[3].finish = this.doctor_advices.length > 0
       steps[5].finish = this.dialysis_order.id > 0
       steps[7].finish =
@@ -993,9 +994,8 @@ export default {
         this.double_check.creater > 0 &&
         this.double_check.modifier > 0
       steps[6].finish = this.monitor_records.length > 0
-      steps[8].finish =
-        this.assessment_after_dislysis.id > 0 &&
-        this.assessment_after_dislysis.creater > 0
+      // steps[8].finish = this.assessment_after_dislysis.id > 0 && this.assessment_after_dislysis.creater > 0
+      steps[8].finish = this.assessment_after_dislysis.id > 0
       steps[9].finish = this.treatment_summary.id > 0
 
       return steps
@@ -1245,7 +1245,9 @@ export default {
           var system_prescribe = resp.data.system_prescribe
 
           var lastAssessment =  resp.data.lastAssessment
-
+          
+          var lastOrder = resp.data.lastOrder
+          this.lastOrder = lastOrder
           this.$refs.nav.setLastRecord(
             lastPredialysisEvaluation,
             lastMonitorRecord,

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -904,14 +904,6 @@ export default {
           manufacturer_name = this.manufacturerList[i].manufacturer_name;
         }
       }
-      var unit =
-        val.dose +
-        val.dose_unit +
-        "*" +
-        val.min_number +
-        val.min_unit +
-        "/" +
-        val.max_unit;
       var over_plus = this.getOverFlushInfo(
         val.drug_warehouse_info,
         val.max_unit,
@@ -924,8 +916,6 @@ export default {
           val.id +
           "&manufacturer=" +
           manufacturer_name +
-          "&unit=" +
-          unit +
           "&min_number=" +
           val.min_number +
           "&max_unit=" +

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -7,9 +7,8 @@
       <div class="cell clearfix">
        药品名称:<span>{{getName(this.$route.query.drug_id)}}</span>&nbsp;
        库存: {{this.$route.query.over_plus}}
-       规格:<span>{{this.$route.query.unit}}</span>&nbsp;
+       规格:<span>{{drug.dose}}{{drug.dose_unit}}*{{drug.min_number}}{{drug.min_unit}}/{{drug.max_unit}}</span>&nbsp;
        厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
-
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>

src/xt_pages/workforce/remind_print_setting.vue

@@ -80,6 +80,7 @@
                 <div>用法:静脉注射</div>
                 <div>打印时间:{{currentDate}}</div>
               </div>
+
               <div class="signPrint" style="font-size:16px;" v-else>
                 <div style="margin-left:50px;">姓名:
                   <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
@@ -173,7 +174,7 @@
               
                 </div>
                 <div class="printCell">
-                  <span>处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}L</span>
+                  <span>处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}ml</span>
                   总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg