Explorar el Código

Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

yq1 hace 1 día
padre
commit
9147604817

+ 2 - 2
src/pages/main/PatientBox.vue Ver fichero

@@ -2740,7 +2740,7 @@ export default {
2740 2740
       this.zone_id = schedual.device_number.zone.id
2741 2741
       this.patient_id = schedual.patient_id
2742 2742
       this.mode_id = schedual.mode_id
2743
-      if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 9829  || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10318) {
2743
+      if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 9829  || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10318 || this.$store.getters.user.template_info.org_id == 10721) {
2744 2744
         console.log('下机时间', schedual.dialysis_order.end_time)
2745 2745
         if (schedual && schedual.dialysis_order != null) {
2746 2746
           this.start_time_str = this.getTimeTwo(schedual.dialysis_order.end_time)
@@ -2753,7 +2753,7 @@ export default {
2753 2753
         schedule_date: schedual.schedule_date
2754 2754
       }
2755 2755
       console.log('params23232323', params)
2756
-      if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 9829 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10101 || this.$store.getters.user.template_info.org_id == 10318) {
2756
+      if (this.$store.getters.user.template_info.org_id == 9671 || this.$store.getters.user.template_info.org_id == 9675 || this.$store.getters.user.template_info.org_id == 10340 || this.$store.getters.user.template_info.org_id == 9829 || this.$store.getters.user.template_info.org_id == 10490 || this.$store.getters.user.template_info.org_id == 10101 || this.$store.getters.user.template_info.org_id == 10318  || this.$store.getters.user.template_info.org_id == 10721) {
2757 2757
         getDialysisRecordOrde(params).then((response) => {
2758 2758
           if (response.data.state == 1) {
2759 2759
             var order = response.data.data.order

+ 19 - 4
src/pages/main/beforeDialysis/components/dialysisParameters.vue Ver fichero

@@ -227,7 +227,7 @@ export default {
227 227
       }
228 228
       getMobileDialysisParameters(params).then(response => {
229 229
         if (response.data.state == 1) {
230
-          //  var schedule =  response.data.data.schedule
230
+          var schedule =  response.data.data.schedule
231 231
           this.loading = false
232 232
           //  var total = response.data.data.total
233 233
           var prescription = response.data.data.prescription
@@ -237,6 +237,21 @@ export default {
237 237
           this.dialysisbefor = dialysbefor
238 238
           this.dialysisBefor = dialysbefor
239 239
           var patient = response.data.data.patient
240
+            
241
+          if(schedule!=null && schedule.length>0){
242
+           
243
+           for(let j=0;j<patient.length;j++){
244
+             patient[j].sort = 0
245
+             for(let i=0;i<schedule.length;i++){
246
+             
247
+                if(patient[j].patient_id == schedule[i].patient_id){
248
+                    patient[j].sort = schedule[i].device_number.sort
249
+                }
250
+             }
251
+            }
252
+        }
253
+
254
+
240 255
           if (response.data.data.patient.length <= 0) {
241 256
             this.isStop = true
242 257
           } else {
@@ -366,14 +381,14 @@ export default {
366 381
             if (patient[i].mode_id == 44) {
367 382
               patient[i].mode_id = '导管溶栓'
368 383
             }
384
+          }
369 385
             this.datalist = []
370
-            this.datalist = patient
386
+            this.datalist = patient.sort((a, b) => a.sort - b.sort)
371 387
             this.tableData = []
372
-            this.tableData = patient
388
+            this.tableData = patient.sort((a, b) => a.sort - b.sort)
373 389
             this.$nextTick(() => {
374 390
               this.$refs.tab.doLayout()
375 391
             })
376
-          }
377 392
         } else {
378 393
           this.loading = false
379 394
         }

+ 13 - 3
src/pages/main/newActionBar/dialysisPrescription.vue Ver fichero

@@ -91,13 +91,19 @@
91 91
           <span v-if="last_record!=undefined && $store.getters.user.template_info.org_id !=10599  && $store.getters.user.template_info.org_id !=10702">上次透后体重:{{last_record.weight_after?last_record.weight_after: "--"}}Kg</span></br>
92 92
           <span v-if="last_record!=undefined && $store.getters.user.template_info.org_id ==10702">上次透后体重:{{(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2): "--"}}Kg</span></br>
93 93
 
94
-
94
+          <span v-if="$store.getters.user.template_info.org_id == 10721">
95
+            <span v-if="predialysis!=null && last_record!=null">
96
+                体重增长:
97
+                {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
98
+              </span>
99
+          </span><br/>
100
+             
95 101
           <span v-if="$store.getters.user.template_info.org_id == 10551 || $store.getters.user.template_info.org_id == 10612 || $store.getters.user.template_info.org_id == 10622 &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined && dialysisPrescription.target_ultrafiltration>0">目标脱水量百分比:{{ (((dialysisPrescription.target_ultrafiltration)/predialysis.dry_weight)*100).toFixed(2)  }}%</span>
96 102
           <span v-if="$store.getters.user.template_info.org_id == 10249 || $store.getters.user.template_info.org_id == 10622   &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined && dialysisPrescription.target_ultrafiltration>0">目标脱水量百分比:{{ (((dialysisPrescription.target_ultrafiltration/1000)/predialysis.dry_weight)*100).toFixed(2)  }}%</span>
97
-          <span v-if="$store.getters.user.template_info.org_id == 10449 &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined">4小时超滤量上限(5%):{{ (predialysis.dry_weight*0.05).toFixed(2)  }}kg</span>
103
+          <span v-if="($store.getters.user.template_info.org_id == 10449 || $store.getters.user.template_info.org_id == 10721) &&predialysis!=undefined&&predialysis.weight_before>0 &&dialysisPrescription!=undefined">4小时超滤量上限(5%):{{ (predialysis.dry_weight*0.05).toFixed(2)  }}kg</span>
98 104
           <span v-if="$store.getters.user.template_info.org_id ==10599 &&predialysis!=undefined">心率:{{predialysis.pulse_frequency  }}次/分</span>&nbsp;
99 105
           <span v-if="$store.getters.user.template_info.org_id ==10599 &&predialysis!=undefined">体温:{{predialysis.temperature  }}℃</span>&nbsp;
100
-          <span v-if="($store.getters.user.template_info.org_id ==10599 || $store.getters.user.template_info.org_id ==10440) &&predialysis!=undefined">血压:{{predialysis.systolic_blood_pressure  }}/{{ predialysis.diastolic_blood_pressure  }}mmHg</span>
106
+          <span v-if="($store.getters.user.template_info.org_id ==10599 || $store.getters.user.template_info.org_id ==10440 ||  $store.getters.user.template_info.org_id ==10721 || $store.getters.user.template_info.org_id ==0) &&predialysis!=undefined">血压:{{predialysis.systolic_blood_pressure  }}/{{ predialysis.diastolic_blood_pressure  }}mmHg</span>
101 107
         </van-cell>
102 108
         <van-field
103 109
           v-model="dialysisPrescription.target_ultrafiltration"
@@ -1933,6 +1939,9 @@ export default {
1933 1939
     this.dialysisDialyszers = dialyzer
1934 1940
     this.dialysisIrrigation = irrigation
1935 1941
     this.dialysisStrainerList = dialysisStrainer
1942
+    console.log("透析器列表-----------------------",this.dialysisDialyszers)
1943
+    console.log("灌流器列表-----------------------",this.dialysisIrrigation)
1944
+    console.log("滤过器列表=-----------==---------",this.dialysisStrainerList)
1936 1945
     }
1937 1946
     this.bodyFluidOptions = this.$store.getters.body_fluid;
1938 1947
     var special_medicine = [
@@ -2251,6 +2260,7 @@ export default {
2251 2260
 
2252 2261
   },
2253 2262
   methods: {
2263
+  
2254 2264
     radioChange(val) {},
2255 2265
 
2256 2266
     formatter(val) {