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.13747"
+  "version": "2999.999.13750"
 }

src/pages/main/dialog/subMenu/LongAdviceSubMenu.vue

@@ -442,7 +442,18 @@ export default {
               this.advice_start_time = year + '-' + month + '-' + day + ' ' + '15:00'
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
-          }else if (this.$store.getters.user.org.id == 10353) {
+          }else if (this.$store.getters.user.org.id == 10735) {
+               if (sch.schedule_type == 1) {
+                 this.advice_start_time = year + '-' + month + '-' + day + ' ' + '06:30'
+                 this.start_time = year + '-' + month + '-' + day + ' ' + '06:30'
+               } else if (sch.schedule_type == 2) {
+                 this.advice_start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+                 this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+               } else if (sch.schedule_type == 3) {
+                 this.advice_start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+                 this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+               }
+             }else if (this.$store.getters.user.org.id == 10353) {
                if (sch.schedule_type == 1) {
                  this.advice_start_time = year + '-' + month + '-' + day + ' ' + '07:00'
                  this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'

src/pages/main/newActionBar/assessmentAfter.vue

@@ -785,7 +785,7 @@ export default {
       }
 
       //干体重默认透前评估里面的干体重
-      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.$store.getters.user.template_info.org_id==10727 || this.$store.getters.user.template_info.org_id==10723){
+      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.$store.getters.user.template_info.org_id==10727 || this.$store.getters.user.template_info.org_id==10723|| this.$store.getters.user.template_info.org_id==10599 || this.$store.getters.user.template_info.org_id==10597){
           this.formValue.additional_weight = this.predialysis.additional_weight
           this.formValue.patient_gose = "1"
       }

src/pages/main/newActionBar/monitoring.vue

@@ -1895,7 +1895,7 @@ methods: {
       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 : ''
-      if (this.template_id == 34) {
+      if (this.template_id == 34|| this.org_id == 10735) {
         this.form.venous_pressure = resp.monitor.venous_pressure ? resp.monitor.venous_pressure : ''
       } else {
         this.form.venous_pressure = '' // this.last_monitor_record.venous_pressure;
@@ -1924,7 +1924,7 @@ methods: {
       }
 
       this.form.arterial_pressure_type = resp.monitor.arterial_pressure_type ? resp.monitor.arterial_pressure_type : 1
-      if (this.template_id == 34) {
+      if (this.template_id == 34 || this.org_id == 10735) {
         this.form.transmembrane_pressure = resp.monitor.transmembrane_pressure ? resp.monitor.transmembrane_pressure : ''
       } else if (this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340) {
         this.form.transmembrane_pressure = 60