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.13746"
+  "version": "2999.999.13747"
 }

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){
+      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.formValue.additional_weight = this.predialysis.additional_weight
           this.formValue.patient_gose = "1"
       }

src/pages/main/newActionBar/assessmentBefore.vue

@@ -843,6 +843,8 @@ created () {
       this.formValue.last_after_weight = (this.last_record.weight_after - this.last_record.additional_weight).toFixed(1)
     }
 
+
+
     if(this.$store.getters.user.template_info.org_id == 10721){
       
        if(this.formValue.temperature == '' || this.formValue.temperature ==0){
@@ -856,6 +858,10 @@ created () {
           this.formValue.temperature = 36.5
        }
     }
+
+    if(this.$store.getters.user.template_info.org_id == 10597){
+      this.formValue.additional_weight = this.last_record.additional_weight
+    }
    
   } else {
     if (this.predialysis.id == undefined && this.last_predialysis.id != undefined) {

src/pages/main/newActionBar/monitoring.vue

@@ -1868,12 +1868,16 @@ methods: {
         this.form.operate_time = Date.parse(new Date())
       }else{
 
-        if(this.org_id!=10060){
+        if(this.org_id!=10060 && this.org_id!=10735){
           this.form.operate_time = lastMonitorRecordList.operate_time ? (lastMonitorRecordList.operate_time + 3600) * 1000 : Date.parse(new Date())
         }
         if(this.org_id ==10060){
           this.form.operate_time = resp.monitor.operate_time ? (resp.monitor.operate_time + 3600) * 1000 : Date.parse(new Date())
         }
+        //针对胶州少海医院
+        if(this.org_id == 10735){
+          this.form.operate_time = lastMonitorRecordList.operate_time ? (lastMonitorRecordList.operate_time + 1800) * 1000 : Date.parse(new Date())
+        }
       }