陈少旭 vor 1 Jahr
Ursprung
Commit
dda76c8736
1 geänderte Dateien mit 92 neuen und 80 gelöschten Zeilen
  1. 92 80
      src/xt_pages/outpatientDoctorStation/doctorDesk.vue

+ 92 - 80
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Datei anzeigen

1738
               //   tempAddition.push(obj)
1738
               //   tempAddition.push(obj)
1739
               // }
1739
               // }
1740
 
1740
 
1741
-              var preTime = ''
1742
-
1743
-              if (prescription.pre_time == 0) {
1744
-                if (this.schedule.schedule_type == 1) {
1745
-                  preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1746
-                } else if (this.schedule.schedule_type == 2) {
1747
-                  preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1748
-                } else if (this.schedule.schedule_type == 3) {
1749
-                  preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1741
+              var preTime = nowTime
1742
+
1743
+              if (this.$store.getters.xt_user.org.id != 9919){
1744
+                if (prescription.pre_time == 0) {
1745
+                  if (this.schedule.schedule_type == 1) {
1746
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1747
+                  } else if (this.schedule.schedule_type == 2) {
1748
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1749
+                  } else if (this.schedule.schedule_type == 3) {
1750
+                    preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1751
+                  }
1752
+                  // preTime = nowTime
1753
+                } else {
1754
+                  preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
1750
                 }
1755
                 }
1751
-                // preTime = nowTime
1752
-              } else {
1753
-                preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
1754
               }
1756
               }
1755
               console.log("is_medicine")
1757
               console.log("is_medicine")
1756
               console.log(is_medicine)
1758
               console.log(is_medicine)
1888
                   }
1890
                   }
1889
                   tempProject.push(obj)
1891
                   tempProject.push(obj)
1890
                 }
1892
                 }
1891
-
1892
-                if (this.schedule.schedule_type == 1) {
1893
-                  var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1894
-                } else if (this.schedule.schedule_type == 2) {
1895
-                  var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1896
-                } else if (this.schedule.schedule_type == 3) {
1897
-                  var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1893
+                var preTime = nowTime
1894
+                if (this.$store.getters.xt_user.org.id != 9919) {
1895
+                  if (this.schedule.schedule_type == 1) {
1896
+                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1897
+                  } else if (this.schedule.schedule_type == 2) {
1898
+                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1899
+                  } else if (this.schedule.schedule_type == 3) {
1900
+                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1901
+                  }
1898
                 }
1902
                 }
1899
 
1903
 
1900
                 let index = i + 1
1904
                 let index = i + 1
2116
                     let tempAdvice = []
2120
                     let tempAdvice = []
2117
                     let tempProject = []
2121
                     let tempProject = []
2118
                     let tempAddition = []
2122
                     let tempAddition = []
2119
-                    var is_medicine  = false
2123
+                    var is_medicine = false
2120
                     //药品
2124
                     //药品
2121
                     for (let b = 0; b < prescription.advices.length; b++) {
2125
                     for (let b = 0; b < prescription.advices.length; b++) {
2122
                       let obj = {
2126
                       let obj = {
2139
                         execution_state: prescription.advices[b].execution_state,
2143
                         execution_state: prescription.advices[b].execution_state,
2140
                         is_medicine: prescription.advices[b].is_medicine,
2144
                         is_medicine: prescription.advices[b].is_medicine,
2141
 
2145
 
2142
-
2143
-
2144
                       }
2146
                       }
2145
                       tempAdvice.push(obj)
2147
                       tempAdvice.push(obj)
2146
-                      if (prescription.advices[b].is_medicine == 1){
2148
+                      if (prescription.advices[b].is_medicine == 1) {
2147
                         is_medicine = true
2149
                         is_medicine = true
2148
                       }
2150
                       }
2149
                     }
2151
                     }
2197
                     //   tempAddition.push(obj)
2199
                     //   tempAddition.push(obj)
2198
                     // }
2200
                     // }
2199
 
2201
 
2200
-                    var preTime = ''
2201
-
2202
-                    if (prescription.pre_time == 0) {
2203
-                      // preTime = nowTime
2204
-                      if (this.schedule.schedule_type == 1) {
2205
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2206
-                      } else if (this.schedule.schedule_type == 2) {
2207
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
2208
-                      } else if (this.schedule.schedule_type == 3) {
2209
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
2202
+                    var preTime = nowTime
2203
+                    if (this.$store.getters.xt_user.org.id != 9919) {
2204
+                      if (prescription.pre_time == 0) {
2205
+                        if (this.schedule.schedule_type == 1) {
2206
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2207
+                        } else if (this.schedule.schedule_type == 2) {
2208
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
2209
+                        } else if (this.schedule.schedule_type == 3) {
2210
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
2211
+                        }
2212
+                      } else {
2213
+                        preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
2210
                       }
2214
                       }
2211
-                    } else {
2212
-                      preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
2213
                     }
2215
                     }
2214
 
2216
 
2217
+
2215
                     let index = i + 1
2218
                     let index = i + 1
2216
                     let obj = {
2219
                     let obj = {
2217
                       id: prescription.id,
2220
                       id: prescription.id,
2347
                         tempProject.push(obj)
2350
                         tempProject.push(obj)
2348
                       }
2351
                       }
