Browse Source

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

yq1 8 months ago
parent
commit
73dfe960a5

+ 2 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue View File

909
                             record.prescription &&
909
                             record.prescription &&
910
                             record.prescription.dialysis_duration_hour
910
                             record.prescription.dialysis_duration_hour
911
                               ? record.prescription.dialysis_duration_hour
911
                               ? record.prescription.dialysis_duration_hour
912
-                              : "/"
912
+                              : "0"
913
                           }}
913
                           }}
914
                         </div>
914
                         </div>
915
                         h
915
                         h
921
                             record.prescription &&
921
                             record.prescription &&
922
                             record.prescription.dialysis_duration_minute
922
                             record.prescription.dialysis_duration_minute
923
                               ? record.prescription.dialysis_duration_minute
923
                               ? record.prescription.dialysis_duration_minute
924
-                              : "/"
924
+                              : "0"
925
                           }}
925
                           }}
926
                         </div>
926
                         </div>
927
                         min
927
                         min

+ 10 - 0
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue View File

64
             </el-form-item>
64
             </el-form-item>
65
           </el-col>
65
           </el-col>
66
 
66
 
67
+          <el-col :span="8" v-if="isShow('透后体重')">
68
+            <el-form-item label="透后体重(kg): " :prop="isName('透后体重')" :rules="isCheckmust('透后体重')">
69
+              <el-input v-model="form.after_weight"></el-input>
70
+            </el-form-item>
71
+          </el-col>
72
+
67
           <el-col :span="8" v-if="isShow('穿刺处血肿')">
73
           <el-col :span="8" v-if="isShow('穿刺处血肿')">
68
             <el-form-item label="穿刺处血肿: " :prop="isName('穿刺处血肿')" :rules="isCheckmust('穿刺处血肿')">
74
             <el-form-item label="穿刺处血肿: " :prop="isName('穿刺处血肿')" :rules="isCheckmust('穿刺处血肿')">
69
               <el-radio-group v-model="form.puncture_point_haematoma">
75
               <el-radio-group v-model="form.puncture_point_haematoma">
900
         condenser:"",
906
         condenser:"",
901
         last_after_weight:"",
907
         last_after_weight:"",
902
         displace_liqui_value:"",
908
         displace_liqui_value:"",
909
+        after_weight:"",
903
       },
910
       },
904
       lapseList:[],
911
       lapseList:[],
905
       leaveOfficeMethod:[],
912
       leaveOfficeMethod:[],
1043
 
1050
 
1044
          this.form.additional_weight = this.predialysis_evaluation.additional_weight
1051
          this.form.additional_weight = this.predialysis_evaluation.additional_weight
1045
        }
1052
        }
1053
+    },
1054
+    'form.after_weight':function(){
1055
+      this.form.after_weight = this.form.weight_after - this.form.additional_weight 
1046
     }
1056
     }
1047
   },
1057
   },
1048
   methods: {
1058
   methods: {

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue View File

994
                         {{
994
                         {{
995
                           prescription.dialysis_duration_hour
995
                           prescription.dialysis_duration_hour
996
                             ? prescription.dialysis_duration_hour
996
                             ? prescription.dialysis_duration_hour
997
-                            : "/"
997
+                            : "0"
998
                         }}
998
                         }}
999
                       </div>
999
                       </div>
1000
                       h
1000
                       h
1005
                         <span v-if="org_id!=10624">{{
1005
                         <span v-if="org_id!=10624">{{
1006
                           prescription.dialysis_duration_minute
1006
                           prescription.dialysis_duration_minute
1007
                             ? prescription.dialysis_duration_minute
1007
                             ? prescription.dialysis_duration_minute
1008
-                            : "/"
1008
+                            : "0"
1009
                         }}
1009
                         }}
1010
                         </span>
1010
                         </span>
1011
 
1011