Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

config/prod.env.js

@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
+  BASE_API: '"http://api.xt.kuyicloud.com"'
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

package.json

@@ -24,7 +24,7 @@
     "print-js": "^1.0.54",
     "vant": "^1.6.8",
     "vue": "^2.5.2",
-    "vue-cropper": "^0.4.8",
+    "vue-cropper": "^0.4.9",
     "vue-cropperjs": "^3.0.0",
     "vue-pickers": "^1.1.5",
     "vue-router": "^3.0.1",
@@ -69,7 +69,7 @@
     "html-webpack-plugin": "^2.30.1",
     "jest": "^22.0.4",
     "jest-serializer-vue": "^0.3.0",
-    "jquery": "^3.3.1",
+    "jquery": "^3.4.0",
     "less": "^3.8.1",
     "less-loader": "^4.1.0",
     "nightwatch": "^0.9.12",

src/pages/advice/DialysisAdviceTable.vue

@@ -83,17 +83,17 @@
 
         </tr>
         <template v-for="(schedule) in schedules">
-          <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice_index + '_' + index"  @click="clickfunction(schedule)">
+          <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
             <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
             <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
             <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
-            <td>{{ getAdaviceType(advice.advice_type)}}</td>
+            <td>{{ getAdaviceType(advice.advice_type,advice.parent_id)}}</td>
             <td>{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}") : "" }}</td>
             <td>
               <span >{{advice.advice_name }}</span>
               <span >{{advice.advice_desc}}</span>
-              <span>{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-              <span> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
+              <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+              <span v-if="advice.single_dose"> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
               <span >{{advice.delivery_way}}</span>
               <span >{{advice.execution_frequency}}</span>
             </td>

src/pages/advice/NormalAdviceTable.vue

@@ -82,18 +82,18 @@
 
           </tr>
           <template v-for="(schedule) in schedules">
-            <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice_index + '_' + index"  @click="clickfunction(schedule)">
+            <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
               <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
               <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
               <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
-              <td>{{ getAdaviceType(advice.advice_type)}}</td>
+              <td>{{ getAdaviceType(advice.advice_type,advice.parent_id)}}</td>
               <td>{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}") : "" }}</td>
               <td>
                 <span >{{advice.advice_name }}</span>
                 <span >{{advice.advice_desc}}</span>
 
-                <span>{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                <span> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
+                <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                <span v-if="advice.single_dose"> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                 <span >{{advice.delivery_way}}</span>
                 <span >{{advice.execution_frequency}}</span>
               </td>

src/pages/main/PrintIndex.vue

@@ -1074,14 +1074,14 @@
                 </template>     -->
                 {{getTime(monitor.operate_time,'{h}:{i}')}}
               </td>
-              <td>&nbsp;{{monitor.systolic_blood_pressure}} / {{monitor.diastolic_blood_pressure}}</td>
-              <td>&nbsp;{{monitor.pulse_frequency}}</td>
-              <td>&nbsp;{{monitor.breathing_rate}}</td>
-              <td>&nbsp;{{monitor.blood_flow_volume}}</td>
-              <td>&nbsp;{{monitor.ultrafiltration_volume}}</td>
-              <td>&nbsp;{{monitor.displacement_quantity}}</td>
-              <td>&nbsp;{{monitor.venous_pressure}}</td>
-              <td>&nbsp;{{monitor.transmembrane_pressure}}</td>
+              <td>&nbsp;{{monitor.systolic_blood_pressure?monitor.systolic_blood_pressure:''}} / {{monitor.diastolic_blood_pressure?monitor.diastolic_blood_pressure:''}}</td>
+              <td>&nbsp;{{monitor.pulse_frequency?monitor.pulse_frequency:''}}</td>
+              <td>&nbsp;{{monitor.breathing_rate?monitor.breathing_rate:''}}</td>
+              <td>&nbsp;{{monitor.blood_flow_volume?monitor.blood_flow_volume:''}}</td>
+              <td>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
+              <td>&nbsp;{{monitor.displacement_quantity?monitor.displacement_quantity:''}}</td>
+              <td>&nbsp;{{monitor.venous_pressure?monitor.venous_pressure:''}}</td>
+              <td>&nbsp;{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:''}}</td>
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
               <td>&nbsp;{{monitor.dialysate_temperature}}</td>
               <td>&nbsp;{{monitor.replacement_rate}}</td> -->
@@ -1114,13 +1114,13 @@
                     <td></td>
                     <td width="75">实际超滤量</td>
                     <td width="70">
-                      <div class="under-line">&nbsp;{{afterdialysis.actual_ultrafiltration}}</div>
+                      <div class="under-line">&nbsp;{{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:''}}</div>
                     </td>
                     <td width="20">ml</td>
                     <td></td>
                     <td width="60">透后体重</td>
                     <td width="50">
-                      <div class="under-line">&nbsp;{{afterdialysis.weight_after}}</div>
+                      <div class="under-line">&nbsp;{{afterdialysis.weight_after?afterdialysis.weight_after:''}}</div>
                     </td>
                     <td width="20">Kg</td>
                     <td></td>
@@ -1862,6 +1862,7 @@ export default {
       }
     };
   },
