Merge branch 'master' of http://git.shengws.com/csx/Vue_New into 20200710_pc_vue_new_branch

src/xt_pages/dialysis/details/NavIgation.vue

@@ -572,7 +572,7 @@ export default {
       this.$refs.monitor_dialog.show();
     },
     showAssessmentAfterDialog: function() {
-      this.$refs.assessment_after_dislysis.show(this.assessment_after_dislysis);
+      this.$refs.assessment_after_dislysis.show(this.assessment_after_dislysis,this.last_assessment_after_dislysis);
     },
     showDoctorAdviceDialog: function() {
       this.$refs.doctor_advice.show();

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -1013,7 +1013,7 @@ export default {
     },
 
     // 数据开始
-    show(predialysis) {
+    show(predialysis,last_after) {
       this.isVisibility = true
       this.predialysis = predialysis
       this.form.observation_content = predialysis.observation_content
@@ -1022,7 +1022,27 @@ export default {
         predialysis.observation_content_other
       // console.log("透后", predialysis);
 
+      if(predialysis != null && predialysis.id == 0){
+        if (last_after != null) {
+          for (var key in last_after){
+            if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after'  && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' ){
+              this.$set(
+                this.form,
+                key,
+                last_after[key]
+              )
+
+            }
+          }
+        }
+      }
+
+
+
+
       this.getPermission()
+
+
     },
 
     hide() {

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -685,7 +685,7 @@
 
           if (this.lastPredialysisEvaluation != null) {
             for (var key in this.lastPredialysisEvaluation){
-              if (key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' && key != 'temperature' && key != 'breathing_rate' && key != 'dry_weight' && key != 'weight_before'){
+              if (key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' && key != 'dry_weight' && key != 'weight_before'){
                 this.$set(
                   this.assessmentBeforeDislysis,
                   key,

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -893,7 +893,7 @@ export default {
         this.form.temperature = '' // this.last_monitor_record.pulse_frequency;
 
         this.form.pulse_frequency = '' // this.last_monitor_record.pulse_frequency;
-        this.form.breathing_rated =  ''
+        this.form.breathing_rated =  resp.monitor.breathing_rated ? resp.monitor.breathing_rated : ''
         this.form.systolic_bp = '' // this.last_monitor_record.systolic_blood_pressure;
         this.form.diastolic_bp = '' // this.last_monitor_record.diastolic_blood_pressure;
         this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume : ''
@@ -907,7 +907,7 @@ export default {
         this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume ? resp.monitor.ultrafiltration_volume : ''
         this.form.sodium_concentration = resp.monitor.sodium_concentration ? resp.monitor.sodium_concentration : ''
         this.form.dialysate_temperature = resp.monitor.dialysate_temperature ? resp.monitor.dialysate_temperature : ''
-        this.form.temperature = ''
+        this.form.temperature =  resp.monitor.temperature ? resp.monitor.temperature : ''
         this.form.replacement_rate = resp.monitor.replacement_rate ? resp.monitor.replacement_rate : ''
         this.form.heparin = resp.monitor.heparin ? resp.monitor.heparin : ''
         this.form.dialysate_flow = resp.monitor.dialysate_flow ? resp.monitor.dialysate_flow : ''