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

src/xt_pages/data/components/drugs.vue

@@ -734,7 +734,7 @@
             return false
           } else {
             this.total = response.data.data.total;
-            console.log("total22222",total)
+          
             this.list = [];
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.list.push(response.data.data.list[i])

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3358,7 +3358,8 @@
                   order_id: this.order.id,
                   record_time: this.record_date,
                   admin_user_id: this.$store.getters.xt_user.user.id,
-                  patient_id: this.patientInfo.id
+                  patient_id: this.patientInfo.id,
+                  his_patient_id: this.hisPatientInfo.id,
                 }
               })
                 .then(function(response) {

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -498,7 +498,7 @@
         } else {
           let arr = []
           for (let i = 0; i < this.allProject.length; i++) {
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 || this.allProject[i].wubi.indexOf(this.search_project_keyword) != -1 || this.allProject[i].pinyin.indexOf(this.search_project_keyword) != -1) {
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ) {
               arr = arr.concat(this.allProject[i])
             }
           }