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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2655,7 +2655,6 @@
       comfirm() {
 
         if (this.curDrugs.length > 0) {
-          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
@@ -2663,10 +2662,8 @@
               }
 
             }
-          }
         }
         if (this.teamList.length > 0) {
-          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.teamList.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，请开特病类型的项目')
@@ -2674,9 +2671,7 @@
               }
 
             }
-          }
 
-          if(this.$store.getters.xt_user.org_id == 10138){
             let arr = this.teamList
             let newArr = []
             arr.map(item => {
@@ -2688,21 +2683,17 @@
               }
             })
             this.teamList = newArr
-          }
         }
 
 
 
         if (this.curDrugs.length == 0) {
-          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
-
             }
-          }
         }
 
         // if (this.curPrescriptions.order_status == 2) {

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1280,7 +1280,6 @@
         //   return
         // }
        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
-          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
@@ -1288,11 +1287,9 @@
               }
 
             }
-          }
         }
 
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
-          if (this.$store.getters.xt_user.org_id == 10138) {
             for (let i = 0; i < this.curDrugs.length; i++) {
               if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
@@ -1300,7 +1297,6 @@
               }
 
             }
-          }
         }
         if (this.curStatus == 1 && this.rightTab == 2) {
           this.$message.error('改处方是药品，无法添加项目')