修改相关bug

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.104"
+  "version": "1.0.105"
 }

config/dev.env.js

@@ -4,7 +4,9 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  // 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: '"http://api.xt.test.sgjyun.com"'
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
+
 })

src/pages/main/dialog/PrescriptionDialog.vue

@@ -64,16 +64,22 @@
         <div class="item" v-if="anticoagulant.shouji != -1&&isShow('首剂')">
           <label class="name" for="sj">首剂({{anticoagulant.shouji_unit}})</label>
           <div class="content">
-            <input type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.anticoagulant_shouji"
+            <input v-if="dialysisPrescription.anticoagulant != 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.anticoagulant_shouji"
+                   :disabled="anticoagulant.shouji==1?false:true"/>
+
+            <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_shouji"
                    :disabled="anticoagulant.shouji==1?false:true"/>
           </div>
         </div>
         <div class="item" v-if="anticoagulant.weichi != -1&&isShow('维持')">
           <label class="name" for="wz">维持({{anticoagulant.weichi_unit}})</label>
           <div class="content">
-            <input type="tel" @focus="inputFocus" id="wz" class="inputBox"
+            <input v-if="dialysisPrescription.anticoagulant != 1" type="tel" @focus="inputFocus" id="wz" class="inputBox"
                    v-model="dialysisPrescription.anticoagulant_weichi"
                    :disabled="anticoagulant.weichi==1?false:true">
+
+            <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_weichi"
+                   :disabled="anticoagulant.shouji==1?false:true"/>
           </div>
         </div>
         <div class="item" v-if="anticoagulant.zongliang != -1 && isShow('总量')">
@@ -85,9 +91,12 @@
 
 
           <div class="content">
-            <input type="tel" @focus="inputFocus" id="zl" class="inputBox"
+            <input v-if="dialysisPrescription.anticoagulant != 1" type="tel" @focus="inputFocus" id="zl" class="inputBox"
                    v-model="dialysisPrescription.anticoagulant_zongliang"
                    :disabled="anticoagulant.zongliang==1?false:true">
+
+            <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_zongliang"
+                   :disabled="anticoagulant.shouji==1?false:true"/>
           </div>
         </div>
 
@@ -478,6 +487,12 @@
           anticoagulant_gaimingcheng: '',
           anticoagulant_gaijiliang: '',
           dialyzer_perfusion_apparatus: '',
+
+          no_anticoagulant_shouji: '0',
+          no_anticoagulant_weichi: '0',
+          no_anticoagulant_zongliang: '0',
+
+
           kalium: '',
           sodium: '',
           calcium: '',
@@ -998,6 +1013,23 @@
                   }
                 }
               }
+
+              console.log(this.dialysisPrescription.dialysis_duration_hour)
+              console.log(this.dialysisPrescription.dialysis_duration_minute)
+              console.log(this.dialysisPrescription.dialysis_duration_hour == '')
+              console.log(this.dialysisPrescription.dialysis_duration_minute == 0)
+
+
+
+              if (this.dialysisPrescription.dialysis_duration_hour === '' || this.dialysisPrescription.dialysis_duration_minute === '') {
+                this.timeValue = ''
+                this.time = '03:00'
+
+              } else {
+
+                this.timeValue = this.dialysisPrescription.dialysis_duration_hour + '小时' + this.dialysisPrescription.dialysis_duration_minute + '分钟'
+                this.time = (this.dialysisPrescription.dialysis_duration_hour > 10 ? this.dialysisPrescription.dialysis_duration_hour : '0' + this.dialysisPrescription.dialysis_duration_hour) + ':' + (this.dialysisPrescription.dialysis_duration_minute > 10 ? this.dialysisPrescription.dialysis_duration_minute : '0' + this.dialysisPrescription.dialysis_duration_minute)
+              }
             })
             break
           case 2:
