diff --git a/src/pages/health/statistic/doctorStatistic/index.vue b/src/pages/health/statistic/doctorStatistic/index.vue
index 302d1ed..9ca2a00 100644
--- a/src/pages/health/statistic/doctorStatistic/index.vue
+++ b/src/pages/health/statistic/doctorStatistic/index.vue
@@ -163,10 +163,10 @@
           <text class="row-label">就医类型：</text>
           <text class="row-value">{{ dictStr(item.type, typeList) }}</text>
         </view> -->
-        <!-- <view class="item-row">
-          <text class="row-label">就诊大夫：</text>
-          <text class="row-value">{{item.doctor}}</text>
-        </view> -->
+        <view class="item-row">
+          <text class="row-label">就诊人：</text>
+          <text class="row-value">{{item.personName}}</text>
+        </view> 
         <view class="item-row">
           <text class="row-label">就诊时间：</text>
           <text class="row-value">{{ item.visitingTime}}</text>
@@ -251,7 +251,7 @@ const windowHeight = computed(() => {
         })	
 onLoad(() => {
     getDict()
-    getList()
+    // getList()
   });
 
  onShow(() => {
@@ -301,8 +301,6 @@ function searchSubmit() {
     filterPanel.value = false
   }
   function resetQuery() {
-      queryParams.value.id = ''
-            queryParams.value.recordId = ''
       queryParams.value.type = '1'
      queryParams.value.startTime =  ''
     queryParams.value.endTime =  ''
@@ -321,11 +319,28 @@ function getList() {
     }
 function   getDict() {
   listPerson(queryPersonParams.value).then((response) => {
-      personList.value = [response.rows] 
-    })
-    listHealthRecord(queryHealthRecordParams.value).then((response) => {  
+      personList.value = [response.rows]
+      if(response.rows.length>0){
+        queryParams.value.personName= response.rows[0].name
+      queryParams.value.id = response.rows[0].id
+      queryHealthRecordParams.value.personId=response.rows[0].id
+      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
         healthRecordList.value = [response.rows] 
-      })  
+        if(response.rows.length>0){
+          queryParams.value.healthRecordName= response.rows[0].name
+          queryParams.value.recordId = response.rows[0].id
+       }
+       getDoctorAnalysis({...queryParams.value }).then(res => {
+        doctor.value = { ...res.data }
+        listData.value = listData.value.concat(res.data.doctorTableList)
+      }).catch(() => {
+      })
+
+
+      })
+     } 
+    })
+        
     }
 function settingConfirm(e) {
       queryParams.value.settingId = e.value[0].settingId
@@ -352,6 +367,10 @@ function settingCancel() {
       queryHealthRecordParams.value.personId=e.value[0].id
       listHealthRecord(queryHealthRecordParams.value).then((response) => {  
         healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+          queryParams.value.healthRecordName= response.rows[0].name
+          queryParams.value.recordId = response.rows[0].id
+    }
     showPerson.value = false
         pageNum.value = 1
       listData.value = []
@@ -359,9 +378,6 @@ function settingCancel() {
 })
   }
  function handlePersonCancel() {
-  queryParams.value.personName = ''
-    queryParams.value.id=''
-
        showPerson.value = false
        listData.value = []
       getList()
@@ -386,8 +402,6 @@ function settingCancel() {
       getList()
   }
  function handleHealthRecordCancel() {
-      queryParams.value.healthRecordName = ''
-    queryParams.value.recordId = ''
        showHealthRecord.value = false
        listData.value = []
       getList()
diff --git a/src/pages/health/statistic/healthStatistic/index.vue b/src/pages/health/statistic/healthStatistic/index.vue
index b55cadb..8d8fed6 100644
--- a/src/pages/health/statistic/healthStatistic/index.vue
+++ b/src/pages/health/statistic/healthStatistic/index.vue
@@ -265,7 +265,7 @@ const windowHeight = computed(() => {
         })	
 onLoad(() => {
     getDict()
-    getList()
+    // getList()
   });
 
  onShow(() => {
@@ -307,7 +307,6 @@ function searchSubmit() {
   }
   function resetQuery() {
       queryParams.value.id = ''
-       queryParams.value.recordId = ''
       queryParams.value.type = '1'
      queryParams.value.startTime =  ''
     queryParams.value.endTime =  ''
@@ -323,11 +322,26 @@ function getList() {
     }
 function   getDict() {
   listPerson(queryPersonParams.value).then((response) => {
-      personList.value = [response.rows] 
-    })
-    listHealthRecord(queryHealthRecordParams.value).then((response) => {  
+      personList.value = [response.rows]
+      if(response.rows.length>0){
+        queryParams.value.personName= response.rows[0].name
+      queryParams.value.id = response.rows[0].id
+      queryHealthRecordParams.value.personId=response.rows[0].id
+      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
         healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+          // queryParams.value.healthRecordName= response.rows[0].name
+          // queryParams.value.recordId = response.rows[0].id
+       }
+       getRecordAnalysis({...queryParams.value }).then(res => {
+        record.value = { ...res.data }
+        listData.value = listData.value.concat(res.data.recordList)
+      }).catch(() => {
       })
+
+      })
+     } 
+    })
     }
 function settingConfirm(e) {
       queryParams.value.settingId = e.value[0].settingId
@@ -354,6 +368,10 @@ function settingCancel() {
       queryHealthRecordParams.value.personId=e.value[0].id
       listHealthRecord(queryHealthRecordParams.value).then((response) => {  
         healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+          queryParams.value.healthRecordName= response.rows[0].name
+          queryParams.value.recordId = response.rows[0].id
+    }
     showPerson.value = false
         pageNum.value = 1
       listData.value = []
@@ -361,9 +379,6 @@ function settingCancel() {
 })
   }
  function handlePersonCancel() {
-  queryParams.value.personName = ''
-    queryParams.value.id=''
-
        showPerson.value = false
        listData.value = []
       getList()
diff --git a/src/pages/health/statistic/marStatistic/index.vue b/src/pages/health/statistic/marStatistic/index.vue
index cf2f531..9dd9a09 100644
--- a/src/pages/health/statistic/marStatistic/index.vue
+++ b/src/pages/health/statistic/marStatistic/index.vue
@@ -320,7 +320,7 @@ const windowHeight = computed(() => {
         })	
 onLoad(() => {
     getDict()
-    getList()
+    // getList()
   });
 
  onShow(() => {
@@ -361,8 +361,7 @@ function searchSubmit() {
     filterPanel.value = false
   }
   function resetQuery() {
-      queryParams.value.id = ''
-      queryParams.value.recordId = ''
+
       queryParams.value.type = '1'
      queryParams.value.startTime =  ''
     queryParams.value.endTime =  ''
@@ -378,11 +377,27 @@ function getList() {
     }
 function   getDict() {
   listPerson(queryPersonParams.value).then((response) => {
-      personList.value = [response.rows] 
-    })
-    listHealthRecord(queryHealthRecordParams.value).then((response) => {  
+      personList.value = [response.rows]
+      if(response.rows.length>0){
+        queryParams.value.personName= response.rows[0].name
+      queryParams.value.id = response.rows[0].id
+      queryHealthRecordParams.value.personId=response.rows[0].id
+      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
         healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+          queryParams.value.healthRecordName= response.rows[0].name
+          queryParams.value.recordId = response.rows[0].id
+       }
+       getMarAnalysis({...queryParams.value }).then(res => {
+        mar.value = { ...res.data }
+        listData.value = listData.value.concat(res.data.marMapList)
+      }).catch(() => {
       })
+
+
+      })
+     } 
+    })
       
     }
 function settingConfirm(e) {
@@ -410,6 +425,10 @@ function settingCancel() {
       queryHealthRecordParams.value.personId=e.value[0].id
       listHealthRecord(queryHealthRecordParams.value).then((response) => {  
         healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+          queryParams.value.healthRecordName= response.rows[0].name
+          queryParams.value.recordId = response.rows[0].id
+    }
     showPerson.value = false
         pageNum.value = 1
       listData.value = []
@@ -417,8 +436,6 @@ function settingCancel() {
 })
   }
  function handlePersonCancel() {
-  queryParams.value.personName = ''
-    queryParams.value.id=''
 
        showPerson.value = false
        listData.value = []
@@ -444,8 +461,7 @@ function settingCancel() {
       getList()
   }
  function handleHealthRecordCancel() {
-  queryParams.value.healthRecordName = ''
-    queryParams.value.recordId = ''
+
        showHealthRecord.value = false
        listData.value = []
       getList()
diff --git a/src/pages/health/statistic/temperatureStatistic/index.vue b/src/pages/health/statistic/temperatureStatistic/index.vue
index 26c9ada..08aa2f0 100644
--- a/src/pages/health/statistic/temperatureStatistic/index.vue
+++ b/src/pages/health/statistic/temperatureStatistic/index.vue
@@ -141,7 +141,7 @@
         <view class="list-item">
           <view class="item-header">
             <u--text  lines="2" 
-              :text="item.time+'  测量 '+item.count+' 次'" size="30rpx" color="#333333" ></u--text>
+              :text="item.name+item.time+'  测量 '+item.count+' 次'" size="30rpx" color="#333333" ></u--text>
           </view>
         <view class="item-row">
           <text class="row-label">最高体温：</text>
@@ -227,7 +227,7 @@ const windowHeight = computed(() => {
         })	
 onLoad(() => {
     getDict()
-    getList()
+    // getList()
   });
 
  onShow(() => {
@@ -268,8 +268,6 @@ function searchSubmit() {
     filterPanel.value = false
   }
   function resetQuery() {
-      queryParams.value.id = ''
-      queryParams.value.recordId = ''
       queryParams.value.type = '1'
      queryParams.value.startTime =  ''
     queryParams.value.endTime =  ''
@@ -285,11 +283,27 @@ function getList() {
     }
 function   getDict() {
   listPerson(queryPersonParams.value).then((response) => {
-      personList.value = [response.rows] 
-    })
-    listHealthRecord(queryHealthRecordParams.value).then((response) => {  
+      personList.value = [response.rows]
+      if(response.rows.length>0){
+        queryParams.value.personName= response.rows[0].name
+      queryParams.value.id = response.rows[0].id
+      queryHealthRecordParams.value.personId=response.rows[0].id
+      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
         healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+          queryParams.value.healthRecordName= response.rows[0].name
+          queryParams.value.recordId = response.rows[0].id
+       }
+       getTemperatureAnalysis({...queryParams.value }).then(res => {
+          temp.value = { ...res.data }
+        listData.value = listData.value.concat(res.data.tableList)
+      }).catch(() => {
       })
+
+
+      })
+     } 
+    })
       
     }
 function settingConfirm(e) {
@@ -317,6 +331,10 @@ function settingCancel() {
       queryHealthRecordParams.value.personId=e.value[0].id
       listHealthRecord(queryHealthRecordParams.value).then((response) => {  
         healthRecordList.value = [response.rows] 
+        if(response.rows.length>0){
+          queryParams.value.healthRecordName= response.rows[0].name
+          queryParams.value.recordId = response.rows[0].id
+    }
     showPerson.value = false
         pageNum.value = 1
       listData.value = []
@@ -324,8 +342,8 @@ function settingCancel() {
 })
   }
  function handlePersonCancel() {
-  queryParams.value.personName = ''
-    queryParams.value.id=''
+  // queryParams.value.personName = ''
+  //   queryParams.value.id=''
 
        showPerson.value = false
        listData.value = []
@@ -350,8 +368,8 @@ function settingCancel() {
       getList()
   }
  function handleHealthRecordCancel() {
-  queryParams.value.healthRecordName = ''
-    queryParams.value.recordId = ''
+  // queryParams.value.healthRecordName = ''
+  //   queryParams.value.recordId = ''
        showHealthRecord.value = false
        listData.value = []
       getList()