ソースを参照

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

csx 3 年 前
コミット
b3937192b7

+ 5 - 0
src/xt_pages/outpatientCharges/statementPrint.vue ファイルの表示

294
 
294
 
295
     },
295
     },
296
     getInfo(order_id,obj) {
296
     getInfo(order_id,obj) {
297
+
297
       if (obj.balance_accounts_type == 2){
298
       if (obj.balance_accounts_type == 2){
298
         let params = {
299
         let params = {
299
           his_patient_id: obj.his_patient_id,
300
           his_patient_id: obj.his_patient_id,
541
   },
542
   },
542
 
543
 
543
   created() {
544
   created() {
545
+    console.log(this.paramsObj)
544
     this.getInfo(this.paramsObj.order_id,this.paramsObj);
546
     this.getInfo(this.paramsObj.order_id,this.paramsObj);
545
     this.org_id = this.$store.getters.xt_user.org_id;
547
     this.org_id = this.$store.getters.xt_user.org_id;
546
     console.log("this.org_id",this.org_id)
548
     console.log("this.org_id",this.org_id)
548
   watch:{
550
   watch:{
549
     paramsObj:{//深度监听,可监听到对象、数组的变化
551
     paramsObj:{//深度监听,可监听到对象、数组的变化
550
       handler(val, oldVal){
552
       handler(val, oldVal){
553
+
551
         this.paramsObj = val;
554
         this.paramsObj = val;
555
+        console.log(this.paramsObj)
556
+
552
         this.getInfo(this.paramsObj.order_id,this.paramsObj)
557
         this.getInfo(this.paramsObj.order_id,this.paramsObj)
553
 
558
 
554
       },
559
       },

+ 2 - 1
src/xt_pages/outpatientCharges/summary.vue ファイルの表示

429
           order_id: row.id,
429
           order_id: row.id,
430
           settle_type: row.settle_type,
430
           settle_type: row.settle_type,
431
           start_time: row.settle_start_time,
431
           start_time: row.settle_start_time,
432
-          end_time: row.settle_end_time
432
+          end_time: row.settle_end_time,
433
+          balance_accounts_type:row.his_patient.balance_accounts_type
433
         }
434
         }
434
         this.orderObj = obj
435
         this.orderObj = obj
435
 
436
 

+ 1 - 1
src/xt_pages/outpatientDoctorStation/components/callPrescription.vue ファイルの表示

256
           }
256
           }
257
           for (let b = 0; b < prescription.project.length; b++) {
257
           for (let b = 0; b < prescription.project.length; b++) {
258
             if(prescription.project[b].type == 2){
258
             if(prescription.project[b].type == 2){
259
-              if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
259
+              if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
260
                 prescription.project.splice(b--,1)
260
                 prescription.project.splice(b--,1)
261
               }
261
               }
262
             }else if(prescription.project[b].type == 3){
262
             }else if(prescription.project[b].type == 3){

+ 1 - 1
src/xt_pages/outpatientDoctorStation/components/nextOrLastPrescription.vue ファイルの表示

307
           }
307
           }
308
           for (let b = 0; b < prescription.project.length; b++) {
308
           for (let b = 0; b < prescription.project.length; b++) {
309
             if(prescription.project[b].type == 2){
309
             if(prescription.project[b].type == 2){
310
-              if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
310
+              if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
311
                 prescription.project.splice(b--,1)
311
                 prescription.project.splice(b--,1)
312
               }
312
               }
313
             }else if(prescription.project[b].type == 3){
313
             }else if(prescription.project[b].type == 3){

+ 6 - 6
src/xt_pages/outpatientDoctorStation/doctorDesk.vue ファイルの表示

1446
                   }
1446
                   }
1447
                   for (let b = 0; b < prescription.project.length; b++) {
1447
                   for (let b = 0; b < prescription.project.length; b++) {
1448
                     if(prescription.project[b].type == 2){
1448
                     if(prescription.project[b].type == 2){
1449
-                      if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
1449
+                      if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
1450
                         prescription.project.splice(b--,1)
1450
                         prescription.project.splice(b--,1)
1451
                       }
1451
                       }
1452
                     }else if(prescription.project[b].type == 3){
1452
                     }else if(prescription.project[b].type == 3){
1830
                         }
1830
                         }
1831
                         for (let b = 0; b < prescription.project.length; b++) {
1831
                         for (let b = 0; b < prescription.project.length; b++) {
1832
                           if(prescription.project[b].type == 2){
1832
                           if(prescription.project[b].type == 2){
1833
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
1833
+                            if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
1834
                               prescription.project.splice(b--,1)
1834
                               prescription.project.splice(b--,1)
1835
                             }
1835
                             }
1836
                           }else if(prescription.project[b].type == 3){
1836
                           }else if(prescription.project[b].type == 3){
2301
                         }
2301
                         }
2302
                         for (let b = 0; b < prescription.project.length; b++) {
2302
                         for (let b = 0; b < prescription.project.length; b++) {
2303
                           if(prescription.project[b].type == 2){
2303
                           if(prescription.project[b].type == 2){
2304
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
2304
+                            if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
2305
                               prescription.project.splice(b--,1)
2305
                               prescription.project.splice(b--,1)
2306
                             }
2306
                             }
2307
                           }else if(prescription.project[b].type == 3){
2307
                           }else if(prescription.project[b].type == 3){
2760
                       }
2760
                       }
2761
                       for (let b = 0; b < prescription.project.length; b++) {
2761
                       for (let b = 0; b < prescription.project.length; b++) {
2762
                         if(prescription.project[b].type == 2){
2762
                         if(prescription.project[b].type == 2){
2763
-                          if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
2763
+                          if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
2764
                             prescription.project.splice(b--,1)
2764
                             prescription.project.splice(b--,1)
2765
                           }
2765
                           }
2766
                         }else if(prescription.project[b].type == 3){
2766
                         }else if(prescription.project[b].type == 3){
3286
                         }
3286
                         }
3287
                         for (let b = 0; b < prescription.project.length; b++) {
3287
                         for (let b = 0; b < prescription.project.length; b++) {
3288
                           if(prescription.project[b].type == 2){
3288
                           if(prescription.project[b].type == 2){
3289
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
3289
+                            if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
3290
                               prescription.project.splice(b--,1)
3290
                               prescription.project.splice(b--,1)
3291
                             }
3291
                             }
3292
                           }else if(prescription.project[b].type == 3){
3292
                           }else if(prescription.project[b].type == 3){
3833
                         }
3833
                         }
3834
                         for (let b = 0; b < prescription.project.length; b++) {
3834
                         for (let b = 0; b < prescription.project.length; b++) {
3835
                           if(prescription.project[b].type == 2){
3835
                           if(prescription.project[b].type == 2){
3836
-                            if (prescription.med_type == "14" && prescription.project[b].project.specail_project != 1) {
3836
+                            if (prescription.med_type == "14" && prescription.project[b].project.disease_directory != 1) {
3837
                               prescription.project.splice(b--,1)
3837
                               prescription.project.splice(b--,1)
3838
                             }
3838
                             }
3839
                           }else if(prescription.project[b].type == 3){
3839
                           }else if(prescription.project[b].type == 3){

+ 28 - 0
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue ファイルの表示

401
           }
401
           }
402
         }
402
         }
403
 
403
 
404
+
405
+        for (let i = 0; i < this.prescriptions.length; i++) {
406
+          for(let b = 0; b < this.prescriptions[i].advices.length; b++){
407
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].advices[b].drug.is_special_diseases != 1) {
408
+              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方,开非特病类型的药")
409
+              return
410
+            }
411
+
412
+          }
413
+
414
+          for(let c = 0; c < this.prescriptions[i].project.length; c++){
415
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 2  && this.prescriptions[i].project[c].project.disease_directory != 1) {
416
+              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方,请开特病类型的项目")
417
+              return
418
+            }
419
+
420
+            if (this.prescriptions[i].med_type == 14 && this.prescriptions[i].project[c].type == 3  && this.prescriptions[i].project[c].good_info.is_special_diseases != 1) {
421
+              this.$message.error("处方" + (i+1).toString() +"属于特病类型处方,请开特病类型的耗材")
422
+              return 
423
+            }
424
+          }
425
+        }
426
+
427
+
428
+
429
+
430
+
431
+
404
         let params = {
432
         let params = {
405
           name: this.tempForm.name,
433
           name: this.tempForm.name,
406
           mode_id: this.tempForm.mode_id,
434
           mode_id: this.tempForm.mode_id,