Home Esplora Aiuto
Registrati Accedi
csx
/
Vue_New
Segui 2
Vota 1
Forka 1
Codice Problemi 34 Pull Requests 0 Rilasci 0 Wiki Activity
Sfoglia il codice sorgente

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

yq1 5 giorni fa
parent
12a5fbf2aa 63a1aa8f15
commit
7160555307
1 ha cambiato i file con 119 aggiunte e 8 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 119 8
      src/xt_pages/outpatientDoctorStation/doctorDesk.vue

+ 119 - 8
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Vedi File 

@@ -2113,7 +2113,10 @@ export default {
2113 2113 
                   } else if (this.schedule.schedule_type == 2) {
2114 2114 
                      if(this.org_id == 10206  || this.org_id == 0 ){
2115 2115 
                       preTime = this.record_date + ' ' + '10:30'
2116 
-                    }else{
2116 
+                    }else if(this.org_id == 10598){
2117 
+                       preTime = this.record_date + ' ' + '09:00'
2118 
+
2119 
+                     }else{
2117 2120 
                      preTime = this.record_date + ' ' + '11:00'
2118 2121 
                    }
2119 2122 
                   } else if (this.schedule.schedule_type == 3) {
 
@@ -2124,13 +2127,13 @@ export default {
2124 2127 
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
2125 2128 
                 }
2126 2129
2130 
+                if(this.$store.getters.xt_user.org.id == 10510){
2131 
+                  preTime = nowTime
2132 
+                }
2133 
+
2127 2134 
               } else {
2128 
-                console.log("test")
2135 
+
2129 2136 
                 if (prescription.pre_time == 0) {
2130 
-                  console.log("++=========")
2131 
-                  console.log(nowTime.split(" ")[0])
2132 
-                  console.log(this.record_date)
2133 
-                  console.log("++=========")
2134 2137
2135 2138 
                   if(nowTime.split(" ")[0] != this.record_date){
2136 2139 
                     // preTime = this.record_date
 
@@ -2143,6 +2146,9 @@ export default {
2143 2146 
                     }else if(this.schedule.schedule_type == 2){
2144 2147 
                       if(this.org_id == 10206  || this.org_id == 0){
2145 2148 
                         preTime = this.record_date + ' ' + '10:30'
2149 
+                      }else if(this.org_id == 10598){
2150 
+                        preTime = this.record_date + ' ' + '09:00'
2151 
+
2146 2152 
                       }else {
2147 2153 
                         preTime = this.record_date + ' ' + '11:00'
2148 2154 
                       }
 
@@ -2150,6 +2156,11 @@ export default {
2150 2156 
                       preTime = this.record_date + ' ' + '17:00'
2151 2157 
                     }
2152 2158
2159 
+
2160 
+                    if(this.$store.getters.xt_user.org.id == 10510){
2161 
+                      preTime = nowTime
2162 
+                    }
2163 
+
2153 2164 
                   }
2154 2165 
                 } else {
2155 2166 
                   preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
 
@@ -2157,6 +2168,8 @@ export default {
2157 2168 
               }
2158 2169
2159 2170
2171 
+
2172 
+
2160 2173 
               let index = i + 1
2161 2174 
               let obj = {
2162 2175 
                 id: prescription.id,
 
@@ -2308,12 +2321,19 @@ export default {
2308 2321 
                   } else if (this.schedule.schedule_type == 2) {
2309 2322 
                     if(this.org_id == 10206  || this.org_id == 0){
2310 2323 
                       preTime = this.record_date + ' ' + '10:30'
2324 
+                    }else if(this.org_id == 10598){
2325 
+                      preTime = this.record_date + ' ' + '09:00'
2326 
+
2311 2327 
                     }else {
2312 2328 
                       preTime = this.record_date + ' ' + '11:00'
2313 2329 
                     }
2314 2330 
                   } else if (this.schedule.schedule_type == 3) {
2315 2331 
                     preTime = this.record_date + ' ' + '17:00'
2316 2332 
                   }
2333 
+
2334 
+                  if(this.$store.getters.xt_user.org.id == 10510){
2335 
+                    preTime = nowTime
2336 
+                  }
2317 2337 
                 }
2318 2338
2319 2339 
                 if(nowTime.split(" ")[0] != this.record_date){
 
@@ -2326,6 +2346,9 @@ export default {
2326 2346 
                   }else if(this.schedule.schedule_type == 2){
2327 2347 
                     if(this.org_id == 10206  || this.org_id == 0){
2328 2348 
                       preTime = this.record_date + ' ' + '10:30'
2349 
+                    }else if(this.org_id == 10598){
2350 
+                      preTime = this.record_date + ' ' + '09:00'
2351 
+
2329 2352 
                     }else {
2330 2353 
                       preTime = this.record_date + ' ' + '11:00'
2331 2354 
                     }
 
@@ -2382,6 +2405,9 @@ export default {
2382 2405 
                 }else if(this.schedule.schedule_type == 2){
2383 2406 
                   if(this.org_id == 10206  || this.org_id == 0){
2384 2407 
                     preTime = this.record_date + ' ' + '10:30'
2408 
+                  }else if(this.org_id == 10598){
2409 
+                    preTime = this.record_date + ' ' + '09:00'
2410 
+
2385 2411 
                   }else {
2386 2412 
                     preTime = this.record_date + ' ' + '11:00'
2387 2413 
                   }
 
@@ -2688,6 +2714,9 @@ export default {
2688 2714 
                         } else if (this.schedule.schedule_type == 2) {
2689 2715 
                           if(this.org_id == 10206  || this.org_id == 0){
2690 2716 
                             preTime = this.record_date + ' ' + '10:30'
2717 
+                          }else if(this.org_id == 10598){
2718 
+                            preTime = this.record_date + ' ' + '09:00'
2719 
+
2691 2720 
                           }else{
2692 2721 
                             preTime = this.record_date + ' ' + '11:00'
2693 2722 
                           }
 
@@ -2697,6 +2726,10 @@ export default {
2697 2726 
                       } else {
2698 2727 
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
2699 2728 
                       }
2729 
+
2730 
+                      if(this.$store.getters.xt_user.org.id == 10510){
2731 
+                        preTime = nowTime
2732 
+                      }
2700 2733 
                     } else {
2701 2734 
                       if (prescription.pre_time == 0) {
2702 2735 
                         if(nowTime.split(" ")[0] != this.record_date){
 
@@ -2709,6 +2742,9 @@ export default {
2709 2742 
                           }else if(this.schedule.schedule_type == 2){
2710 2743 
                             if(this.org_id == 10206  || this.org_id == 0){
2711 2744 
                               preTime = this.record_date + ' ' + '10:30'
2745 
+                            }else if(this.org_id == 10598){
2746 
+                              preTime = this.record_date + ' ' + '09:00'
2747 
+
2712 2748 
                             }else {
2713 2749 
                               preTime = this.record_date + ' ' + '11:00'
2714 2750 
                             }
 
@@ -2876,14 +2912,19 @@ export default {
2876 2912 
                         } else if (this.schedule.schedule_type == 2) {
2877 2913 
                           if(this.org_id == 10206  || this.org_id == 0){
2878 2914 
                             preTime =this.record_date + ' ' + '10:30'
2879 
-                          }else{
2915 
+                          }else if(this.org_id == 10598){
2916 
+                            preTime = this.record_date + ' ' + '09:00'
2880 2917
2918 
+                          }else{
2881 2919 
                             preTime = this.record_date + ' ' + '11:00'
2882 
-
2883 2920 
                           }
2884 2921 
                         } else if (this.schedule.schedule_type == 3) {
2885 2922 
                           preTime = this.record_date + ' ' + '17:00'
2886 2923 
                         }
2924 
+
2925 
+                        if(this.$store.getters.xt_user.org.id == 10510){
2926 
+                          preTime = nowTime
2927 
+                        }
2887 2928 
                       }
2888 2929 
                       if(nowTime.split(" ")[0] != this.record_date){
2889 2930 
                         if(this.schedule.schedule_type == 1){
 
@@ -2895,6 +2936,9 @@ export default {
2895 2936 
                         }else if(this.schedule.schedule_type == 2){
2896 2937 
                           if(this.org_id == 10206  || this.org_id == 0){
2897 2938 
                             preTime = this.record_date + ' ' + '10:30'
2939 
+                          }else if(this.org_id == 10598){
2940 
+                            preTime = this.record_date + ' ' + '09:00'
2941 
+
2898 2942 
                           }else {
2899 2943 
                             preTime = this.record_date + ' ' + '11:00'
2900 2944 
                           }
 
@@ -2944,6 +2988,9 @@ export default {
2944 2988 
                       }else if(this.schedule.schedule_type == 2){
2945 2989 
                         if(this.org_id == 10206  || this.org_id == 0){
2946 2990 
                           preTime = this.record_date + ' ' + '10:30'
2991 
+                        } else if(this.org_id == 10598){
2992 
+                          preTime = this.record_date + ' ' + '09:00'
2993 
+
2947 2994 
                         }else {
2948 2995 
                           preTime = this.record_date + ' ' + '11:00'
2949 2996 
                         }
 
@@ -3331,6 +3378,9 @@ export default {
3331 3378 
                         }else if(this.schedule.schedule_type == 2){
3332 3379 
                           if(this.org_id == 10206  || this.org_id == 0){
3333 3380 
                             preTime = this.record_date + ' ' + '10:30'
3381 
+                          }else if(this.org_id == 10598){
3382 
+                            preTime = this.record_date + ' ' + '09:00'
3383 
+
3334 3384 
                           }else {
3335 3385 
                             preTime = this.record_date + ' ' + '11:00'
3336 3386 
                           }
 
@@ -3488,6 +3538,9 @@ export default {
3488 3538 
                         }else if(this.schedule.schedule_type == 2){
3489 3539 
                           if(this.org_id == 10206  || this.org_id == 0){
3490 3540 
                             preTime = this.record_date + ' ' + '10:30'
3541 
+                          }else if(this.org_id == 10598){
3542 
+                            preTime = this.record_date + ' ' + '09:00'
3543 
+
3491 3544 
                           }else {
3492 3545 
                             preTime = this.record_date + ' ' + '11:00'
3493 3546 
                           }
 
@@ -3535,6 +3588,9 @@ export default {
3535 3588 
                       }else if(this.schedule.schedule_type == 2){
3536 3589 
                         if(this.org_id == 10206  || this.org_id == 0){
3537 3590 
                           preTime = this.record_date + ' ' + '10:30'
3591 
+                        }else if(this.org_id == 10598){
3592 
+                          preTime = this.record_date + ' ' + '09:00'
3593 
+
3538 3594 
                         }else {
3539 3595 
                           preTime = this.record_date + ' ' + '11:00'
3540 3596 
                         }
 
@@ -3908,6 +3964,9 @@ export default {
3908 3964 
                       }else if(this.schedule.schedule_type == 2){
3909 3965 
                         if(this.org_id == 10206  || this.org_id == 0){
3910 3966 
                           preTime = this.record_date + ' ' + '10:30'
3967 
+                        }else if(this.org_id == 10598){
3968 
+                          preTime = this.record_date + ' ' + '09:00'
3969 
+
3911 3970 
                         }else {
3912 3971 
                           preTime = this.record_date + ' ' + '11:00'
3913 3972 
                         }
 
@@ -4064,6 +4123,9 @@ export default {
4064 4123 
                       }else if(this.schedule.schedule_type == 2){
4065 4124 
                         if(this.org_id == 10206  || this.org_id == 0){
4066 4125 
                           preTime = this.record_date + ' ' + '10:30'
4126 
+                        }else if(this.org_id == 10598){
4127 
+                          preTime = this.record_date + ' ' + '09:00'
4128 
+
4067 4129 
                         }else {
4068 4130 
                           preTime = this.record_date + ' ' + '11:00'
4069 4131 
                         }
 
@@ -4112,6 +4174,9 @@ export default {
4112 4174 
                     }else if(this.schedule.schedule_type == 2){
4113 4175 
                       if(this.org_id == 10206  || this.org_id == 0){
4114 4176 
                         preTime = this.record_date + ' ' + '10:30'
4177 
+                      }else if(this.org_id == 10598){
4178 
+                        preTime = this.record_date + ' ' + '09:00'
4179 
+
4115 4180 
                       }else {
4116 4181 
                         preTime = this.record_date + ' ' + '11:00'
4117 4182 
                       }
 
@@ -4577,6 +4642,9 @@ export default {
4577 4642 
                           if(this.org_id == 10206  || this.org_id == 0){
4578 4643 
                             preTime = this.record_date + ' ' + '10:30'
4579 4644
4645 
+                          }else if(this.org_id == 10598){
4646 
+                            preTime = this.record_date + ' ' + '09:00'
4647 
+
4580 4648 
                           }else {
4581 4649 
                             preTime = this.record_date + ' ' + '11:00'
4582 4650 
                           }
 
@@ -4586,6 +4654,10 @@ export default {
4586 4654 
                       } else {
4587 4655 
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
4588 4656 
                       }
4657 
+
4658 
+                      if(this.$store.getters.xt_user.org.id == 10510){
4659 
+                        preTime = nowTime
4660 
+                      }
4589 4661 
                     } else {
4590 4662 
                       console.log("0---00000000000")
4591 4663 
                       if (prescription.pre_time == 0) {
 
@@ -4600,6 +4672,9 @@ export default {
4600 4672 
                           }else if(this.schedule.schedule_type == 2){
4601 4673 
                             if(this.org_id == 10206  || this.org_id == 0){
4602 4674 
                               preTime = this.record_date + ' ' + '10:30'
4675 
+                            }else if(this.org_id == 10598){
4676 
+                              preTime = this.record_date + ' ' + '09:00'
4677 
+
4603 4678 
                             }else {
4604 4679 
                               preTime = this.record_date + ' ' + '11:00'
4605 4680 
                             }
 
@@ -4764,12 +4839,19 @@ export default {
4764 4839 
                         } else if (this.schedule.schedule_type == 2) {
4765 4840 
                           if(this.org_id == 10206  || this.org_id == 0){
4766 4841 
                             preTime = this.record_date + ' ' + '10:30'
4842 
+                          }else if(this.org_id == 10598){
4843 
+                            preTime = this.record_date + ' ' + '09:00'
4844 
+
4767 4845 
                           }else{
4768 4846 
                             preTime = this.record_date + ' ' + '11:00'
4769 4847 
                           }
4770 4848 
                         } else if (this.schedule.schedule_type == 3) {
4771 4849 
                           preTime = this.record_date + ' ' + '17:00'
4772 4850 
                         }
4851 
+
4852 
+                        if(this.$store.getters.xt_user.org.id == 10510){
4853 
+                          preTime = nowTime
4854 
+                        }
4773 4855 
                       }
4774 4856 
                       if(nowTime.split(" ")[0] != this.record_date){
4775 4857 
                         if(this.schedule.schedule_type == 1){
 
@@ -4781,6 +4863,9 @@ export default {
4781 4863 
                         }else if(this.schedule.schedule_type == 2){
4782 4864 
                           if(this.org_id == 10206  || this.org_id == 0){
4783 4865 
                             preTime = this.record_date + ' ' + '10:30'
4866 
+                          }else if(this.org_id == 10598){
4867 
+                            preTime = this.record_date + ' ' + '09:00'
4868 
+
4784 4869 
                           }else {
4785 4870 
                             preTime = this.record_date + ' ' + '11:00'
4786 4871 
                           }
 
@@ -4836,6 +4921,9 @@ export default {
4836 4921 
                       }else if(this.schedule.schedule_type == 2){
4837 4922 
                         if(this.org_id == 10206  || this.org_id == 0){
4838 4923 
                           preTime = this.record_date + ' ' + '10:30'
4924 
+                        }else if(this.org_id == 10598){
4925 
+                          preTime = this.record_date + ' ' + '09:00'
4926 
+
4839 4927 
                         }else {
4840 4928 
                           preTime = this.record_date + ' ' + '11:00'
4841 4929 
                         }
 
@@ -5200,6 +5288,9 @@ export default {
5200 5288 
                         } else if (this.schedule.schedule_type == 2) {
5201 5289 
                           if(this.org_id == 10206  || this.org_id == 0){
5202 5290 
                             preTime =this.record_date + ' ' + '10:30'
5291 
+                          }else if(this.org_id == 10598){
5292 
+                            preTime = this.record_date + ' ' + '09:00'
5293 
+
5203 5294 
                           }else{
5204 5295 
                             preTime = this.record_date + ' ' + '11:00'
5205 5296 
 
@@ -5210,6 +5301,10 @@ export default {
5210 5301 
                       } else {
5211 5302 
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
5212 5303 
                       }
5304 
+
5305 
+                      if(this.$store.getters.xt_user.org.id == 10510){
5306 
+                        preTime = nowTime
5307 
+                      }
5213 5308 
                     } else {
5214 5309 
                       if (prescription.pre_time == 0) {
5215 5310 
                         preTime = nowTime
 
@@ -5223,6 +5318,9 @@ export default {
5223 5318 
                           }else if(this.schedule.schedule_type == 2){
5224 5319 
                             if(this.org_id == 10206  || this.org_id == 0){
5225 5320 
                               preTime = this.record_date + ' ' + '10:30'
5321 
+                            }else if(this.org_id == 10598){
5322 
+                              preTime = this.record_date + ' ' + '09:00'
5323 
+
5226 5324 
                             }else {
5227 5325 
                               preTime = this.record_date + ' ' + '11:00'
5228 5326 
                             }
 
@@ -5389,12 +5487,19 @@ export default {
5389 5487 
                           if(this.org_id == 10206 ||  this.org_id == 0){
5390 5488 
                             preTime = this.record_date + ' ' + '10:30'
5391 5489
5490 
+                          }else if(this.org_id == 10598){
5491 
+                            preTime = this.record_date + ' ' + '09:00'
5492 
+
5392 5493 
                           }else{
5393 5494 
                             preTime = this.record_date + ' ' + '11:00'
5394 5495 
                           }
5395 5496 
                         } else if (this.schedule.schedule_type == 3) {
5396 5497 
                           preTime = this.record_date + ' ' + '17:00'
5397 5498 
                         }
5499 
+
5500 
+                        if(this.$store.getters.xt_user.org.id == 10510){
5501 
+                          preTime = nowTime
5502 
+                        }
5398 5503 
                       }
5399 5504 
                       if(nowTime.split(" ")[0] != this.record_date){
5400 5505 
                         if(this.schedule.schedule_type == 1){
 
@@ -5406,6 +5511,9 @@ export default {
5406 5511 
                         }else if(this.schedule.schedule_type == 2){
5407 5512 
                           if(this.org_id == 10206  || this.org_id == 0){
5408 5513 
                             preTime = this.record_date + ' ' + '10:30'
5514 
+                          }else if(this.org_id == 10598){
5515 
+                            preTime = this.record_date + ' ' + '09:00'
5516 
+
5409 5517 
                           }else {
5410 5518 
                             preTime = this.record_date + ' ' + '11:00'
5411 5519 
                           }
 
@@ -5460,6 +5568,9 @@ export default {
5460 5568 
                       }else if(this.schedule.schedule_type == 2){
5461 5569 
                         if(this.org_id == 10206  || this.org_id == 0){
5462 5570 
                           preTime = this.record_date + ' ' + '10:30'
5571 
+                        }else if(this.org_id == 10598){
5572 
+                          preTime = this.record_date + ' ' + '09:00'
5573 
+
5463 5574 
                         }else {
5464 5575 
                           preTime = this.record_date + ' ' + '11:00'
5465 5576 
                         }