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

src/store/modules/globalConfig.js

@@ -712,6 +712,66 @@ const global_config = {
         sodium: 1,
         calcium: 1,
         bicarbonate: 1
+      },
+      34: {
+        id: 34,
+        name: 'HDF100',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      35: {
+        id: 35,
+        name: 'HDF600',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      36: {
+        id: 36,
+        name: 'HDF800',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      37: {
+        id: 37,
+        name: 'HDF1000',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
       }
     },
     anticoagulants_confit: { // 抗凝剂

src/xt_pages/sign/index.vue

@@ -287,9 +287,10 @@ export default {
         if (response.data.data.patientlist != null) {
           var patientlist = response.data.data.patientlist
           this.weigh_list.id = patientlist.id
-          this.weigh_list.dry_weight = patientlist.dry_weight?response.data.data.dryWeight.dry_weight:0
+          var dryWeight =  response.data.data.dryWeight
+          this.weigh_list.dry_weight = patientlist.dry_weight
           if (this.weigh_list.dry_weight === 0) {
-            this.weigh_list.dry_weight = ''
+            this.weigh_list.dry_weight = dryWeight.dry_weight
           }
           this.weigh_list.weight_before = patientlist.weight_before
           if (this.weigh_list.weight_before === 0) {