diff --git a/src/pages/health/doctorRecord/addEdit.vue b/src/pages/health/doctorRecord/addEdit.vue
index e7653b5..cd67081 100644
--- a/src/pages/health/doctorRecord/addEdit.vue
+++ b/src/pages/health/doctorRecord/addEdit.vue
@@ -184,8 +184,36 @@ function dictStr(val, arr) {
       return str
  }
 function  getData() {
-       // 就医类型
-       getDicts('doctor_type').then(res => {
+      
+      // 药品来源
+      
+    if(form.value.id!=null){
+      getDoctorRecord(form.value.id).then(res => {
+        listPerson(queryPersonParams.value).then((response) => {
+     personList.value = [response.rows] 
+     if(response.rows.length>0){
+      form.value.personName= response.rows[0].name
+      form.value.personId = response.rows[0].id
+      queryHealthRecordParams.value.personId=res.data.personId
+      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
+        healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+      form.value.healthRecordName= response.rows[0].name
+      form.value.healthRecordId = response.rows[0].id
+    }
+      })
+     }
+     })
+        form.value = res.data   
+            // 就医类型
+           getDicts('doctor_type').then(result => {
+          form.value.typeName=dictStr(form.value.type, result.data)
+         })
+      })
+      
+    }else{
+ // 就医类型
+ getDicts('doctor_type').then(res => {
         typeList.value =[res.data] 
       })
     listPerson(queryPersonParams.value).then((response) => {
@@ -203,16 +231,7 @@ function  getData() {
       })
      }
      })
-      // 药品来源
-      
-    if(form.value.id!=null){
-      getDoctorRecord(form.value.id).then(res => {
-        form.value = res.data   
-      })
-                 // 就医类型
-          getDicts('doctor_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-         })
+
     }
 }
 
diff --git a/src/pages/health/healthRecord/addEdit.vue b/src/pages/health/healthRecord/addEdit.vue
index 14d5d61..ef2e706 100644
--- a/src/pages/health/healthRecord/addEdit.vue
+++ b/src/pages/health/healthRecord/addEdit.vue
@@ -39,6 +39,10 @@
                 inputAlign="right" border="none"></u--input>
               <u-icon slot="right" name="arrow-down"></u-icon>
             </u-form-item>
+            <u-form-item label="康复时间" prop="rehabilitationTime"  @click="selectRehabilitationTime()">
+            <u--input v-model="form.rehabilitationTime" disabled disabledColor="#ffffff" placeholder="请选择康复时间" inputAlign="right" border="none"></u--input>
+          <u-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
             <u-form-item label="初期症状" prop="initialSymptoms" required >
                 <u--textarea v-model="form.initialSymptoms" placeholder="请填写初期症状" border="none" autoHeight inputAlign="right" count
                 maxlength="2000" style="padding:18rpx 0;"></u--textarea>
@@ -52,10 +56,7 @@
                 maxlength="2000" style="padding:18rpx 0;"></u--textarea>
             </u-form-item>
            
-            <u-form-item label="康复时间" prop="rehabilitationTime"  @click="selectRehabilitationTime()">
-            <u--input v-model="form.rehabilitationTime" disabled disabledColor="#ffffff" placeholder="请选择康复时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
+   
    
           <u-form-item label="备注" prop="remark"  labelPosition="top">
             <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