2349
 
2352
 
2350
-                      // var preTime = nowTime
2351
-                      var preTime = ''
2352
-                      if (this.schedule.schedule_type == 1) {
2353
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2354
-                      } else if (this.schedule.schedule_type == 2) {
2355
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
2356
-                      } else if (this.schedule.schedule_type == 3) {
2357
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
2353
+                      var preTime = nowTime
2354
+                      // var preTime = ''
2355
+                      if(this.org_id != 9919 ) {
2356
+                        if (this.schedule.schedule_type == 1) {
2357
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2358
+                        } else if (this.schedule.schedule_type == 2) {
2359
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
2360
+                        } else if (this.schedule.schedule_type == 3) {
2361
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
2362
+                        }
2358
                       }
2363
                       }
2359
 
2364
 
2360
                       let index = i + 1
2365
                       let index = i + 1
3853
                     //   tempAddition.push(obj)
3858
                     //   tempAddition.push(obj)
3854
                     // }
3859
                     // }
3855
 
3860
 
3856
-                    var preTime = ''
3861
+                    var preTime = nowTime
3857
 
3862
 
3858
-                    if (prescription.pre_time == 0) {
3859
-                      // preTime = nowTime
3860
-                      if (this.schedule.schedule_type == 1) {
3861
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3862
-                      } else if (this.schedule.schedule_type == 2) {
3863
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
3864
-                      } else if (this.schedule.schedule_type == 3) {
3865
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
3863
+                    if(this.org_id != 9919 ) {
3864
+                      if (prescription.pre_time == 0) {
3865
+                        if (this.schedule.schedule_type == 1) {
3866
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3867
+                        } else if (this.schedule.schedule_type == 2) {
3868
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
3869
+                        } else if (this.schedule.schedule_type == 3) {
3870
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
3871
+                        }
3872
+                      } else {
3873
+                        preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
3866
                       }
3874
                       }
3867
-                    } else {
3868
-                      preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
3869
                     }
3875
                     }
3870
 
3876
 
3871
                     let index = i + 1
3877
                     let index = i + 1
4001
                       }
4007
                       }
4002
 
4008
 
4003
                       // var preTime = nowTime
4009
                       // var preTime = nowTime
4004
-                      var preTime = ''
4005
-                      if (this.schedule.schedule_type == 1) {
4006
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4007
-                      } else if (this.schedule.schedule_type == 2) {
4008
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
4009
-                      } else if (this.schedule.schedule_type == 3) {
4010
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
4010
+                      var preTime = nowTime
4011
+                      if(this.org_id != 9919 ) {
4012
+                        if (this.schedule.schedule_type == 1) {
4013
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4014
+                        } else if (this.schedule.schedule_type == 2) {
4015
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
4016
+                        } else if (this.schedule.schedule_type == 3) {
4017
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
4018
+                        }
4011
                       }
4019
                       }
4012
 
4020
 
4013
                       let index = i + 1
4021
                       let index = i + 1
4481
                     //   tempAddition.push(obj)
4489
                     //   tempAddition.push(obj)
4482
                     // }
4490
                     // }
4483
 
4491
 
4484
-                    var preTime = ''
4492
+                    var preTime = nowTime
4485
 
4493
 
4486
-                    if (prescription.pre_time == 0) {
4487
-                      // preTime = nowTime
4488
-                      if (this.schedule.schedule_type == 1) {
4489
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4490
-                      } else if (this.schedule.schedule_type == 2) {
4491
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
4492
-                      } else if (this.schedule.schedule_type == 3) {
4493
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
4494
+                    if(this.org_id != 9919) {
4495
+                      if (prescription.pre_time == 0) {
4496
+                        // preTime = nowTime
4497
+                        if (this.schedule.schedule_type == 1) {
4498
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4499
+                        } else if (this.schedule.schedule_type == 2) {
4500
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
4501
+                        } else if (this.schedule.schedule_type == 3) {
4502
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
4503
+                        }
4504
+                      } else {
4505
+                        preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
4494
                       }
4506
                       }
4495
-                    } else {
4496
-                      preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
4497
                     }
4507
                     }
4498
 
4508
 
4499
                     let index = i + 1
4509
                     let index = i + 1
4629
                         tempProject.push(obj)
4639
                         tempProject.push(obj)
4630
                       }
4640
                       }
4631
 
4641
 
4632
-                      // var preTime = nowTime
4633
-                      var preTime = ''
4634
-                      if (this.schedule.schedule_type == 1) {
4635
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4636
-                      } else if (this.schedule.schedule_type == 2) {
4637
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
4638
-                      } else if (this.schedule.schedule_type == 3) {
4639
-                        preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
4642
+                      var preTime = nowTime
4643
+                      // var preTime = ''
4644
+                      if(this.org_id != 9919 ) {
4645
+                        if (this.schedule.schedule_type == 1) {
4646
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4647
+                        } else if (this.schedule.schedule_type == 2) {
4648
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
4649
+                        } else if (this.schedule.schedule_type == 3) {
4650
+                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
4651
+                        }
4640
                       }
4652
                       }
4641
 
4653
 
4642
                       let index = i + 1
4654
                       let index = i + 1