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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -3703,6 +3703,11 @@
                       }
                       this.all_table_data.push(obj)
 
+                      if(obj.name == "刘伟琼"){
+                        console.log(obj)
+
+                      }
+
                     }
                   } else {
                     let obj = {
@@ -3729,7 +3734,7 @@
                         id: response.data.data.list[i].id,
                         name: response.data.data.list[i].name,
                         number: response.data.data.list[i].his_patient[b].number,
-                        order_status: 1,
+                        order_status: 0,
                         his_patient_id: response.data.data.list[i].his_patient[b].id,
                         order_number: '',
                         order_id: 0,
@@ -3764,6 +3769,7 @@
                 this.hisPatientDatas.push(this.all_table_data[i])
               }
             }
+
             let unChargePatient = []
             for (let i = 0; i < this.all_table_data.length; i++) {
               let isHasUnCharge = false
@@ -3807,13 +3813,9 @@
             if (this.radio == 1) {
               this.all_table_data = this.unique_four(this.all_table_data)
             }
-            console.log("~~~~~~~~~~")
-
-            console.log(this.all_table_data)
 
             switch (this.radio) {
               case 1:
-                console.log(this.all_table_data)
                 this.patientTableData = []
                 for (let i = 0; i < this.all_table_data.length; i++) {
                   let isHasUnCharge = false
@@ -3837,12 +3839,10 @@
                   if (isHasUnCharge) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
-
                 }
-
                 this.all_patient = this.patientTableData
-
                 break
+
               case 2:
                 this.patientTableData = []
                 for (let i = 0; i < this.all_table_data.length; i++) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1910,10 +1910,7 @@
           this.showTwo = true
         }
 
-        this.state2 = info.sick_history
-        if (this.state2 == 0) {
-          this.state2 = ''
-        }
+
 
         if (info.prescription_status == 0) {
           this.order_status = ''
@@ -1991,7 +1988,19 @@
 
                 }
               }
+
+              if(last_info.sick_history == 0){
+                this.state2 = ''
+              }else{
+                this.state2 = last_info.sick_history
+              }
+
+
             }else{
+              this.state2 = info.sick_history
+              if (this.state2 == 0) {
+                this.state2 = ''
+              }
               if(info.diagnosis.length == 0){
                 this.diagnose = []
               }else{