csx před 5 roky
rodič
revize
28a2bd24fd

+ 1 - 1
build/cdn.json Zobrazit soubor

1
 {
1
 {
2
-  "version": "1.0.104"
2
+  "version": "1.0.105"
3
 }
3
 }

+ 4 - 2
config/dev.env.js Zobrazit soubor

4
 
4
 
5
 module.exports = merge(prodEnv, {
5
 module.exports = merge(prodEnv, {
6
   NODE_ENV: '"development"',
6
   NODE_ENV: '"development"',
7
-  // BASE_API: '"http://api.xt.test.sgjyun.com"'
7
+  BASE_API: '"http://api.xt.test.sgjyun.com"'
8
    //http://api.xt.test.sgjyun.com http://localhost:9529
8
    //http://api.xt.test.sgjyun.com http://localhost:9529
9
-   BASE_API: '"http://api.xt.test.sgjyun.com"'
9
+   // BASE_API: '"http://api.xt.test.sgjyun.com"'
10
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
11
+
10
 })
12
 })

+ 47 - 6
src/pages/main/dialog/PrescriptionDialog.vue Zobrazit soubor

64
         <div class="item" v-if="anticoagulant.shouji != -1&&isShow('首剂')">
64
         <div class="item" v-if="anticoagulant.shouji != -1&&isShow('首剂')">
65
           <label class="name" for="sj">首剂({{anticoagulant.shouji_unit}})</label>
65
           <label class="name" for="sj">首剂({{anticoagulant.shouji_unit}})</label>
66
           <div class="content">
66
           <div class="content">
67
-            <input type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.anticoagulant_shouji"
67
+            <input v-if="dialysisPrescription.anticoagulant != 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.anticoagulant_shouji"
68
+                   :disabled="anticoagulant.shouji==1?false:true"/>
69
+
70
+            <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_shouji"
68
                    :disabled="anticoagulant.shouji==1?false:true"/>
71
                    :disabled="anticoagulant.shouji==1?false:true"/>
69
           </div>
72
           </div>
70
         </div>
73
         </div>
71
         <div class="item" v-if="anticoagulant.weichi != -1&&isShow('维持')">
74
         <div class="item" v-if="anticoagulant.weichi != -1&&isShow('维持')">
72
           <label class="name" for="wz">维持({{anticoagulant.weichi_unit}})</label>
75
           <label class="name" for="wz">维持({{anticoagulant.weichi_unit}})</label>
73
           <div class="content">
76
           <div class="content">
74
-            <input type="tel" @focus="inputFocus" id="wz" class="inputBox"
77
+            <input v-if="dialysisPrescription.anticoagulant != 1" type="tel" @focus="inputFocus" id="wz" class="inputBox"
75
                    v-model="dialysisPrescription.anticoagulant_weichi"
78
                    v-model="dialysisPrescription.anticoagulant_weichi"
76
                    :disabled="anticoagulant.weichi==1?false:true">
79
                    :disabled="anticoagulant.weichi==1?false:true">
80
+
81
+            <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_weichi"
82
+                   :disabled="anticoagulant.shouji==1?false:true"/>
77
           </div>
83
           </div>
78
         </div>
84
         </div>
79
         <div class="item" v-if="anticoagulant.zongliang != -1 && isShow('总量')">
85
         <div class="item" v-if="anticoagulant.zongliang != -1 && isShow('总量')">
85
 
91
 
86
 
92
 
87
           <div class="content">
93
           <div class="content">
88
-            <input type="tel" @focus="inputFocus" id="zl" class="inputBox"
94
+            <input v-if="dialysisPrescription.anticoagulant != 1" type="tel" @focus="inputFocus" id="zl" class="inputBox"
89
                    v-model="dialysisPrescription.anticoagulant_zongliang"
95
                    v-model="dialysisPrescription.anticoagulant_zongliang"
90
                    :disabled="anticoagulant.zongliang==1?false:true">
96
                    :disabled="anticoagulant.zongliang==1?false:true">
