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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13748"
+  "version": "2999.999.13754"
 }

src/pages/main/newActionBar/monitoring.vue

@@ -2047,7 +2047,12 @@ methods: {
       if(this.org_id == 10597 || this.org_id ==10599 || this.org_id ==10587 || this.org_id ==10571 || this.org_id==10579 || this.org_id ==10600 || this.org_id ==10612 || this.org_id ==10617 || this.org_id ==10580 || this.org_id ==10375 || this.org_id ==10629 || this.org_id ==10480  || this.org_id ==10414 || this.org_id ==10679 || this.org_id ==10693 || this.org_id == 10694 || this.org_id == 10697 || this.org_id ==10702 || this.org_id ==10723 || this.org_id == 10721){
 
         if(lastMonitorRecordList!=null){
-          this.form.ultrafiltration_rate = lastMonitorRecordList.ultrafiltration_rate?lastMonitorRecordList.ultrafiltration_rate:this.today_last_monitor_record.ultrafiltration_rate
+          if(this.org_id != 10721){
+            this.form.ultrafiltration_rate = lastMonitorRecordList.ultrafiltration_rate?lastMonitorRecordList.ultrafiltration_rate:""
+          }else{
+            this.form.ultrafiltration_rate = lastMonitorRecordList.ultrafiltration_rate?lastMonitorRecordList.ultrafiltration_rate:this.today_last_monitor_record.ultrafiltration_rate
+          }
+         
           console.log("haaaaaaaaaaaaaaaa",this.form.ultrafiltration_rate)
           console.log("bbbbbbbbbbbbbbbbbbbbb",this.today_last_monitor_record.ultrafiltration_rate)
           this.form.replacement_rate = lastMonitorRecordList.replacement_rate?lastMonitorRecordList.replacement_rate:""
@@ -2079,19 +2084,29 @@ methods: {
             this.form.displacement_quantity = (lastMonitorRecordList.displacement_quantity + this.monitorRecords[1].displacement_quantity).toFixed(1)
           }
 
-
-
-          this.form.ultrafiltration_volume = (this.form.replacement_rate + lastMonitorRecordList.ultrafiltration_volume).toFixed(0)
-
           if(this.org_id == 10694){
             this.form.ultrafiltration_volume = this.form.ultrafiltration_volume.toFixed(0)
           }
 
+          if(this.org_id == 10597){
+            console.log("this.form.replacement_rate",this.form.ultrafiltration_rate)
+            console.log("this.form.ultrafiltration_volume",this.form.ultrafiltration_volume)
+            this.form.ultrafiltration_volume = (this.form.ultrafiltration_rate + lastMonitorRecordList.ultrafiltration_volume).toFixed(0)
+
+          }else{
+            this.form.ultrafiltration_volume = (this.form.ultrafiltration_rate + lastMonitorRecordList.ultrafiltration_volume).toFixed(0)
+          }
+
           if(this.org_id == 10721){
 
             this.form.displacement_quantity =  resp.monitor.displacement_quantity
+
+            this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume
           }
 
+        
+          
+
         }