a

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,12 +69,12 @@
     "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",
     "node-notifier": "^5.1.2",
-    "node-sass": "^4.9.3",
+    "node-sass": "^4.11.0",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "portfinder": "^1.0.13",

src/pages/advice/DialysisAdviceTable.vue

@@ -87,13 +87,13 @@
             <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>
@@ -231,13 +231,15 @@ export default {
     openPicker() {
       this.$refs.picker.open();
     },
-    getAdaviceType(type) {
-      if (type == 1) {
-        return "长嘱";
-      } else if (type == 2) {
-        return "临嘱";
-      } else if (type == 3) {
-        return "临嘱";
+    getAdaviceType(type,parent_id) {
+      if(parent_id == 0) {
+        if (type == 1) {
+          return "长嘱";
+        } else if (type == 2) {
+          return "临嘱";
+        } else if (type == 3) {
+          return "临嘱";
+        }
       }
     },
     getName(val) {

src/pages/advice/NormalAdviceTable.vue

@@ -86,14 +86,14 @@
               <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>
@@ -230,13 +230,15 @@
       },
       openPicker() {
         this.$refs.picker.open();
-      },getAdaviceType(type){
-        if(type == 1){
-          return "长嘱"
-        }else if(type == 2){
-          return "临嘱"
-        }else if(type == 3){
-          return "临嘱"
+      },  getAdaviceType(type,parent_id) {
+        if(parent_id == 0) {
+          if (type == 1) {
+            return "长嘱";
+          } else if (type == 2) {
+            return "临嘱";
+          } else if (type == 3) {
+            return "临嘱";
+          }
         }
       },getName(val){
         for(let i = 0; i < this.admin_user.length; i++){

src/pages/main/dialog/MonitDialog.vue

@@ -504,20 +504,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,10 @@
                       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.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                     <span
                       v-if="advice.single_dose"
-                    >单次量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
+                    >单次用量{{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/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,24 @@
         </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_index == 0" :rowspan="group.advices.length">
+
+            <td v-if="advice.patient_id > 0" :rowspan="group.advices.length">
+              <span></span>
+            </td>
+
+            <td v-else-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 v-if="advice.prescribing_number">{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
+            <td v-if="advice.single_dose">{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
             <td>{{ advice.parent_id == 0 ? advice.delivery_way : "" }}</td>
             <td>{{ advice.parent_id == 0 ? advice.execution_frequency : "" }}</td>
 

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>