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

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1600,7 +1600,7 @@ export default {
         }
       }
 
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517 || this.$store.getters.xt_user.org.id == 10580 || this.$store.getters.xt_user.org.id == 10579){
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517  || this.$store.getters.xt_user.org.id == 10579){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1
@@ -1630,6 +1630,35 @@ export default {
           }
       }
 
+      if(this.$store.getters.xt_user.org.id == 10580){
+        var year = date.getFullYear()
+          var month = date.getMonth() + 1
+          var day = date.getDate()
+
+          var hours = date.getHours()
+          var minites = date.getMinutes()
+
+          if (month < 10) {
+            month = '0' + month
+          }
+          if (day < 10) {
+            day = '0' + day
+          }
+          if (hours < 10) {
+            hours = '0' + hours
+          }
+          if (minites < 10) {
+            minites = '0' + minites
+          }
+          if (this.schedulePatient.schedule_type == 1) {
+            this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + '07:00'
+          } else if (this.schedulePatient.schedule_type == 2) {
+            this.groupForm.start_time= year + '-' + month + '-' + day + ' ' + '10:30'
+          } else if (this.schedulePatient.schedule_type == 3) {
+           this.groupForm.start_time = year + '-' + month + '-' + day + ' ' + '15:30'
+          }
+      }
+
       if( this.$store.getters.xt_user.org.id == 9829 ){
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -2648,7 +2648,7 @@ mu
               if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
             } else if (schedual.schedule_type == 2) {
-              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+              this.start_time = year + '-' + month + '-' + day + ' ' + '10:30'
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }

src/xt_pages/outpatientDoctorStation/modeTemplateDetail.vue

@@ -251,7 +251,7 @@
       month_prescriptions: Array,
       isloading: false,
       loading: false,
-      org_id:this.$store.getters.xt_user.org_id,
+      org_id:0,
       other_sick: {
         type: Array,
         default: function() {
@@ -1938,6 +1938,8 @@
       }
     },
     created() {
+      this.org_id = this.$store.getters.xt_user.org_id
+      console.log("ord22o2o2o",this.org_id)
       for(let key in this.$store.getters.treatment_mode){
         this.modeOptions[key] = this.$store.getters.treatment_mode[key]
         this.modeOptionsTwo[key]=  this.$store.getters.treatment_mode[key]