陈少旭 1 rok temu
rodzic
commit
471eea6455

+ 5 - 4
src/xt_pages/hospitalStation/components/deskPrescription.vue Wyświetl plik

@@ -3293,10 +3293,10 @@ export default {
3293 3293
             for (let b = 0; b < temp2.length; b++) {
3294 3294
               let obj = {
3295 3295
                 id: 0,
3296
+                single_dose: temp2[b].single_dose.toString(),
3296 3297
                 project_id: temp2[b].id,
3297 3298
                 project_name: temp2[b].project_name,
3298 3299
                 statistical_classification: '',
3299
-                single_dose: temp2[b].single_dose.toString(),
3300 3300
                 delivery_way: temp2[b].delivery_way,
3301 3301
                 execution_frequency: temp2[b].execution_frequency,
3302 3302
                 number_days: temp2[b].number_days.toString(),
@@ -3311,6 +3311,7 @@ export default {
3311 3311
                 obj['project'] = temp2[b].project
3312 3312
                 obj['unit'] = temp2[b].project.unit
3313 3313
 
3314
+
3314 3315
               } else if (temp2[b].type == 3) {
3315 3316
                 obj['good_info'] = temp2[b].good_info
3316 3317
                 obj['unit'] = temp2[b].good_info.packing_unit
@@ -3449,7 +3450,7 @@ export default {
3449 3450
               cus_total: 1,
3450 3451
               price: good_info[i].packing_price,
3451 3452
               medical_code: good_info[i].medical_insurance_number,
3452
-              unit: this.getGoodUnit(good_info[i].good_unit),
3453
+              unit: good_info[i].packing_unit,
3453 3454
               type: 3,
3454 3455
               total: good_info[i].total,
3455 3456
               is_special_diseases: good_info[i].is_special_diseases,
@@ -3584,7 +3585,7 @@ export default {
3584 3585
                   id: project[i].project_id,
3585 3586
                   project_name: project[i].good_info.good_name,
3586 3587
                   statistical_classification: '',
3587
-                  single_dose: '',
3588
+                  single_dose: project[i].good_info.default_count,
3588 3589
                   delivery_way: '',
3589 3590
                   execution_frequency: '',
3590 3591
                   number_days: '',
@@ -3592,7 +3593,7 @@ export default {
3592 3593
                   price: project[i].good_info.retail_price,
3593 3594
                   remark: '',
3594 3595
                   medical_code: project[i].good_info.medical_insurance_number,
3595
-                  unit: project[i].good_info.unit,
3596
+                  unit: project[i].good_info.packing_unit,
3596 3597
                   type: project[i].type,
3597 3598
                   is_special_diseases: project[i].good_info.is_special_diseases,
3598 3599
                   team_id: team_id,

+ 80 - 54
src/xt_pages/hospitalStation/doctorDesk.vue Wyświetl plik

@@ -1275,7 +1275,7 @@
1275 1275
                 var preTime = ''
1276 1276
 
1277 1277
                 if (prescription.pre_time == 0) {
1278
-                  if (this.$store.getters.xt_user.org.id != 10210 || this.$store.getters.xt_user.org.id != 0){
1278
+                  if (this.$store.getters.xt_user.org.id != 10210 && this.$store.getters.xt_user.org.id != 0){
1279 1279
                     if (this.schedule.schedule_type == 1) {
1280 1280
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1281 1281
                     } else if (this.schedule.schedule_type == 2) {
@@ -1284,13 +1284,13 @@
1284 1284
                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1285 1285
                     }
1286 1286
                   }else{
1287
-                    preTime = ""
1287
+                    preTime = nowTime
1288 1288
                   }
1289 1289
                 } else {
1290
-                  if (this.$store.getters.xt_user.org.id != 10210  || this.$store.getters.xt_user.org.id != 0){
1290
+                  if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0){
1291 1291
                     preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
1292 1292
                   }else{
1293
-                    preTime = ""
1293
+                    preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
1294 1294
                   }
1295 1295
                 }
1296 1296
 
@@ -1405,14 +1405,23 @@
1405 1405
                     tempProject.push(obj)
1406 1406
                   }
1407 1407
 
1408
-                  if (this.schedule.schedule_type == 1) {
1409
-                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1410
-                  } else if (this.schedule.schedule_type == 2) {
1411
-                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1412
-                  } else if (this.schedule.schedule_type == 3) {
1413
-                    var preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1408
+                  var preTime = ""
1409
+                  if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0){
1410
+                    if (this.schedule.schedule_type == 1) {
1411
+                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1412
+                    } else if (this.schedule.schedule_type == 2) {
1413
+                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1414
+                    } else if (this.schedule.schedule_type == 3) {
1415
+                       preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1416
+                    }
1417
+                  }else{
1418
+                    preTime = nowTime
1419
+
1414 1420
                   }
1415 1421
 
1422
+
1423
+
1424
+
1416 1425
                   let index = i + 1
1417 1426
                   let obj = {
1418 1427
                     id: 0,
@@ -1693,15 +1702,17 @@
1693 1702
                       // }
1694 1703
 
1695 1704
                       var preTime = ''
1696
-
1697 1705
                       if (prescription.pre_time == 0) {
1698
-                        // preTime = nowTime
1699
-                        if (this.schedule.schedule_type == 1) {
1700
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1701
-                        } else if (this.schedule.schedule_type == 2) {
1702
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1703
-                        } else if (this.schedule.schedule_type == 3) {
1704
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1706
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
1707
+                          if (this.schedule.schedule_type == 1) {
1708
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1709
+                          } else if (this.schedule.schedule_type == 2) {
1710
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1711
+                          } else if (this.schedule.schedule_type == 3) {
1712
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1713
+                          }
1714
+                        }else{
1715
+                          preTime = nowTime
1705 1716
                         }
1706 1717
                       } else {
1707 1718
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -1821,12 +1832,17 @@
1821 1832
 
1822 1833
                         // var preTime = nowTime
1823 1834
                         var preTime = ''
1824
-                        if (this.schedule.schedule_type == 1) {
1825
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1826
-                        } else if (this.schedule.schedule_type == 2) {
1827
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1828
-                        } else if (this.schedule.schedule_type == 3) {
1829
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1835
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
1836
+
1837
+                          if (this.schedule.schedule_type == 1) {
1838
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1839
+                          } else if (this.schedule.schedule_type == 2) {
1840
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
1841
+                          } else if (this.schedule.schedule_type == 3) {
1842
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
1843
+                          }
1844
+                        }else{
1845
+                          preTime = nowTime
1830 1846
                         }
1831 1847
 
1832 1848
                         let index = i + 1
@@ -3195,12 +3211,18 @@
3195 3211
 
3196 3212
                       if (prescription.pre_time == 0) {
3197 3213
                         // preTime = nowTime
3198
-                        if (this.schedule.schedule_type == 1) {
3199
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3200
-                        } else if (this.schedule.schedule_type == 2) {
3201
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
3202
-                        } else if (this.schedule.schedule_type == 3) {
3203
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
3214
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
3215
+
3216
+                          if (this.schedule.schedule_type == 1) {
3217
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3218
+                          } else if (this.schedule.schedule_type == 2) {
3219
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
3220
+                          } else if (this.schedule.schedule_type == 3) {
3221
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
3222
+                          }
3223
+                        }else{
3224
+                          preTime = nowTime
3225
+
3204 3226
                         }
3205 3227
                       } else {
3206 3228
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -3314,14 +3336,15 @@
3314 3336
                           tempProject.push(obj)
3315 3337
                         }
3316 3338
 
3317
-                        // var preTime = nowTime
3318
-                        var preTime = ''
3319
-                        if (this.schedule.schedule_type == 1) {
3320
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3321
-                        } else if (this.schedule.schedule_type == 2) {
3322
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
3323
-                        } else if (this.schedule.schedule_type == 3) {
3324
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
3339
+                        var preTime = nowTime
3340
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
3341
+                          if (this.schedule.schedule_type == 1) {
3342
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3343
+                          } else if (this.schedule.schedule_type == 2) {
3344
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
3345
+                          } else if (this.schedule.schedule_type == 3) {
3346
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
3347
+                          }
3325 3348
                         }
3326 3349
 
3327 3350
                         let index = i + 1
@@ -3646,16 +3669,17 @@
3646 3669
                       //   tempAddition.push(obj)
3647 3670
                       // }
3648 3671
 
3649
-                      var preTime = ''
3672
+                      var preTime = nowTime
3650 3673
 
3651 3674
                       if (prescription.pre_time == 0) {
3652
-                        // preTime = nowTime
3653
-                        if (this.schedule.schedule_type == 1) {
3654
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3655
-                        } else if (this.schedule.schedule_type == 2) {
3656
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
3657
-                        } else if (this.schedule.schedule_type == 3) {
3658
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
3675
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
3676
+                          if (this.schedule.schedule_type == 1) {
3677
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3678
+                          } else if (this.schedule.schedule_type == 2) {
3679
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
3680
+                          } else if (this.schedule.schedule_type == 3) {
3681
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
3682
+                          }
3659 3683
                         }
3660 3684
                       } else {
3661 3685
                         preTime = this.getTime(prescription.pre_time, '{y}-{m}-{d} {h}:{i}')
@@ -3770,14 +3794,16 @@
3770 3794
                           tempProject.push(obj)
3771 3795
                         }
3772 3796
 
3773
-                        // var preTime = nowTime
3774
-                        var preTime = ''
3775
-                        if (this.schedule.schedule_type == 1) {
3776
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3777
-                        } else if (this.schedule.schedule_type == 2) {
3778
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
3779
-                        } else if (this.schedule.schedule_type == 3) {
3780
-                          preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
3797
+                        var preTime = nowTime
3798
+                        // var preTime = ''
3799
+                        if (this.$store.getters.xt_user.org.id != 10210  && this.$store.getters.xt_user.org.id != 0) {
3800
+                          if (this.schedule.schedule_type == 1) {
3801
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3802
+                          } else if (this.schedule.schedule_type == 2) {
3803
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '11:00'
3804
+                          } else if (this.schedule.schedule_type == 3) {
3805
+                            preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '17:00'
3806
+                          }
3781 3807
                         }
3782 3808
 
3783 3809
                         let index = i + 1

+ 1 - 1
src/xt_pages/outpatientCharges/components/registerDialog.vue Wyświetl plik

@@ -634,7 +634,7 @@
634 634
           'certificates':this.form.certificates,
635 635
         }
636 636
 
637
-        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 10318 && this.form.id_card_type ==  4) ){
637
+        if ((this.$store.getters.xt_user.org_id == 10387 && this.form.id_card_type ==  4) || (this.$store.getters.xt_user.org_id == 4 && this.form.id_card_type ==  4)){
638 638
           try {
639 639
             //检测当前浏览器是否支持websocket模式
640 640
             window.WebSocket = window.WebSocket || window.MozWebSocket;

+ 20 - 11
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Wyświetl plik

@@ -136,7 +136,6 @@
136 136
 
137 137
             <!-- <el-button size="small" ref="button_four"  @click="open(5)" type="primary" :disabled='prescriptions && prescriptions[0].advices && prescriptions[0].project ? prescriptions[0].advices.length == 0 && prescriptions[0].project.length == 0 : false'>存模板</el-button> -->
138 138
           </div>
139
-          
140 139
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
141 140
             <el-button size="small" @click="opentwo(1)" type="primary">保存</el-button>
142 141
             <el-button size="small" @click="opentwo(2)" type="primary">打印</el-button>
@@ -166,7 +165,7 @@
166 165
                            :org_id="org_id"
167 166
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
168 167
                            v-on:getSunziValue = "getSunziValue"
169
-                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
168
+                           :hisPatientInfo="hisPatientInfo" :patient_diagnoses="patient_diagnoses" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
170 169
                            v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
171 170
 
172 171
 
@@ -608,6 +607,7 @@ export default {
608 607
       printList:[],
609 608
       printDate:'',
610 609
       anticoagulants_confit:null,
610
+      patient_diagnoses:[]
611 611
     }
612 612
   },
613 613
 
@@ -1442,6 +1442,15 @@ export default {
1442 1442
             this.diagnoses = []
1443 1443
           }
1444 1444
 
1445
+          var patientDiagnose = response.data.data.patientDiagnose
1446
+
1447
+          if(patientDiagnose!=null && patientDiagnose.length >0){
1448
+            this.patient_diagnoses = []
1449
+            this.patient_diagnoses = patientDiagnose.sort(this.compare('sort'))
1450
+          }else{
1451
+            this.patient_diagnoses = []
1452
+          }
1453
+
1445 1454
           this.additions = response.data.data.additions
1446 1455
 
1447 1456
         }
@@ -1756,7 +1765,7 @@ export default {
1756 1765
               // }
1757 1766
 
1758 1767
               var preTime = nowTime
1759
-              if (this.$store.getters.xt_user.org.id != 9919){
1768
+              if (this.$store.getters.xt_user.org.id != 9919 || this.$store.getters.xt_user.org.id != 10485){
1760 1769
                 if (prescription.pre_time == 0) {
1761 1770
                   if (this.schedule.schedule_type == 1) {
1762 1771
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -1913,7 +1922,7 @@ export default {
1913 1922
                   tempProject.push(obj)
1914 1923
                 }
1915 1924
                 var preTime = nowTime
1916
-                if (this.$store.getters.xt_user.org.id != 9919) {
1925
+                if (this.$store.getters.xt_user.org.id != 9919 || this.$store.getters.xt_user.org.id != 10485) {
1917 1926
                   if (this.schedule.schedule_type == 1) {
1918 1927
                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1919 1928
                   } else if (this.schedule.schedule_type == 2) {
@@ -2038,7 +2047,7 @@ export default {
2038 2047
                 // this.setMonthPrescription(month_prescriptions)
2039 2048
 
2040 2049
                 this.patientInfo = response.data.data.xt_info
2041
-                console.log("patientInfo++++++++++++++++",this.patientInfo)
2050
+
2042 2051
                 this.hisPatientInfo = response.data.data.his_info
2043 2052
                 this.case_history = response.data.data.case_history
2044 2053
 
@@ -2223,7 +2232,7 @@ export default {
2223 2232
                     // }
2224 2233
 
2225 2234
                     var preTime = nowTime
2226
-                    if (this.$store.getters.xt_user.org.id != 9919) {
2235
+                    if (this.$store.getters.xt_user.org.id != 9919 ||this.$store.getters.xt_user.org.id != 10485 ) {
2227 2236
                       if (prescription.pre_time == 0) {
2228 2237
                         if (this.schedule.schedule_type == 1) {
2229 2238
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -2381,7 +2390,7 @@ export default {
2381 2390
 
2382 2391
                       var preTime = nowTime
2383 2392
                       // var preTime = ''
2384
-                      if(this.org_id != 9919 ) {
2393
+                      if(this.org_id !=  9919 || this.org_id !=  10485) {
2385 2394
                         if (this.schedule.schedule_type == 1) {
2386 2395
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2387 2396
                         } else if (this.schedule.schedule_type == 2) {
@@ -3887,7 +3896,7 @@ export default {
3887 3896
 
3888 3897
                     var preTime = nowTime
3889 3898
 
3890
-                    if(this.org_id != 9919 ) {
3899
+                    if(this.org_id != 9919 || this.org_id  != 10485 ) {
3891 3900
                       if (prescription.pre_time == 0) {
3892 3901
                         if (this.schedule.schedule_type == 1) {
3893 3902
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
@@ -4041,7 +4050,7 @@ export default {
4041 4050
 
4042 4051
                       // var preTime = nowTime
4043 4052
                       var preTime = nowTime
4044
-                      if(this.org_id != 9919 ) {
4053
+                      if(this.org_id != 9919 ||  this.org_id != 10485) {
4045 4054
                         if (this.schedule.schedule_type == 1) {
4046 4055
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4047 4056
                         } else if (this.schedule.schedule_type == 2) {
@@ -4524,7 +4533,7 @@ export default {
4524 4533
 
4525 4534
                     var preTime = nowTime
4526 4535
 
4527
-                    if(this.org_id != 9919) {
4536
+                    if(this.org_id != 9919 || this.org_id != 10485) {
4528 4537
                       if (prescription.pre_time == 0) {
4529 4538
                         // preTime = nowTime
4530 4539
                         if (this.schedule.schedule_type == 1) {
@@ -4681,7 +4690,7 @@ export default {
4681 4690
 
4682 4691
                       var preTime = nowTime
4683 4692
                       // var preTime = ''
4684
-                      if(this.org_id != 9919 ) {
4693
+                      if(this.org_id != 9919  || this.org_id != 10485) {
4685 4694
                         if (this.schedule.schedule_type == 1) {
4686 4695
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4687 4696
                         } else if (this.schedule.schedule_type == 2) {

+ 3 - 3
src/xt_pages/user/ktv.vue Wyświetl plik

@@ -785,9 +785,9 @@ export default {
785 785
     },
786 786
     submitNew(formName) {
787 787
       let valueSix = 0
788
-      for(let i = 0; i < items.length; i++){
789
-        if(items[i].item_name == "KT/V"){
790
-          valueSix = items[i].value
788
+      for(let i = 0; i < this.items.length; i++){
789
+        if(this.items[i].item_name == "KT/V"){
790
+          valueSix = this.items[i].value
791 791
         }
792 792
       }
793 793
       if(valueSix.length == 0){