518合并代码

src/xt_pages/hospitalStation/components/deskRecord.vue

@@ -848,6 +848,7 @@ export default {
         if (this.case_history.diagnose == 0) {
           this.case_history.diagnose = "";
         }
+        this.allergic_history = this.case_history.allergic_history
         this.form.id = this.case_history.id;
         this.primary_disease = this.case_history.primary_disease
         this.confirm_failure_date = this.case_history.confirm_failure_date

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -849,6 +849,7 @@ export default {
           this.case_history.diagnose = "";
         }
         this.form.id = this.case_history.id;
+        this.allergic_history = this.case_history.allergic_history
         this.primary_disease = this.case_history.primary_disease
         this.confirm_failure_date = this.case_history.confirm_failure_date
         this.drug_allergy_history = this.case_history.drug_allergy_history