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

build/cdn.json

 {
-  "version": "2999.999.13744"
+  "version": "2999.999.13748"
 }

src/pages/main/newActionBar/assessmentAfter.vue

       }
 
       //干体重默认透前评估里面的干体重
-      if(this.$store.getters.user.template_info.org_id==10138 || this.$store.getters.user.template_info.org_id==10278 ||  this.$store.getters.user.template_info.org_id==0 || this.$store.getters.user.template_info.org_id==3877 || this.$store.getters.user.template_info.org_id==10551 || this.$store.getters.user.template_info.org_id==10558 || this.$store.getters.user.template_info.org_id==10515 || this.$store.getters.user.template_info.org_id==10597 || this.$store.getters.user.template_info.org_id==10599 || this.$store.getters.user.template_info.org_id==10598  || this.$store.getters.user.template_info.org_id==10510 || this.$store.getters.user.template_info.org_id==10629 || this.$store.getters.user.template_info.org_id==10702 || this.$store.getters.user.template_info.org_id==10721 ){
+      if(this.$store.getters.user.template_info.org_id==10138 || this.$store.getters.user.template_info.org_id==10278 ||  this.$store.getters.user.template_info.org_id==0 || this.$store.getters.user.template_info.org_id==3877 || this.$store.getters.user.template_info.org_id==10551 || this.$store.getters.user.template_info.org_id==10558 || this.$store.getters.user.template_info.org_id==10515 || this.$store.getters.user.template_info.org_id==10597 || this.$store.getters.user.template_info.org_id==10599 || this.$store.getters.user.template_info.org_id==10598  || this.$store.getters.user.template_info.org_id==10510 || this.$store.getters.user.template_info.org_id==10629 || this.$store.getters.user.template_info.org_id==10702 || this.$store.getters.user.template_info.org_id==10721 || this.$store.getters.user.template_info.org_id==10726 ){
           this.formValue.additional_weight = this.predialysis.additional_weight
           this.formValue.patient_gose = "1"
       }
       if(this.formValue.temperature == 0){
          this.formValue.temperature = 36.5
       }
-      if(this.formValue.systolic_blood_pressure == 0){
-         this.formValue.systolic_blood_pressure = this.last_monitor.systolic_blood_pressure
-      }
-      if(this.formValue.diastolic_blood_pressure == 0){
-        this.formValue.diastolic_blood_pressure = this.last_monitor.diastolic_blood_pressure
-      }
+     
       if(this.formValue.pulse_frequency == 0){
          this.formValue.pulse_frequency = this.last_monitor.pulse_frequency
       }

src/pages/main/newActionBar/assessmentBefore.vue

   this.getPermission()
 
   console.log("数据我哦我",this.predialysis_evaluation_obj)
+  console.log("上次透前评估",this.last_predialysis)
   
   if (this.predialysis != null) {
     if (this.predialysis.thromubus_type == 1) {
     this.propDryForm.remark = this.dry_weight.remakes
 
     if(this.$store.getters.user.template_info.org_id==10677 || this.$store.getters.user.template_info.org_id==10679){
-      console.log("处方000啊多发点辅导费",this.first_monitor)
+     
       if(this.formValue.temperature == 0){
          this.formValue.temperature = 36.5
       }

src/pages/main/newActionBar/computer.vue

       this.nuclein_date_str = this.getTimeOne(this.record.nuclein_date);
     }
 
-    if(this.predialysis!=null){
+    if(this.org_id == 10721){
+      if(this.predialysis!=null){
       if(this.predialysis.internal_fistula!=''){
           this.change_nurse = 0
           this.puncture_nurse = this.record == null || this.record.id == ""? this.$store.getters.user.admin.id : this.record.puncture_nurse;
       }
     }
 
+    }
+   
     for (let index = 0; index < this.temp_device_numbers.length; index++) {
       const device_number = this.temp_device_numbers[index];
       this.temp_device_numbers[index]["zoneNumber"] =

src/pages/main/newActionBar/dialysisPrescription.vue

           if(this.dialysisPrescription.mode_id != 2){
             this.dialysisPrescription.replacement_flow = ""
           }
+          if(this.$store.getters.user.template_info.org_id == 10721){
+            if(this.dialysisPrescription.prescription_water == 0){
+              Toast.fail('请填写处方脱水量!')
+              return
+           }
+          }
           if(this.$store.getters.user.template_info.org_id!=9671){
             if (this.$store.getters.user.template_info.template_id == 6) {
             console.log(" this.dialysisPrescription.mode_id", this.dialysisPrescription.mode_id)
           return
          }
        }
+      
+      if(this.$store.getters.user.template_info.org_id == 10721){
+         if(this.dialysisPrescription.prescription_water == 0){
+          Toast.fail('请填写处方脱水量!')
+          return
+         }
+      } 
       if(this.dialysisPrescription.mode_id != 2){
         this.dialysisPrescription.replacement_flow = ""
       }

src/pages/main/newActionBar/monitoring.vue

       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.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:""
           this.form.transmembrane_pressure = lastMonitorRecordList.transmembrane_pressure?lastMonitorRecordList.transmembrane_pressure:""
 
           this.form.venous_pressure = lastMonitorRecordList.venous_pressure?lastMonitorRecordList.venous_pressure:""
 
           this.form.displacement_quantity = lastMonitorRecordList.displacement_quantity + lastMonitorRecordList.replacement_rate
+         
           if(this.org_id == 10587){
             this.form.displacement_quantity = (lastMonitorRecordList.displacement_quantity + (lastMonitorRecordList.replacement_rate *60) ).toFixed(0)
           }
 
 
 
-          this.form.ultrafiltration_volume = (lastMonitorRecordList.ultrafiltration_rate + lastMonitorRecordList.ultrafiltration_volume).toFixed(0)
+          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 == 10721){
+
+            this.form.displacement_quantity =  resp.monitor.displacement_quantity
+          }
+
         }
 
       
       }
 
       if(this.org_id == 10644){
-          console.log("hahahhahahahahh",this.form.displacement_quantity)
+        
           this.form.displacement_quantity = (this.form.displacement_quantity/1000).toFixed(2)
        }