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

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -667,12 +667,15 @@
         }
       },
       setMonthPrescription(month_prescriptions) {
+        console.log("~~~~~~~~")
         this.month_prescriptions = []
 
         let drug_month_prescriptions = {
           advices: []
         }
         let drug_ids = []
+        let drug_ids2 = []
+
         let project_month_prescriptions = {
           project: []
 
@@ -693,6 +696,9 @@
                 price: month_prescriptions[i].advices[a].price
 
               }
+              if(month_prescriptions[i].advices[a].drug_id == 1280){
+                drug_ids2.push(obj)
+              }
               drug_ids.push(obj)
               drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
             }
@@ -726,18 +732,10 @@
         const obj1 = {}
         const obj2 = {}
 
-        drug_ids = drug_ids.reduce((cur, next) => {
-          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        project_ids = project_ids.reduce((cur, next) => {
-          obj1[next.price] ? '' : obj1[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        additions_ids = additions_ids.reduce((cur, next) => {
-          obj2[next.price] ? '' : obj2[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+        drug_ids = this.unique(drug_ids)
+        project_ids = this.unique(project_ids)
+        additions_ids = this.unique(additions_ids)
+
 
         let drugs = []
         let projects = []
@@ -747,7 +745,7 @@
           let obj = {}
           let count = 0
           for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
-            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
+            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id ==  drug_month_prescriptions.advices[a].drug_id) {
               obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
               obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
               obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
@@ -775,7 +773,7 @@
           let obj = {}
           let count = 0
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-            if (project_ids[i].price == project_month_prescriptions.project[a].price) {
+            if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
 
               if (project_month_prescriptions.project[a].type == 2) {
                 obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
@@ -3194,7 +3192,6 @@
         if (this.dayorMonth == 'day') {
           this.$emit('day')
         } else if (this.dayorMonth == 'month') {
-          console.log('~~~~~~')
           let form = {
             id: this.patientInfo.id,
             his_patient_id: this.hisPatientInfo.id
@@ -3213,7 +3210,22 @@
       },
       clearSelection() {
         this.$refs.tabProjectTeam.clearSelection()
-      }
+      },unique(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].id === res[j].id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
+      },
     },
     mounted() {
 

src/xt_pages/hospitalStation/doctorDesk.vue

@@ -318,6 +318,7 @@
     },
     data() {
       return {
+        current_data:null,
         drugs: [],
         allDrugs: [],
         advices_template: [],
@@ -598,6 +599,7 @@
             this.admin_info = response.data.data.info
 
             if (this.patientTableData.length > 0) {
+              this.current_data = this.patientTableData[0]
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
               this.oldCurrentRow = this.patientTableData[0]
               this.getPatientInfo(this.patientTableData[0])
@@ -703,18 +705,10 @@
         const obj1 = {}
         const obj2 = {}
 
-        drug_ids = drug_ids.reduce((cur, next) => {
-          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        project_ids = project_ids.reduce((cur, next) => {
-          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
-        additions_ids = additions_ids.reduce((cur, next) => {
-          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
-          return cur
-        }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+        drug_ids = this.unique(drug_ids)
+        project_ids = this.unique(project_ids)
+        additions_ids = this.unique(additions_ids)
+
 
         let drugs = []
         let projects = []
@@ -724,7 +718,7 @@
           let obj = {}
           let count = 0
           for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
-            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
+            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price && drug_ids[i].id ==  drug_month_prescriptions.advices[a].drug_id) {
               obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
               obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
               obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
@@ -751,7 +745,7 @@
           let obj = {}
           let count = 0
           for (let a = 0; a < project_month_prescriptions.project.length; a++) {
-            if (project_ids[i].price == project_month_prescriptions.project[a].price) {
+            if (project_ids[i].price == project_month_prescriptions.project[a].price && project_ids[i].id == project_month_prescriptions.project[a].project_id) {
               if (project_month_prescriptions.project[a].type == 2) {
                 obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
                 obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
@@ -1038,6 +1032,7 @@
             this.admin_info = response.data.data.info
 
             if (this.patientTableData.length > 0) {
+              this.current_data = this.patientTableData[0]
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
               this.oldCurrentRow = this.patientTableData[0]
               this.getPatientInfo(this.patientTableData[0])
@@ -1419,9 +1414,25 @@
           }
         })
 
+      },unique(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].id === res[j].id && array[i].price === res[j].price) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
       },
 
       choosePatient(val) {
+        this.current_data = val
         if (this.titleType == '电子病历') {
 
           if (this.$refs.child.watchSign > 2) {
@@ -4010,6 +4021,7 @@
         }
       }, changeDay() {
         this.current_tab = 'day'
+        this.getPatientInfo(this.current_data)
 
       }, changeMonth(val) {
         this.current_tab = 'month'