Browse Source

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

csx 3 years ago
parent
commit
6728fdee4c

+ 2 - 2
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

2540
         if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
2540
         if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
2541
           if(this.$store.getters.xt_user.org_id == 10138) {
2541
           if(this.$store.getters.xt_user.org_id == 10138) {
2542
             for (let i = 0; i < this.curDrugs.length; i++) {
2542
             for (let i = 0; i < this.curDrugs.length; i++) {
2543
-              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
2543
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
2544
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
2544
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
2545
                 return
2545
                 return
2546
               }
2546
               }
2553
         if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
2553
         if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
2554
           if(this.$store.getters.xt_user.org_id == 10138) {
2554
           if(this.$store.getters.xt_user.org_id == 10138) {
2555
             for (let i = 0; i < this.curDrugs.length; i++) {
2555
             for (let i = 0; i < this.curDrugs.length; i++) {
2556
-              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
2556
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
2557
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
2557
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
2558
                 return
2558
                 return
2559
               }
2559
               }

+ 2 - 2
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue View File

1282
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
1282
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
1283
           if (this.$store.getters.xt_user.org_id == 10138) {
1283
           if (this.$store.getters.xt_user.org_id == 10138) {
1284
             for (let i = 0; i < this.curDrugs.length; i++) {
1284
             for (let i = 0; i < this.curDrugs.length; i++) {
1285
-              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
1285
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
1286
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
1286
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
1287
                 return
1287
                 return
1288
               }
1288
               }
1294
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
1294
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
1295
           if (this.$store.getters.xt_user.org_id == 10138) {
1295
           if (this.$store.getters.xt_user.org_id == 10138) {
1296
             for (let i = 0; i < this.curDrugs.length; i++) {
1296
             for (let i = 0; i < this.curDrugs.length; i++) {
1297
-              if (this.curPrescriptions.med_type == 13 && this.curDrugs[i].is_special_diseases != 1) {
1297
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
1298
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
1298
                 this.$message.error('该处方属于特病类型处方,开非特病类型的药')
1299
                 return
1299
                 return
1300
               }
1300
               }