+
   methods: {
     getUser() {
       fetchAllAdminUsers().then(response => {

src/pages/main/dialog/AssessmentDialog.vue

@@ -232,7 +232,7 @@
         setTimeout(function () {
           input.scrollIntoView()
         }, 0);
-        
+
         if (input.setSelectionRange) {
           setTimeout(function () {
               input.setSelectionRange(0, input.value.length);
@@ -279,7 +279,7 @@
             } else {
               this.propForm.result = []
             }
-            
+
             this.propForm.click_ref = "last_post_dialysis"
 
             break
@@ -346,7 +346,7 @@
             } else {
               this.propForm.result = []
             }
-            
+
             this.propForm.click_ref = "catheter"
 
             break
@@ -370,7 +370,7 @@
             } else {
               this.propForm.result = []
             }
-            
+
             this.propForm.click_ref = "complication"
             break
 
@@ -570,6 +570,7 @@
       },
       commitInfo:function () {
         Toast.loading({forbidClick: true, duration: 0})
+        console.log(this.formValue)
         EditAssessmentBeforeDislysis(this.$route.query.patient_id,  this.record_date, this.formValue).then(response=>{
           if (response.data.state == 0) {
             Toast(response.data.msg);
@@ -614,12 +615,15 @@
       // console.log(this.predialysis)
       this.formValue = this.predialysis
       if (this.predialysis.id == undefined && this.last_predialysis.id != undefined) {
-        this.$set(this.formValue, "dry_weight", this.last_predialysis["dry_weight"])
+
+
+        this.$set(this.formValue, "dry_weight", this.last_predialysis["dry_weight"].toString())
         this.$set(this.formValue, "internal_fistula", this.last_predialysis["internal_fistula"])
         this.$set(this.formValue, "internal_fistula_skin", this.last_predialysis["internal_fistula_skin"])
         this.$set(this.formValue, "blood_access_part_id", this.last_predialysis["blood_access_part_id"])
         this.$set(this.formValue, "blood_access_part_opera_id", this.last_predialysis["blood_access_part_opera_id"])
       }
+      console.log(this.formValue)
       this.hemorrhage_state = this.formValue.is_hemorrhage == 1
     }
   };
@@ -636,6 +640,6 @@
   border: none;
   border-bottom: 1px #e5e5e5 solid;
   }
- 
+
 </style>
 

src/pages/main/dialog/MonitDialog.vue

@@ -6,7 +6,7 @@
             <h1 class="name">透析监测</h1>
             <span class="success" >&nbsp;</span>
         </div>
-        <div style="width:100%;background: #fff;">        
+        <div style="width:100%;background: #fff;">
          <div class="yzNav" style="width:80%">
                 <span @click="openForm()">新增监测</span>
                 <span @click="openEidtForm()">修改监测</span>
@@ -21,31 +21,31 @@
                 <th width="72px">血压(mmHg)</th>
                 <th width="80px">心率(次/分)</th>
                 <th width="110px">呼吸(次/分)</th>
-                <th width="92px">血流量(ml/min)</th>  
+                <th width="92px">血流量(ml/min)</th>
                 <th width="76px">静脉压(mmHg)</th>
                 <th width="76px">跨膜压(mmHg)</th>
                 <th width="76px">超滤量(L)</th>
                 <th width="92px">钠浓度(mmol/L)</th>
                 <th width="82px">透析液温度(℃)</th>
                 <th width="92px">置换率(L/h)</th>
-                <th width="50px">置换量(L)</th>        
+                <th width="50px">置换量(L)</th>
                 <th width="92px">病情变化</th>
                 <th width="92px">处理</th>
                 <th width="92px">结果</th>
             </tr>
             <tr v-for="(item,index) in monitorRecords" :key="index" :value="item.value" @click="selectRow(index, item)" :class="index==currentIndex?rowClass:''">
                 <td>{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
-                <td>{{item.systolic_blood_pressure}}/{{item.diastolic_blood_pressure}}</td>
-                <td>{{item.pulse_frequency}}</td>
-                <td>{{item.breathing_rate}}</td>
-                <td>{{item.blood_flow_volume}}</td>
-                <td>{{item.venous_pressure}}</td>
-                <td>{{item.transmembrane_pressure}}</td>
-                <td>{{item.ultrafiltration_volume}}</td>
-                <td>{{item.sodium_concentration}}</td>
-                <td>{{item.dialysate_temperature}}</td>
-                <td>{{item.replacement_rate}}</td>
-                <td>{{item.displacement_quantity}}</td>        
+                <td>{{item.systolic_blood_pressure?item.systolic_blood_pressure:""}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:""}}</td>
+                <td>{{item.pulse_frequency?item.pulse_frequency:""}}</td>
+                <td>{{item.breathing_rate?item.breathing_rate:""}}</td>
+                <td>{{item.blood_flow_volume?item.blood_flow_volume:""}}</td>
+                <td>{{item.venous_pressure?item.venous_pressure:""}}</td>
+                <td>{{item.transmembrane_pressure?item.transmembrane_pressure:""}}</td>
+                <td>{{item.ultrafiltration_volume?item.ultrafiltration_volume:""}}</td>
+                <td>{{item.sodium_concentration?item.sodium_concentration:""}}</td>
+                <td>{{item.dialysate_temperature?item.dialysate_temperature:""}}</td>
+                <td>{{item.replacement_rate?item.replacement_rate:""}}</td>
+                <td>{{item.displacement_quantity?item.displacement_quantity:""}}</td>
                 <td>{{item.symptom}}</td>
                 <td>{{item.dispose}}</td>
                 <td>{{item.result}}</td>
@@ -145,27 +145,27 @@
               <input type="text" class="inputBox" style="width: 100%;margin-bottom:5px;" v-model="form.result" readonly placeholder="选择"  @click="showSubMenu('result')">
               <textarea @focus="lastInputFocus" @blur="lastInputBlur" class="inputBox" style="width: 100%;" :rows="4" v-model="form.result"></textarea>
             </div>
-            
+
             <div class="cell width">
               <label>监测人：</label>
-              <span>{{doctor}}</span>                       
+              <span>{{doctor}}</span>
             </div>
 
-          </div> 
+          </div>
         </div>
     </div>
-    
+
     <mt-datetime-picker
       ref="picker"
       type="datetime"
       @confirm="handleConfirm"
       v-model="pickertime">
     </mt-datetime-picker>
-    
+
     <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm"
                         :propsForm="propForm"></check-box-sub-menu>
 
-    
+
 </div>
 </template>
 
@@ -292,21 +292,91 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           var monitor = resp.data.monitor;
+          if(monitor.systolic_blood_pressure == 0){
+            this.form.systolic_bp = ""
+          }else {
+            this.form.systolic_bp = monitor.systolic_blood_pressure;
+          }
+
+          if(monitor.diastolic_blood_pressure == 0){
+            this.form.diastolic_bp = ""
+          }else {
+            this.form.diastolic_bp = monitor.diastolic_blood_pressure;
+          }
+
+          if(monitor.pulse_frequency == 0){
+            this.form.pulse_frequency = ""
+          }else {
+            this.form.pulse_frequency = monitor.pulse_frequency;
+          }
+
+          if(monitor.breathing_rate == 0){
+            this.form.breathing_rated = ""
+          }else {
+            this.form.breathing_rated = monitor.breathing_rate;
+          }
+
+          if(monitor.blood_flow_volume == 0){
+            this.form.blood_flow_volume = ""
+          }else {
+            this.form.blood_flow_volume = monitor.blood_flow_volume;
+          }
+
+
+          if(monitor.venous_pressure == 0){
+            this.form.venous_pressure = ""
+          }else {
+            this.form.venous_pressure = monitor.venous_pressure;
+          }
+
+          if(monitor.arterial_pressure == 0){
+            this.form.arterial_pressure = ""
+          }else {
+            this.form.arterial_pressure = monitor.arterial_pressure;
+          }
+
+          if(monitor.transmembrane_pressure == 0){
+            this.form.transmembrane_pressure = ""
+          }else {
+            this.form.transmembrane_pressure = monitor.transmembrane_pressure;
+          }
+
+          if(monitor.ultrafiltration_rate == 0){
+            this.form.ultrafiltration_rate = ""
+          }else {
+            this.form.ultrafiltration_rate = monitor.ultrafiltration_rate;
+          }
+
+          if(monitor.ultrafiltration_volume == 0){
+            this.form.ultrafiltration_volume = ""
+          }else {
+            this.form.ultrafiltration_volume = monitor.ultrafiltration_volume;
+          }
+
+          if(monitor.sodium_concentration == 0){
+            this.form.sodium_concentration = ""
+          }else {
+            this.form.sodium_concentration = monitor.sodium_concentration;
+          }
+
+          if(monitor.dialysate_temperature == 0){
+            this.form.dialysate_temperature = ""
+          }else {
+            this.form.dialysate_temperature = monitor.dialysate_temperature;
+          }
+
+          if(monitor.replacement_rate == 0){
+            this.form.replacement_rate = ""
+          }else {
+            this.form.replacement_rate = monitor.replacement_rate;
+          }
+
+          if(monitor.displacement_quantity == 0){
+            this.form.displacement_quantity = ""
+          }else {
+            this.form.displacement_quantity = monitor.displacement_quantity;
+          }
 
-          this.form.systolic_bp = monitor.systolic_blood_pressure;
-          this.form.diastolic_bp = monitor.diastolic_blood_pressure;
-          this.form.pulse_frequency = monitor.pulse_frequency;
-          this.form.breathing_rated = monitor.breathing_rate;
-          this.form.blood_flow_volume = monitor.blood_flow_volume;
-          this.form.venous_pressure = monitor.venous_pressure;
-          this.form.arterial_pressure = monitor.arterial_pressure;
-          this.form.transmembrane_pressure = monitor.transmembrane_pressure;
-          this.form.ultrafiltration_rate = monitor.ultrafiltration_rate;
-          this.form.ultrafiltration_volume = monitor.ultrafiltration_volume;
-          this.form.sodium_concentration = monitor.sodium_concentration;
-          this.form.dialysate_temperature = monitor.dialysate_temperature;
-          this.form.replacement_rate = monitor.replacement_rate;
-          this.form.displacement_quantity = monitor.displacement_quantity;
           this.form.ktv = monitor.ktv;
           this.form.symptom = monitor.symptom;
           this.form.dispose = monitor.dispose;
@@ -442,21 +512,98 @@ export default {
       this.listPanel = false;
       // console.log("this.currentRow", this.currentRow);
 
-      this.form.pulse_frequency = this.currentRow.pulse_frequency;
-      this.form.breathing_rated = this.currentRow.breathing_rate;
-      this.form.systolic_bp = this.currentRow.systolic_blood_pressure;
-      this.form.diastolic_bp = this.currentRow.diastolic_blood_pressure;
-      this.form.blood_flow_volume = this.currentRow.blood_flow_volume;
-      this.form.venous_pressure = this.currentRow.venous_pressure;
-      this.form.arterial_pressure = this.currentRow.arterial_pressure;
-      this.form.transmembrane_pressure = this.currentRow.transmembrane_pressure;
-      this.form.ultrafiltration_rate = this.currentRow.ultrafiltration_rate;
-      this.form.ultrafiltration_volume = this.currentRow.ultrafiltration_volume;
-      this.form.sodium_concentration = this.currentRow.sodium_concentration;
-      this.form.dialysate_temperature = this.currentRow.dialysate_temperature;
-      this.form.replacement_rate = this.currentRow.replacement_rate;
-      this.form.displacement_quantity = this.currentRow.displacement_quantity;
-      this.form.ktv = this.currentRow.ktv;
+
+      if(this.currentRow.systolic_blood_pressure == 0){
+        this.form.systolic_bp = ""
+      }else {
+        this.form.systolic_bp = this.currentRow.systolic_blood_pressure;
+      }
+
+      if(this.currentRow.diastolic_blood_pressure == 0){
+        this.form.diastolic_bp = ""
+      }else {
+        this.form.diastolic_bp = this.currentRow.diastolic_blood_pressure;
+      }
+
+      if(this.currentRow.pulse_frequency == 0){
+        this.form.pulse_frequency = ""
+      }else {
+        this.form.pulse_frequency = this.currentRow.pulse_frequency;
+      }
+
+      if(this.currentRow.breathing_rate == 0){
+        this.form.breathing_rated = ""
+      }else {
+        this.form.breathing_rated = this.currentRow.breathing_rate;
+      }
+
+      if(this.currentRow.blood_flow_volume == 0){
+        this.form.blood_flow_volume = ""
+      }else {
+        this.form.blood_flow_volume = this.currentRow.blood_flow_volume;
+      }
+
+
+      if(this.currentRow.venous_pressure == 0){
+        this.form.venous_pressure = ""
+      }else {
+        this.form.venous_pressure = this.currentRow.venous_pressure;
+      }
+
+      if(this.currentRow.arterial_pressure == 0){
+        this.form.arterial_pressure = ""
+      }else {
+        this.form.arterial_pressure = this.currentRow.arterial_pressure;
+      }
+
+      if(this.currentRow.transmembrane_pressure == 0){
+        this.form.transmembrane_pressure = ""
+      }else {
+        this.form.transmembrane_pressure = this.currentRow.transmembrane_pressure;
+      }
+
+      if(this.currentRow.ultrafiltration_rate == 0){
+        this.form.ultrafiltration_rate = ""
+      }else {
+        this.form.ultrafiltration_rate =this.currentRow.ultrafiltration_rate;
+      }
+
+      if(this.currentRow.ultrafiltration_volume == 0){
+        this.form.ultrafiltration_volume = ""
+      }else {
+        this.form.ultrafiltration_volume = this.currentRow.ultrafiltration_volume;
+      }
+
+      if(this.currentRow.sodium_concentration == 0){
+        this.form.sodium_concentration = ""
+      }else {
+        this.form.sodium_concentration = this.currentRow.sodium_concentration;
+      }
+
+      if(this.currentRow.dialysate_temperature == 0){
+        this.form.dialysate_temperature = ""
+      }else {
+        this.form.dialysate_temperature = this.currentRow.dialysate_temperature;
+      }
+
+      if(this.currentRow.replacement_rate == 0){
+        this.form.replacement_rate = ""
+      }else {
+        this.form.replacement_rate = this.currentRow.replacement_rate;
+      }
+
+      if(this.currentRow.displacement_quantity == 0){
+        this.form.displacement_quantity = ""
+      }else {
+        this.form.displacement_quantity = this.currentRow.displacement_quantity;
+      }
+
+      if(this.currentRow.ktv == 0){
+        this.form.ktv = ""
+      }else {
+        this.form.ktv = this.currentRow.ktv;
+      }
+
       this.form.symptom = this.currentRow.symptom;
       this.form.dispose = this.currentRow.dispose;
       this.form.result = this.currentRow.result;
@@ -504,20 +651,20 @@ export default {
       this.form.breathing_rated = ""; //this.last_monitor_record.breathing_rate;
       this.form.systolic_bp = ""; //this.last_monitor_record.systolic_blood_pressure;
       this.form.diastolic_bp = ""; //this.last_monitor_record.diastolic_blood_pressure;
-      this.form.blood_flow_volume = this.last_monitor_record.blood_flow_volume;
-      this.form.venous_pressure = this.last_monitor_record.venous_pressure;
-      this.form.arterial_pressure = this.last_monitor_record.arterial_pressure;
-      this.form.transmembrane_pressure = this.last_monitor_record.transmembrane_pressure;
-      this.form.ultrafiltration_rate = this.last_monitor_record.ultrafiltration_rate;
-      this.form.ultrafiltration_volume = this.last_monitor_record.ultrafiltration_volume;
-      this.form.sodium_concentration = this.last_monitor_record.sodium_concentration;
-      this.form.dialysate_temperature = this.last_monitor_record.dialysate_temperature;
-      this.form.replacement_rate = this.last_monitor_record.replacement_rate;
-      this.form.displacement_quantity = this.last_monitor_record.displacement_quantity;
-      this.form.ktv = this.last_monitor_record.ktv;
-      this.form.symptom = this.last_monitor_record.symptom;
-      this.form.dispose = this.last_monitor_record.dispose;
-      this.form.result = this.last_monitor_record.result;
+      this.form.blood_flow_volume =""; //this.last_monitor_record.blood_flow_volume;
+      this.form.venous_pressure = "";//this.last_monitor_record.venous_pressure;
+      this.form.arterial_pressure = ""; //this.last_monitor_record.arterial_pressure;
+      this.form.transmembrane_pressure =""; // this.last_monitor_record.transmembrane_pressure;
+      this.form.ultrafiltration_rate = "";// this.last_monitor_record.ultrafiltration_rate;
+      this.form.ultrafiltration_volume ="";// this.last_monitor_record.ultrafiltration_volume;
+      this.form.sodium_concentration = "";//this.last_monitor_record.sodium_concentration;
+      this.form.dialysate_temperature = ""; //this.last_monitor_record.dialysate_temperature;
+      this.form.replacement_rate = ""; // this.last_monitor_record.replacement_rate;
+      this.form.displacement_quantity =""; // this.last_monitor_record.displacement_quantity;
+      this.form.ktv = ""; //this.last_monitor_record.ktv;
+      this.form.symptom ="";// this.last_monitor_record.symptom;
+      this.form.dispose =""; // this.last_monitor_record.dispose;
+      this.form.result =""; //this.last_monitor_record.result;
       this.form.id = -1;
       console.log(this.form);
       // }

src/pages/main/dialog/OrdersDialog.vue

@@ -68,10 +68,9 @@
                       v-if="advice.drug_spec > 0"
                     >{{ advice.drug_spec }}{{ advice.drug_spec_unit }}</span> -->
                     <span>{{ advice.advice_desc }}</span>
-                    <span>{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                    <span
-                      v-if="advice.single_dose"
-                    >单次量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+                    <span  v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                    <span v-if="advice.single_dose"
+                    >单次用量{{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>
                   </div>

src/pages/main/dialog/new_order/AddNewOrders.vue

@@ -53,8 +53,10 @@
                   style="text-align: left; padding-left: 5px; padding-right: 5px;"
                 >{{ advice.title }}</td>
                 <td>{{ advice.advice_desc }}</td>
-                <td>{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
-                <td>{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
+                <td v-if="advice.prescribing_number">{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
+                <td v-else></td>
+                <td v-if="advice.single_dose">{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
+                <td v-else></td>
                 <td>{{ advice.delivery_way }}</td>
                 <td>{{ advice.execution_frequency }}</td>
               </tr>
@@ -68,8 +70,9 @@
                   style="text-align: left; padding-right: 5px; padding-left: 25px;"
                 >{{ subdrug.title }}</td>
                 <td>{{ subdrug.advice_desc }}</td>
-                <td>{{ subdrug.prescribing_number }}{{ subdrug.prescribing_number_unit }}</td>
-                <td>{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>
+                <td><span v-if="subdrug.prescribing_number">{{ subdrug.prescribing_number }}{{ subdrug.prescribing_number_unit }}</span></td>
+                <td><span v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</span></td>
+                <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
                 <td></td>
                 <td></td>
               </tr>

src/pages/main/dialog/new_order/select_advice_template_dialog.vue

@@ -24,10 +24,20 @@
                         </div>
                         <div v-show="isFold(template.id)" class="advice" v-for="(advice, index) in template.DoctorAdviceTemplate" :key="index">
                             <span v-if="advice.parent_id > 0" class="subdrug_info">
-                                {{ advice.advice_name }} {{ advice.advice_desc }} {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }} 单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}
+                              <span> {{ advice.advice_name }}</span>
+                              <span> {{ advice.advice_desc }} </span>
+                              <span v-if="advice.prescribing_number"> {{ advice.prescribing_number }} {{ advice.prescribing_number_unit }}</span>
+                              <span v-if="advice.single_dose">  单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+
                             </span>
                             <van-checkbox v-else class="advice_info" :value="isAdviceSelecting(advice.id)" @click="selectAdviceAction(template, advice)">
-                                {{ advice.advice_name }} {{ advice.advice_desc }} {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }} 单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }} {{ advice.delivery_way }} {{ advice.execution_frequency }}
+                              <span> {{ advice.advice_name }}</span>
+                              <span> {{ advice.advice_desc }} </span>
+                              <span v-if="advice.prescribing_number"> {{ advice.prescribing_number }} {{ advice.prescribing_number_unit }}</span>
+                              <span v-if="advice.single_dose">  单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                              <span> {{ advice.delivery_way }} </span>
+                              <span> {{ advice.execution_frequency }}</span>
+                              <!--{{ advice.advice_name }} {{ advice.advice_desc }} {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }} 单次用量{{ advice.single_dose }}{{ advice.single_dose_unit }} {{ advice.delivery_way }} {{ advice.execution_frequency }}-->
                             </van-checkbox>
                         </div>
                     </div>

src/pages/main/dialysis/AdviceTable.vue

@@ -73,7 +73,7 @@
 
           <th width="334px">开始时间</th>
           <th width="415px">医嘱内容</th>
-          <th width="220px">用药规格</th>
+          <th width="220px">规格</th>
           <th width="164px">开药数量</th>
           <th width="164px">单次用量</th>
           <th width="286px">给药途径</th>
@@ -94,20 +94,23 @@
         </tr>
         <template v-for="(group, group_index) in advice_groups">
           <tr v-for="(advice, advice_index) in group.advices" :key="advice.id">
+
+            <!--<td v-if="advice.patient_id > 0" :rowspan="group.advices.length">-->
+              <!--<span></span>-->
+            <!--</td>-->
+
             <td v-if="advice_index == 0" :rowspan="group.advices.length">
               <span v-if="advice.advice_type == 1">长嘱</span>
               <span v-if="advice.advice_type == 2">临嘱</span>
               <span v-if="advice.advice_type == 3">临嘱</span>
 
-
             </td>
 
             <td v-if="advice_index == 0" :rowspan="group.advices.length">{{ parseTime(advice.start_time, "{m}-{d} {h}:{i}") }}</td>
             <td :class="{ 'advice_name': advice.parent_id == 0, 'subdrug_name': advice.parent_id > 0 }">{{ advice.advice_name }}</td>
-            <!-- <td>{{ advice.drug_spec }} {{ advice.drug_spec_unit }} * {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td> -->
             <td>{{ advice.advice_desc }}</td>
-            <td>{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
-            <td>{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
+            <td ><span v-if="advice.prescribing_number">{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span></td>
+            <td ><span v-if="advice.single_dose">{{ advice.single_dose }} {{ advice.single_dose_unit }}</span></td>
             <td>{{ advice.parent_id == 0 ? advice.delivery_way : "" }}</td>
             <td>{{ advice.parent_id == 0 ? advice.execution_frequency : "" }}</td>
 

src/pages/main/dialysis/DialysisTab.vue

@@ -2,16 +2,16 @@
     <div class="fixedBox">
         <div class="nav">
             <ul>
-                <li v-for="(item,i) in ['长期透析处方','透析记录','医嘱信息','排班信息','宣教信息']" :key="i" :class="index == i? 'active':'' "  @click="ClickTab(i)" >{{item}}</li> 
+                <li v-for="(item,i) in ['长期透析处方','透析记录','排班信息','宣教信息']" :key="i" :class="index == i? 'active':'' "  @click="ClickTab(i)" >{{item}}</li>
             </ul>
         </div>
 
         <div class="tab-content">
             <long-table v-show="index==0" title="长期透析处方"></long-table>
             <record-table v-show="index==1" title="透析记录"></record-table>
-            <advice-table v-show="index==2" title="医嘱信息"></advice-table>
-            <schedul-table v-show="index==3" class="排班信息"></schedul-table>
-            <mission-table v-show="index==4" class="宣教信息"></mission-table>
+            <!--<advice-table v-show="index==2" title="医嘱信息"></advice-table>-->
+            <schedul-table v-show="index==2" class="排班信息"></schedul-table>
+            <mission-table v-show="index==3" class="宣教信息"></mission-table>
         </div>
     </div>
 </template> 

src/pages/main/dialysis/RecordTable.vue

@@ -62,13 +62,13 @@
             <td>{{scheduleType(item.schedule_type)}}</td>
             <td>{{item.partition_name}} - {{item.device_number}}</td>
             <td>{{modeName(item.prescription.mode_id)}}</td>
-            <td>{{item.prescription.dialysis_duration}}</td>
-            <td>{{item.prescription.dry_weight}}</td>
-            <td>{{item.predialysis_evaluation.weight_before}}</td>
-            <td>{{item.assessment_after_dislysis.weight_after}}</td>
-            <td>{{item.predialysis_evaluation.systolic_blood_pressure}}</td>
-            <td>{{item.assessment_after_dislysis.systolic_blood_pressure}}</td>
-            <td>{{item.predialysis_evaluation.ultrafiltration_amount}}</td>
+            <td>{{item.prescription.dialysis_duration?item.prescription.dialysis_duration:""}}</td>
+            <td>{{item.prescription.dry_weight?item.prescription.dry_weight:""}}</td>
+            <td>{{item.predialysis_evaluation.weight_before?item.predialysis_evaluation.weight_before:""}}</td>
+            <td>{{item.assessment_after_dislysis.weight_after?item.assessment_after_dislysis.weight_after:""}}</td>
+            <td>{{item.predialysis_evaluation.systolic_blood_pressure?item.predialysis_evaluation.systolic_blood_pressure:""}}</td>
+            <td>{{item.assessment_after_dislysis.systolic_blood_pressure?item.assessment_after_dislysis.systolic_blood_pressure:""}}</td>
+            <td>{{item.predialysis_evaluation.ultrafiltration_amount?item.predialysis_evaluation.ultrafiltration_amount:""}}</td>
             <td>{{setAnticoagulantsConfit(item.prescription)}}</td>
             <!--<td>{{getName(item.treatment_summary.zl_nurse)}}</td>-->
             <!--<td>{{getName(item.treatment_summary.zl_doctor)}}</td>-->
@@ -302,12 +302,15 @@ export default {
       return typeName;
     },
     setAnticoagulantsConfit: function(prescription) {
+
+
       if (
         typeof this.anticoagulantsConfit[prescription.anticoagulant] ==
         "undefined"
       ) {
         return "";
       } else {
+
         if (this.anticoagulantsConfit[prescription.anticoagulant].shouji != 1) {
           return this.anticoagulantsConfit[prescription.anticoagulant].name;
         } else {

src/pages/main/today/TodayTab.vue

@@ -393,7 +393,9 @@ export default {
       //     break
       //   }
       // }
+      this.monitor_records.reverse();
       this.last_monitor_record = monitor
+
     },
 
     didEditMonitor(monitor) {

src/pages/main/today/assessmentAfter.vue

@@ -6,18 +6,18 @@
       <ul>
         <li>
           <label for="thtz">透后体重 : </label>
-          <span class="content" id="thtz">{{weight_after}}</span>
-          <span class="unit">kg</span>
+          <span class="content" id="thtz">{{weight_after?weight_after:''}}</span>
+          <span class="unit">{{weight_after?"kg":''}}</span>
         </li>
         <li>
           <label for="ssy">收缩压 : </label>
-          <span class="content" id="ssy">{{systolic_blood_pressure}}</span>
-          <span class="unit">mmHg</span>
+          <span class="content" id="ssy">{{systolic_blood_pressure?systolic_blood_pressure:''}}</span>
+          <span class="unit">{{systolic_blood_pressure?"mmHg":''}}</span>
         </li>
         <li>
           <label for="sjcll">实际超滤量: </label>
-          <span class="content" id="sjcll">{{actual_ultrafiltration}}</span>
-          <span class="unit">ml</span>
+          <span class="content" id="sjcll">{{actual_ultrafiltration?actual_ultrafiltration:''}}</span>
+          <span class="unit">{{actual_ultrafiltration?"ml":''}}</span>
         </li>
         <li>
           <label for="nx">透析器凝血 : </label>
@@ -44,18 +44,18 @@
       <ul>
         <li>
           <label for="tzjs">体重减少 : </label>
-          <span class="content" id="tzjs">{{weight_loss}}</span>
-          <span class="unit">kg</span>
+          <span class="content" id="tzjs">{{weight_loss?weight_loss:''}}</span>
+          <span class="unit">{{weight_loss?"kg":''}}</span>
         </li>
         <li>
           <label for="szy">舒张压 : </label>
-          <span id="szy" class="content">{{diastolic_blood_pressure}}</span>
-          <span class="unit">mmHg</span>
+          <span id="szy" class="content">{{diastolic_blood_pressure?diastolic_blood_pressure:''}}</span>
+          <span class="unit">{{diastolic_blood_pressure?"mmHg":''}}</span>
         </li>
         <li>
           <label for="sjzhl">实际置换量 : </label>
-          <span id="sjzhl" class="content">{{actual_displacement}}</span>
-          <span class="unit">ml</span>
+          <span id="sjzhl" class="content">{{actual_displacement?actual_displacement:''}}</span>
+          <span class="unit">{{actual_displacement?"ml":''}}</span>
         </li>
         <li>
           <label for="thzz">透后症状 : </label>
@@ -82,13 +82,13 @@
       <ul>
         <li>
           <label for="tw">体温 : </label>
-          <span class="content" id="tw">{{temperature}}</span>
-          <span class="unit">℃</span>
+          <span class="content" id="tw">{{temperature?temperature:''}}</span>
+          <span class="unit">{{temperature?"℃":''}}</span>
         </li>
         <li>
           <label for="ml">脉率 : </label>
-          <span id="ml" class="content">{{pulse_frequency}}</span>
-          <span class="unit">次/分</span>
+          <span id="ml" class="content">{{pulse_frequency?pulse_frequency:''}}</span>
+          <span class="unit">{{pulse_frequency?"次/分":''}}</span>
         </li>
         <li>
           <label for="sjzl">实际治疗时长 : </label>
@@ -96,7 +96,7 @@
         </li>
         <li>
           <label for="txzrl">透析中入量: </label>
-          <span id="txzrl" class="content">{{dialysis_intakes_feed}}</span>
+          <span id="txzrl" class="content">{{dialysis_intakes_feed?dialysis_intakes_feed:''}}</span>
         </li>
         <li>
           <label for="xgtlcz">血管通路操作: </label>

src/pages/main/today/assessmentBefore.vue

@@ -5,17 +5,17 @@
       <ul>
         <li>
           <label>透前体重 : </label>
-          <span class="content">{{ weight_before }}</span>
-          <span class="unit">kg</span>
+          <span class="content">{{ weight_before?weight_before:'' }}</span>
+          <span class="unit">{{ weight_before?"kg":'' }}</span>
         </li>
         <li>
           <label>收缩压 : </label>
-          <span class="content">{{ systolic_blood_pressure }}</span>
-          <span class="unit">mmHg</span>
+          <span class="content">{{ systolic_blood_pressure?systolic_blood_pressure:""}}</span>
+          <span class="unit">{{ systolic_blood_pressure?"mmHg":""}}</span>
         </li>
         <li>
           <label>前次透析后: </label>
-          <span class="content">{{ last_post_dialysis }}</span>
+          <span class="content">{{ last_post_dialysis}}</span>
           <span class="unit"></span>
         </li>
         <li>
@@ -27,13 +27,13 @@
       <ul>
         <li>
           <label>干体重 : </label>
-          <span class="content">{{ dry_weight }}</span>
-          <span class="unit">kg</span>
+          <span class="content">{{ dry_weight?dry_weight:''}}</span>
+          <span class="unit">{{ dry_weight?"kg":''}}</span>
         </li>
         <li>
           <label>舒张压 : </label>
-          <span class="content">{{ diastolic_blood_pressure }}</span>
-          <span class="unit">mmHg</span>
+          <span class="content">{{ diastolic_blood_pressure?diastolic_blood_pressure:'' }}</span>
+          <span class="unit">{{ diastolic_blood_pressure?'mmHg':'' }}</span>
         </li>
         <li>
           <label>透析期间 : </label>
@@ -49,13 +49,13 @@
       <ul>
         <li>
           <label>体温 : </label>
-          <span class="content">{{ temperature }}</span>
-          <span class="unit">℃</span>
+          <span class="content">{{ temperature?temperature:''}}</span>
+          <span class="unit">{{ temperature?"℃":''}}</span>
         </li>
         <li>
           <label>心率 : </label>
-          <span class="content">{{ pulse_frequency }}</span>
-          <span class="unit">次/分</span>
+          <span class="content">{{ pulse_frequency?pulse_frequency:''}}</span>
+          <span class="unit">{{ pulse_frequency?"次/分":''}}</span>
         </li>
         <li>
           <label>透析前症状 : </label>

src/pages/main/today/dialysisMonitoring.vue

@@ -22,17 +22,19 @@
         </tr>
         <tr v-for="(item,index) in tableDate" :key="index" :value="item.value">
           <td>{{parseTime(item.operate_time, "{y}-{m}-{d} {h}:{i}")}}</td>
-          <td>{{item.systolic_blood_pressure}}/{{item.diastolic_blood_pressure}}</td>
-          <td>{{item.pulse_frequency}}</td>
-          <td>{{item.breathing_rate}}</td>
-          <td>{{item.blood_flow_volume}}</td>
-          <td>{{item.venous_pressure}}</td>
-          <td>{{item.transmembrane_pressure}}</td>
-          <td>{{item.ultrafiltration_volume}}</td>
-          <td>{{item.sodium_concentration}}</td>
-          <td>{{item.dialysate_temperature}}</td>
-          <td>{{item.replacement_rate}}</td>
-          <td>{{item.displacement_quantity}}</td>        
+
+
+          <td>{{item.systolic_blood_pressure?item.systolic_blood_pressure:''}}/{{item.diastolic_blood_pressure?item.diastolic_blood_pressure:''}}</td>
+          <td>{{item.pulse_frequency?item.pulse_frequency:''}}</td>
+          <td>{{item.breathing_rate?item.breathing_rate:''}}</td>
+          <td>{{item.blood_flow_volume?item.blood_flow_volume:''}}</td>
+          <td>{{item.venous_pressure?item.venous_pressure:''}}</td>
+          <td>{{item.transmembrane_pressure?item.transmembrane_pressure:''}}</td>
+          <td>{{item.ultrafiltration_volume?item.ultrafiltration_volume:''}}</td>
+          <td>{{item.sodium_concentration?item.sodium_concentration:''}}</td>
+          <td>{{item.dialysate_temperature?item.dialysate_temperature:''}}</td>
+          <td>{{item.replacement_rate?item.replacement_rate:''}}</td>
+          <td>{{item.displacement_quantity?item.displacement_quantity:''}}</td>
           <td>{{item.symptom}}</td>
           <td>{{item.dispose}}</td>
           <td>{{item.result}}</td>

src/pages/main/today/dialysisPrescription.vue

@@ -9,35 +9,35 @@
         </li>
         <li>
           <label>目标超滤量 : </label>
-          <span class="content">{{target_ultrafiltration}}</span>
-          <span class="unit">ml</span>
+          <span class="content">{{target_ultrafiltration != '0'?target_ultrafiltration:''}}</span>
+          <span class="unit">{{target_ultrafiltration != '0'?"ml":''}}</span>
         </li>
         <li>
           <label>首剂 : </label>
-          <span class="content">{{anticoagulant_shouji}}</span>
-          <span class="unit">mg</span>
+          <span class="content">{{anticoagulant_shouji != '0'?anticoagulant_shouji:''}}</span>
+          <span class="unit">{{anticoagulant_shouji != '0'?"mg":''}}</span>
         </li>
         <li>
           <label>置换量 : </label>
-          <span class="content">{{replacement_total}}</span>
-          <span class="unit">L</span>
+          <span class="content">{{replacement_total != '0'?replacement_total:""}}</span>
+          <span class="unit">{{replacement_total != '0'?"L":""}}</span>
         </li>
         <li>
           <label>钙: </label>
-          <span class="content">{{calcium}}</span>
-          <span class="unit">mmol/l</span>
+          <span class="content">{{calcium != '0'?calcium:""}}</span>
+          <span class="unit">{{calcium != '0'?"mmol/l":""}}</span>
         </li>
         <li>
           <label>葡萄糖 : </label>
-          <span class="content">{{glucose}}</span>
-          <span class="unit">mmol/l</span>
+          <span class="content">{{glucose != '0'?glucose:""}}</span>
+          <span class="unit">{{glucose != '0'?"mmol/l":""}}</span>
         </li>
       </ul>
       <ul>
         <li>
           <label>透析时长 : </label>
-          <span class="content">{{dialysis_duration}}</span>
-          <span class="unit">h</span>
+          <span class="content">{{dialysis_duration != '0'?dialysis_duration:""}}</span>
+          <span class="unit">{{dialysis_duration != '0'?"h":""}}</span>
         </li>
         <li>
           <label>透析液配方 : </label>
@@ -45,18 +45,18 @@
         </li>
         <li>
           <label>维持 : </label>
-          <span class="content">{{anticoagulant_weichi}}</span>
-          <span class="unit">mg/h</span>
+          <span class="content">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
+          <span class="unit">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
         </li>
         <li>
           <label>钾 : </label>
-          <span class="content">{{kalium}}</span>
-          <span class="unit">mmol/L</span>
+          <span class="content">{{kalium != '0'?kalium:""}}</span>
+          <span class="unit">{{kalium != '0'?"mmol/L":""}}</span>
         </li>
         <li>
           <label>碳酸氢盐 : </label>
-          <span class="content">{{bicarbonate}}</span>
-          <span class="unit">mmol/l</span>
+          <span class="content">{{bicarbonate != '0'?bicarbonate:""}}</span>
+          <span class="unit">{{bicarbonate != '0'?"mmol/l":""}}</span>
         </li>
         <!-- <li>
           <label>干体重 : </label>
@@ -65,15 +65,15 @@
         </li> -->
         <li>
           <label>透析液温度 : </label>
-          <span class="content">{{dialysate_temperature}}</span>
-          <span class="unit">℃</span>
+          <span class="content">{{dialysate_temperature != '0'?dialysate_temperature:""}}</span>
+          <span class="unit">{{dialysate_temperature != '0'?"℃":""}}</span>
         </li>
       </ul>
       <ul>
         <li>
           <label>血流量 : </label>
-          <span class="content">{{blood_flow_volume}}</span>
-          <span class="unit">ml/min</span>
+          <span class="content">{{blood_flow_volume != '0'?blood_flow_volume:''}}</span>
+          <span class="unit">{{blood_flow_volume != '0'?"ml/min":''}}</span>
         </li>
         <li>
           <label>抗疑剂 : </label>
@@ -81,23 +81,23 @@
         </li>
         <li>
           <label>总量: </label>
-          <span class="content">{{anticoagulant_zongliang}}</span>
-          <span class="unit">mg</span>
+          <span class="content">{{anticoagulant_zongliang != '0'?anticoagulant_zongliang:""}}</span>
+          <span class="unit">{{anticoagulant_zongliang != '0'?"mg":""}}</span>
         </li>
         <li>
           <label>钠 : </label>
-          <span class="content">{{sodium}}</span>
-          <span class="unit">mmol/l</span>
+          <span class="content">{{sodium != '0'?sodium:""}}</span>
+          <span class="unit">{{sodium != '0'?"mmol/l":""}}</span>
         </li>
         <li>
           <label>透析液流量 : </label>
-          <span class="content">{{dialysate_flow}}</span>
-          <span class="unit">ml/min</span>
+          <span class="content">{{dialysate_flow != '0'?dialysate_flow:""}}</span>
+          <span class="unit">{{dialysate_flow != '0'?"ml/min":""}}</span>
         </li>
         <li>
           <label>电导率 : </label>
-          <span class="content">{{conductivity}}</span>
-          <span class="unit">mS/cm</span>
+          <span class="content">{{conductivity != '0'?conductivity:""}}</span>
+          <span class="unit">{{conductivity != '0'?"mS/cm":""}}</span>
         </li>
 
         <li>

src/pages/main/today/statOrder.vue

@@ -24,8 +24,8 @@
               <span>{{advice.advice_name }}</span>
               <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
               <span>{{advice.advice_desc}}</span>
-              <span>{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-              <span>单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+              <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+              <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
               <span>{{advice.delivery_way}}</span>
               <span>{{advice.execution_frequency}}</span>
             </td>

src/pages/monitoring/index.vue

@@ -70,9 +70,9 @@
             <td width="9%">{{item.patient.dialysis_no}}</td>
             <td width="13%">{{parseTime(item.schedule_date, "{y}-{m}-{d}")}}</td>
             <td width="10%">{{item.treatment_mode.name}}</td>
-            <td width="9%">{{item.prescription.dewater_amount}}</td>
+            <td width="9%">{{item.prescription.dewater_amount?item.prescription.dewater_amount:""}}</td>
             <td width="14%">
-              {{item.assessment_before_dislysis.weight_before}}/{{item.assessment_after_dislysis.weight_after}}
+              {{item.assessment_before_dislysis.weight_before?item.assessment_before_dislysis.weight_before:""}}/{{item.assessment_after_dislysis.weight_after?item.assessment_after_dislysis.weight_after:""}}
             </td>
             <td width="27%">
               <span v-if="monitorBloodPressureStatus(item.monitoring_record) == 1">低压</span>

src/pages/personal/ElectronicSignature.vue

@@ -118,7 +118,7 @@ export default {
       middleAry: [],
       // 配置参数
       config: {
-        lineWidth: 1,
+        lineWidth: 15,
         lineColor: "#000",
         shadowBlur: 1,
         fillStyle: "#fff"