97
+
98
+            <input v-if="dialysisPrescription.anticoagulant == 1" type="tel" @focus="inputFocus" id="sj" v-model="dialysisPrescription.no_anticoagulant_zongliang"
99
+                   :disabled="anticoagulant.shouji==1?false:true"/>
91
           </div>
100
           </div>
92
         </div>
101
         </div>
93
 
102
 
478
           anticoagulant_gaimingcheng: '',
487
           anticoagulant_gaimingcheng: '',
479
           anticoagulant_gaijiliang: '',
488
           anticoagulant_gaijiliang: '',
480
           dialyzer_perfusion_apparatus: '',
489
           dialyzer_perfusion_apparatus: '',
490
+
491
+          no_anticoagulant_shouji: '0',
492
+          no_anticoagulant_weichi: '0',
493
+          no_anticoagulant_zongliang: '0',
494
+
495
+
481
           kalium: '',
496
           kalium: '',
482
           sodium: '',
497
           sodium: '',
483
           calcium: '',
498
           calcium: '',
998
                   }
1013
                   }
999
                 }
1014
                 }
1000
               }
1015
               }
1016
+
1017
+              console.log(this.dialysisPrescription.dialysis_duration_hour)
1018
+              console.log(this.dialysisPrescription.dialysis_duration_minute)
1019
+              console.log(this.dialysisPrescription.dialysis_duration_hour == '')
1020
+              console.log(this.dialysisPrescription.dialysis_duration_minute == 0)
1021
+
1022
+
1023
+
1024
+              if (this.dialysisPrescription.dialysis_duration_hour === '' || this.dialysisPrescription.dialysis_duration_minute === '') {
1025
+                this.timeValue = ''
1026
+                this.time = '03:00'
1027
+
1028
+              } else {
1029
+
1030
+                this.timeValue = this.dialysisPrescription.dialysis_duration_hour + '小时' + this.dialysisPrescription.dialysis_duration_minute + '分钟'
1031
+                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)
1032
+              }
1001
             })
1033
             })
1002
             break
1034
             break
1003
           case 2:
1035
           case 2:
1120
         return anticoagulan_name
1152
         return anticoagulan_name
1121
       },
1153
       },
