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

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

                   } else if (this.schedule.schedule_type == 2) {
                      if(this.org_id == 10206  || this.org_id == 0 ){
                       preTime = this.record_date + ' ' + '10:30'
-                    }else{
+                    }else if(this.org_id == 10598){
+                       preTime = this.record_date + ' ' + '09:00'
+
+                     }else{
                      preTime = this.record_date + ' ' + '11:00'
                    }
                   } else if (this.schedule.schedule_type == 3) {
                   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("test")
+
                 if (prescription.pre_time == 0) {
-                  console.log("++=========")
-                  console.log(nowTime.split(" ")[0])
-                  console.log(this.record_date)
-                  console.log("++=========")
 
                   if(nowTime.split(" ")[0] != this.record_date){
                     // preTime = this.record_date
                     }else if(this.schedule.schedule_type == 2){
                       if(this.org_id == 10206  || this.org_id == 0){
                         preTime = this.record_date + ' ' + '10:30'
+                      }else if(this.org_id == 10598){
+                        preTime = this.record_date + ' ' + '09:00'
+
                       }else {
                         preTime = this.record_date + ' ' + '11:00'
                       }
                       preTime = this.record_date + ' ' + '17:00'
                     }
 
+
+                    if(this.$store.getters.xt_user.org.id == 10510){
+                      preTime = nowTime
+                    }
+
                   }
                 } else {
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
               }
 
 
+
+
               let index = i + 1
               let obj = {
                 id: prescription.id,
                   } else if (this.schedule.schedule_type == 2) {
                     if(this.org_id == 10206  || this.org_id == 0){
                       preTime = this.record_date + ' ' + '10:30'
+                    }else if(this.org_id == 10598){
+                      preTime = this.record_date + ' ' + '09:00'
+
                     }else {
                       preTime = this.record_date + ' ' + '11:00'
                     }
                   } else if (this.schedule.schedule_type == 3) {
                     preTime = this.record_date + ' ' + '17:00'
                   }
+
+                  if(this.$store.getters.xt_user.org.id == 10510){
+                    preTime = nowTime
+                  }
                 }
 
                 if(nowTime.split(" ")[0] != this.record_date){
                   }else if(this.schedule.schedule_type == 2){
                     if(this.org_id == 10206  || this.org_id == 0){
                       preTime = this.record_date + ' ' + '10:30'
+                    }else if(this.org_id == 10598){
+                      preTime = this.record_date + ' ' + '09:00'
+
                     }else {
                       preTime = this.record_date + ' ' + '11:00'
                     }
                 }else if(this.schedule.schedule_type == 2){
                   if(this.org_id == 10206  || this.org_id == 0){
                     preTime = this.record_date + ' ' + '10:30'
+                  }else if(this.org_id == 10598){
+                    preTime = this.record_date + ' ' + '09:00'
+
                   }else {
                     preTime = this.record_date + ' ' + '11:00'
                   }
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else{
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       } 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){
                           }else if(this.schedule.schedule_type == 2){
                             if(this.org_id == 10206  || this.org_id == 0){
                               preTime = this.record_date + ' ' + '10:30'
+                            }else if(this.org_id == 10598){
+                              preTime = this.record_date + ' ' + '09:00'
+
                             }else {
                               preTime = this.record_date + ' ' + '11:00'
                             }
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime =this.record_date + ' ' + '10:30'
-                          }else{
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
 
+                          }else{
                             preTime = this.record_date + ' ' + '11:00'
-
                           }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+
+                        if(this.$store.getters.xt_user.org.id == 10510){
+                          preTime = nowTime
+                        }
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        } else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        }else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        }else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        }else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }
                     }else if(this.schedule.schedule_type == 2){
                       if(this.org_id == 10206  || this.org_id == 0){
                         preTime = this.record_date + ' ' + '10:30'
+                      }else if(this.org_id == 10598){
+                        preTime = this.record_date + ' ' + '09:00'
+
                       }else {
                         preTime = this.record_date + ' ' + '11:00'
                       }
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
 
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       } 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) {
                           }else if(this.schedule.schedule_type == 2){
                             if(this.org_id == 10206  || this.org_id == 0){
                               preTime = this.record_date + ' ' + '10:30'
+                            }else if(this.org_id == 10598){
+                              preTime = this.record_date + ' ' + '09:00'
+
                             }else {
                               preTime = this.record_date + ' ' + '11:00'
                             }
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else{
                             preTime = this.record_date + ' ' + '11:00'
                           }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+
+                        if(this.$store.getters.xt_user.org.id == 10510){
+                          preTime = nowTime
+                        }
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        }else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }
                         } else if (this.schedule.schedule_type == 2) {
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime =this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else{
                             preTime = this.record_date + ' ' + '11:00'
 
                       } 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
                           }else if(this.schedule.schedule_type == 2){
                             if(this.org_id == 10206  || this.org_id == 0){
                               preTime = this.record_date + ' ' + '10:30'
+                            }else if(this.org_id == 10598){
+                              preTime = this.record_date + ' ' + '09:00'
+
                             }else {
                               preTime = this.record_date + ' ' + '11:00'
                             }
                           if(this.org_id == 10206 ||  this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
 
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else{
                             preTime = this.record_date + ' ' + '11:00'
                           }
                         } else if (this.schedule.schedule_type == 3) {
                           preTime = this.record_date + ' ' + '17:00'
                         }
+
+                        if(this.$store.getters.xt_user.org.id == 10510){
+                          preTime = nowTime
+                        }
                       }
                       if(nowTime.split(" ")[0] != this.record_date){
                         if(this.schedule.schedule_type == 1){
                         }else if(this.schedule.schedule_type == 2){
                           if(this.org_id == 10206  || this.org_id == 0){
                             preTime = this.record_date + ' ' + '10:30'
+                          }else if(this.org_id == 10598){
+                            preTime = this.record_date + ' ' + '09:00'
+
                           }else {
                             preTime = this.record_date + ' ' + '11:00'
                           }
                       }else if(this.schedule.schedule_type == 2){
                         if(this.org_id == 10206  || this.org_id == 0){
                           preTime = this.record_date + ' ' + '10:30'
+                        }else if(this.org_id == 10598){
+                          preTime = this.record_date + ' ' + '09:00'
+
                         }else {
                           preTime = this.record_date + ' ' + '11:00'
                         }