@@ -1120,6 +1152,11 @@
         return anticoagulan_name
       },
       commitInfo: function () {
+        if(this.dialysisPrescription.anticoagulant == 1){
+          this.dialysisPrescription.anticoagulant_weichi = '0'
+          this.dialysisPrescription.anticoagulant_shouji = '0'
+          this.dialysisPrescription.anticoagulant_zongliang = '0'
+        }
         if (this.$store.getters.user.template_info.template_id == 6) {
           if (this.dialysisPrescription.mode_id == 2) {
             if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.displace_liqui_value == 0 || this.dialysisPrescription.displace_liqui_value == '') {
@@ -1416,7 +1453,7 @@
         if (this.$store.getters.user.template_info.template_id == 6) {
           if (this.dialysisPrescription.mode_id == 2) {
             if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.displace_liqui_value == 0 || this.dialysisPrescription.displace_liqui_value == '') {
-              Toast.fail('HDF模式下置换方式和置换量不能为空！')
+              Toast.fail('HDF模式下置换方式和置换液总量不能为空！')
               return
             }
           }
@@ -1906,11 +1943,15 @@
         }
       } else if (this.solution_prop != null && typeof this.solution_prop.id != 'undefined' && this.solution_prop.id) {
         for (const key in this.solution_prop) {
-          this.dialysisPrescription[key] = this.solution_prop[key]
+          if(key != "target_ultrafiltration") {
+            this.dialysisPrescription[key] = this.solution_prop[key]
+          }
         }
       } else if (this.last_prescription != null && typeof this.last_prescription.id != 'undefined' && this.last_prescription.id) {
         for (const key in this.last_prescription) {
-          this.dialysisPrescription[key] = this.last_prescription[key]
+          if(key != "target_ultrafiltration") {
+            this.dialysisPrescription[key] = this.last_prescription[key]
+          }
         }
       } else {
         this.dialysisPrescription.mode_id = this.schedual.mode_id

src/pages/main/dialog/TreatmentDialog.vue

@@ -25,7 +25,7 @@
                   <el-option v-for="(s, index) in summary" :label="s.text" :value="s.value"
                              :key="index"></el-option>
                 </el-select> -->
-                
+
               <el-input readonly v-model="dialysisSummary.summaryContentSelect" placeholder="请选择" @focus="showSubMenu('summary')" ></el-input>
 
               </el-form-item>
@@ -39,7 +39,7 @@
           </div> -->
         </div>
     </div>
-    
+
     <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" :propsForm="propForm"></check-box-sub-menu>
   </div>
 </template>
@@ -55,7 +55,7 @@ export default {
   data() {
     return {
       isShowDialog:true,
-      
+
       visibility: false,
       propForm: {
         title: '',
@@ -138,20 +138,17 @@ export default {
     // this.patient.id = this.patient_prop.id
 
     if (this.record != null && this.record.id != '') {
-      // for (const key in this.record) {
-      //   this.dialysisSummary[key] = this.record[key];
-      // }
-      // if(this.record.mission != 'undefined'){
-      //   this.dialysisSummary.propagandaAndEducationContent = this.record.mission
-      // }
-      // if(this.record.dialysis_summary != 'undefined'){
-      //   this.dialysisSummary.summaryContent = this.record.dialysis_summary
-      // }
-
-
+      for (const key in this.record) {
+        this.dialysisSummary[key] = this.record[key];
+      }
+      if(this.record.mission != 'undefined'){
+        this.dialysisSummary.propagandaAndEducationContent = this.record.mission
+      }
+      if(this.record.dialysis_summary != 'undefined'){
+        this.dialysisSummary.summaryContent = this.record.dialysis_summary
+      }
     }
-    console.log(this.dialysisSummary.propagandaAndEducationContent)
-    console.log(this.dialysisSummary.summaryContent)
+
   },
   methods: {
     lastInputFocus: function(event) {
@@ -195,7 +192,7 @@ export default {
     menuCancle: function () {
         this.visibility = false
         this.isShowDialog = true
-    }, 
+    },
     menuComfirm: function (val) {
 
       this.visibility = false
@@ -219,7 +216,7 @@ export default {
           break
       }
 
-    }, 
+    },
 
     dialysisSummarySelectChange: function(values) {
       if(this.dialysisSummary.summaryContent == null){
@@ -302,7 +299,7 @@ export default {
         }
       }
   },
-  
+
   components: {
     CheckBoxSubMenu,
   },

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

@@ -22,7 +22,7 @@
             </div>
             <div class="cell">
               <label>药品规格</label>
-              <input type="number" onclick="this.select()" class="inputBox" style="width:60%" v-model="order.advice_desc">
+              <input  onclick="this.select()" class="inputBox" style="width:60%" v-model="order.advice_desc">
               <input
                 type="text"
                 placeholder="单位"

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

@@ -20,7 +20,7 @@
               <label>药品规格</label>
               <!--<input class="inputBox" style="width:62.5%" v-model="order.advice_desc">-->
 
-              <input type="number" class="inputBox" style="width:62.5%" v-model="order.advice_desc">
+              <input class="inputBox" style="width:62.5%" v-model="order.advice_desc">
               <input
                 type="text"
                 placeholder="单位"

src/pages/main/template/DialysisPrintOrderSix.vue

@@ -445,9 +445,9 @@
                         <td height="35px" colspan="2" class="advice-name" style="padding-left:7px;" >
                           <span v-if="advice.parent_id > 0">---></span>
                           <span >{{advice.advice_name }}</span>
-                          <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                          <span v-if="advice&&advice.advice_desc">({{advice.advice_desc}}{{advice.drug_spec_unit}})</span>
                           <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                          <!--<span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>-->
+                          <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                           <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
                           <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
                           <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span>

src/pages/main/today/TodayTab.vue

@@ -201,7 +201,7 @@
     </van-popup>
 
     <van-popup title="治疗小结" v-model="menuList[9].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <treatment-dialog :patient_prop="patient" :record="treatment_summary" @did_update="closeTreatmentOf"
+      <treatment-dialog :patient_prop="patient" :record="treatment_summary" @did_update="updateTreatmentOf"
                         @close="closeTreatmentOf" ref="treatment_dialog"></treatment-dialog>
     </van-popup>
 
@@ -1296,6 +1296,11 @@ import {parseTime} from '@/utils'
       if (assessment_after_dislysis != undefined) {
         this.assessment_after_dislysis = assessment_after_dislysis
       }
+    },updateTreatmentOf:function(val){
+      this.closeDialog(9)
+      this.treatment_summary = val
+
+
     },
 
     closeTreatmentOf: function () {