Merge branch 'master' of http://git.shengws.com/csx/Pad_New

src/pages/main/dialog/PrescriptionDialog.vue

@@ -2849,6 +2849,7 @@ export default {
     ) {
       this.timeValue = ''
       this.time = '03:00'
+      this.dialysisPrescription.dialysis_duration = 3
     } else {
       this.timeValue =
         this.dialysisPrescription.dialysis_duration_hour +
@@ -2863,6 +2864,13 @@ export default {
         (this.dialysisPrescription.dialysis_duration_minute > 10
           ? this.dialysisPrescription.dialysis_duration_minute
           : '0' + this.dialysisPrescription.dialysis_duration_minute)
+
+      this.dialysisPrescription.dialysis_duration =
+        parseFloat(this.dialysisPrescription.dialysis_duration_hour) +
+        parseFloat(
+          (this.dialysisPrescription.dialysis_duration_minute / 60).toFixed(2)
+        );
+
     }
 
     this.dialyserList = this.machines_prop