Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

     hisPatientInfo: Object,
     record_date: String,
     detalid: Number,
+    befor:Object,
+    LastCaseHistory:Object,
   },
   components: {
     medicalRecord,
           var templatedetail = response.data.data.templateDetail;
           console.log("templatedetail", templatedetail);
           this.case_history.chief_conplaint = templatedetail.chief_conplaint;
-          this.case_history.history_of_present_illness =
-            templatedetail.history_of_present_illness;
+          this.case_history.history_of_present_illness = templatedetail.history_of_present_illness;
           this.case_history.past_history = templatedetail.past_history;
           this.case_history.personal_history = templatedetail.personal_history;
           this.case_history.family_history = templatedetail.family_history;
       this.patientInfo.first_dialysis_date
     );
    
-    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
-    this.physical_examination = this.case_history.physical_examination
-    this.special_inspection = this.case_history.special_inspection
-    this.lab_apparatus = this.case_history.lab_apparatus
+    if(this.case_history!=undefined){
+      if(this.case_history.id == 0){
+        this.primary_disease = this.LastCaseHistory.primary_disease
+        this.confirm_failure_date = this.LastCaseHistory.confirm_failure_date
+        this.drug_allergy_history = this.LastCaseHistory.drug_allergy_history
+        this.physical_examination = this.LastCaseHistory.physical_examination
+        this.special_inspection = this.LastCaseHistory.special_inspection
+        this.lab_apparatus = this.LastCaseHistory.lab_apparatus
+        this.case_history.sick = this.LastCaseHistory.sick
+        this.case_history.diagnose = this.LastCaseHistory.diagnose
+        this.allergic_history = this.LastCaseHistory.allergic_history
+        this.case_history.family_history = this.LastCaseHistory.family_history
+        this.case_history.doctor_advice = this.LastCaseHistory.doctor_advice
+        this.case_history.remark = this.LastCaseHistory.remark
+        this.case_history.past_history = this.LastCaseHistory.past_history
+        this.case_history.personal_history = this.LastCaseHistory.personal_history
+        this.case_history.chief_conplaint = this.LastCaseHistory.chief_conplaint
+        this.case_history.history_of_present_illness = this.LastCaseHistory.history_of_present_illness
+        this.case_history.diagnostic = this.LastCaseHistory.diagnostic
+       
+      
+      }   
+      if(this.case_history.id > 0){
+        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
+        this.physical_examination = this.case_history.physical_examination
+        this.special_inspection = this.case_history.special_inspection
+        this.lab_apparatus = this.case_history.lab_apparatus
+      }
+    }
+   
   },
   watch: {
     detalid: function (val) {
 
     patientInfo: {
       handler(newval, oldval) {
+
         this.primary_disease = this.patientInfo.primary_disease;
         this.confirm_failure_date = this.patientInfo.confirm_failure_date;
         this.drug_allergy_history = this.patientInfo.drug_allergy_history;
         this.physical_examination = this.patientInfo.physical_examination;
         this.special_inspection = this.patientInfo.special_inspection;
         this.lab_apparatus = this.patientInfo.lab_apparatus;
+        console.log("WOWOWOWOOWOWOWWO",this.patientInfo)
+        console.log("透气那数据阿道夫阿道夫阿道夫低分安抚",this.LastCaseHistory)
+
+
+        if(this.befor!=undefined){
+          if(this.case_history.temperature == 0){
+            this.case_history.temperature =  this.befor.temperature?this.befor.temperature:""
+          }
+
+          if(this.case_history.pulse == 0){
+            this.case_history.pulse =  this.befor.pulse_frequency?this.befor.pulse_frequency:""
+          }
+
+          if(this.case_history.breathing == 0){
+            this.case_history.breathing = this.befor.breathing_rate?this.befor.breathing_rate:""
+          }
+        
+          if(this.case_history.sbp==0){
+            this.case_history.sbp = this.befor.systolic_blood_pressure?this.befor.systolic_blood_pressure:""
+          }
+
+          if(this.case_history.dbp == 0){
+            this.case_history.dbp = this.befor.diastolic_blood_pressure?this.befor.diastolic_blood_pressure:""
+          }   
+        }
       },
       deep: true,
     },

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

 
 
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
-                     :hisPatientInfo="hisPatientInfo" v-if="titleType == '电子病历'" :detalid="detalid"
+                     :hisPatientInfo="hisPatientInfo" v-if="titleType == '电子病历'" :detalid="detalid" :befor="befor"
+                     :LastCaseHistory="LastCaseHistory"
                      ref="child"></desk-record>
         <medicalRecord ref='medicalRecord' @func="getMsgFormSon"></medicalRecord>
         <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
       anticoagulants_confit: null,
       patient_diagnoses: [],
       // zuobiao_project:[],
+      befor:{},
+      LastCaseHistory:{}
     }
   },
 
           this.doctors = response.data.data.doctors
           this.department = response.data.data.department
 
+          this.befor = response.data.data.befor
+
+          this.LastCaseHistory= response.data.data.LastCaseHistory
+
           for (let i = 0; i < this.doctors.length; i++) {
             if (this.doctors[i].user_type == 1) {
               this.doctors.splice(i, 1)