1122
       commitInfo: function () {
1154
       commitInfo: function () {
1155
+        if(this.dialysisPrescription.anticoagulant == 1){
1156
+          this.dialysisPrescription.anticoagulant_weichi = '0'
1157
+          this.dialysisPrescription.anticoagulant_shouji = '0'
1158
+          this.dialysisPrescription.anticoagulant_zongliang = '0'
1159
+        }
1123
         if (this.$store.getters.user.template_info.template_id == 6) {
1160
         if (this.$store.getters.user.template_info.template_id == 6) {
1124
           if (this.dialysisPrescription.mode_id == 2) {
1161
           if (this.dialysisPrescription.mode_id == 2) {
1125
             if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.displace_liqui_value == 0 || this.dialysisPrescription.displace_liqui_value == '') {
1162
             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
         if (this.$store.getters.user.template_info.template_id == 6) {
1453
         if (this.$store.getters.user.template_info.template_id == 6) {
1417
           if (this.dialysisPrescription.mode_id == 2) {
1454
           if (this.dialysisPrescription.mode_id == 2) {
1418
             if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.displace_liqui_value == 0 || this.dialysisPrescription.displace_liqui_value == '') {
1455
             if (this.dialysisPrescription.displace_liqui_part == 0 || this.dialysisPrescription.displace_liqui_part == -2 || this.dialysisPrescription.displace_liqui_value == 0 || this.dialysisPrescription.displace_liqui_value == '') {
1419
-              Toast.fail('HDF模式下置换方式和置换量不能为空!')
1456
+              Toast.fail('HDF模式下置换方式和置换液总量不能为空!')
1420
               return
1457
               return
1421
             }
1458
             }
1422
           }
1459
           }
1906
         }
1943
         }
1907
       } else if (this.solution_prop != null && typeof this.solution_prop.id != 'undefined' && this.solution_prop.id) {
1944
       } else if (this.solution_prop != null && typeof this.solution_prop.id != 'undefined' && this.solution_prop.id) {
1908
         for (const key in this.solution_prop) {
1945
         for (const key in this.solution_prop) {
1909
-          this.dialysisPrescription[key] = this.solution_prop[key]
1946
+          if(key != "target_ultrafiltration") {
1947
+            this.dialysisPrescription[key] = this.solution_prop[key]
1948
+          }
1910
         }
1949
         }
1911
       } else if (this.last_prescription != null && typeof this.last_prescription.id != 'undefined' && this.last_prescription.id) {
1950
       } else if (this.last_prescription != null && typeof this.last_prescription.id != 'undefined' && this.last_prescription.id) {
1912
         for (const key in this.last_prescription) {
1951
         for (const key in this.last_prescription) {
1913
-          this.dialysisPrescription[key] = this.last_prescription[key]
1952
+          if(key != "target_ultrafiltration") {
1953
+            this.dialysisPrescription[key] = this.last_prescription[key]
1954
+          }
1914
         }
1955
         }
1915
       } else {
1956
       } else {
1916
         this.dialysisPrescription.mode_id = this.schedual.mode_id
1957
         this.dialysisPrescription.mode_id = this.schedual.mode_id

+ 16 - 19
src/pages/main/dialog/TreatmentDialog.vue Zobrazit soubor

25
                   <el-option v-for="(s, index) in summary" :label="s.text" :value="s.value"
25
                   <el-option v-for="(s, index) in summary" :label="s.text" :value="s.value"
26
                              :key="index"></el-option>
26
                              :key="index"></el-option>
27
                 </el-select> -->
27
                 </el-select> -->
28
-                
28
+
29
               <el-input readonly v-model="dialysisSummary.summaryContentSelect" placeholder="请选择" @focus="showSubMenu('summary')" ></el-input>
29
               <el-input readonly v-model="dialysisSummary.summaryContentSelect" placeholder="请选择" @focus="showSubMenu('summary')" ></el-input>
30
 
30
 
31
               </el-form-item>
31
               </el-form-item>
39
           </div> -->
39
           </div> -->
40
         </div>
40
         </div>
41
     </div>
41
     </div>
42
-    
42
+
43
     <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" :propsForm="propForm"></check-box-sub-menu>
43
     <check-box-sub-menu :visibility="visibility" v-on:menu-cancle="menuCancle" v-on:menu-comfirm="menuComfirm" :propsForm="propForm"></check-box-sub-menu>
44
   </div>
44
   </div>
45
 </template>
45
 </template>
55
   data() {
55
   data() {
56
     return {
56
     return {
57
       isShowDialog:true,
57
       isShowDialog:true,
58
-      
58
+
59
       visibility: false,
59
       visibility: false,
60
       propForm: {
60
       propForm: {
61
         title: '',
61
         title: '',
138
     // this.patient.id = this.patient_prop.id
138
     // this.patient.id = this.patient_prop.id
139
 
139
 
140
     if (this.record != null && this.record.id != '') {
140
     if (this.record != null && this.record.id != '') {
141
-      // for (const key in this.record) {
142
-      //   this.dialysisSummary[key] = this.record[key];
143
-      // }
144
-      // if(this.record.mission != 'undefined'){
145
-      //   this.dialysisSummary.propagandaAndEducationContent = this.record.mission
146
-      // }
147
-      // if(this.record.dialysis_summary != 'undefined'){
148
-      //   this.dialysisSummary.summaryContent = this.record.dialysis_summary
149
-      // }
150
-
151
-
141
+      for (const key in this.record) {
142
+        this.dialysisSummary[key] = this.record[key];
143
+      }
144
+      if(this.record.mission != 'undefined'){
145
+        this.dialysisSummary.propagandaAndEducationContent = this.record.mission
146
+      }
147
+      if(this.record.dialysis_summary != 'undefined'){
148
+        this.dialysisSummary.summaryContent = this.record.dialysis_summary
149
+      }
152
     }
150
     }
153
-    console.log(this.dialysisSummary.propagandaAndEducationContent)
154
-    console.log(this.dialysisSummary.summaryContent)
151
+
155
   },
152
   },
156
   methods: {
153
   methods: {
157
     lastInputFocus: function(event) {
154
     lastInputFocus: function(event) {
195
     menuCancle: function () {
192
     menuCancle: function () {
196
         this.visibility = false
193
         this.visibility = false
197
         this.isShowDialog = true
194
         this.isShowDialog = true
198
-    }, 
195
+    },
199
     menuComfirm: function (val) {
196
     menuComfirm: function (val) {
200
 
197
 
201
       this.visibility = false
198
       this.visibility = false
219
           break
216
           break
220
       }
217
       }
221
 
218
 
222
-    }, 
219
+    },
223
 
220
 
224
     dialysisSummarySelectChange: function(values) {
221
     dialysisSummarySelectChange: function(values) {
225
       if(this.dialysisSummary.summaryContent == null){
222
       if(this.dialysisSummary.summaryContent == null){
302
         }
299
         }
303
       }
300
       }
304
   },
301
   },
305
-  
302
+
306
   components: {
303
   components: {
307
     CheckBoxSubMenu,
304
     CheckBoxSubMenu,
308
   },
305
   },

+ 1 - 1
src/pages/main/dialog/modify_order/modify_order_form.vue Zobrazit soubor

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

+ 1 - 1
src/pages/main/dialog/new_order/order_form.vue Zobrazit soubor

20
               <label>药品规格</label>
20
               <label>药品规格</label>
21
               <!--<input class="inputBox" style="width:62.5%" v-model="order.advice_desc">-->
21
               <!--<input class="inputBox" style="width:62.5%" v-model="order.advice_desc">-->
22
 
22
 
23
-              <input type="number" class="inputBox" style="width:62.5%" v-model="order.advice_desc">
23
+              <input class="inputBox" style="width:62.5%" v-model="order.advice_desc">
24
               <input
24
               <input
25
                 type="text"
25
                 type="text"
26
                 placeholder="单位"
26
                 placeholder="单位"

+ 2 - 2
src/pages/main/template/DialysisPrintOrderSix.vue Zobrazit soubor

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

+ 6 - 1
src/pages/main/today/TodayTab.vue Zobrazit soubor

201
     </van-popup>
201
     </van-popup>
202
 
202
 
203
     <van-popup title="治疗小结" v-model="menuList[9].showPopup" :overlay="true" :close-on-click-overlay="false">
203
     <van-popup title="治疗小结" v-model="menuList[9].showPopup" :overlay="true" :close-on-click-overlay="false">
204
-      <treatment-dialog :patient_prop="patient" :record="treatment_summary" @did_update="closeTreatmentOf"
204
+      <treatment-dialog :patient_prop="patient" :record="treatment_summary" @did_update="updateTreatmentOf"
205
                         @close="closeTreatmentOf" ref="treatment_dialog"></treatment-dialog>
205
                         @close="closeTreatmentOf" ref="treatment_dialog"></treatment-dialog>
206
     </van-popup>
206
     </van-popup>
207
 
207
 
1296
       if (assessment_after_dislysis != undefined) {
1296
       if (assessment_after_dislysis != undefined) {
1297
         this.assessment_after_dislysis = assessment_after_dislysis
1297
         this.assessment_after_dislysis = assessment_after_dislysis
1298
       }
1298
       }
1299
+    },updateTreatmentOf:function(val){
1300
+      this.closeDialog(9)
1301
+      this.treatment_summary = val
1302
+
1303
+
1299
     },
1304
     },
1300
 
1305
 
1301
     closeTreatmentOf: function () {
1306
     closeTreatmentOf: function () {