@@ -298,7 +299,7 @@ function handleState() {
   function   handleEtiologyConfirm(e) {
         form.value.etiologyName = e.value[0].dictLabel
         form.value.place = e.value[0].dictValue
-        showEtiology.value = false
+        showEtiology.etiology = false
   }
  function handleEtiologyCancel() {
   showEtiology.value = false
diff --git a/src/pages/health/marRecord/addEdit.vue b/src/pages/health/marRecord/addEdit.vue
index f9e0e2b..8fbf5c8 100644
--- a/src/pages/health/marRecord/addEdit.vue
+++ b/src/pages/health/marRecord/addEdit.vue
@@ -207,7 +207,45 @@ function  getData() {
   listMedicineBasic(queryMedicineParams.value).then((response) => {
     medicalList.value = [response.rows] 
   })
-    listPerson(queryPersonParams.value).then((response) => {
+      // 药品来源
+      
+    if(form.value.id!=null){
+      getMarRecord(form.value.id).then(res => {
+        listPerson(queryPersonParams.value).then((response) => {
+     personList.value = [response.rows] 
+     if(response.rows.length>0){
+      form.value.personName= response.rows[0].name
+      form.value.personId = response.rows[0].id
+      queryHealthRecordParams.value.personId=res.data.personId
+      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
+        healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+      form.value.healthRecordName= response.rows[0].name
+      form.value.healthRecordId = response.rows[0].id
+    }
+      })
+     }
+     })
+        form.value = res.data   
+        form.value.medicalName=form.value.name
+        getDicts('mar_place').then(result => {
+          form.value.placeName=dictStr(form.value.place, result.data)
+         })
+          // 药品来源
+        getDicts('mar_resource').then(result => {
+          form.value.resourceName=dictStr(form.value.resource, result.data)
+         })
+                   // 药品来源
+        getDicts('medical_unit').then(result => {
+          form.value.unitName=dictStr(form.value.unit, result.data)
+         })
+                // 用药类型
+           getDicts('mar_type').then(result => {
+          form.value.marTypeName=dictStr(form.value.type, result.data)
+         })
+      })
+    }else{
+      listPerson(queryPersonParams.value).then((response) => {
      personList.value = [response.rows] 
      if(response.rows.length>0){
       form.value.personName= response.rows[0].name
@@ -239,28 +277,6 @@ function  getData() {
         placeList.value =[res.data] 
       })
 
-      // 药品来源
-      
-    if(form.value.id!=null){
-      getMarRecord(form.value.id).then(res => {
-        form.value = res.data   
-        form.value.medicalName=form.value.name
-        getDicts('mar_place').then(result => {
-          form.value.placeName=dictStr(form.value.place, result.data)
-         })
-          // 药品来源
-        getDicts('mar_resource').then(result => {
-          form.value.resourceName=dictStr(form.value.resource, result.data)
-         })
-                   // 药品来源
-        getDicts('medical_unit').then(result => {
-          form.value.unitName=dictStr(form.value.unit, result.data)
-         })
-                // 用药类型
-           getDicts('mar_type').then(result => {
-          form.value.marTypeName=dictStr(form.value.type, result.data)
-         })
-      })
     }
 }
 
diff --git a/src/pages/health/person/addEdit.vue b/src/pages/health/person/addEdit.vue
index 59a3ebc..98d7a22 100644
--- a/src/pages/health/person/addEdit.vue
+++ b/src/pages/health/person/addEdit.vue
@@ -26,7 +26,7 @@
             </u-form-item>
           
             <u-form-item label="生日" prop="birthday" required @click="selectBirthday()">
-            <u--input v-model="form.birthday" disabled disabledColor="#ffffff" placeholder="请选择发生时间" inputAlign="right" border="none"></u--input>
+            <u--input v-model="form.birthday" disabled disabledColor="#ffffff" placeholder="请选择生日" inputAlign="right" border="none"></u--input>
           <u-icon slot="right" name="arrow-right"></u-icon>
           </u-form-item>
           <u-form-item label="性别" prop="sexName" required @click="handleSex">
diff --git a/src/pages/health/processRecord/addEdit.vue b/src/pages/health/processRecord/addEdit.vue
index f6f2061..3f8ab14 100644
--- a/src/pages/health/processRecord/addEdit.vue
+++ b/src/pages/health/processRecord/addEdit.vue
@@ -123,7 +123,22 @@ onReady(() => {
      form.value.recordingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
 })
 function  getData() {
-    listPerson(queryPersonParams.value).then((response) => {
+  
+    if(form.value.id!=null){
+      getProcessRecord(form.value.id).then(res => {
+        listPerson(queryPersonParams.value).then((response) => {
+     personList.value = [response.rows] 
+     if(response.rows.length>0){
+      queryHealthRecordParams.value.personId=res.data.personId
+      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
+        healthRecordList.value = [response.rows] 
+      })
+     }
+     })
+        form.value = res.data   
+      })
+    }else{
+      listPerson(queryPersonParams.value).then((response) => {
      personList.value = [response.rows] 
      if(response.rows.length>0){
       form.value.personName= response.rows[0].name
@@ -138,12 +153,9 @@ function  getData() {
       })
      }
      })
-  
-    if(form.value.id!=null){
-      getProcessRecord(form.value.id).then(res => {
-        form.value = res.data   
-      })
     }
+
+
 }
 
 function handlePerson() {
@@ -163,6 +175,10 @@ function   handlePersonConfirm(e) {
       queryHealthRecordParams.value.personId=e.value[0].id
       listHealthRecord(queryHealthRecordParams.value).then((response) => {  
         healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+      form.value.healthRecordName= response.rows[0].name
+      form.value.healthRecordId = response.rows[0].id
+    }
   showPerson.value = false
 })
       
diff --git a/src/pages/health/temperatureRecord/addEdit.vue b/src/pages/health/temperatureRecord/addEdit.vue
index b90e466..e89e253 100644
--- a/src/pages/health/temperatureRecord/addEdit.vue
+++ b/src/pages/health/temperatureRecord/addEdit.vue
@@ -129,7 +129,21 @@ onReady(() => {
      form.value.measureTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
 })
 function  getData() {
-    listPerson(queryPersonParams.value).then((response) => {
+    if(form.value.id!=null){
+      getTemperatureRecord(form.value.id).then(res => {
+        listPerson(queryPersonParams.value).then((response) => {
+     personList.value = [response.rows] 
+     if(response.rows.length>0){
+      queryHealthRecordParams.value.personId=res.data.personId
+      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
+        healthRecordList.value = [response.rows] 
+      })
+     }
+     })
+        form.value = res.data   
+      })
+    }else{
+      listPerson(queryPersonParams.value).then((response) => {
      personList.value = [response.rows] 
      if(response.rows.length>0){
       form.value.personName= response.rows[0].name
@@ -144,11 +158,6 @@ function  getData() {
       })
      }
      })
-  
-    if(form.value.id!=null){
-      getTemperatureRecord(form.value.id).then(res => {
-        form.value = res.data   
-      })
     }
 }
 
@@ -169,6 +178,10 @@ function   handlePersonConfirm(e) {
       queryHealthRecordParams.value.personId=e.value[0].id
       listHealthRecord(queryHealthRecordParams.value).then((response) => {  
         healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+      form.value.healthRecordName= response.rows[0].name
+      form.value.healthRecordId = response.rows[0].id
+    }
   showPerson.value = false
 })