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

@@ -2540,7 +2540,7 @@
         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 == 13 && this.curDrugs[i].is_special_diseases != 1) {
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
@@ -2553,7 +2553,7 @@
         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 == 13 && this.curDrugs[i].is_special_diseases != 1) {
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -1282,7 +1282,7 @@
         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 == 13 && this.curDrugs[i].is_special_diseases != 1) {
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }
@@ -1294,7 +1294,7 @@
         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 == 13 && this.curDrugs[i].is_special_diseases != 1) {
+              if (this.curPrescriptions.med_type == 14 && this.curDrugs[i].is_special_diseases != 1) {
                 this.$message.error('该处方属于特病类型处方，开非特病类型的药')
                 return
               }