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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.1.107"
+  "version": "1.1.124"
 }

config/dev.env.js

@@ -4,9 +4,9 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"https://api.xt.kuyicloud.com"'
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
 
-  // BASE_API: '"http://api.xt.test.sgjyun.com"'
+  BASE_API: '"http://api.xt.test.sgjyun.com"'
    //http://api.xt.test.sgjyun.com http://localhost:9529
    // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // BASE_API: '"https://api.xt.kuyicloud.com"'

src/pages/main/dialog/PlaneDialog.vue

@@ -15,9 +15,7 @@
         <span
           class="success"
           @click="modify()"
-          v-if="
-            isPremission || this.$store.getters.user.user.id == this.creator
-          "
+          v-if="isPremission || this.$store.getters.user.user.id == this.creator"
           >修改</span
         >
       </div>

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -368,6 +368,10 @@ export default {
     },
     didSelectDeliveryWay: function(index) {
       this.didCloseSingleOptionDialog();
+      if (index == -1) {
+        this.order.delivery_way = "";
+        return;
+      }
       this.order.delivery_way = this.delivery_way_options[index].name;
     },
     selectExecFrequencyAction: function() {

src/pages/main/template/DialysisPrintOrderOne.vue

@@ -569,8 +569,10 @@
               <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 v-if="isShowZero && monitor.operate_time">&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:0}}</td>
+              <td v-else>&nbsp;{{monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:''}}</td>
+              <td v-if="isShowZero && monitor.operate_time">&nbsp;{{monitor.displacement_quantity?monitor.displacement_quantity:0}}</td>
+              <td v-else>&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>
@@ -606,7 +608,7 @@
                     <td width="70">
                       <div class="under-line">&nbsp;{{afterdialysis.actual_ultrafiltration?afterdialysis.actual_ultrafiltration:''}}</div>
                     </td>
-                    <td width="20">ml</td>
+                    <td width="20">L</td>
                     <td></td>
                     <td width="60">透后体重</td>
                     <td width="50">
@@ -1092,6 +1094,7 @@
         summary: {},
         receiverTreatmentAccess: {},
         org_template_info: {},
+        isShowZero: false,
 
         doctor_advices: [],
         advice_groups: [],
@@ -1353,6 +1356,11 @@
             this.advices = response.data.data.advices;
             this.monitors = response.data.data.monitors;
             this.summary = response.data.data.summary;
+            this.org_template_info = response.data.data.org_template_info
+            // 配置超滤量和置换量是否要显示0还是空
+            if(this.org_template_info.org_id == 9535){
+              this.isShowZero = true
+            }
 
             if (this.monitors.length < 8) {
               var nl = 8 - this.monitors.length;

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -371,11 +371,11 @@
                     <div v-if="prescription.anticoagulant != 1"  class="under_line" style="width: 50px;text-align: center;">
                       {{prescription.anticoagulant_weichi?prescription.anticoagulant_weichi:"0"}}
                     </div>
-                    <span v-if="prescription.anticoagulant == 5">ml</span>
-                    <span v-if="prescription.anticoagulant == 4">mg</span>
-                    <span v-if="prescription.anticoagulant == 3">iu</span>
-                    <span v-if="prescription.anticoagulant == 2">iu</span>
-                    <span v-if="prescription.anticoagulant == 1">mg</span>
+                    <span v-if="prescription.anticoagulant == 5">ml/h</span>
+                    <span v-if="prescription.anticoagulant == 4">mg/h</span>
+                    <span v-if="prescription.anticoagulant == 3">iu/h</span>
+                    <span v-if="prescription.anticoagulant == 2">iu/h</span>
+                    <span v-if="prescription.anticoagulant == 1">mg/h</span>
                   </div>
 
                   <div class="inline_block" style="margin-left:20px;" v-if="prescription.anticoagulant == 5">

src/pages/main/today/dialysisPrescription.vue

@@ -103,11 +103,11 @@
         <li v-if="isShow('维持')">
           <label>维持 : </label>
           <span class="content">{{anticoagulant_weichi != '0'?anticoagulant_weichi:""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_weichi != '0'?"iu":""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_weichi != '0'?"iu":""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_weichi != '0'?"mg":""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_weichi != '0'?"mg":""}}</span>
-          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_weichi != '0'?"ml":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 2">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 3">{{anticoagulant_weichi != '0'?"iu/h":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 1">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 4">{{anticoagulant_weichi != '0'?"mg/h":""}}</span>
+          <span class="unit" v-if="this.prescription.anticoagulant == 5">{{anticoagulant_weichi != '0'?"ml/h":""}}</span>
         </li>
 
         <li v-if="isShow('总量')&&this.prescription.anticoagulant != 5">

src/store/modules/globalConfig.js

@@ -408,7 +408,7 @@ const global_config = {
       },
       5: {
         id: 5,
-        name: '枸橼酸钠',
+        name: '4%枸橼酸钠',
         type: 1,
         shouji: -1,
         weichi: 1,
@@ -421,6 +421,21 @@ const global_config = {
         gaimingcheng_unit: 'ml/h',
         gaijiliang_unit: ''
       },
+      // 6: {
+      //   id: 6,
+      //   name: '3%枸橼酸钠',
+      //   type: 1,
+      //   shouji: -1,
+      //   weichi: 1,
+      //   zongliang: -1,
+      //   gaimingcheng: 1,
+      //   gaijiliang: 1,
+      //   shouji_unit: '',
+      //   weichi_unit: 'ml/h',
+      //   zongliang_unit: '',
+      //   gaimingcheng_unit: 'ml/h',
+      //   gaijiliang_unit: ''
+      // }
     },
     anticoagulants_set: {
       type: 2,