11

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -2102,7 +2102,7 @@ export default {
               if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                 if (prescription.pre_time == 0) {
                   if (this.schedule.schedule_type == 1) {
-                    if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                    if (this.org_id == 10028 || this.org_id == 10571  || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206 || this.org_id == 10598){
                       preTime = this.record_date + ' ' + '6:00'
@@ -2123,13 +2123,14 @@ export default {
                     preTime = this.record_date + ' ' + '17:00'
                   }
                   // preTime = nowTime
+                  if(this.$store.getters.xt_user.org.id == 10510 || this.org_id == 0){
+                    preTime = nowTime
+                  }
+
                 } else {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                 }
 
-                if(this.$store.getters.xt_user.org.id == 10510){
-                  preTime = nowTime
-                }
 
               } else {
 
@@ -2138,7 +2139,7 @@ export default {
                   if(nowTime.split(" ")[0] != this.record_date){
                     // preTime = this.record_date
                     if(this.schedule.schedule_type == 1){
-                      if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
+                      if(this.org_id == 10206   || this.org_id == 10598) {
                         preTime = this.record_date+ ' ' + '6:00'
                       }else {
                         preTime = this.record_date + ' ' + '7:00'
@@ -2157,7 +2158,7 @@ export default {
                     }
 
 
-                    if(this.$store.getters.xt_user.org.id == 10510){
+                    if(this.$store.getters.xt_user.org.id == 10510 || this.org_id == 0){
                       preTime = nowTime
                     }
 
@@ -2310,7 +2311,7 @@ export default {
                 var preTime = nowTime
                 if (this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                   if (this.schedule.schedule_type == 1) {
-                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                    if (this.org_id == 10028 ||  this.org_id == 10571 || this.org_id == 10633) {
                       preTime = this.record_date + ' ' + '6:30'
                     } else if(this.org_id == 10206  || this.org_id == 10598) {
                       preTime = this.record_date+ ' ' + '6:00'
@@ -2331,7 +2332,7 @@ export default {
                     preTime = this.record_date + ' ' + '17:00'
                   }
 
-                  if(this.$store.getters.xt_user.org.id == 10510){
+                  if(this.$store.getters.xt_user.org.id == 10510  || this.org_id == 0){
                     preTime = nowTime
                   }
                 }
@@ -2702,7 +2703,7 @@ export default {
                     if ( this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                       if (prescription.pre_time == 0) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                          if (this.org_id == 10028 || this.org_id == 10571  || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
@@ -2723,18 +2724,18 @@ export default {
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+                        if(this.$store.getters.xt_user.org.id == 10510 || this.org_id == 0 ){
+                          preTime = nowTime
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
 
-                      if(this.$store.getters.xt_user.org.id == 10510){
-                        preTime = nowTime
-                      }
                     } else {
                       if (prescription.pre_time == 0) {
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
+                            if(this.org_id == 10206  || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
@@ -2752,6 +2753,9 @@ export default {
                             preTime = this.record_date + ' ' + '17:00'
                           }
                         }
+                        if(this.$store.getters.xt_user.org.id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
                         // preTime = nowTime
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -2900,7 +2904,7 @@ export default {
                       // var preTime = ''
                       if ( this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date + ' ' + '6:00'
@@ -2910,7 +2914,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206  || this.org_id == 0){
+                          if(this.org_id == 10206 ){
                             preTime =this.record_date + ' ' + '10:30'
                           }else if(this.org_id == 10598){
                             preTime = this.record_date + ' ' + '09:00'
@@ -2922,7 +2926,7 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
 
-                        if(this.$store.getters.xt_user.org.id == 10510){
+                        if(this.$store.getters.xt_user.org.id == 10510  || this.org_id == 0){
                           preTime = nowTime
                         }
                       }
@@ -4639,7 +4643,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206  || this.org_id == 0){
+                          if(this.org_id == 10206  ){
                             preTime = this.record_date + ' ' + '10:30'
 
                           }else if(this.org_id == 10598){
@@ -4651,20 +4655,21 @@ export default {
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+                        if(this.$store.getters.xt_user.org.id == 10510 || this.org_id == 0){
+                          preTime = nowTime
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
 
-                      if(this.$store.getters.xt_user.org.id == 10510){
-                        preTime = nowTime
-                      }
+
                     } else {
                       console.log("0---00000000000")
                       if (prescription.pre_time == 0) {
                         // preTime = nowTime
                         if(nowTime.split(" ")[0] != this.record_date){
                           if(this.schedule.schedule_type == 1){
-                            if(this.org_id == 10206  || this.org_id == 0 || this.org_id == 10598) {
+                            if(this.org_id == 10206  || this.org_id == 10598) {
                               preTime = this.record_date+ ' ' + '6:00'
                             }else {
                               preTime = this.record_date + ' ' + '7:00'
@@ -4682,6 +4687,10 @@ export default {
                             preTime = this.record_date + ' ' + '17:00'
                           }
                         }
+                        if(this.$store.getters.xt_user.org.id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
+
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
@@ -4828,7 +4837,7 @@ export default {
                       var preTime = nowTime
                       if (this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191 && this.$store.getters.xt_user.org.id != 10375 ) {
                         if (this.schedule.schedule_type == 1) {
-                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 0 || this.org_id == 10633) {
+                          if (this.org_id == 10028 || this.org_id == 10571 || this.org_id == 10633) {
                             preTime = this.record_date + ' ' + '6:30'
                           } else if(this.org_id == 10206 || this.org_id == 10598){
                             preTime = this.record_date+ ' ' + '6:00'
@@ -4849,7 +4858,7 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
 
-                        if(this.$store.getters.xt_user.org.id == 10510){
+                        if(this.$store.getters.xt_user.org.id == 10510 || this.org_id == 0 ){
                           preTime = nowTime
                         }
                       }
@@ -5286,7 +5295,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206  || this.org_id == 0){
+                          if(this.org_id == 10206 ){
                             preTime =this.record_date + ' ' + '10:30'
                           }else if(this.org_id == 10598){
                             preTime = this.record_date + ' ' + '09:00'
@@ -5298,13 +5307,14 @@ export default {
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+                        if(this.$store.getters.xt_user.org.id == 10510  || this.org_id == 0){
+                          preTime = nowTime
+                        }
                       } else {
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
                       }
 
-                      if(this.$store.getters.xt_user.org.id == 10510){
-                        preTime = nowTime
-                      }
+
                     } else {
                       if (prescription.pre_time == 0) {
                         preTime = nowTime
@@ -5484,7 +5494,7 @@ export default {
                           }
                           // preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
                         } else if (this.schedule.schedule_type == 2) {
-                          if(this.org_id == 10206 ||  this.org_id == 0){
+                          if(this.org_id == 10206 ){
                             preTime = this.record_date + ' ' + '10:30'
 
                           }else if(this.org_id == 10598){
@@ -5497,7 +5507,7 @@ export default {
                           preTime = this.record_date + ' ' + '17:00'
                         }
 
-                        if(this.$store.getters.xt_user.org.id == 10510){
+                        if(this.$store.getters.xt_user.org.id == 10510 ||  this.org_id == 0){
                           preTime = nowTime
                         }
                       }