diff --git a/src/api/health/activity.js b/src/api/health/activity.js
new file mode 100644
index 0000000..00ea5cf
--- /dev/null
+++ b/src/api/health/activity.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询活动记录列表
+export function listActivity(query) {
+  return request({
+    url: '/health/activity/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询活动记录详细
+export function getActivity(id) {
+  return request({
+    url: '/health/activity/' + id,
+    method: 'get'
+  })
+}
+
+// 新增活动记录
+export function addActivity(data) {
+  return request({
+    url: '/health/activity',
+    method: 'post',
+    data
+  })
+}
+
+// 修改活动记录
+export function updateActivity(data) {
+  return request({
+    url: '/health/activity',
+    method: 'put',
+    data
+  })
+}
+
+// 删除活动记录
+export function delActivity(id) {
+  return request({
+    url: '/health/activity/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/health/doctorRecord.js b/src/api/health/doctorRecord.js
index 4a1af1d..055d389 100644
--- a/src/api/health/doctorRecord.js
+++ b/src/api/health/doctorRecord.js
@@ -2,43 +2,43 @@ import request from '@/utils/request'
 
 // 查询就医记录列表
 export function listDoctorRecord(query) {
-    return request({
-        url: '/health/doctorRecord/list',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: '/health/doctorRecord/list',
+    method: 'get',
+    params: query
+  })
 }
 
 // 查询就医记录详细
 export function getDoctorRecord(id) {
-    return request({
-        url: '/health/doctorRecord/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/health/doctorRecord/' + id,
+    method: 'get'
+  })
 }
 
 // 新增就医记录
 export function addDoctorRecord(data) {
-    return request({
-        url: '/health/doctorRecord',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/health/doctorRecord',
+    method: 'post',
+    data
+  })
 }
 
 // 修改就医记录
 export function updateDoctorRecord(data) {
-    return request({
-        url: '/health/doctorRecord',
-        method: 'put',
-        data: data
-    })
+  return request({
+    url: '/health/doctorRecord',
+    method: 'put',
+    data
+  })
 }
 
 // 删除就医记录
 export function delDoctorRecord(id) {
-    return request({
-        url: '/health/doctorRecord/' + id,
-        method: 'delete'
-    })
+  return request({
+    url: '/health/doctorRecord/' + id,
+    method: 'delete'
+  })
 }
diff --git a/src/api/health/healthRecord.js b/src/api/health/healthRecord.js
index 31907ef..8997827 100644
--- a/src/api/health/healthRecord.js
+++ b/src/api/health/healthRecord.js
@@ -2,43 +2,43 @@ import request from '@/utils/request'
 
 // 查询健康档案列表
 export function listHealthRecord(query) {
-    return request({
-        url: '/health/healthRecord/list',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: '/health/healthRecord/list',
+    method: 'get',
+    params: query
+  })
 }
 
 // 查询健康档案详细
 export function getHealthRecord(id) {
-    return request({
-        url: '/health/healthRecord/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/health/healthRecord/' + id,
+    method: 'get'
+  })
 }
 
 // 新增健康档案
 export function addHealthRecord(data) {
-    return request({
-        url: '/health/healthRecord',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/health/healthRecord',
+    method: 'post',
+    data
+  })
 }
 
 // 修改健康档案
 export function updateHealthRecord(data) {
-    return request({
-        url: '/health/healthRecord',
-        method: 'put',
-        data: data
-    })
+  return request({
+    url: '/health/healthRecord',
+    method: 'put',
+    data
+  })
 }
 
 // 删除健康档案
 export function delHealthRecord(id) {
-    return request({
-        url: '/health/healthRecord/' + id,
-        method: 'delete'
-    })
+  return request({
+    url: '/health/healthRecord/' + id,
+    method: 'delete'
+  })
 }
diff --git a/src/api/health/heightWeightRecord.js b/src/api/health/heightWeightRecord.js
new file mode 100644
index 0000000..8bf1e83
--- /dev/null
+++ b/src/api/health/heightWeightRecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询身高体重记录列表
+export function listHeightWeightRecord(query) {
+  return request({
+    url: '/health/heightWeightRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询身高体重记录详细
+export function getHeightWeightRecord(id) {
+  return request({
+    url: '/health/heightWeightRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增身高体重记录
+export function addHeightWeightRecord(data) {
+  return request({
+    url: '/health/heightWeightRecord',
+    method: 'post',
+    data
+  })
+}
+
+// 修改身高体重记录
+export function updateHeightWeightRecord(data) {
+  return request({
+    url: '/health/heightWeightRecord',
+    method: 'put',
+    data
+  })
+}
+
+// 删除身高体重记录
+export function delHeightWeightRecord(id) {
+  return request({
+    url: '/health/heightWeightRecord/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/health/marRecord.js b/src/api/health/marRecord.js
index 20da6df..ddb437f 100644
--- a/src/api/health/marRecord.js
+++ b/src/api/health/marRecord.js
@@ -2,43 +2,43 @@ import request from '@/utils/request'
 
 // 查询用药记录列表
 export function listMarRecord(query) {
-    return request({
-        url: '/health/marRecord/list',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: '/health/marRecord/list',
+    method: 'get',
+    params: query
+  })
 }
 
 // 查询用药记录详细
 export function getMarRecord(id) {
-    return request({
-        url: '/health/marRecord/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/health/marRecord/' + id,
+    method: 'get'
+  })
 }
 
 // 新增用药记录
 export function addMarRecord(data) {
-    return request({
-        url: '/health/marRecord',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/health/marRecord',
+    method: 'post',
+    data
+  })
 }
 
 // 修改用药记录
 export function updateMarRecord(data) {
-    return request({
-        url: '/health/marRecord',
-        method: 'put',
-        data: data
-    })
+  return request({
+    url: '/health/marRecord',
+    method: 'put',
+    data
+  })
 }
 
 // 删除用药记录
 export function delMarRecord(id) {
-    return request({
-        url: '/health/marRecord/' + id,
-        method: 'delete'
-    })
+  return request({
+    url: '/health/marRecord/' + id,
+    method: 'delete'
+  })
 }
diff --git a/src/api/health/medicineBasic.js b/src/api/health/medicineBasic.js
new file mode 100644
index 0000000..0e13201
--- /dev/null
+++ b/src/api/health/medicineBasic.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询药品基础信息列表
+export function listMedicineBasic(query) {
+  return request({
+    url: '/health/medicineBasic/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询药品基础信息详细
+export function getMedicineBasic(id) {
+  return request({
+    url: '/health/medicineBasic/' + id,
+    method: 'get'
+  })
+}
+
+// 新增药品基础信息
+export function addMedicineBasic(data) {
+  return request({
+    url: '/health/medicineBasic',
+    method: 'post',
+    data
+  })
+}
+
+// 修改药品基础信息
+export function updateMedicineBasic(data) {
+  return request({
+    url: '/health/medicineBasic',
+    method: 'put',
+    data
+  })
+}
+
+// 删除药品基础信息
+export function delMedicineBasic(id) {
+  return request({
+    url: '/health/medicineBasic/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/health/medicineStock.js b/src/api/health/medicineStock.js
new file mode 100644
index 0000000..eaff3d0
--- /dev/null
+++ b/src/api/health/medicineStock.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询药品实时库存列表
+export function listMedicineStock(query) {
+  return request({
+    url: '/health/medicineStock/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询药品实时库存详细
+export function getMedicineStock(id) {
+  return request({
+    url: '/health/medicineStock/' + id,
+    method: 'get'
+  })
+}
+
+// 新增药品实时库存
+export function addMedicineStock(data) {
+  return request({
+    url: '/health/medicineStock',
+    method: 'post',
+    data
+  })
+}
+
+// 修改药品实时库存
+export function updateMedicineStock(data) {
+  return request({
+    url: '/health/medicineStock',
+    method: 'put',
+    data
+  })
+}
+
+// 删除药品实时库存
+export function delMedicineStock(id) {
+  return request({
+    url: '/health/medicineStock/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/health/medicineStockIn.js b/src/api/health/medicineStockIn.js
new file mode 100644
index 0000000..aaa7706
--- /dev/null
+++ b/src/api/health/medicineStockIn.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询药品入库清单列表
+export function listMedicineStockIn(query) {
+  return request({
+    url: '/health/medicineStockIn/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询药品入库清单详细
+export function getMedicineStockIn(id) {
+  return request({
+    url: '/health/medicineStockIn/' + id,
+    method: 'get'
+  })
+}
+
+// 新增药品入库清单
+export function addMedicineStockIn(data) {
+  return request({
+    url: '/health/medicineStockIn',
+    method: 'post',
+    data
+  })
+}
+
+// 修改药品入库清单
+export function updateMedicineStockIn(data) {
+  return request({
+    url: '/health/medicineStockIn',
+    method: 'put',
+    data
+  })
+}
+
+// 删除药品入库清单
+export function delMedicineStockIn(id) {
+  return request({
+    url: '/health/medicineStockIn/' + id,
+    method: 'delete'
+  })
+}
+
+// 查询药品入库清单列表
+export function listMedicineRealtimeStock(query) {
+  return request({
+    url: '/health/medicineStockIn/realTimeList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/health/statisticAnalysis.js b/src/api/health/statisticAnalysis.js
new file mode 100644
index 0000000..2b39859
--- /dev/null
+++ b/src/api/health/statisticAnalysis.js
@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function getMarAnalysis(query) {
+  return request({
+    url: '/health/analysis/marAnalysis',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getTemperatureAnalysis(query) {
+  return request({
+    url: '/health/analysis/temperatureAnalysis',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/health/temperatureRecord.js b/src/api/health/temperatureRecord.js
index b38fe66..77355b1 100644
--- a/src/api/health/temperatureRecord.js
+++ b/src/api/health/temperatureRecord.js
@@ -2,43 +2,43 @@ import request from '@/utils/request'
 
 // 查询体温记录列表
 export function listTemperatureRecord(query) {
-    return request({
-        url: '/health/temperatureRecord/list',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: '/health/temperatureRecord/list',
+    method: 'get',
+    params: query
+  })
 }
 
 // 查询体温记录详细
 export function getTemperatureRecord(id) {
-    return request({
-        url: '/health/temperatureRecord/' + id,
-        method: 'get'
-    })
+  return request({
+    url: '/health/temperatureRecord/' + id,
+    method: 'get'
+  })
 }
 
 // 新增体温记录
 export function addTemperatureRecord(data) {
-    return request({
-        url: '/health/temperatureRecord',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/health/temperatureRecord',
+    method: 'post',
+    data
+  })
 }
 
 // 修改体温记录
 export function updateTemperatureRecord(data) {
-    return request({
-        url: '/health/temperatureRecord',
-        method: 'put',
-        data: data
-    })
+  return request({
+    url: '/health/temperatureRecord',
+    method: 'put',
+    data
+  })
 }
 
 // 删除体温记录
 export function delTemperatureRecord(id) {
-    return request({
-        url: '/health/temperatureRecord/' + id,
-        method: 'delete'
-    })
+  return request({
+    url: '/health/temperatureRecord/' + id,
+    method: 'delete'
+  })
 }
diff --git a/src/api/health/weightRecord.js b/src/api/health/weightRecord.js
deleted file mode 100644
index 149bf96..0000000
--- a/src/api/health/weightRecord.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询体重记录列表
-export function listWeightRecord(query) {
-    return request({
-        url: '/health/weightRecord/list',
-        method: 'get',
-        params: query
-    })
-}
-
-// 查询体重记录详细
-export function getWeightRecord(id) {
-    return request({
-        url: '/health/weightRecord/' + id,
-        method: 'get'
-    })
-}
-
-// 新增体重记录
-export function addWeightRecord(data) {
-    return request({
-        url: '/health/weightRecord',
-        method: 'post',
-        data: data
-    })
-}
-
-// 修改体重记录
-export function updateWeightRecord(data) {
-    return request({
-        url: '/health/weightRecord',
-        method: 'put',
-        data: data
-    })
-}
-
-// 删除体重记录
-export function delWeightRecord(id) {
-    return request({
-        url: '/health/weightRecord/' + id,
-        method: 'delete'
-    })
-}
diff --git a/src/pages.json b/src/pages.json
index e12510a..0ed06a4 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -46,12 +46,6 @@
       "style": {
         "navigationBarTitleText": "就医记录"
       }
-    } ,
-    {
-      "path": "pages/health/doctorRecord/details",
-      "style": {
-        "navigationBarTitleText": "就医记录详情"
-      }
     }
     ,
     {
@@ -66,13 +60,6 @@
         "navigationBarTitleText": "健康档案"
       }
     } ,
-    {
-      "path": "pages/health/healthRecord/details",
-      "style": {
-        "navigationBarTitleText": "健康档案详情"
-      }
-    }
-    ,
     {
       "path": "pages/health/healthRecord/addEdit",
       "style": {
@@ -92,6 +79,52 @@
         "navigationBarTitleText": "用药记录"
       }
     },
+    {
+      "path": "pages/health/medicineBasic/list",
+      "style": {
+        "navigationBarTitleText": "药品基础信息"
+      }
+    } 
+    ,
+    {
+      "path": "pages/health/medicineBasic/details",
+      "style": {
+        "navigationBarTitleText": "药品基础信息详情"
+      }
+    } 
+    ,
+    {
+      "path": "pages/health/medicineBasic/addEdit",
+      "style": {
+        "navigationBarTitleText": "药品基础信息"
+      }
+    },
+    {
+      "path": "pages/health/medicineStockIn/list",
+      "style": {
+        "navigationBarTitleText": "药品入库清单"
+      }
+    } 
+    ,
+    {
+      "path": "pages/health/medicineStockIn/details",
+      "style": {
+        "navigationBarTitleText": "药品入库清单详情"
+      }
+    } 
+    ,
+    {
+      "path": "pages/health/medicineStockIn/addEdit",
+      "style": {
+        "navigationBarTitleText": "药品入库清单"
+      }
+    }, {
+      "path": "pages/health/medicineStock/list",
+      "style": {
+        "navigationBarTitleText": "药品实时库存"
+      }
+    } 
+    ,
     {
       "path": "pages/health/temperatureRecord/list",
       "style": {
@@ -104,18 +137,24 @@
       "style": {
         "navigationBarTitleText": "体温记录"
       }
+    }, {
+      "path": "pages/health/heightWeightRecord/list",
+      "style": {
+        "navigationBarTitleText": "身高体重记录"
+      }
+    } 
+    ,
+    {
+      "path": "pages/health/heightWeightRecord/addEdit",
+      "style": {
+        "navigationBarTitleText": "身高体重记录"
+      }
     },
     {
       "path": "pages/health/person/list",
       "style": {
         "navigationBarTitleText": "成员管理"
       }
-    } ,
-    {
-      "path": "pages/health/person/details",
-      "style": {
-        "navigationBarTitleText": "成员管理详情"
-      }
     }
     ,
     {
@@ -125,22 +164,16 @@
       }
     },
     {
-      "path": "pages/health/weightRecord/list",
+      "path": "pages/health/activity/list",
       "style": {
-        "navigationBarTitleText": "体重记录"
-      }
-    } ,
-    {
-      "path": "pages/health/weightRecord/details",
-      "style": {
-        "navigationBarTitleText": "体重记录详情"
+        "navigationBarTitleText": "活动记录"
       }
     }
     ,
     {
-      "path": "pages/health/weightRecord/addEdit",
+      "path": "pages/health/activity/addEdit",
       "style": {
-        "navigationBarTitleText": "体重记录"
+        "navigationBarTitleText": "活动记录"
       }
     }
   ],
diff --git a/src/pages/health/activity/addEdit.vue b/src/pages/health/activity/addEdit.vue
new file mode 100644
index 0000000..aea6c71
--- /dev/null
+++ b/src/pages/health/activity/addEdit.vue
@@ -0,0 +1,266 @@
+<template>
+  <view class="container" style="paddingBottom:1rpx;">
+    <u-navbar
+    leftIconSize="40rpx"
+    leftIconColor="#333333"
+    title="活动记录"
+  >
+  </u-navbar>
+    <view class="section">
+      <view class="section-title">{{ title}}</view>
+      <view class="form-view">
+        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+          <u-form-item label="活动名称" prop="name" required >
+              <u--input v-model="form.name"  placeholder="请填写活动名称"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+          <u-form-item label="类型" prop="typeName" required @click="handleType">
+              <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="活动地点" required prop="place" >
+              <u--input v-model="form.place"  placeholder="请填写活动地点"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="成员" required prop="partner" >
+              <u--input v-model="form.partner" placeholder="请填写成员"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="开始时间" prop="startTime" required @click="selectStartTime()">
+            <u--input v-model="form.startTime" 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="endTime" required  @click="selectEndTime()">
+            <u--input v-model="form.endTime" 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="exerciseTime" >
+              <u--input v-model="form.exerciseTime" placeholder="请填写活动时长"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="总费用" prop="totalCost" >
+              <u--input v-model="form.totalCost" type="number"  placeholder="请填写总费用"
+                inputAlign="right" border="none">
+                <template #suffix>
+					<up-text
+						text="元"
+					></up-text>
+				</template></u--input>
+            </u-form-item>
+            <u-form-item label="费用明细" prop="costDetail"  labelPosition="top">
+            <u--textarea v-model="form.costDetail" placeholder="请填写费用明细" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+          <u-form-item label="饮食" prop="foods"  labelPosition="top">
+            <u--textarea v-model="form.foods" placeholder="请填写饮食" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+          <u-form-item label="收获" prop="harvest"  labelPosition="top">
+            <u--textarea v-model="form.harvest" placeholder="请填写收获" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+          <u-form-item label="备注" prop="remark"  labelPosition="top">
+            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+        </u--form>
+        <view class="form-btn">
+          <u-button type="primary" text="提交" @click="submit"></u-button>
+        </view>
+      </view>
+    </view>
+    <u-toast ref="uToast"></u-toast>
+        <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleTypeCancel"
+        @confirm="handleTypeConfirm"></u-picker>
+        <u-datetime-picker
+			:show="startTimeShow"
+			mode="datetime"
+      ref="startTimeRef" 
+			@cancel="startTimeShow=false"
+			@confirm="startTimeConfirm"
+			itemHeight="88"
+		></u-datetime-picker>
+
+    <u-datetime-picker
+			:show="endTimeShow"
+			mode="datetime"
+      ref="endTimeRef" 
+			@cancel="endTimeShow=false"
+			@confirm="endTimeConfirm"
+			itemHeight="88"
+		></u-datetime-picker>
+  </view>
+</template>
+
+<script setup>
+import { getActivity, addActivity, updateActivity } from '@/api/health/activity'
+const { proxy } = getCurrentInstance()
+  import { getDicts } from '@/api/system/dict/data.js'
+import dayjs from 'dayjs'
+import {onLoad,onReady} from "@dcloudio/uni-app";
+  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const birthdayShow = ref(false)
+const title = ref("活动记录")
+const startTimeShow = ref(false)
+const endTimeShow = ref(false)
+const typeList = ref([])
+const showType = ref(false)
+const data = reactive({
+form: {
+  id: null,
+    name: null,
+    type: null,
+    place: null,
+    activityVolume: null,
+    exerciseTime: null,
+    startTime: null,
+    endTime: null,
+    harvest: null,
+    foods: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    totalCost: null,
+    partner: null,
+    costDetail: null
+},
+rules: {
+  name: [{ required: true, message: '活动名称不能为空', trigger:['change', 'blur'] }],
+  place: [{ required: true, message: '活动地点不能为空', trigger: ['change', 'blur'] }],
+  partner: [{ required: true, message: '成员不能为空', trigger: ['change', 'blur'] }],
+  startTime: [{ required: true, message: '开始时间不能为空', trigger: ['change', 'blur'] }],
+  endTime: [{ required: true, message: '结束时间不能为空', trigger: ['change', 'blur'] }],
+  typeName: [{ required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
+}
+})
+const { form, rules} = toRefs(data)
+
+
+onLoad((option) => {
+     form.value.id = option.id
+     if(form.value.id!=null){
+      title.value="活动记录-修改"
+     }else{
+      title.value="活动记录-新增"
+     }
+    getData()
+})
+onReady(() => {
+  form.value.startTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
+})
+function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+ }
+ function  selectStartTime() {
+      startTimeShow.value = true
+      proxy.$refs['startTimeRef'].innerValue = new Date().getTime()
+  }
+function startTimeConfirm(e) {
+      form.value.startTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
+      startTimeShow.value = false
+  }
+
+  function  selectEndTime() {
+    endTimeShow.value = true
+      proxy.$refs['endTimeRef'].innerValue = new Date().getTime()
+  }
+function endTimeConfirm(e) {
+      form.value.endTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
+      endTimeShow.value = false
+  }
+function  getData() {
+     // 类型
+     getDicts('activity_type').then(res => {
+        typeList.value =[res.data] 
+      })
+    if(form.value.id!=null){
+      getActivity(form.value.id).then(res => {
+        form.value = res.data   
+            // 类型
+           getDicts('activity_type').then(result => {
+          form.value.typeName=dictStr(form.value.type, result.data)
+         })
+      })
+    }
+}
+
+
+  function handleType() {
+        if (typeList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '类型为空  ', type: 'warning'
+          })
+        } else {
+          showType.value = true
+        }
+     }
+  function   handleTypeConfirm(e) {
+        form.value.typeName = e.value[0].dictLabel
+        form.value.type = e.value[0].dictValue
+        showType.value = false
+  }
+ function handleTypeCancel() {
+       showType.value = false
+      }
+
+
+function submit() {
+      proxy.$refs['uForm'].validate().then(() => {
+        if (form.value.id != null) {
+          updateActivity(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '修改成功', complete() {
+              uni.navigateTo({ url: `/pages/health/activity/list` })
+            }
+          })
+        })
+        }else {
+          addActivity(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/activity/list` })
+            }
+          })
+        })
+        }
+      })
+    }
+</script>
+
+<style lang="scss" scoped>
+.section {
+  margin: 24rpx;
+  padding: 16rpx 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+
+  .section-title {
+    width: 360rpx;
+    color: #333333;
+    line-height: 44rpx;
+    font-size: 30rpx;
+    border-left: 6rpx solid #2681FF;
+    padding-left: 26rpx;
+  }
+
+  .form-view {
+    padding: 20rpx 0rpx 0 10rpx;
+
+    .form-btn {
+      padding-top: 20rpx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/weightRecord/list.vue b/src/pages/health/activity/list.vue
similarity index 58%
rename from src/pages/health/weightRecord/list.vue
rename to src/pages/health/activity/list.vue
index 386a02c..626f73f 100644
--- a/src/pages/health/weightRecord/list.vue
+++ b/src/pages/health/activity/list.vue
@@ -1,53 +1,68 @@
 <template>
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.name" border="false" placeholder="请输入标题" class="search-input"
-          @blur="searchBlur" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-          <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">类型</view>
-              <view class="state-list">
-                <view v-for="item in journeyTypeList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectStatus(item)">{{ item.dictLabel }}</view>
-              </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
+         <view class="search-view">
+          <u-input v-model="queryParams.name" border="false" type="select"   @click="handleSearch" placeholder="请填入活动名称" suffixIcon="search"
+	    suffixIconStyle="color: #909399" class="search-input">
+        </u-input>
+        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+       </view>
+       </u-sticky>
     <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
       <u-list-item v-for="(item, index) in listData" :key="index">
         <view class="list-item">
-          <view class="item-header" @click="enterDetails(item)">
-            <u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.name" size="30rpx" color="#333333" :bold="true"></u--text>
+          <view class="item-header">
+            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="dictStr(item.type,typeList) +'：'+item.name" size="30rpx" color="#333333" :bold="true"></u--text>
           </view>
           <view class="item-row">
-            <text class="row-label">类型：</text>
-            <text class="row-value">{{ dictStr(item.type, journeyTypeList) }}</text>
+            <text class="row-label">活动地点：</text>
+            <text class="row-value">{{ item.place }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">记录时间：</text>
-            <text class="row-value">{{ item.createTime }}</text>
+            <text class="row-label">成员：</text>
+            <text class="row-value">{{ item.partner }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">内容：</text>
+            <text class="row-label">开始时间：</text>
+            <text class="row-value">{{ item.startTime }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">结束时间：</text>
+            <text class="row-value">{{ item.endTime }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">活动时长：</text>
+            <text class="row-value">{{ item.exerciseTime }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">活动量：</text>
+            <text class="row-value">{{ item.activityVolume }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">总费用（元）：</text>
+            <text class="row-value">{{ item.totalCost }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">费用明细：</text>
+            <text class="row-value">{{ item.costDetail }}</text>
+          </view>
+          
+          <view class="item-row">
+            <text class="row-label">饮食：</text>
+            <text class="row-value">{{ item.foods }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">收获：</text>
+            <text class="row-value">{{ item.harvest }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">备注：</text>
             <text class="row-value">{{ item.remark }}</text>
           </view>
           <view class="operate" >
-            <!-- <view class="btn filling" @click="enterDetails(item)">查看</view > -->
-               <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleEdit(item)">修改</view>
             <view class="btn filling" @click="handleDelete(item)">删除</view>
           </view>
         </view>
@@ -56,29 +71,30 @@
       </view>
       <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
     </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
   </view>
 </template>
 
 <script setup>
-import { listHeartJourney, delHeartJourney } from '@/api/invest/heartJourney'
+import { listActivity, delActivity } from '@/api/health/activity'
 import { getDicts } from '@/api/system/dict/data.js'
+import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
 const listData = ref([])
 const isShow = ref(false)
 const status = ref('loadmore')
-const journeyTypeList = ref([])
-const settingPickShow = ref(false)
-const settingColumns = ref([])
+const typeList = ref([])
+
+const  flag= ref(true)
 const data = reactive({
   filterPanel: false,
   queryParams: {
-      name: '',
-      type: '',
+    name: null,
+    type: null,
+    nickName: null
    } 
 })
 const { filterPanel, queryParams} = toRefs(data)
@@ -86,7 +102,6 @@ const windowHeight = computed(() => {
 			uni.getSystemInfoSync().windowHeight - 50
 		})	
 onLoad(() => {
-    getDict()
     getList()
   });
 
@@ -98,6 +113,22 @@ onLoad(() => {
     }
   });
 
+  function handleSearch() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+     }
+
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+
 function loadmore() {
       pageNum.value += 1
       if (status.value == 'loadmore') {
@@ -105,8 +136,12 @@ function loadmore() {
       }
     }
 function getList() {
+       // 类型
+       getDicts('activity_type').then(res => {
+        typeList.value = res.data
+      })
       status.value = 'loading'
-      listHeartJourney({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+      listActivity({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
         listData.value = listData.value.concat(res.rows)
         if (listData.value.length < res.total) {
           status.value = 'loadmore'
@@ -117,67 +152,13 @@ function getList() {
         status.value = 'nomore'
       })
     }
-function   getDict() {
-      // 类型
-      getDicts('journey_type').then(res => {
-        journeyTypeList.value = res.data
-      })
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-function selectStatus(item) {
-      queryParams.value.type = item.dictValue
-      journeyTypeList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-    function searchSubmit() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-        queryParams.value.name = '',
-        queryParams.value.type = ''
-      journeyTypeList.value.map(ele => {
-        Reflect.set(ele, 'selected', false)
-      })
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/work/heartJourney/details?id=${item.id}` })
-    }
+
     function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/work/heartJourney/addEdit?id=${item.id}` })
+      uni.navigateTo({ url: `/pages/health/activity/addEdit?id=${item.id}` })
       isShow.value = true
     }
     function handleAdd() {
-      uni.navigateTo({ url: `/pages/work/heartJourney/addEdit` })
+      uni.navigateTo({ url: `/pages/health/activity/addEdit` })
       isShow.value = true
     }
     function handleDelete(item) {
@@ -186,8 +167,8 @@ function selectStatus(item) {
         	content: '你确定要删除吗',
         	success: function (res) {
         		if (res.confirm) {
-        		  delHeartJourney(item.id)
-              uni.navigateTo({ url: `/pages/work/heartJourney/list` })
+        		  delActivity(item.id)
+              uni.navigateTo({ url: `/pages/health/activity/list` })
         		} else if (res.cancel) {
         			console.log('取消');
         		}
@@ -214,7 +195,6 @@ function selectStatus(item) {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/health/doctorRecord/addEdit.vue b/src/pages/health/doctorRecord/addEdit.vue
index 62cf02d..73fbaac 100644
--- a/src/pages/health/doctorRecord/addEdit.vue
+++ b/src/pages/health/doctorRecord/addEdit.vue
@@ -1,105 +1,163 @@
 <template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="心路历程"
-		>
-		</u-navbar>
-      <view class="section">
-        <view class="section-title">{{ title}}</view>
-        <view class="form-view">
-          <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-            :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-            <u-form-item label="标题" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写标题"
+  <view class="container" style="paddingBottom:1rpx;">
+    <u-navbar
+    leftIconSize="40rpx"
+    leftIconColor="#333333"
+    title="就医记录"
+  >
+  </u-navbar>
+    <view class="section">
+      <view class="section-title">{{ title}}</view>
+      <view class="form-view">
+        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
+            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
+              inputAlign="right" border="none"></u--input>
+            <u-icon slot="right" name="arrow-down"></u-icon>
+          </u-form-item>
+          <u-form-item label="健康档案" prop="healthRecordName" required @click="handHealthRecord">
+            <u--input v-model="form.healthRecordName" disabled disabledColor="#ffffff" placeholder="请选择健康档案"
+              inputAlign="right" border="none"></u--input>
+            <u-icon slot="right" name="arrow-down"></u-icon>
+          </u-form-item>
+          <u-form-item label="医院名称" prop="hospitalName" required >
+              <u--input v-model="form.hospitalName"  placeholder="请填写医院名称"
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
-            <u-form-item label="类型" prop="typeName" required @click="handleShowTeam">
-              <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
+            <u-form-item label="科室" prop="departments" required >
+              <u--input v-model="form.departments"  placeholder="请填写科室"
                 inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
             </u-form-item>
-            <u-form-item label="记录时间" prop="createTime" required @click="selectDate()">
-              <u--input v-model="form.createTime" disabled disabledColor="#ffffff" placeholder="请选择记录时间" inputAlign="right" border="none"></u--input>
-						<u-icon slot="right" name="arrow-right"></u-icon>
+            <u-form-item label="大夫" prop="doctor" required >
+              <u--input v-model="form.doctor"  placeholder="请填写大夫"
+                inputAlign="right" border="none"></u--input>
             </u-form-item>
-            <u-form-item label="内容" prop="remark" required labelPosition="top">
-              <u--textarea v-model="form.remark" placeholder="请填写内容" border="none" autoHeight inputAlign="right" count
-                maxlength="20000" style="padding:18rpx 0;"></u--textarea>
+            <u-form-item label="就诊时间" prop="visitingTime" required @click="selectDate()">
+            <u--input v-model="form.visitingTime" 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="partner" required >
+              <u--input v-model="form.partner"  placeholder="请填写陪同人"
+                inputAlign="right" border="none"></u--input>
             </u-form-item>
-          </u--form>
-          <view class="form-btn">
-            <u-button type="primary" text="提交" @click="submit"></u-button>
-          </view>
+            <u-form-item label="诊断及开药" prop="prescribe"  labelPosition="top">
+            <u--textarea v-model="form.prescribe" placeholder="请填写诊断及开药" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+            <u-form-item label="总费用" prop="totalCost" required >
+              <u--input v-model="form.totalCost"  placeholder="请填写总费用"
+                inputAlign="right" border="none">
+                <template #suffix>
+					<up-text
+						text="元"
+					></up-text>
+				</template></u--input>
+            </u-form-item>
+            <u-form-item label="费用明细" prop="costDetail" required >
+              <u--textarea v-model="form.costDetail" placeholder="请填写费用明细" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+            </u-form-item>
+          <u-form-item label="备注" prop="remark"  labelPosition="top">
+            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+        </u--form>
+        <view class="form-btn">
+          <u-button type="primary" text="提交" @click="submit"></u-button>
         </view>
       </view>
-      <u-toast ref="uToast"></u-toast>
-      <u-picker itemHeight="88" :show="showTeam" :columns="journeyTypeList" keyName="dictLabel" @cancel="handleCancel"
-        @confirm="handleConfirm"></u-picker>
-        <u-datetime-picker
+    </view>
+    <u-toast ref="uToast"></u-toast>
+    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
+      @confirm="handlePersonConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handHealthRecordCancel"
+      @confirm="handHealthRecordConfirm"></u-picker>
+      <u-datetime-picker
 			:show="datePickShow"
 			mode="datetime"
-      ref="createTimeRef" 
+      ref="visitingTimeRef" 
 			@cancel="datePickShow=false"
 			@confirm="datePickConfirm"
 			itemHeight="88"
 		></u-datetime-picker>
-    </view>
-  </template>
-  
-  <script setup>
-  import {getHeartJourney, addHeartJourney, updateHeartJourney } from '@/api/invest/heartJourney'
+  </view>
+</template>
+
+<script setup>
+import { getDoctorRecord, addDoctorRecord, updateDoctorRecord } from '@/api/health/doctorRecord'
+import { listPerson } from '@/api/health/person'
+import { listHealthRecord } from '@/api/health/healthRecord'
+const { proxy } = getCurrentInstance()
   import { getDicts } from '@/api/system/dict/data.js'
-  const { proxy } = getCurrentInstance()
-  import dayjs from 'dayjs'
-  import {onLoad,onReady} from "@dcloudio/uni-app";
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import dayjs from 'dayjs'
+import {onLoad,onReady} from "@dcloudio/uni-app";
+  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
 const datePickShow = ref(false)
-const showTeam = ref(false)
-const title = ref("心路历程")
-const journeyTypeList = ref([])
+const showPerson = ref(false)
+const showHealthRecord = ref(false)
+const title = ref("就医记录")
+const healthRecordList = ref([])
+const personList = ref([])
 const data = reactive({
-  form: {},
-  rules: {
-          name: [{ type: 'string', required: true, message: '标题不能为空', trigger: ['change', 'blur'] }],
-          createTime: [{ type: 'string', required: true, message: '记录时间不能为空', trigger: ['change', 'blur'] }],
-          typeName: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
-          remark: [{ type: 'string', required: true, message: '内容不能为空', trigger: ['change', 'blur'] }],
-  }
+form: {
+  id: null,
+    hospitalName: null,
+    departments: null,
+    doctor: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    healthRecordId: null,
+    visitingTime: null,
+    prescribe: null,
+    personId: null,
+    totalCost: null,
+    partner: null,
+    costDetail: null
+},
+queryPersonParams: {
+  pageNum: 1,
+  status: '1',
+  pageSize: 1000
+},
+queryHealthRecordParams: {
+  pageNum: 1,
+  personId:null,
+  pageSize: 1000
+},
+rules: {
+  healthRecordName: [{ required: true, message: '健康档案不能为空', trigger:['change', 'blur'] }],
+  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
+  hospitalName: [{ required: true, message: '医院名称不能为空', trigger: ['change', 'blur'] }],
+  departments: [{ required: true, message: '科室不能为空', trigger: ['change', 'blur'] }],
+  doctor: [{ required: true, message: '大夫不能为空', trigger: ['change', 'blur'] }],
+  totalCost: [{ type: 'number',  required: true, message: '总费用不能为空', trigger: ['change', 'blur'] }],
+  partner: [{ required: true, message: '陪同人不能为空', trigger: ['change', 'blur'] }],
+  prescribe: [{ required: true, message: '诊断及开药不能为空', trigger: ['change', 'blur'] }],
+  visitingTime: [{ required: true, message: '就诊时间不能为空', trigger: ['change', 'blur'] }]
+}
 })
-const { form, rules} = toRefs(data)
+const { form, queryPersonParams, queryHealthRecordParams, rules} = toRefs(data)
+
 
 onLoad((option) => {
-       form.value.id = option.id
-       if(form.value.id!=null){
-        title.value="心路历程-修改"
-       }else{
-        title.value="心路历程-新增"
-       }
-      getDict()
-  })
-  onReady(() => {
-    form.value.createTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-  })
-  function  getDict() {
-        // 类型
-        getDicts('journey_type').then(res => {
-        journeyTypeList.value =[res.data] 
-      })
-      if(form.value.id!=null){
-        getHeartJourney(form.value.id).then(res => {
-          form.value = res.data
-           // 类型
-        getDicts('journey_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-      })
-          
-        })
-      }
-  }
-  function dictStr(val, arr) {
+     form.value.id = option.id
+     if(form.value.id!=null){
+      title.value="就医记录-修改"
+     }else{
+      title.value="就医记录-新增"
+     }
+    getData()
+})
+onReady(() => {
+     form.value.visitingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
+})
+function dictStr(val, arr) {
       let str = ''
       arr.map(item => {
         if (item.dictValue === val) {
@@ -107,78 +165,133 @@ onLoad((option) => {
         }
       })
       return str
+ }
+function  getData() {
+    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=response.rows[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
     }
+      })
+     }
+     })
+      // 药品来源
+      
+    if(form.value.id!=null){
+      getDoctorRecord(form.value.id).then(res => {
+        form.value = res.data   
+      })
+    }
+}
 
-  function handleShowTeam() {
-        if (journeyTypeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '类型为空  ', type: 'warning'
-          })
-        } else {
-          showTeam.value = true
-        }
-      }
-      function   handleConfirm(e) {
-        form.value.typeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-        showTeam.value = false
-      }
-      function handleCancel() {
-       showTeam.value = false
-      }
-      function  selectDate() {
-				datePickShow.value = true
-        proxy.$refs['createTimeRef'].innerValue = new Date().getTime()
-			}
-			function datePickConfirm(e) {
-				form.value.createTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-				datePickShow.value = false
-			}
-      function submit() {
-        proxy.$refs['uForm'].validate().then(() => {
-          if (form.value.id != null) {
-            updateHeartJourney(form.value).then(res => {
-              proxy.$refs['uToast'].show({
-              message: '修改成功', complete() {
-                uni.navigateTo({ url: `/pages/work/heartJourney/list` })
-              }
-            })
-          })
-          }else {
-            addHeartJourney(form.value).then(res => {
-              proxy.$refs['uToast'].show({
-              message: '新增成功', complete() {
-                uni.navigateTo({ url: `/pages/work/heartJourney/list` })
-              }
-            })
-          })
-          }
+function handlePerson() {
+      if (personList.value[0].length === 0) {
+        proxy.$refs['uToast'].show({
+          message: '人员为空  ', type: 'warning'
         })
+      } else {
+        showPerson.value = true
       }
-  </script>
-  
-  <style lang="scss" scoped>
-  .section {
-    margin: 24rpx;
-    padding: 16rpx 24rpx;
-    background-color: #fff;
-    border-radius: 8rpx;
-  
-    .section-title {
-      width: 360rpx;
-      color: #333333;
-      line-height: 44rpx;
-      font-size: 30rpx;
-      border-left: 6rpx solid #2681FF;
-      padding-left: 26rpx;
+   }
+function   handlePersonConfirm(e) {
+     form.value.personName = e.value[0].name
+      form.value.personId = e.value[0].id
+      form.value.healthRecordName = ''
+      form.value.healthRecordId = ''
+      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
     }
-  
-    .form-view {
-      padding: 20rpx 0rpx 0 10rpx;
-  
-      .form-btn {
-        padding-top: 20rpx;
+  showPerson.value = false
+})
+      
+}
+function handlePersonCancel() {
+     showPerson.value = false
+  }
+
+function handHealthRecord() {
+      if (healthRecordList.value[0].length === 0) {
+        proxy.$refs['uToast'].show({
+          message: '健康档案为空  ', type: 'warning'
+        })
+      } else {
+        showHealthRecord.value = true
       }
+   }
+function   handHealthRecordConfirm(e) {
+      form.value.healthRecordName = e.value[0].name
+      form.value.healthRecordId = e.value[0].id
+      showHealthRecord.value = false
+}
+function handHealthRecordCancel() {
+     showHealthRecord.value = false
+}
+
+
+function  selectDate() {
+      datePickShow.value = true
+      proxy.$refs['visitingTimeRef'].innerValue = new Date().getTime()
+  }
+function datePickConfirm(e) {
+      form.value.visitingTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
+      datePickShow.value = false
+  }
+function submit() {
+      proxy.$refs['uForm'].validate().then(() => {
+        if (form.value.id != null) {
+          updateDoctorRecord(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '修改成功', complete() {
+              uni.navigateTo({ url: `/pages/health/doctorRecord/list` })
+            }
+          })
+        })
+        }else {
+          addDoctorRecord(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/doctorRecord/list` })
+            }
+          })
+        })
+        }
+      })
+    }
+</script>
+
+<style lang="scss" scoped>
+.section {
+  margin: 24rpx;
+  padding: 16rpx 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+
+  .section-title {
+    width: 360rpx;
+    color: #333333;
+    line-height: 44rpx;
+    font-size: 30rpx;
+    border-left: 6rpx solid #2681FF;
+    padding-left: 26rpx;
+  }
+
+  .form-view {
+    padding: 20rpx 0rpx 0 10rpx;
+
+    .form-btn {
+      padding-top: 20rpx;
     }
   }
-  </style>
\ No newline at end of file
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/doctorRecord/details.vue b/src/pages/health/doctorRecord/details.vue
deleted file mode 100644
index d66166f..0000000
--- a/src/pages/health/doctorRecord/details.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="心路历程详情"
-		>
-		</u-navbar>
-      <view class="section">
-        <u-cell-group>
-        <u-cell title="标题:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
-        <u-cell title="类型:" titleStyle="font-weight:bolder" :value="detailInfo.type"></u-cell>
-        <u-cell title="记录时间:" titleStyle="font-weight:bolder" :value="detailInfo.createTime"></u-cell>
-        <u-cell title="内容:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
-      </u-cell-group>
-      </view>
-      <u-toast ref="uToast"></u-toast>
-    </view>
-  </template>
-  
-<script setup>
-import { getHeartJourney} from '@/api/invest/heartJourney'
-import { getDicts } from '@/api/system/dict/data.js'
-import {onLoad} from "@dcloudio/uni-app";
-import {reactive ,toRefs,ref,computed }from "vue";
-const id = ref('')
-const data = reactive({
-  detailInfo: {} 
-})
-const {detailInfo} = toRefs(data)
-onLoad((option) => {
-    id.value = option.id
-    getInfo()
-  })
-  function getInfo() {
-    getHeartJourney(id.value).then(res => {
-          detailInfo.value = res.data
-                     // 类型
-            getDicts('journey_type').then(result => {
-         detailInfo.value.type=dictStr(detailInfo.value.type, result.data)
-      })
-        })
-  }
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-  </script>
-  
-  <style lang="scss" scoped>
-  .section {
-    margin: 24rpx;
-    padding: 16rpx 24rpx;
-    background-color: #fff;
-    border-radius: 8rpx;
-  
-    .section-title {
-      width: 280rpx;
-      color: #333333;
-      line-height: 44rpx;
-      font-size: 30rpx;
-      border-left: 6rpx solid #2681FF;
-      padding-left: 26rpx;
-    }
-  
-    .content {
-      width: 647rpx;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-    }
-  
-    .img-con {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 20rpx
-    }
-    .form-view {
-      padding: 20rpx 0rpx 0 10rpx;
-  
-      .form-btn {
-        padding-top: 20rpx;
-      }
-    }
-  }
-  </style>
\ No newline at end of file
diff --git a/src/pages/health/doctorRecord/list.vue b/src/pages/health/doctorRecord/list.vue
index 386a02c..8e16896 100644
--- a/src/pages/health/doctorRecord/list.vue
+++ b/src/pages/health/doctorRecord/list.vue
@@ -1,27 +1,68 @@
 <template>
   <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         <view class="search-view">
+          <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
+	    suffixIconStyle="color: #909399" class="search-input">
+        </u-input>
+        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+       </view>
+       </u-sticky>
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
       <view class="search-view">
-        <u--input v-model="queryParams.name" border="false" placeholder="请输入标题" class="search-input"
-          @blur="searchBlur" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择就诊时间" suffixIcon="calendar"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
         <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
           labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-          <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+
         <u-transition :show="filterPanel" mode="fade">
           <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
             <view class="filter-panel-content">
-              <view class="filter-title">类型</view>
-              <view class="state-list">
-                <view v-for="item in journeyTypeList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectStatus(item)">{{ item.dictLabel }}</view>
-              </view>
+ 
+            
+              <view class="select-header">就诊时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
             </view>
             <view class="btn-box">
               <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
               <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
             </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="datetime"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
           </view>
         </u-transition>
       </view>
@@ -29,25 +70,49 @@
     <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
       <u-list-item v-for="(item, index) in listData" :key="index">
         <view class="list-item">
-          <view class="item-header" @click="enterDetails(item)">
-            <u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.name" size="30rpx" color="#333333" :bold="true"></u--text>
+          <view class="item-header">
+            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="item.healthRecordName +'：'+ item.hospitalName" size="30rpx" color="#333333" :bold="true"></u--text>
           </view>
           <view class="item-row">
-            <text class="row-label">类型：</text>
-            <text class="row-value">{{ dictStr(item.type, journeyTypeList) }}</text>
+            <text class="row-label">就诊时间：</text>
+            <text class="row-value">{{ item.visitingTime }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">记录时间：</text>
-            <text class="row-value">{{ item.createTime }}</text>
+            <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-label">科室：</text>
+            <text class="row-value">{{ item.departments }}</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.partner }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">总费用（元）：</text>
+            <text class="row-value">{{ item.totalCost }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">诊断及开药：</text>
+            <text class="row-value">{{ item.prescribe }}</text>
+          </view>
+   
+          <view class="item-row">
+            <text class="row-label">费用明细：</text>
+            <text class="row-value">{{ item.costDetail }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">备注：</text>
             <text class="row-value">{{ item.remark }}</text>
           </view>
           <view class="operate" >
-            <!-- <view class="btn filling" @click="enterDetails(item)">查看</view > -->
-               <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleEdit(item)">修改</view>
             <view class="btn filling" @click="handleDelete(item)">删除</view>
           </view>
         </view>
@@ -58,35 +123,52 @@
     </u-list>
     <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
       @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
+        @confirm="handlePersonConfirm"></u-picker>
   </view>
 </template>
 
 <script setup>
-import { listHeartJourney, delHeartJourney } from '@/api/invest/heartJourney'
+import { listDoctorRecord, delDoctorRecord } from '@/api/health/doctorRecord'
+import { listPerson } from '@/api/health/person'
 import { getDicts } from '@/api/system/dict/data.js'
+import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
 const listData = ref([])
 const isShow = ref(false)
 const status = ref('loadmore')
-const journeyTypeList = ref([])
 const settingPickShow = ref(false)
 const settingColumns = ref([])
+const timeShow= ref(false)
+const showPerson = ref(false)
+const personList = ref([])
+
+const  flag= ref(true)
+const time =ref( Number(new Date()))
 const data = reactive({
   filterPanel: false,
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 100
+  },
   queryParams: {
-      name: '',
-      type: '',
+    hospitalName: null,
+    departments: null,
+    doctor: null,
+    healthRecordId: null,
+    time: '',
+    personId: null
    } 
 })
-const { filterPanel, queryParams} = toRefs(data)
+const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
 const windowHeight = computed(() => {
 			uni.getSystemInfoSync().windowHeight - 50
 		})	
 onLoad(() => {
-    getDict()
     getList()
   });
 
@@ -98,6 +180,11 @@ onLoad(() => {
     }
   });
 
+
+  function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
 function loadmore() {
       pageNum.value += 1
       if (status.value == 'loadmore') {
@@ -105,8 +192,11 @@ function loadmore() {
       }
     }
 function getList() {
+  listPerson(queryPersonParams.value).then((response) => {
+        personList.value = [response.rows] 
+      })
       status.value = 'loading'
-      listHeartJourney({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+      listDoctorRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
         listData.value = listData.value.concat(res.rows)
         if (listData.value.length < res.total) {
           status.value = 'loadmore'
@@ -117,11 +207,16 @@ function getList() {
         status.value = 'nomore'
       })
     }
-function   getDict() {
-      // 类型
-      getDicts('journey_type').then(res => {
-        journeyTypeList.value = res.data
-      })
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
     }
 function settingConfirm(e) {
       queryParams.value.settingId = e.value[0].settingId
@@ -131,53 +226,54 @@ function settingConfirm(e) {
 function settingCancel() {
       settingPickShow.value = false
     }
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-function selectStatus(item) {
-      queryParams.value.type = item.dictValue
-      journeyTypeList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
     function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
       pageNum.value = 1
       listData.value = []
       getList()
       filterPanel.value = false
     }
+    function handlePerson() {
+        if (personList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '人员为空  ', type: 'warning'
+          })
+        } else {
+          showPerson.value = true
+        }
+     }
+  function   handlePersonConfirm(e) {
+    queryParams.value.personName = e.value[0].name
+    queryParams.value.personId= e.value[0].id
+        showPerson.value = false
+        pageNum.value = 1
+      listData.value = []
+      getList()
+  }
+ function handlePersonCancel() {
+       showPerson.value = false
+  }
     function searchBlur() {
       pageNum.value = 1
       listData.value = []
       getList()
     }
     function resetQuery() {
-        queryParams.value.name = '',
-        queryParams.value.type = ''
-      journeyTypeList.value.map(ele => {
-        Reflect.set(ele, 'selected', false)
-      })
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/work/heartJourney/details?id=${item.id}` })
+          queryParams.value.personName = ''
+        queryParams.value.startTime = ''
+         queryParams.value.time = ''
+        
+        queryParams.value.endTime = ''
+        queryParams.value.personId = ''
     }
     function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/work/heartJourney/addEdit?id=${item.id}` })
+      uni.navigateTo({ url: `/pages/health/doctorRecord/addEdit?id=${item.id}` })
       isShow.value = true
     }
     function handleAdd() {
-      uni.navigateTo({ url: `/pages/work/heartJourney/addEdit` })
+      uni.navigateTo({ url: `/pages/health/doctorRecord/addEdit` })
       isShow.value = true
     }
     function handleDelete(item) {
@@ -186,8 +282,8 @@ function selectStatus(item) {
         	content: '你确定要删除吗',
         	success: function (res) {
         		if (res.confirm) {
-        		  delHeartJourney(item.id)
-              uni.navigateTo({ url: `/pages/work/heartJourney/list` })
+        		  delDoctorRecord(item.id)
+              uni.navigateTo({ url: `/pages/health/doctorRecord/list` })
         		} else if (res.cancel) {
         			console.log('取消');
         		}
@@ -214,7 +310,6 @@ function selectStatus(item) {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/health/healthRecord/addEdit.vue b/src/pages/health/healthRecord/addEdit.vue
index 62cf02d..14d5d61 100644
--- a/src/pages/health/healthRecord/addEdit.vue
+++ b/src/pages/health/healthRecord/addEdit.vue
@@ -1,105 +1,180 @@
 <template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="心路历程"
-		>
-		</u-navbar>
-      <view class="section">
-        <view class="section-title">{{ title}}</view>
-        <view class="form-view">
-          <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-            :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-            <u-form-item label="标题" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写标题"
+  <view class="container" style="paddingBottom:1rpx;">
+    <u-navbar
+    leftIconSize="40rpx"
+    leftIconColor="#333333"
+    title="健康档案"
+  >
+  </u-navbar>
+    <view class="section">
+      <view class="section-title">{{ title}}</view>
+      <view class="form-view">
+        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
+            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
+              inputAlign="right" border="none"></u--input>
+            <u-icon slot="right" name="arrow-down"></u-icon>
+          </u-form-item>
+          <u-form-item label="档案名称" prop="name" required >
+              <u--input v-model="form.name"  placeholder="请填写档案名称"
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
-            <u-form-item label="类型" prop="typeName" required @click="handleShowTeam">
+          <u-form-item label="类型" prop="typeName" required @click="handleType">
               <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
                 inputAlign="right" border="none"></u--input>
               <u-icon slot="right" name="arrow-down"></u-icon>
             </u-form-item>
-            <u-form-item label="记录时间" prop="createTime" required @click="selectDate()">
-              <u--input v-model="form.createTime" disabled disabledColor="#ffffff" placeholder="请选择记录时间" inputAlign="right" border="none"></u--input>
-						<u-icon slot="right" name="arrow-right"></u-icon>
+            <u-form-item label="档案状态" prop="stateName" required @click="handleState">
+              <u--input v-model="form.stateName" disabled disabledColor="#ffffff" placeholder="请选择档案状态"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
             </u-form-item>
-            <u-form-item label="内容" prop="remark" required labelPosition="top">
-              <u--textarea v-model="form.remark" placeholder="请填写内容" border="none" autoHeight inputAlign="right" count
-                maxlength="20000" style="padding:18rpx 0;"></u--textarea>
+            <u-form-item label="发生时间" prop="occurTime" required @click="selectOccurTime()">
+            <u--input v-model="form.occurTime" 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="etiologyName" required @click="handleEtiology">
+              <u--input v-model="form.etiologyName" disabled disabledColor="#ffffff" placeholder="请选择发生原因"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
             </u-form-item>
-          </u--form>
-          <view class="form-btn">
-            <u-button type="primary" text="提交" @click="submit"></u-button>
-          </view>
+            <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>
+            </u-form-item>
+            <u-form-item label="中期症状" prop="mediumTermSymptoms"  >
+                <u--textarea v-model="form.mediumTermSymptoms" placeholder="请填写中期症状" border="none" autoHeight inputAlign="right" count
+                maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+            </u-form-item>
+            <u-form-item label="后期症状" prop="laterStageSymptoms"  >
+                <u--textarea v-model="form.laterStageSymptoms" placeholder="请填写后期症状" border="none" autoHeight inputAlign="right" count
+                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
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+        </u--form>
+        <view class="form-btn">
+          <u-button type="primary" text="提交" @click="submit"></u-button>
         </view>
       </view>
-      <u-toast ref="uToast"></u-toast>
-      <u-picker itemHeight="88" :show="showTeam" :columns="journeyTypeList" keyName="dictLabel" @cancel="handleCancel"
-        @confirm="handleConfirm"></u-picker>
-        <u-datetime-picker
-			:show="datePickShow"
+    </view>
+    <u-toast ref="uToast"></u-toast>
+    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
+      @confirm="handlePersonConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showState" :columns="stateList" keyName="dictLabel" @cancel="handleStateCancel"
+        @confirm="handleStateConfirm"></u-picker>
+
+        <u-picker itemHeight="88" :show="showEtiology" :columns="etiologyList" keyName="dictLabel" @cancel="handleEtiologyCancel"
+        @confirm="handleEtiologyConfirm"></u-picker>
+
+        <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleTypeCancel"
+        @confirm="handleTypeConfirm"></u-picker>
+      <u-datetime-picker
+			:show="occurTimeShow"
 			mode="datetime"
-      ref="createTimeRef" 
-			@cancel="datePickShow=false"
-			@confirm="datePickConfirm"
+      ref="occurTimeRef" 
+			@cancel="occurTimeShow=false"
+			@confirm="occurTimeConfirm"
 			itemHeight="88"
 		></u-datetime-picker>
-    </view>
-  </template>
-  
-  <script setup>
-  import {getHeartJourney, addHeartJourney, updateHeartJourney } from '@/api/invest/heartJourney'
+
+    <u-datetime-picker
+			:show="rehabilitationTimeShow"
+			mode="datetime"
+      ref="rehabilitationTimeRef" 
+			@cancel="rehabilitationTimeShow=false"
+			@confirm="rehabilitationTimeConfirm"
+			itemHeight="88"
+		></u-datetime-picker>
+  </view>
+</template>
+
+<script setup>
+import {getHealthRecord, addHealthRecord, updateHealthRecord } from '@/api/health/healthRecord'
+import { listPerson, getPerson } from '@/api/health/person'
+const { proxy } = getCurrentInstance()
   import { getDicts } from '@/api/system/dict/data.js'
-  const { proxy } = getCurrentInstance()
-  import dayjs from 'dayjs'
-  import {onLoad,onReady} from "@dcloudio/uni-app";
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import dayjs from 'dayjs'
+import {onLoad,onReady} from "@dcloudio/uni-app";
+  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const showTeam = ref(false)
-const title = ref("心路历程")
-const journeyTypeList = ref([])
+const occurTimeShow = ref(false)
+const showPerson = ref(false)
+const title = ref("健康档案")
+const personList = ref([])
+
+const typeList = ref([])
+const showType = ref(false)
+
+const stateList = ref([])
+const showState = ref(false)
+
+const etiologyList = ref([])
+const showEtiology = ref(false)
+
+const rehabilitationTimeShow = ref(false)
+
 const data = reactive({
-  form: {},
-  rules: {
-          name: [{ type: 'string', required: true, message: '标题不能为空', trigger: ['change', 'blur'] }],
-          createTime: [{ type: 'string', required: true, message: '记录时间不能为空', trigger: ['change', 'blur'] }],
-          typeName: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
-          remark: [{ type: 'string', required: true, message: '内容不能为空', trigger: ['change', 'blur'] }],
-  }
+form: {
+  id: null,
+    name: null,
+    type: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    occurTime: null,
+    rehabilitationTime: null,
+    initialSymptoms: null,
+    mediumTermSymptoms: null,
+    laterStageSymptoms: null,
+    etiology: null,
+    personId: null,
+    state: '1',
+    stateName: '建档中'
+},
+queryPersonParams: {
+  pageNum: 1,
+  status: '1',
+  pageSize: 1000
+},
+rules: {
+  name: [{ required: true, message: '档案名称不能为空', trigger:['change', 'blur'] }],
+  personName: [{ required: true, message: '人员姓名不能为空', trigger: ['change', 'blur'] }],
+  occurTime: [{ required: true, message: '发生时间不能为空', trigger: ['change', 'blur'] }],
+  typeName: [{ required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
+  etiologyName: [{ required: true, message: '发生原因不能为空', trigger: ['change', 'blur'] }],
+  stateName: [{ required: true, message: '状态不能为空', trigger: ['change', 'blur'] }],
+  initialSymptoms: [{ required: true, message: '初期症状不能为空', trigger: ['change', 'blur'] }]
+}
 })
-const { form, rules} = toRefs(data)
+const { form, queryPersonParams, rules} = toRefs(data)
+
 
 onLoad((option) => {
-       form.value.id = option.id
-       if(form.value.id!=null){
-        title.value="心路历程-修改"
-       }else{
-        title.value="心路历程-新增"
-       }
-      getDict()
-  })
-  onReady(() => {
-    form.value.createTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-  })
-  function  getDict() {
-        // 类型
-        getDicts('journey_type').then(res => {
-        journeyTypeList.value =[res.data] 
-      })
-      if(form.value.id!=null){
-        getHeartJourney(form.value.id).then(res => {
-          form.value = res.data
-           // 类型
-        getDicts('journey_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-      })
-          
-        })
-      }
-  }
-  function dictStr(val, arr) {
+     form.value.id = option.id
+     if(form.value.id!=null){
+      title.value="健康档案-修改"
+     }else{
+      title.value="健康档案-新增"
+     }
+    getData()
+})
+onReady(() => {
+     form.value.occurTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
+})
+function dictStr(val, arr) {
       let str = ''
       arr.map(item => {
         if (item.dictValue === val) {
@@ -107,78 +182,209 @@ onLoad((option) => {
         }
       })
       return str
-    }
+ }
+function  getData() {
+    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
+      if( form.value.id==null){
+      getPerson( response.rows[0].id).then((response) => {
+    const date = new Date()
+    const year = date.getFullYear() // 年份
+    let month = date.getMonth() + 1 // 月份，返回值为0-11，所以需要加1
+    let day = date.getDate() // 日期
 
-  function handleShowTeam() {
-        if (journeyTypeList.value[0].length === 0) {
+    // 对月份和日期进行补零
+    month = month < 10 ? '0' + month : month.toString()
+    day = day < 10 ? '0' + day : day.toString()
+
+    const currentDate = year + month + day
+    form.value.name = response.data.name + currentDate + '档案'
+  })}
+     }
+     })
+     // 类型
+     getDicts('record_type').then(res => {
+        typeList.value =[res.data] 
+      })
+       // 状态
+       getDicts('health_record_state').then(res => {
+        stateList.value =[res.data] 
+      })
+       // 发生原因
+       getDicts('etiology').then(res => {
+        etiologyList.value =[res.data] 
+      })
+    if(form.value.id!=null){
+      getHealthRecord(form.value.id).then(res => {
+        form.value = res.data   
+        getDicts('etiology').then(result => {
+          form.value.etiologyName=dictStr(form.value.etiology, result.data)
+         })
+          // 状态
+        getDicts('health_record_state').then(result => {
+          form.value.stateName=dictStr(form.value.state, result.data)
+         })
+                // 类型
+           getDicts('record_type').then(result => {
+          form.value.typeName=dictStr(form.value.type, result.data)
+         })
+      })
+    }
+}
+
+function handlePerson() {
+      if (personList.value[0].length === 0) {
+        proxy.$refs['uToast'].show({
+          message: '人员为空  ', type: 'warning'
+        })
+      } else {
+        showPerson.value = true
+      }
+   }
+function   handlePersonConfirm(e) {
+     form.value.personName = e.value[0].name
+      form.value.personId = e.value[0].id
+
+      getPerson( e.value[0].id).then((response) => {
+    const date = new Date()
+    const year = date.getFullYear() // 年份
+    let month = date.getMonth() + 1 // 月份，返回值为0-11，所以需要加1
+    let day = date.getDate() // 日期
+
+    // 对月份和日期进行补零
+    month = month < 10 ? '0' + month : month.toString()
+    day = day < 10 ? '0' + day : day.toString()
+
+    const currentDate = year + month + day
+    form.value.name = response.data.name + currentDate + '档案'
+  })
+      showPerson.value = false         
+}
+function handlePersonCancel() {
+     showPerson.value = false
+  }
+
+function handleState() {
+        if (stateList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '档案状态为空  ', type: 'warning'
+          })
+        } else {
+          showState.value = true
+        }
+     }
+  function   handleStateConfirm(e) {
+        form.value.stateName = e.value[0].dictLabel
+        form.value.resource = e.value[0].dictValue
+        showState.value = false
+  }
+ function handleStateCancel() {
+      showState.value = false
+      }
+
+
+      function handleEtiology() {
+        if (etiologyList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '发生原因为空  ', type: 'warning'
+          })
+        } else {
+          showEtiology.value = true
+        }
+     }
+  function   handleEtiologyConfirm(e) {
+        form.value.etiologyName = e.value[0].dictLabel
+        form.value.place = e.value[0].dictValue
+        showEtiology.value = false
+  }
+ function handleEtiologyCancel() {
+  showEtiology.value = false
+      }
+
+  function handleType() {
+        if (typeList.value[0].length === 0) {
           proxy.$refs['uToast'].show({
             message: '类型为空  ', type: 'warning'
           })
         } else {
-          showTeam.value = true
+          showType.value = true
         }
-      }
-      function   handleConfirm(e) {
+     }
+  function   handleTypeConfirm(e) {
         form.value.typeName = e.value[0].dictLabel
         form.value.type = e.value[0].dictValue
-        showTeam.value = false
+        showType.value = false
+  }
+ function handleTypeCancel() {
+       showType.value = false
       }
-      function handleCancel() {
-       showTeam.value = false
-      }
-      function  selectDate() {
-				datePickShow.value = true
-        proxy.$refs['createTimeRef'].innerValue = new Date().getTime()
-			}
-			function datePickConfirm(e) {
-				form.value.createTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-				datePickShow.value = false
-			}
-      function submit() {
-        proxy.$refs['uForm'].validate().then(() => {
-          if (form.value.id != null) {
-            updateHeartJourney(form.value).then(res => {
-              proxy.$refs['uToast'].show({
-              message: '修改成功', complete() {
-                uni.navigateTo({ url: `/pages/work/heartJourney/list` })
-              }
-            })
+
+function  selectOccurTime() {
+      occurTimeShow.value = true
+      proxy.$refs['occurTimeRef'].innerValue = new Date().getTime()
+  }
+function occurTimeConfirm(e) {
+      form.value.occurTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
+      occurTimeShow.value = false
+  }
+
+  function  selectRehabilitationTime() {
+    rehabilitationTimeShow.value = true
+      proxy.$refs['rehabilitationTimeRef'].innerValue = new Date().getTime()
+  }
+function rehabilitationTimeConfirm(e) {
+      form.value.rehabilitationTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
+      rehabilitationTimeShow.value = false
+  }
+
+function submit() {
+      proxy.$refs['uForm'].validate().then(() => {
+        if (form.value.id != null) {
+          updateHealthRecord(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '修改成功', complete() {
+              uni.navigateTo({ url: `/pages/health/healthRecord/list` })
+            }
           })
-          }else {
-            addHeartJourney(form.value).then(res => {
-              proxy.$refs['uToast'].show({
-              message: '新增成功', complete() {
-                uni.navigateTo({ url: `/pages/work/heartJourney/list` })
-              }
-            })
-          })
-          }
         })
-      }
-  </script>
-  
-  <style lang="scss" scoped>
-  .section {
-    margin: 24rpx;
-    padding: 16rpx 24rpx;
-    background-color: #fff;
-    border-radius: 8rpx;
-  
-    .section-title {
-      width: 360rpx;
-      color: #333333;
-      line-height: 44rpx;
-      font-size: 30rpx;
-      border-left: 6rpx solid #2681FF;
-      padding-left: 26rpx;
+        }else {
+          addHealthRecord(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/healthRecord/list` })
+            }
+          })
+        })
+        }
+      })
     }
-  
-    .form-view {
-      padding: 20rpx 0rpx 0 10rpx;
-  
-      .form-btn {
-        padding-top: 20rpx;
-      }
+</script>
+
+<style lang="scss" scoped>
+.section {
+  margin: 24rpx;
+  padding: 16rpx 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+
+  .section-title {
+    width: 360rpx;
+    color: #333333;
+    line-height: 44rpx;
+    font-size: 30rpx;
+    border-left: 6rpx solid #2681FF;
+    padding-left: 26rpx;
+  }
+
+  .form-view {
+    padding: 20rpx 0rpx 0 10rpx;
+
+    .form-btn {
+      padding-top: 20rpx;
     }
   }
-  </style>
\ No newline at end of file
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/healthRecord/details.vue b/src/pages/health/healthRecord/details.vue
deleted file mode 100644
index d66166f..0000000
--- a/src/pages/health/healthRecord/details.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="心路历程详情"
-		>
-		</u-navbar>
-      <view class="section">
-        <u-cell-group>
-        <u-cell title="标题:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
-        <u-cell title="类型:" titleStyle="font-weight:bolder" :value="detailInfo.type"></u-cell>
-        <u-cell title="记录时间:" titleStyle="font-weight:bolder" :value="detailInfo.createTime"></u-cell>
-        <u-cell title="内容:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
-      </u-cell-group>
-      </view>
-      <u-toast ref="uToast"></u-toast>
-    </view>
-  </template>
-  
-<script setup>
-import { getHeartJourney} from '@/api/invest/heartJourney'
-import { getDicts } from '@/api/system/dict/data.js'
-import {onLoad} from "@dcloudio/uni-app";
-import {reactive ,toRefs,ref,computed }from "vue";
-const id = ref('')
-const data = reactive({
-  detailInfo: {} 
-})
-const {detailInfo} = toRefs(data)
-onLoad((option) => {
-    id.value = option.id
-    getInfo()
-  })
-  function getInfo() {
-    getHeartJourney(id.value).then(res => {
-          detailInfo.value = res.data
-                     // 类型
-            getDicts('journey_type').then(result => {
-         detailInfo.value.type=dictStr(detailInfo.value.type, result.data)
-      })
-        })
-  }
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-  </script>
-  
-  <style lang="scss" scoped>
-  .section {
-    margin: 24rpx;
-    padding: 16rpx 24rpx;
-    background-color: #fff;
-    border-radius: 8rpx;
-  
-    .section-title {
-      width: 280rpx;
-      color: #333333;
-      line-height: 44rpx;
-      font-size: 30rpx;
-      border-left: 6rpx solid #2681FF;
-      padding-left: 26rpx;
-    }
-  
-    .content {
-      width: 647rpx;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-    }
-  
-    .img-con {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 20rpx
-    }
-    .form-view {
-      padding: 20rpx 0rpx 0 10rpx;
-  
-      .form-btn {
-        padding-top: 20rpx;
-      }
-    }
-  }
-  </style>
\ No newline at end of file
diff --git a/src/pages/health/healthRecord/list.vue b/src/pages/health/healthRecord/list.vue
index 386a02c..29ca07d 100644
--- a/src/pages/health/healthRecord/list.vue
+++ b/src/pages/health/healthRecord/list.vue
@@ -1,27 +1,71 @@
 <template>
   <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         <view class="search-view">
+          <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
+	    suffixIconStyle="color: #909399" class="search-input">
+        </u-input>
+        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+       </view>
+       </u-sticky>
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
       <view class="search-view">
-        <u--input v-model="queryParams.name" border="false" placeholder="请输入标题" class="search-input"
-          @blur="searchBlur" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择发生时间" suffixIcon="calendar"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
         <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
           labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-          <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+
         <u-transition :show="filterPanel" mode="fade">
           <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
             <view class="filter-panel-content">
-              <view class="filter-title">类型</view>
+              <view class="filter-title">档案状态</view>
               <view class="state-list">
-                <view v-for="item in journeyTypeList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectStatus(item)">{{ item.dictLabel }}</view>
+                <view v-for="item in typeList" :key="item.id" class="state-item"
+                  :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
               </view>
+              <view class="select-header">发生时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
             </view>
             <view class="btn-box">
               <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
               <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
             </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="datetime"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
           </view>
         </u-transition>
       </view>
@@ -29,25 +73,52 @@
     <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
       <u-list-item v-for="(item, index) in listData" :key="index">
         <view class="list-item">
-          <view class="item-header" @click="enterDetails(item)">
-            <u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+          <view class="item-header">
+            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
               :text="item.name" size="30rpx" color="#333333" :bold="true"></u--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">{{ dictStr(item.type, journeyTypeList) }}</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.createTime }}</text>
+            <text class="row-label">档案状态：</text>
+            <text class="row-value">{{ dictStr(item.state, stateList) }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">内容：</text>
+            <text class="row-label">发生时间：</text>
+            <text class="row-value">{{ item.occurTime }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">康复时间：</text>
+            <text class="row-value">{{ item.rehabilitationTime }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">发生原因：</text>
+            <text class="row-value">{{ dictStr(item.etiology, etiologyList) }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">初期症状：</text>
+            <text class="row-value">{{ item.initialSymptoms }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">中期症状：</text>
+            <text class="row-value">{{ item.mediumTermSymptoms }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">后期症状：</text>
+            <text class="row-value">{{ item.laterStageSymptoms }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">备注：</text>
             <text class="row-value">{{ item.remark }}</text>
           </view>
           <view class="operate" >
-            <!-- <view class="btn filling" @click="enterDetails(item)">查看</view > -->
-               <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleEdit(item)">修改</view>
             <view class="btn filling" @click="handleDelete(item)">删除</view>
           </view>
         </view>
@@ -58,35 +129,57 @@
     </u-list>
     <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
       @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
+        @confirm="handlePersonConfirm"></u-picker>
   </view>
 </template>
 
 <script setup>
-import { listHeartJourney, delHeartJourney } from '@/api/invest/heartJourney'
+import { listHealthRecord, delHealthRecord } from '@/api/health/healthRecord'
+import { listPerson } from '@/api/health/person'
 import { getDicts } from '@/api/system/dict/data.js'
+import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
 const listData = ref([])
 const isShow = ref(false)
 const status = ref('loadmore')
-const journeyTypeList = ref([])
 const settingPickShow = ref(false)
 const settingColumns = ref([])
+const timeShow= ref(false)
+const showPerson = ref(false)
+const personList = ref([])
+const typeList = ref([])
+const etiologyList = ref([])
+const stateList = ref([])
+
+const  flag= ref(true)
+const time =ref( Number(new Date()))
 const data = reactive({
   filterPanel: false,
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 100
+  },
   queryParams: {
-      name: '',
-      type: '',
+    name: null,
+    type: null,
+    healthRecordId: null,
+    dosingTime: null,
+    dosage: null,
+    personId: null,
+    resource: null,
+    place: null
    } 
 })
-const { filterPanel, queryParams} = toRefs(data)
+const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
 const windowHeight = computed(() => {
 			uni.getSystemInfoSync().windowHeight - 50
 		})	
 onLoad(() => {
-    getDict()
     getList()
   });
 
@@ -98,6 +191,32 @@ onLoad(() => {
     }
   });
 
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+
+  function selectType(item) {
+      queryParams.value.type = item.dictValue
+      typeList.value.map(ele => {
+        if (ele.dictValue == item.dictValue) {
+          ele.selected = true
+          Reflect.set(ele, 'selected', true)
+        } else {
+          Reflect.set(ele, 'selected', false)
+        }
+      })
+    }
+
+  function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
 function loadmore() {
       pageNum.value += 1
       if (status.value == 'loadmore') {
@@ -105,8 +224,24 @@ function loadmore() {
       }
     }
 function getList() {
+  listPerson(queryPersonParams.value).then((response) => {
+        personList.value = [response.rows] 
+      })
+       // 类型
+       getDicts('record_type').then(res => {
+        typeList.value = res.data
+      })
+       // 用药地点
+       getDicts('etiology').then(res => {
+        etiologyList.value = res.data
+      })
+            // 单位
+            getDicts('health_record_state').then(res => {
+              stateList.value = res.data
+      })
+
       status.value = 'loading'
-      listHeartJourney({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+      listHealthRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
         listData.value = listData.value.concat(res.rows)
         if (listData.value.length < res.total) {
           status.value = 'loadmore'
@@ -117,11 +252,16 @@ function getList() {
         status.value = 'nomore'
       })
     }
-function   getDict() {
-      // 类型
-      getDicts('journey_type').then(res => {
-        journeyTypeList.value = res.data
-      })
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
     }
 function settingConfirm(e) {
       queryParams.value.settingId = e.value[0].settingId
@@ -131,53 +271,58 @@ function settingConfirm(e) {
 function settingCancel() {
       settingPickShow.value = false
     }
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-function selectStatus(item) {
-      queryParams.value.type = item.dictValue
-      journeyTypeList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
     function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
       pageNum.value = 1
       listData.value = []
       getList()
       filterPanel.value = false
     }
+    function handlePerson() {
+        if (personList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '人员为空  ', type: 'warning'
+          })
+        } else {
+          showPerson.value = true
+        }
+     }
+  function   handlePersonConfirm(e) {
+    queryParams.value.personName = e.value[0].name
+    queryParams.value.personId= e.value[0].id
+        showPerson.value = false
+        pageNum.value = 1
+      listData.value = []
+      getList()
+  }
+ function handlePersonCancel() {
+       showPerson.value = false
+  }
     function searchBlur() {
       pageNum.value = 1
       listData.value = []
       getList()
     }
     function resetQuery() {
-        queryParams.value.name = '',
-        queryParams.value.type = ''
-      journeyTypeList.value.map(ele => {
-        Reflect.set(ele, 'selected', false)
-      })
+          queryParams.value.personName = ''
+       queryParams.value.type = ''
+        queryParams.value.startTime = ''
+         queryParams.value.time = ''
+        
+        queryParams.value.endTime = ''
+        queryParams.value.personId = ''
     }
     function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/work/heartJourney/details?id=${item.id}` })
+      uni.navigateTo({ url: `/pages/health/healthRecord/details?id=${item.id}` })
     }
     function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/work/heartJourney/addEdit?id=${item.id}` })
+      uni.navigateTo({ url: `/pages/health/healthRecord/addEdit?id=${item.id}` })
       isShow.value = true
     }
     function handleAdd() {
-      uni.navigateTo({ url: `/pages/work/heartJourney/addEdit` })
+      uni.navigateTo({ url: `/pages/health/healthRecord/addEdit` })
       isShow.value = true
     }
     function handleDelete(item) {
@@ -186,8 +331,8 @@ function selectStatus(item) {
         	content: '你确定要删除吗',
         	success: function (res) {
         		if (res.confirm) {
-        		  delHeartJourney(item.id)
-              uni.navigateTo({ url: `/pages/work/heartJourney/list` })
+        		  delHealthRecord(item.id)
+              uni.navigateTo({ url: `/pages/health/healthRecord/list` })
         		} else if (res.cancel) {
         			console.log('取消');
         		}
@@ -214,7 +359,6 @@ function selectStatus(item) {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/health/heightWeightRecord/addEdit.vue b/src/pages/health/heightWeightRecord/addEdit.vue
new file mode 100644
index 0000000..fa6116d
--- /dev/null
+++ b/src/pages/health/heightWeightRecord/addEdit.vue
@@ -0,0 +1,217 @@
+<template>
+  <view class="container" style="paddingBottom:1rpx;">
+    <u-navbar
+    leftIconSize="40rpx"
+    leftIconColor="#333333"
+    title="身高体重记录"
+  >
+  </u-navbar>
+    <view class="section">
+      <view class="section-title">{{ title}}</view>
+      <view class="form-view">
+        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
+            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
+              inputAlign="right" border="none"></u--input>
+            <u-icon slot="right" name="arrow-down"></u-icon>
+          </u-form-item>
+          <u-form-item label="测量时间" prop="measureTime" required @click="selectDate()">
+            <u--input v-model="form.measureTime" 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="身高" required prop="height" >
+            <u--input v-model="form.height"  type="number" placeholder="请填写身高"
+              inputAlign="right" border="none">
+              <template #suffix>
+        <up-text
+          text="CM"
+        ></up-text>
+      </template>
+            </u--input>
+          </u-form-item>
+          <u-form-item label="体重" required prop="weight" >
+            <u--input v-model="form.weight"  type="number" placeholder="请填写体重过"
+              inputAlign="right" border="none">
+              <template #suffix>
+        <up-text
+          text="KG"
+        ></up-text>
+      </template>
+            </u--input>
+          </u-form-item>
+          <u-form-item label="备注" prop="remark"  labelPosition="top">
+            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+        </u--form>
+        <view class="form-btn">
+          <u-button type="primary" text="提交" @click="submit"></u-button>
+        </view>
+      </view>
+    </view>
+    <u-toast ref="uToast"></u-toast>
+    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
+      @confirm="handlePersonConfirm"></u-picker>
+      <u-datetime-picker
+    :show="datePickShow"
+    mode="datetime"
+    ref="measureTimeRef" 
+    @cancel="datePickShow=false"
+    @confirm="datePickConfirm"
+    itemHeight="88"
+  ></u-datetime-picker>
+  </view>
+</template>
+
+<script setup>
+import {
+  getHeightWeightRecord,
+  addHeightWeightRecord,
+  updateHeightWeightRecord
+} from '@/api/health/heightWeightRecord'
+import { listPerson, } from '@/api/health/person'
+const { proxy } = getCurrentInstance()
+import dayjs from 'dayjs'
+import {onLoad,onReady} from "@dcloudio/uni-app";
+  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const datePickShow = ref(false)
+const showPerson = ref(false)
+const title = ref("身高体重记录")
+const personList = ref([])
+const data = reactive({
+form: {
+  id: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    measureTime: null,
+    weight: null,
+    personId: null,
+    height: null
+},
+queryPersonParams: {
+  pageNum: 1,
+  status: '1',
+  pageSize: 1000
+},
+rules: {
+  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
+  measureTime: [{ required: true, message: '测量时间不能为空', trigger: ['change', 'blur'] }]
+}
+})
+const { form, queryPersonParams, rules} = toRefs(data)
+
+
+onLoad((option) => {
+     form.value.id = option.id
+     if(form.value.id!=null){
+      title.value="身高体重记录-修改"
+     }else{
+      title.value="身高体重记录-新增"
+     }
+    getData()
+})
+onReady(() => {
+     form.value.measureTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
+})
+function  getData() {
+    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
+     }
+     })
+  
+    if(form.value.id!=null){
+      getHeightWeightRecord(form.value.id).then(res => {
+        form.value = res.data   
+      })
+    }
+}
+
+function handlePerson() {
+      if (personList.value[0].length === 0) {
+        proxy.$refs['uToast'].show({
+          message: '人员为空  ', type: 'warning'
+        })
+      } else {
+        showPerson.value = true
+      }
+   }
+function   handlePersonConfirm(e) {
+     form.value.personName = e.value[0].name
+      form.value.personId = e.value[0].id
+      form.value.healthRecordName = ''
+      form.value.healthRecordId = ''
+      queryHealthRecordParams.value.personId=e.value[0].id
+      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
+        healthRecordList.value = [response.rows] 
+  showPerson.value = false
+})
+      
+}
+function handlePersonCancel() {
+     showPerson.value = false
+  }
+function  selectDate() {
+      datePickShow.value = true
+      proxy.$refs['measureTimeRef'].innerValue = new Date().getTime()
+  }
+function datePickConfirm(e) {
+      form.value.measureTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
+      datePickShow.value = false
+  }
+function submit() {
+      proxy.$refs['uForm'].validate().then(() => {
+        if (form.value.id != null) {
+          updateHeightWeightRecord(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '修改成功', complete() {
+              uni.navigateTo({ url: `/pages/health/heightWeightRecord/list` })
+            }
+          })
+        })
+        }else {
+          addHeightWeightRecord(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/heightWeightRecord/list` })
+            }
+          })
+        })
+        }
+      })
+    }
+</script>
+
+<style lang="scss" scoped>
+.section {
+  margin: 24rpx;
+  padding: 16rpx 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+
+  .section-title {
+    width: 360rpx;
+    color: #333333;
+    line-height: 44rpx;
+    font-size: 30rpx;
+    border-left: 6rpx solid #2681FF;
+    padding-left: 26rpx;
+  }
+
+  .form-view {
+    padding: 20rpx 0rpx 0 10rpx;
+
+    .form-btn {
+      padding-top: 20rpx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/heightWeightRecord/list.vue b/src/pages/health/heightWeightRecord/list.vue
new file mode 100644
index 0000000..22a44f7
--- /dev/null
+++ b/src/pages/health/heightWeightRecord/list.vue
@@ -0,0 +1,432 @@
+<template>
+  <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         <view class="search-view">
+          <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
+	    suffixIconStyle="color: #909399" class="search-input">
+        </u-input>
+        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+       </view>
+       </u-sticky>
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择测量时间" suffixIcon="calendar"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+              <view class="select-header">测量时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="datetime"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+    </u-sticky>
+    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+      <u-list-item v-for="(item, index) in listData" :key="index">
+        <view class="list-item">
+          <view class="item-header">
+            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="item.personName+'，身高：'+item.height +'CM'+'，体重：'+item.weight +'KG'" size="30rpx" color="#333333" :bold="true"></u--text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">测量时间：</text>
+            <text class="row-value">{{ item.measureTime }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">备注：</text>
+            <text class="row-value">{{ item.remark }}</text>
+          </view>
+          <view class="operate" >
+            <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleDelete(item)">删除</view>
+          </view>
+        </view>
+      </u-list-item>
+      <view>
+      </view>
+      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+    </u-list>
+    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
+        @confirm="handlePersonConfirm"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import {
+  listHeightWeightRecord,
+  delHeightWeightRecord
+} from '@/api/health/heightWeightRecord'
+import { listPerson } from '@/api/health/person'
+import { timeHandler } from '@/utils/common.ts'
+import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed }from "vue";
+const pageNum = ref(1)
+const listData = ref([])
+const isShow = ref(false)
+const status = ref('loadmore')
+const settingPickShow = ref(false)
+const settingColumns = ref([])
+const timeShow= ref(false)
+const showPerson = ref(false)
+const personList = ref([])
+const  flag= ref(true)
+const time =ref( Number(new Date()))
+const data = reactive({
+  filterPanel: false,
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 100
+  },
+  queryParams: {
+    measureTime: null,
+    weight: null,
+    personId: null,
+    height: null
+   } 
+})
+const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
+const windowHeight = computed(() => {
+			uni.getSystemInfoSync().windowHeight - 50
+		})	
+onLoad(() => {
+    getList()
+  });
+
+ onShow(() => {
+    if (isShow.value) {
+      listData.value=[]
+      getList()
+      isShow.value = false
+    }
+  });
+  function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+function loadmore() {
+      pageNum.value += 1
+      if (status.value == 'loadmore') {
+        getList()
+      }
+    }
+function getList() {
+  listPerson(queryPersonParams.value).then((response) => {
+        personList.value = [response.rows] 
+      })
+      status.value = 'loading'
+      listHeightWeightRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+        listData.value = listData.value.concat(res.rows)
+        if (listData.value.length < res.total) {
+          status.value = 'loadmore'
+        } else {
+          status.value = 'nomore'
+        }
+      }).catch(() => {
+        status.value = 'nomore'
+      })
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function settingConfirm(e) {
+      queryParams.value.settingId = e.value[0].settingId
+      queryParams.value.settingName = e.value[0].settingName
+      settingPickShow.value = false
+    }
+function settingCancel() {
+      settingPickShow.value = false
+    }
+    function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function handlePerson() {
+        if (personList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '人员为空  ', type: 'warning'
+          })
+        } else {
+          showPerson.value = true
+        }
+     }
+  function   handlePersonConfirm(e) {
+    queryParams.value.personName = e.value[0].name
+    queryParams.value.personId= e.value[0].id
+        showPerson.value = false
+        pageNum.value = 1
+      listData.value = []
+      getList()
+  }
+ function handlePersonCancel() {
+       showPerson.value = false
+  }
+    function searchBlur() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+    }
+    function resetQuery() {
+          queryParams.value.personName = ''
+        queryParams.value.startTime = ''
+         queryParams.value.time = ''
+        queryParams.value.endTime = ''
+        queryParams.value.personId = ''
+    }
+    function handleEdit(item) {
+      uni.navigateTo({ url: `/pages/health/heightWeightRecord/addEdit?id=${item.id}` })
+      isShow.value = true
+    }
+    function handleAdd() {
+      uni.navigateTo({ url: `/pages/health/heightWeightRecord/addEdit` })
+      isShow.value = true
+    }
+    function handleDelete(item) {
+      uni.showModal({
+        	title: '提示',
+        	content: '你确定要删除吗',
+        	success: function (res) {
+        		if (res.confirm) {
+        		  delHeightWeightRecord(item.id)
+              uni.navigateTo({ url: `/pages/health/heightWeightRecord/list` })
+        		} else if (res.cancel) {
+        			console.log('取消');
+        		}
+        	}
+        });
+    }
+	
+</script>
+
+<style lang="scss" scoped>
+.btnAdd {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      display:float;
+      text-align: center;
+    }
+
+.search-view {
+  padding: 12rpx 32rpx;
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+
+  .search-input {
+    background: #F5F5F5;
+    color: #333333;
+    margin-right: 36rpx;
+  }
+
+  .filter-panel {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 96rpx;
+    background-color: rgba(0, 0, 0, 0.5);
+
+    .filter-panel-content {
+      background-color: #ffff;
+      padding: 0 30rpx 30rpx;
+
+      .filter-title {
+        color: #000000;
+        font-size: 30rpx;
+        font-weight: 500;
+        padding: 30rpx 0;
+      }
+
+      .state-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .state-item {
+          width: 210rpx;
+          height: 72rpx;
+          border: 1rpx solid rgba(0, 0, 0, 0.25);
+          border-radius: 72rpx;
+          text-align: center;
+          line-height: 72rpx;
+          margin: 0 20rpx 20rpx 0;
+          font-size: 28rpx;
+          color: #000000;
+        }
+
+        .active {
+          background-color: rgba(222, 241, 255, 1);
+          border: 1rpx solid rgba(22, 119, 255, 1);
+        }
+      }
+    }
+
+    .btn-box {
+      display: flex;
+      padding: 24rpx 30rpx;
+      background-color: #fff;
+      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+    }
+  }
+}
+
+.list-item {
+  margin: 0 24rpx 24rpx;
+  padding: 32rpx;
+  background-color: #fff;
+
+  .item-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: 16rpx;
+
+    .status {
+      .status-item {
+        width: 120rpx;
+        height: 44rpx;
+        text-align: center;
+        line-height: 44rpx;
+        border-radius: 4rpx;
+        font-size: 24rpx;
+      }
+
+      .status1 {
+        background: #F0F0F0;
+        color: #8C8C8C;
+      }
+
+      .status2 {
+        background: rgba(38, 129, 255, 0.2);
+        color: #2681FF;
+      }
+
+      .status3 {
+        background: #F7F7F7;
+        color: #2681FF;
+      }
+
+      .status4 {
+        background: rgba(255, 85, 51, 0.2);
+        color: #FF5533;
+      }
+
+      .status5 {
+        background: #F7F7F7;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .status7 {
+        background: rgba(255, 129, 51, 0.2);
+        color: #FF8133;
+      }
+
+      .status8 {
+        background: rgba(65, 217, 165, 0.2);
+        color: #41D9A5;
+      }
+    }
+  }
+
+  .item-row {
+    padding: 16rpx 0;
+
+    .row-label {
+      color: rgba(0, 0, 0, 0.55);
+    }
+
+    .row-value {
+      color: rgba(0, 0, 0, 0.85)
+    }
+  }
+
+  .operate {
+    display: flex;
+    justify-content: flex-end;
+
+    .btn {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      margin-left: 5rpx;
+      text-align: center;
+    }
+
+    .circulation {
+      background: rgba(0, 0, 0, 0.04);
+      margin-right: 24rpx;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    .filling {
+      background: #2681FF;
+      border-radius: 8rpx;
+      color: #FFFFFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/homepage/index.vue b/src/pages/health/homepage/index.vue
index a376835..5924a31 100644
--- a/src/pages/health/homepage/index.vue
+++ b/src/pages/health/homepage/index.vue
@@ -1,117 +1,335 @@
 <template>
-  <view class="work-container">
-
-
-    <!-- 宫格组件 -->
-    <uni-section title="健康管理" v-show="auth.hasPermi('health:person:list')"  type="line"></uni-section>
-    <view class="grid-body">
-      <uni-grid :column="4" :showBorder="false">
-        <uni-grid-item v-for="(item, index) in healthGridList" :key="index" v-show="auth.hasPermi(item.permission)" @click="navigateTo(item.path)">
-        <view class="grid-item-box">
-            <uni-icons :type="item.icon" size="30"></uni-icons>
-            <text class="text">{{ item.text }}</text>
-          </view>
-      </uni-grid-item>
-      </uni-grid>
+  <view class="content">
+    <view class="text-area">
+      <text class="title"></text>
     </view>
-  </view>
+    <div class="app-container" style="overflow: auto">
+    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;健康总览</div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="../../assets/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">成员数</div>
+          <div class="num">3<span>人</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="../../assets/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">档案数量</div>
+          <div class="num">5<span>份</span></div>
+        </div>
+      </div>
+    </div>
+    
+    <div class="header-con"  ref="searchHeightRef">
 
-      
+      <div class="item">
+        <img src="../../assets/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">就医次数</div>
+          <div class="num">8<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="../../assets/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">用药次数</div>
+          <div class="num">100<span>次</span></div>
+        </div>
+      </div>
+    </div>
+    <div class="header-con"  ref="searchHeightRef">
+
+<div class="item">
+  <img src="../../assets/one.png" alt="" />
+  <div class="info-sum">
+    <div class="title">体温记录</div>
+    <div class="num">88<span>次</span></div>
+  </div>
+</div>
+<div class="item">
+  <img src="../../assets/ticketSum.png" alt="" />
+  <div class="info-sum">
+    <div class="title">体重身高记录</div>
+    <div class="num">100<span>次</span></div>
+  </div>
+</div>
+</div>
+<div class="header-con"  ref="searchHeightRef">
+
+<div class="item">
+  <img src="../../assets/one.png" alt="" />
+  <div class="info-sum">
+    <div class="title">活动记录</div>
+    <div class="num">8<span>次</span></div>
+  </div>
+</div>
+<div class="item">
+  <img src="../../assets/ticketSum.png" alt="" />
+  <div class="info-sum">
+    <div class="title">药品数量</div>
+    <div class="num">10<span>种</span></div>
+  </div>
+</div>
+</div>
+
+    <div></div>
+  </div>
+</view>
 </template>
-
 <script setup>
+import { ref, onMounted } from 'vue';
+import { getPosAccountsInfo, getInvestAccountsInfo, getCreditReportInfo, getLendAccountsInfo, getCreditAccountsInfo, getDebitAccountsInfo } from '@/api/invest/accountAnalysis.js'
 import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
+//POS机信息
+const posCount = ref(0) //POS机总数
+const currentMonthAmount = ref(0) //当月刷卡金额
+const currentMonthCommission = ref(0) //当月刷卡手续费
+const currentMonthCount = ref(0) //当月刷卡次数
+const currentYearAmount = ref(0) //当年刷卡金额
+const currentYearCommission = ref(0) //当年刷卡手续费
+const currentYearCount = ref(0) //当年刷卡次数
+const accumulateAmount = ref(0) //累计刷卡金额
+const accumulateCommission = ref(0) //累计刷卡手续费
+const accumulateCount = ref(0) //累计刷卡次数
 
-// 也可以使用下面的方式
-	import { ref } from "vue";
+//投资账户信息
+const stocksCount = ref(0) //股票账户
+const futuresCount = ref(0) //期货账户
+const currentMonthInvest = ref(0) //当月收益
+const currentMonthIncome = ref(0) //当月盈利
+const currentMonthExpenses = ref(0) //当月亏损
+const futuresIncome = ref(0) //期货收益
+const totalIncome = ref(0) //投资总收益
+const stocksIncome = ref(0) //股票收益
+const investBalance = ref(0) //投资账户余额
 
-  const healthGridList=ref([
-        { path: '/pages/health/healthRecord/list', text: '健康档案', icon: 'wallet-filled', permission: 'health:healthRecord:list'  },
-        { path: '/pages/health/temperatureRecord/list', text: '体温记录', icon: 'wallet', permission: 'health:temperatureRecord:list'  },
-        { path: '/pages/health/doctorRecord/list', text: '就医记录', icon: 'upload', permission: 'health:doctorRecord:list'  },
-        { path: '/pages/health/marRecord/list', text: '用药记录', icon: 'shop-filled', permission: 'health:marRecord:list' },
-        { path: '/pages/health/weightRecord/list', text: '体重记录', icon: 'calendar', permission: 'health:weightRecord:list'  },
-        { path: '/pages/health/person/list', text: '成员管理', icon: 'paperplane-filled', permission: 'health:person:list'  }
-      ])
-	function navigateTo(path) {
-    uni.navigateTo({
-        url: path
-      });
-	}
+//储蓄账户信息
+const debitCount = ref(0) //储蓄卡总数
+const debitICount = ref(0) //I类储蓄卡总数
+const debitIICount = ref(0) //II类储蓄卡总数
+const debitOnlineCount = ref(0) //网络账户总数
+const storedValueCardCount = ref(0) //储值卡总数
+const otherDebitCount = ref(0) //其他账户数
+const storedValueCardBalance = ref(0) //储值卡余额
+const housingFundBalance = ref(0) //公积金余额
+const medicalBalance = ref(0) //医保余额
+const debitOnlineBalance = ref(0) //网络账户余额
+const personalPensionBalance = ref(0) //个人养老金余额
+const otherDebitBalance = ref(0) //其他余额
+const debitBalance = ref(0) //储蓄卡余额
+const debitTotalBalance = ref(0) //储蓄账户余额
+
+//借贷账户信息
+const peopleLendHistory = ref(0) //人情借贷余额
+const peopleLendCount = ref(0) //人情账户
+const onlineLendCount = ref(0) //贷款账户
+const unclearedOnlineDebtCount = ref(0) //未结清贷款账户数
+const unClearedOnlineDebt = ref(0) //未结清贷款本息
+const unClearedOnlineDebtPrinciple = ref(0) //未结清贷款本金
+const unClearedOnlineDebtInterest = ref(0) //未结清贷款利息
+const clearedOnlineDebtCount = ref(0) //已结清贷款账户数
+const clearedOnlineDebt = ref(0) //已结清贷款本息
+const clearedOnlineDebtPrinciple = ref(0) //已结清贷款本金
+const clearedOnlineDebtInterest = ref(0) //已结清贷款利息
+const dueOnlineDebt = ref(0) //本月应还贷款
+const repaidOnlineDebt = ref(0) //本月已还贷款
+const leftOnlineDebt = ref(0) //本月剩余应还贷款
+
+//信用卡信息
+const creditInstallmentHistory = ref(0)
+const creditCount = ref(0) //信用卡数量
+const currentCreditBill = ref(0)
+const creditInstallment = ref(0)
+const creditLimit = ref(0) //信用卡额度
+const lastSixMonthUsedLimit = ref(0) //近6月使用额度
+const lastSixMonthUsedRate = ref(0) //近6月使用率
+const lastMonthUsedLimit = ref(0) //上月已用额度
+const lastMonthUsedRate = ref(0) //上月使用率
+const creditBalance = ref(0) //信用卡余额
+const creditAvailableLimit = ref(0) //信用卡可用额度
+const creditBillRate = ref(0) //信用卡使用率
+const unclearedCreditInstallmentCount = ref(0) //未结清分期数量
+const unclearedCreditInstallment = ref(0) //未结清分期本息
+const unclearedCreditInstallmentPrinciple = ref(0) //未结清分期本金
+const unclearedCreditInstallmentInterest = ref(0) //未结清分期利息
+const clearedCreditInstallmentCount = ref(0) //已结清分期数量
+const clearedCreditInstallmentDebt = ref(0) //已结清分期本息
+const clearedCreditInstallmentPrinciple = ref(0) //已结清分期本金
+const clearedCreditInstallmentInterest = ref(0) //已结清分期利息
+
+//征信报告信息
+const lastOneMonths = ref(0) //近1月硬查询
+const lastTwoMonths = ref(0) //近2月硬查询
+const lastThreeMonths = ref(0) //近3月硬查询
+const lastSixMonths = ref(0) //近6月硬查询
+const lastOneYears = ref(0) //近1年硬查询
+const lastTwoYears = ref(0) //近2年硬查询
+const lastAllYears = ref(0) //所有硬查询
+const lastSixMonthQueryCount = ref(0) //近6月个人查询
+const lastSixMonthsAfterLoan = ref(0) //近6月贷后管理
+const lastTwoYearsAfterLoan = ref(0) //近2年贷后管理
+const totalAfterLoan = ref(0) //总贷后管理
+
+const getInvestAccountsInfoData = () => {
+  getInvestAccountsInfo().then((res) => {
+    stocksCount.value = res.data.stocksCount
+    futuresCount.value = res.data.futuresCount
+    totalIncome.value = res.data.totalIncome
+    futuresIncome.value = res.data.futuresIncome
+    stocksIncome.value = res.data.stocksIncome
+    investBalance.value = res.data.investBalance
+    currentMonthInvest.value = res.data.currentMonthInvest
+    currentMonthIncome.value = res.data.currentMonthIncome
+    currentMonthExpenses.value = res.data.currentMonthExpenses
+  })
+}
+
+const getPosAccountsInfoData = () => {
+  getPosAccountsInfo().then((res) => {
+    posCount.value = res.data.posCount
+    currentMonthAmount.value = res.data.currentMonthAmount
+    currentMonthCommission.value = res.data.currentMonthCommission
+    currentMonthCount.value = res.data.currentMonthCount
+    currentYearAmount.value = res.data.currentYearAmount
+    currentYearCommission.value = res.data.currentYearCommission
+    currentYearCount.value = res.data.currentYearCount
+    accumulateAmount.value = res.data.accumulateAmount
+    accumulateCommission.value = res.data.accumulateCommission
+    accumulateCount.value = res.data.accumulateCount
+  })
+}
+
+const getCreditAccountsInfoData = () => {
+  getCreditAccountsInfo().then((res) => {
+    creditCount.value = res.data.creditCount
+    currentCreditBill.value = res.data.currentCreditBill
+    creditInstallment.value = res.data.creditInstallment
+    creditLimit.value = res.data.creditLimit
+    lastSixMonthUsedLimit.value = res.data.lastSixMonthUsedLimit
+    lastSixMonthUsedRate.value = res.data.lastSixMonthUsedRate
+    lastMonthUsedLimit.value = res.data.lastMonthUsedLimit
+    lastMonthUsedRate.value = res.data.lastMonthUsedRate
+    creditBalance.value = res.data.creditBalance
+    creditAvailableLimit.value = res.data.creditAvailableLimit
+    creditBillRate.value = res.data.creditBillRate
+    unclearedCreditInstallmentCount.value = res.data.unclearedCreditInstallmentCount
+    unclearedCreditInstallment.value = res.data.unclearedCreditInstallment
+    unclearedCreditInstallmentPrinciple.value = res.data.unclearedCreditInstallmentPrinciple
+    unclearedCreditInstallmentInterest.value = res.data.unclearedCreditInstallmentInterest
+    clearedCreditInstallmentCount.value = res.data.clearedCreditInstallmentCount
+    clearedCreditInstallmentDebt.value = res.data.clearedCreditInstallmentDebt
+    clearedCreditInstallmentPrinciple.value = res.data.clearedCreditInstallmentPrinciple
+    clearedCreditInstallmentInterest.value = res.data.clearedCreditInstallmentInterest
+  })
+}
+const getLendAccountsInfoData = () => {
+  getLendAccountsInfo().then((res) => {
+    peopleLendCount.value = res.data.peopleLendCount
+    onlineLendCount.value = res.data.onlineLendCount
+    unClearedOnlineDebt.value = res.data.unClearedOnlineDebt
+    creditInstallmentHistory.value = res.data.creditInstallmentHistory
+    peopleLendHistory.value = res.data.peopleLendHistory
+    unclearedOnlineDebtCount.value = res.data.unclearedOnlineDebtCount
+    clearedOnlineDebtCount.value = res.data.clearedOnlineDebtCount
+    clearedOnlineDebt.value = res.data.clearedOnlineDebt
+    dueOnlineDebt.value = res.data.dueOnlineDebt
+    repaidOnlineDebt.value = res.data.repaidOnlineDebt
+    leftOnlineDebt.value = res.data.leftOnlineDebt
+    unClearedOnlineDebtPrinciple.value = res.data.unClearedOnlineDebtPrinciple
+    unClearedOnlineDebtInterest.value = res.data.unClearedOnlineDebtInterest
+    clearedOnlineDebtPrinciple.value = res.data.clearedOnlineDebtPrinciple
+    clearedOnlineDebtInterest.value = res.data.clearedOnlineDebtInterest
+  })
+}
+const getCreditReportInfoData = () => {
+  getCreditReportInfo().then((res) => {
+    lastOneMonths.value = res.data.lastOneMonths
+    lastTwoMonths.value = res.data.lastTwoMonths
+    lastThreeMonths.value = res.data.lastThreeMonths
+    lastSixMonths.value = res.data.lastSixMonths
+    lastOneYears.value = res.data.lastOneYears
+    lastTwoYears.value = res.data.lastTwoYears
+    lastAllYears.value = res.data.lastAllYears
+    lastSixMonthQueryCount.value = res.data.lastSixMonthQueryCount
+    lastSixMonthsAfterLoan.value = res.data.lastSixMonthsAfterLoan
+    lastTwoYearsAfterLoan.value = res.data.lastTwoYearsAfterLoan
+    totalAfterLoan.value = res.data.totalAfterLoan
+  })
+}
+const getDebitAccountsInfoData = () => {
+  getDebitAccountsInfo().then((res) => {
+    debitCount.value = res.data.debitCount
+    debitICount.value = res.data.debitICount
+    debitIICount.value = res.data.debitIICount
+    debitOnlineCount.value = res.data.debitOnlineCount
+    storedValueCardCount.value = res.data.storedValueCardCount
+    debitBalance.value = res.data.debitBalance
+    debitTotalBalance.value = res.data.debitTotalBalance
+    debitOnlineBalance.value = res.data.debitOnlineBalance
+    storedValueCardBalance.value = res.data.storedValueCardBalance
+    housingFundBalance.value = res.data.housingFundBalance
+    medicalBalance.value = res.data.medicalBalance
+    personalPensionBalance.value = res.data.personalPensionBalance
+    otherDebitBalance.value = res.data.otherDebitBalance
+    otherDebitCount.value = res.data.otherDebitCount
+  })
+}
+
+onMounted(() => {
+  getInvestAccountsInfoData()
+  getPosAccountsInfoData()
+  getDebitAccountsInfoData()
+  getCreditAccountsInfoData()
+  getLendAccountsInfoData()
+  getCreditReportInfoData()
+})
 </script>
 
-<style lang="scss">
-  /* #ifndef APP-NVUE */
-  page {
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    background-color: #fff;
-    min-height: 100%;
-    height: auto;
-  }
-
-  view {
-    font-size: 14px;
-    line-height: inherit;
-  }
-
-  /* #endif */
-
-  .text {
-    text-align: center;
-    font-size: 22rpx;
-    margin-top: 10rpx;
-  }
-
-  .grid-item-box {
-    flex: 1;
-    /* #ifndef APP-NVUE */
-    display: flex;
-    /* #endif */
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 15px 0;
-  }
-
-  .uni-margin-wrap {
-    width: 690rpx;
+<style lang="scss" scoped>
+.app-container {
+  .header-con {
     width: 100%;
-    ;
-  }
-
-  .swiper {
-    height: 300rpx;
-  }
-
-  .swiper-box {
-    height: 150px;
-  }
-
-  .swiper-item {
-    /* #ifndef APP-NVUE */
+    height: 100px;
+    background-color: #ffffff;
+    margin-bottom: 5px;
     display: flex;
-    /* #endif */
-    flex-direction: column;
-    justify-content: center;
+    justify-content: space-between;
     align-items: center;
-    color: #fff;
-    height: 300rpx;
-    line-height: 300rpx;
-  }
-
-  @media screen and (min-width: 500px) {
-    .uni-swiper-dot-box {
-      width: 400px;
-      /* #ifndef APP-NVUE */
-      margin: 0 auto;
-      /* #endif */
-      margin-top: 8px;
+    .item {
+      width: 50%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 0px 5px 0px 5px;
+      .title {
+        margin-left: 5px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 5px;
+        font-size: 14px;
+      }
+      .num {
+        margin-left: 5px;
+        font-weight: bold;
+        font-size: 14px;
+      }
     }
-
-    .image {
-      width: 100%;
+    img {
+      height: 30px;
+      width: 30px;
     }
   }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 16px;
+  }
+}
 </style>
diff --git a/src/pages/health/index.vue b/src/pages/health/index.vue
index a376835..d7d0aa8 100644
--- a/src/pages/health/index.vue
+++ b/src/pages/health/index.vue
@@ -13,6 +13,18 @@
           </view>
       </uni-grid-item>
       </uni-grid>
+    </view>
+        <!-- 宫格组件 -->
+        <uni-section title="药品管理" v-show="auth.hasPermi('health:medicineStockIn:list')"  type="line"></uni-section>
+    <view class="grid-body">
+      <uni-grid :column="4" :showBorder="false">
+        <uni-grid-item v-for="(item, index) in medicineGridList" :key="index" v-show="auth.hasPermi(item.permission)" @click="navigateTo(item.path)">
+        <view class="grid-item-box">
+            <uni-icons :type="item.icon" size="30"></uni-icons>
+            <text class="text">{{ item.text }}</text>
+          </view>
+      </uni-grid-item>
+      </uni-grid>
     </view>
   </view>
 
@@ -26,12 +38,20 @@ import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
 	import { ref } from "vue";
 
   const healthGridList=ref([
-        { path: '/pages/health/healthRecord/list', text: '健康档案', icon: 'wallet-filled', permission: 'health:healthRecord:list'  },
-        { path: '/pages/health/temperatureRecord/list', text: '体温记录', icon: 'wallet', permission: 'health:temperatureRecord:list'  },
+       { path: '/pages/health/person/list', text: '成员管理', icon: 'staff-filled', permission: 'health:person:list'  },
+        { path: '/pages/health/healthRecord/list', text: '健康档案', icon: 'list', permission: 'health:healthRecord:list'  },
         { path: '/pages/health/doctorRecord/list', text: '就医记录', icon: 'upload', permission: 'health:doctorRecord:list'  },
         { path: '/pages/health/marRecord/list', text: '用药记录', icon: 'shop-filled', permission: 'health:marRecord:list' },
-        { path: '/pages/health/weightRecord/list', text: '体重记录', icon: 'calendar', permission: 'health:weightRecord:list'  },
-        { path: '/pages/health/person/list', text: '成员管理', icon: 'paperplane-filled', permission: 'health:person:list'  }
+        { path: '/pages/health/temperatureRecord/list', text: '体温记录', icon: 'spinner-cycle', permission: 'health:temperatureRecord:list'  },
+        { path: '/pages/health/heightWeightRecord/list', text: '身高体重记录', icon: 'map-pin-ellipse', permission: 'health:heightWeightRecord:list'  },
+        { path: '/pages/health/activity/list', text: '活动记录', icon: 'images-filled', permission: 'health:activity:list'  }
+       
+      ])
+      const medicineGridList=ref([
+        { path: '/pages/health/medicineBasic/list', text: '药品基础信息', icon: 'folder-add-filled', permission: 'health:medicineBasic:list'  },
+        { path: '/pages/health/medicineStockIn/list', text: '药品入库清单', icon: 'arrow-down', permission: 'health:medicineStockIn:list'  },
+        { path: '/pages/health/medicineStock/list', text: '药品实时库存', icon: 'color', permission: 'health:medicineStockIn:list'  }
+       
       ])
 	function navigateTo(path) {
     uni.navigateTo({
diff --git a/src/pages/health/marRecord/addEdit.vue b/src/pages/health/marRecord/addEdit.vue
index f521457..f9e0e2b 100644
--- a/src/pages/health/marRecord/addEdit.vue
+++ b/src/pages/health/marRecord/addEdit.vue
@@ -26,10 +26,11 @@
                 inputAlign="right" border="none"></u--input>
               <u-icon slot="right" name="arrow-down"></u-icon>
             </u-form-item>
-          <u-form-item label="用药名称" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写用药名称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
+            <u-form-item label="药品名称" prop="medicalName" required @click="handleMedical">
+            <u--input v-model="form.medicalName" disabled disabledColor="#ffffff" placeholder="请选择药品名称"
+              inputAlign="right" border="none"></u--input>
+            <u-icon slot="right" name="arrow-down"></u-icon>
+          </u-form-item>
             <u-form-item label="药品来源" prop="resourceName" required @click="handleResource">
               <u--input v-model="form.resourceName" disabled disabledColor="#ffffff" placeholder="请选择药品来源"
                 inputAlign="right" border="none"></u--input>
@@ -48,7 +49,11 @@
               <u--input v-model="form.dosage"  placeholder="请填写用药剂量"
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
-         
+            <u-form-item label="用药单位" prop="unitName" required @click="handleUnit">
+              <u--input v-model="form.unitName" disabled disabledColor="#ffffff" placeholder="请选择用药单位"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></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
               maxlength="2000" style="padding:18rpx 0;"></u--textarea>
@@ -72,6 +77,10 @@
         @confirm="handleMarTypeConfirm"></u-picker>
         <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handHealthRecordCancel"
       @confirm="handHealthRecordConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
+      @confirm="handleMedicalConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showUnit" :columns="unitList" keyName="dictLabel" @cancel="handleUnitCancel"
+      @confirm="handleUnitConfirm"></u-picker>
       <u-datetime-picker
 			:show="datePickShow"
 			mode="datetime"
@@ -87,6 +96,7 @@
 import { getMarRecord, addMarRecord, updateMarRecord  } from '@/api/health/marRecord'
 import { listPerson, getPerson } from '@/api/health/person'
 import { listHealthRecord } from '@/api/health/healthRecord'
+import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
 const { proxy } = getCurrentInstance()
   import { getDicts } from '@/api/system/dict/data.js'
 import dayjs from 'dayjs'
@@ -95,18 +105,27 @@ import {onLoad,onReady} from "@dcloudio/uni-app";
 import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
 const datePickShow = ref(false)
 const showPerson = ref(false)
+const flag = ref('add')
 const showHealthRecord = ref(false)
 const title = ref("用药记录")
 const healthRecordList = ref([])
 const personList = ref([])
 
+const medicalList = ref([])
+const showMedical = ref(false)
+
 const marTypeList = ref([])
 const showMarType = ref(false)
+
 const resourceList = ref([])
 const showResource = ref(false)
+
 const placeList = ref([])
 const showPlace = ref(false)
 
+const unitList = ref([])
+const showUnit = ref(false)
+
 const data = reactive({
 form: {
   id: null,
@@ -137,33 +156,57 @@ queryHealthRecordParams: {
   personId:null,
   pageSize: 1000
 },
+queryMedicineParams: {
+    pageNum: 1,
+    treatmentType: null,
+    pageSize: 1000
+  },
 rules: {
   healthRecordName: [{ required: true, message: '健康档案不能为空', trigger:['change', 'blur'] }],
   personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  name: [{ required: true, message: '用药名称不能为空', trigger: ['change', 'blur'] }],
-  type: [{ required: true, message: '用药类型不能为空', trigger: ['change', 'blur'] }],
+  medicalName: [{ required: true, message: '药品名称不能为空', trigger: ['change', 'blur'] }],
+  marTypeName: [{ required: true, message: '用药类型不能为空', trigger: ['change', 'blur'] }],
   resource: [{ required: true, message: '药品来源不能为空', trigger: ['change', 'blur'] }],
   place: [{ required: true, message: '用药地点不能为空', trigger: ['change', 'blur'] }],
+  dosage: [{ type: 'number', required: true, message: '用药剂量不能为空', trigger: ['change', 'blur'] }],
 
   dosingTime: [{ required: true, message: '用药时间不能为空', trigger: ['change', 'blur'] }]
 }
 })
-const { form, queryPersonParams, queryHealthRecordParams, rules} = toRefs(data)
+const { form, queryPersonParams, queryHealthRecordParams,queryMedicineParams, rules} = toRefs(data)
 
 
 onLoad((option) => {
      form.value.id = option.id
-     if(form.value.id!=null){
+     flag.value = option.flag
+     if(flag.value==null){
+      if(form.value.id!=null){
       title.value="用药记录-修改"
      }else{
       title.value="用药记录-新增"
      }
+     }else{
+      title.value="用药记录-复制"
+     }
+     
     getData()
 })
 onReady(() => {
      form.value.dosingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
 })
+function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+ }
 function  getData() {
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicalList.value = [response.rows] 
+  })
     listPerson(queryPersonParams.value).then((response) => {
      personList.value = [response.rows] 
      if(response.rows.length>0){
@@ -182,6 +225,10 @@ function  getData() {
      // 类型
      getDicts('mar_type').then(res => {
         marTypeList.value =[res.data] 
+      })
+           // 类型
+     getDicts('medical_unit').then(res => {
+        unitList.value =[res.data] 
       })
        // 类型
        getDicts('mar_resource').then(res => {
@@ -197,31 +244,26 @@ function  getData() {
     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 => {
+           getDicts('mar_type').then(result => {
           form.value.marTypeName=dictStr(form.value.type, result.data)
          })
       })
     }
 }
 
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
 function handlePerson() {
       if (personList.value[0].length === 0) {
         proxy.$refs['uToast'].show({
@@ -239,6 +281,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
 })
       
@@ -246,6 +292,34 @@ function   handlePersonConfirm(e) {
 function handlePersonCancel() {
      showPerson.value = false
   }
+
+  function handleMedical() {
+      if (medicalList.value[0].length === 0) {
+        proxy.$refs['uToast'].show({
+          message: '药品为空  ', type: 'warning'
+        })
+      } else {
+        showMedical.value = true
+      }
+   }
+function   handleMedicalConfirm(e) {
+     form.value.medicalName = e.value[0].shortNameBrandPackaging
+     form.value.name = e.value[0].shortNameBrandPackaging
+      form.value.medicineId = e.value[0].id
+      getMedicineBasic(e.value[0].id).then((response) => {
+    form.value.unit = response.data.unit
+       // 药品来源
+         getDicts('medical_unit').then(result => {
+          form.value.unitName=dictStr( response.data.unit, result.data)
+         })
+    form.value.contentUnit = response.data.contentUnit
+  })
+      showMedical.value = false
+      
+}
+function handleMedicalCancel() {
+     showMedical.value = false
+  }
 function handHealthRecord() {
       if (healthRecordList.value[0].length === 0) {
         proxy.$refs['uToast'].show({
@@ -282,6 +356,24 @@ function handleResource() {
       showResource.value = false
       }
 
+      function handleUnit() {
+        if (unitList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '用药单位为空  ', type: 'warning'
+          })
+        } else {
+          showUnit.value = true
+        }
+     }
+  function   handleUnitConfirm(e) {
+        form.value.unitName = e.value[0].dictLabel
+        form.value.unit = e.value[0].dictValue
+        showUnit.value = false
+  }
+ function handleUnitCancel() {
+      showUnit.value = false
+      }
+
       function handlePlace() {
         if (placeList.value[0].length === 0) {
           proxy.$refs['uToast'].show({
@@ -312,6 +404,15 @@ function handleResource() {
   function   handleMarTypeConfirm(e) {
         form.value.marTypeName = e.value[0].dictLabel
         form.value.type = e.value[0].dictValue
+
+        queryMedicineParams.value.treatmentType = e.value[0].dictValue
+        form.value.medicalName = ""
+     form.value.name = ""
+      form.value.medicineId = null
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicalList.value = [response.rows] 
+  })
+
         showMarType.value = false
   }
  function handleMarTypeCancel() {
@@ -329,13 +430,25 @@ function datePickConfirm(e) {
 function submit() {
       proxy.$refs['uForm'].validate().then(() => {
         if (form.value.id != null) {
-          updateMarRecord(form.value).then(res => {
+          if(flag.value==null){
+            updateMarRecord(form.value).then(res => {
             proxy.$refs['uToast'].show({
             message: '修改成功', complete() {
               uni.navigateTo({ url: `/pages/health/marRecord/list` })
             }
           })
         })
+          }else {
+            form.value.id == null
+            addMarRecord(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/marRecord/list` })
+            }
+          })
+        })
+          }
+
         }else {
           addMarRecord(form.value).then(res => {
             proxy.$refs['uToast'].show({
diff --git a/src/pages/health/marRecord/list.vue b/src/pages/health/marRecord/list.vue
index 2f1207f..af6a785 100644
--- a/src/pages/health/marRecord/list.vue
+++ b/src/pages/health/marRecord/list.vue
@@ -75,16 +75,25 @@
         <view class="list-item">
           <view class="item-header">
             <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
-              :text="item.personName+'，用药：'+item.name +item.dosage " size="30rpx" color="#333333" :bold="true"></u--text>
+              :text="item.name +' '+ item.dosage+dictStr(item.unit, unitList) " size="30rpx" color="#333333" :bold="true"></u--text>
           </view>
           <view class="item-row">
-            <text class="row-label">健康档案：</text>
-            <text class="row-value">{{ item.healthRecordName }}</text>
+            <text class="row-label">用药时间：</text>
+            <text class="row-value">{{ item.dosingTime }}</text>
           </view>
           <view class="item-row">
             <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.personName }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">健康档案：</text>
+            <text class="row-value">{{ item.healthRecordName }}</text>
+          </view>
+  
           <view class="item-row">
             <text class="row-label">药品来源：</text>
             <text class="row-value">{{ dictStr(item.resource,resourceList) }}</text>
@@ -94,11 +103,12 @@
             <text class="row-value">{{ dictStr(item.place, placeList) }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">用药时间：</text>
-            <text class="row-value">{{ item.dosingTime }}</text>
+            <text class="row-label">备注：</text>
+            <text class="row-value">{{ item.remark }}</text>
           </view>
           <view class="operate" >
             <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleCopy(item)">复制</view>
             <view class="btn filling" @click="handleDelete(item)">删除</view>
           </view>
         </view>
@@ -135,6 +145,7 @@ const personList = ref([])
 const typeList = ref([])
 const resourceList = ref([])
 const placeList = ref([])
+const unitList = ref([])
 
 const  flag= ref(true)
 const time =ref( Number(new Date()))
@@ -215,6 +226,11 @@ function getList() {
        getDicts('mar_place').then(res => {
         placeList.value = res.data
       })
+            // 单位
+            getDicts('medical_unit').then(res => {
+              unitList.value = res.data
+      })
+
        // 药品类型
        getDicts('mar_resource').then(res => {
         resourceList.value = res.data
@@ -251,7 +267,7 @@ function settingCancel() {
       settingPickShow.value = false
     }
     function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
         queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
       } 
       pageNum.value = 1
@@ -300,6 +316,10 @@ function settingCancel() {
       uni.navigateTo({ url: `/pages/health/marRecord/addEdit?id=${item.id}` })
       isShow.value = true
     }
+    function handleCopy(item) {
+      uni.navigateTo({ url: `/pages/health/marRecord/addEdit?flag=copy&id=${item.id}` })
+      isShow.value = true
+    }
     function handleAdd() {
       uni.navigateTo({ url: `/pages/health/marRecord/addEdit` })
       isShow.value = true
diff --git a/src/pages/health/medicineBasic/addEdit.vue b/src/pages/health/medicineBasic/addEdit.vue
new file mode 100644
index 0000000..fe78429
--- /dev/null
+++ b/src/pages/health/medicineBasic/addEdit.vue
@@ -0,0 +1,524 @@
+<template>
+  <view class="container" style="paddingBottom:1rpx;">
+    <u-navbar
+    leftIconSize="40rpx"
+    leftIconColor="#333333"
+    title="药品基础信息"
+  >
+  </u-navbar>
+    <view class="section">
+      <view class="section-title">{{ title}}</view>
+      <view class="form-view">
+        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+          <u-form-item label="药品全称" prop="name" required >
+              <u--input v-model="form.name"  placeholder="请填写药品全称"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="药品简称" prop="shortName" required >
+              <u--input v-model="form.shortName"  placeholder="请填写药品简称"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="药品编码" prop="code" required >
+              <u--input v-model="form.code"  placeholder="请填写药品编码"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+
+          <u-form-item label="药品剂型" prop="dosageFormName" required @click="handleDosageForm">
+              <u--input v-model="form.dosageFormName" disabled disabledColor="#ffffff" placeholder="请选择药品剂型"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="治疗类型" prop="treatmentTypeName" required @click="handleTreatmentType">
+              <u--input v-model="form.treatmentTypeName" disabled disabledColor="#ffffff" placeholder="请选择治疗类型"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="药品分类"  prop="classificationName" required @click="handleClassification">
+              <u--input v-model="form.classificationName" disabled disabledColor="#ffffff" placeholder="请选择药品分类"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+
+            <u-form-item label="类别" prop="categoryName" required @click="handleCategory">
+              <u--input v-model="form.categoryName" disabled disabledColor="#ffffff" placeholder="请选择类别"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="品牌" prop="brand" required >
+              <u--input v-model="form.brand"  placeholder="请填写品牌"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="药品包装" prop="packaging" required >
+              <u--input v-model="form.packaging"  placeholder="请填写药品包装"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="包装单位" prop="packageUnitName" required @click="handlePackageUnit">
+              <u--input v-model="form.packageUnitName" disabled disabledColor="#ffffff" placeholder="请选择包装单位"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="生产厂家" prop="manufacturers" required >
+              <u--input v-model="form.manufacturers"  placeholder="请填写生产厂家"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="是否进口" prop="isImportName"  @click="handleIsImport">
+              <u--input v-model="form.isImportName" disabled disabledColor="#ffffff" placeholder="请选择是否进口"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="规格" prop="specifications" >
+              <u--input v-model="form.specifications"  placeholder="请填写规格"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="规格单位" prop="unitName"  @click="handleUnit">
+              <u--input v-model="form.unitName" disabled disabledColor="#ffffff" placeholder="请选择规格单位"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="单个含量" prop="content"  >
+              <u--input v-model="form.content"  placeholder="请填写单个含量"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="含量单位" prop="contentUnitName"  @click="handleContentUnit">
+              <u--input v-model="form.contentUnitName" disabled disabledColor="#ffffff" placeholder="请选择含量单位"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="生产地址" prop="address"  >
+              <u--input v-model="form.address"  placeholder="请填写生产地址"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="功能主治" prop="indications"  labelPosition="top">
+            <u--textarea v-model="form.indications" placeholder="请填写功能主治" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+          <u-form-item label="贮藏" prop="storage"  labelPosition="top">
+            <u--textarea v-model="form.storage" placeholder="请填写贮藏" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+          <u-form-item label="药品成分" prop="ingredients"  labelPosition="top">
+            <u--textarea v-model="form.ingredients" placeholder="请填写药品成分" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+          <u-form-item label="用法用量" prop="usage"  labelPosition="top">
+            <u--textarea v-model="form.usage" placeholder="请填写用法用量" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+          <u-form-item label="性状" prop="character"  labelPosition="top">
+            <u--textarea v-model="form.character" placeholder="请填写性状" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+          <u-form-item label="不良反应" prop="adverseReaction"  labelPosition="top">
+            <u--textarea v-model="form.adverseReaction" placeholder="请填写不良反应" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+          <u-form-item label="备注" prop="remark"  labelPosition="top">
+            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+        </u--form>
+        <view class="form-btn">
+          <u-button type="primary" text="提交" @click="submit"></u-button>
+        </view>
+      </view>
+    </view>
+    <u-toast ref="uToast"></u-toast>
+    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
+      @confirm="handlePersonConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showDosageForm" :columns="dosageFormList" keyName="dictLabel" @cancel="handleDosageFormCancel"
+        @confirm="handleDosageFormConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showTreatmentType" :columns="treatmentTypeList" keyName="dictLabel" @cancel="handleTreatmentTypeCancel"
+        @confirm="handleTreatmentTypeConfirm"></u-picker>
+        <u-picker itemHeight="88" :show="showClassification" :columns="classificationList" keyName="dictLabel" @cancel="handleClassificationCancel"
+        @confirm="handleClassificationConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showCategory" :columns="categoryList" keyName="dictLabel" @cancel="handleCategoryCancel"
+      @confirm="handleCategoryConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showPackageUnit" :columns="packageUnitList" keyName="dictLabel" @cancel="handlePackageUnitCancel"
+      @confirm="handlePackageUnitConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showIsImport" :columns="isImportList" keyName="dictLabel" @cancel="handleIsImportCancel"
+      @confirm="handleIsImportConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showUnit" :columns="unitList" keyName="dictLabel" @cancel="handleUnitCancel"
+      @confirm="handleUnitConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showContentUnit" :columns="contentUnitList" keyName="dictLabel" @cancel="handleContentUnitCancel"
+      @confirm="handleContentUnitConfirm"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import {getMedicineBasic, addMedicineBasic, updateMedicineBasic } from '@/api/health/medicineBasic'
+const { proxy } = getCurrentInstance()
+  import { getDicts } from '@/api/system/dict/data.js'
+import dayjs from 'dayjs'
+import {onLoad,onReady} from "@dcloudio/uni-app";
+  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const datePickShow = ref(false)
+const title = ref("药品基础信息")
+const flag = ref('add')
+
+const dosageFormList = ref([])
+const showDosageForm = ref(false)
+
+const treatmentTypeList = ref([])
+const showTreatmentType = ref(false)
+
+const classificationList = ref([])
+const showClassification = ref(false)
+
+const categoryList = ref([])
+const showCategory = ref(false)
+
+const packageUnitList = ref([])
+const showPackageUnit = ref(false)
+
+const isImportList = ref([])
+const showIsImport = ref(false)
+
+const unitList = ref([])
+const showUnit = ref(false)
+
+const contentUnitList = ref([])
+const showContentUnit = ref(false)
+
+
+const data = reactive({
+form: {
+  id: null,
+    name: null,
+    classification: null,
+    category: null,
+    brand: null,
+    packaging: null,
+    manufacturers: null,
+    treatmentType: null,
+    isImport: null,
+    ingredients: null,
+    usage: null,
+    dosageForm: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    code: null,
+    specifications: null,
+    unit: null,
+    address: null,
+    adverseReaction: null,
+    content: null,
+    contentUnit: null,
+    character: null,
+    storage: null,
+    indications: null
+},
+rules: {
+  name: [{ required: true, message: '药品全称不能为空', trigger:['change', 'blur'] }],
+  shortName: [{ required: true, message: '药品简称不能为空', trigger: ['change', 'blur'] }],
+  classificationName: [{ required: true, message: '药品分类不能为空', trigger: ['change', 'blur'] }],
+  categoryName: [{ required: true, message: '类别不能为空', trigger: ['change', 'blur'] }],
+  brand: [{ required: true, message: '品牌不能为空', trigger: ['change', 'blur'] }],
+  packaging: [{ required: true, message: '药品包装不能为空', trigger: ['change', 'blur'] }],
+  manufacturers: [{ required: true, message: '生产厂家不能为空', trigger: ['change', 'blur'] }],
+  code: [{ required: true, message: '药品编码不能为空', trigger: ['change', 'blur'] }],
+  dosageFormName: [{ required: true, message: '药品剂型不能为空', trigger: ['change', 'blur'] }]
+}
+})
+const { form, rules} = toRefs(data)
+
+
+onLoad((option) => {
+  form.value.id = option.id
+     flag.value = option.flag
+     if(flag.value==null){
+      if(form.value.id!=null){
+      title.value="药品基础信息-修改"
+     }else{
+      title.value="药品基础信息-新增"
+     }
+     }else{
+      title.value="药品基础信息-复制"
+     }
+    getData()
+})
+onReady(() => {
+     form.value.dosingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
+})
+function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+ }
+function  getData() {
+     // 类型
+     getDicts('dosage_form').then(res => {
+      dosageFormList.value =[res.data] 
+      })
+       // 类型
+     getDicts('mar_type').then(res => {
+      treatmentTypeList.value =[res.data] 
+      })
+       // 类型
+     getDicts('medicine_classification').then(res => {
+      classificationList.value =[res.data] 
+      })
+       // 类型
+     getDicts('medicine_category').then(res => {
+      categoryList.value =[res.data] 
+      })
+       // 类型
+     getDicts('package_unit').then(res => {
+      packageUnitList.value =[res.data] 
+      })
+       // 类型
+     getDicts('is_import').then(res => {
+      isImportList.value =[res.data] 
+      })
+       // 类型
+     getDicts('medical_unit').then(res => {
+      unitList.value =[res.data] 
+      })
+       // 类型
+     getDicts('content_unit').then(res => {
+      contentUnitList.value =[res.data] 
+      })
+
+    if(form.value.id!=null){
+      getMedicineBasic(form.value.id).then(res => {
+        form.value = res.data   
+        getDicts('dosage_form').then(result => {
+          form.value.dosageFormName=dictStr(form.value.dosageForm, result.data)
+         })
+         getDicts('mar_type').then(result => {
+          form.value.treatmentTypeName=dictStr(form.value.treatmentType, result.data)
+         })
+         getDicts('medicine_classification').then(result => {
+          form.value.classificationName=dictStr(form.value.classification, result.data)
+         })
+         getDicts('medicine_category').then(result => {
+          form.value.categoryName=dictStr(form.value.category, result.data)
+         })
+         getDicts('package_unit').then(result => {
+          form.value.packageUnitName=dictStr(form.value.packageUnit, result.data)
+         })
+         getDicts('is_import').then(result => {
+          form.value.isImportName=dictStr(form.value.isImport, result.data)
+         })
+         getDicts('medical_unit').then(result => {
+          form.value.unitName=dictStr(form.value.unit, result.data)
+         })
+         getDicts('content_unit').then(result => {
+          form.value.contentUnitName=dictStr(form.value.contentUnit, result.data)
+         })
+      })
+    }
+}
+
+function handleDosageForm() {
+        if (dosageFormList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品剂型为空  ', type: 'warning'
+          })
+        } else {
+          showDosageForm.value = true
+        }
+     }
+  function   handleDosageFormConfirm(e) {
+        form.value.dosageFormName = e.value[0].dictLabel
+        form.value.dosageForm = e.value[0].dictValue
+        showDosageForm.value = false
+  }
+ function handleDosageFormCancel() {
+  showDosageForm.value = false
+      }
+
+      function handleTreatmentType() {
+        if (treatmentTypeList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品来源为空  ', type: 'warning'
+          })
+        } else {
+          showTreatmentType.value = true
+        }
+     }
+  function   handleTreatmentTypeConfirm(e) {
+        form.value.treatmentTypeName = e.value[0].dictLabel
+        form.value.treatmentType = e.value[0].dictValue
+        showTreatmentType.value = false
+  }
+ function handleTreatmentTypeCancel() {
+  showTreatmentType.value = false
+      }
+
+      function handleClassification() {
+        if (classificationList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品来源为空  ', type: 'warning'
+          })
+        } else {
+          showClassification.value = true
+        }
+     }
+  function   handleClassificationConfirm(e) {
+        form.value.classificationName = e.value[0].dictLabel
+        form.value.classification = e.value[0].dictValue
+        showClassification.value = false
+  }
+ function handleClassificationCancel() {
+  showClassification.value = false
+      }
+
+      function handleCategory() {
+        if (categoryList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品来源为空  ', type: 'warning'
+          })
+        } else {
+          showCategory.value = true
+        }
+     }
+  function   handleCategoryConfirm(e) {
+        form.value.categoryName = e.value[0].dictLabel
+        form.value.category = e.value[0].dictValue
+        showCategory.value = false
+  }
+ function handleCategoryCancel() {
+  showCategory.value = false
+      }
+
+      function handlePackageUnit() {
+        if (packageUnitList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品来源为空  ', type: 'warning'
+          })
+        } else {
+          showPackageUnit.value = true
+        }
+     }
+  function   handlePackageUnitConfirm(e) {
+        form.value.packageUnitName = e.value[0].dictLabel
+        form.value.packageUnit = e.value[0].dictValue
+        showPackageUnit.value = false
+  }
+ function handlePackageUnitCancel() {
+  showPackageUnit.value = false
+      }
+
+      function handleIsImport() {
+        if (isImportList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品来源为空  ', type: 'warning'
+          })
+        } else {
+          showIsImport.value = true
+        }
+     }
+  function   handleIsImportConfirm(e) {
+        form.value.isImportName = e.value[0].dictLabel
+        form.value.isImport = e.value[0].dictValue
+        showIsImport.value = false
+  }
+ function handleIsImportCancel() {
+  showIsImport.value = false
+      }
+
+      function handleUnit() {
+        if (unitList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品来源为空  ', type: 'warning'
+          })
+        } else {
+          showUnit.value = true
+        }
+     }
+  function   handleUnitConfirm(e) {
+        form.value.unitName = e.value[0].dictLabel
+        form.value.unit = e.value[0].dictValue
+        showUnit.value = false
+  }
+ function handleUnitCancel() {
+  showUnit.value = false
+      }
+
+      function handleContentUnit() {
+        if (contentUnitList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品来源为空  ', type: 'warning'
+          })
+        } else {
+          showContentUnit.value = true
+        }
+     }
+  function   handleContentUnitConfirm(e) {
+        form.value.contentUnitName = e.value[0].dictLabel
+        form.value.contentUnit = e.value[0].dictValue
+        showContentUnit.value = false
+  }
+ function handleContentUnitCancel() {
+  showContentUnit.value = false
+      }
+function submit() {
+      proxy.$refs['uForm'].validate().then(() => {
+        if (form.value.id != null) {
+        if(flag.value==null){
+          updateMedicineBasic(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '修改成功', complete() {
+              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
+            }
+          })
+        })
+          }else {
+            form.value.id == null
+            addMedicineBasic(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
+            }
+          })
+        })
+          }
+
+        }else {
+          addMedicineBasic(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
+            }
+          })
+        })
+        }
+      })
+    }
+</script>
+
+<style lang="scss" scoped>
+.section {
+  margin: 24rpx;
+  padding: 16rpx 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+
+  .section-title {
+    width: 360rpx;
+    color: #333333;
+    line-height: 44rpx;
+    font-size: 30rpx;
+    border-left: 6rpx solid #2681FF;
+    padding-left: 26rpx;
+  }
+
+  .form-view {
+    padding: 20rpx 0rpx 0 10rpx;
+
+    .form-btn {
+      padding-top: 20rpx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineBasic/details.vue b/src/pages/health/medicineBasic/details.vue
new file mode 100644
index 0000000..9051dfc
--- /dev/null
+++ b/src/pages/health/medicineBasic/details.vue
@@ -0,0 +1,140 @@
+<template>
+    <view class="container" style="paddingBottom:1rpx;">
+      <u-navbar
+			leftIconSize="40rpx"
+			leftIconColor="#333333"
+			title="药品基础信息详情"
+		>
+		</u-navbar>
+      <view class="section">
+        <u-cell-group>
+        <u-cell title="药品全称:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
+        <u-cell title="药品简称:" titleStyle="font-weight:bolder" :value="detailInfo.shortName"></u-cell>
+        <u-cell title="药品编码:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
+        <u-cell title="药品剂型:" titleStyle="font-weight:bolder" :value="detailInfo.dosageForm"></u-cell>
+        <u-cell title="治疗类型:" titleStyle="font-weight:bolder" center :value="detailInfo.treatmentType"> </u-cell>
+        <u-cell title="药品分类:" titleStyle="font-weight:bolder" :value="detailInfo.classification"></u-cell>
+        <u-cell title="类别:" titleStyle="font-weight:bolder" :value="detailInfo.category"></u-cell>
+        <u-cell title="品牌:" titleStyle="font-weight:bolder" :value="detailInfo.brand"></u-cell>
+        <u-cell title="药品包装:" titleStyle="font-weight:bolder" :value="detailInfo.packaging"></u-cell>
+        <u-cell title="包装单位:" titleStyle="font-weight:bolder" :value="detailInfo.packageUnit"></u-cell>
+        <u-cell title="生产厂家:" titleStyle="font-weight:bolder" :value="detailInfo.manufacturers"></u-cell>
+        <u-cell title="是否进口:" titleStyle="font-weight:bolder" :value="detailInfo.isImport"></u-cell>
+        <u-cell title="规格:" titleStyle="font-weight:bolder" :value="detailInfo.specifications"></u-cell>
+        <u-cell title="规格单位:" titleStyle="font-weight:bolder" :value="detailInfo.unit"></u-cell>
+        <u-cell title="单个含量:" titleStyle="font-weight:bolder" :value="detailInfo.content"></u-cell>
+        <u-cell title="含量单位:" titleStyle="font-weight:bolder" :value="detailInfo.contentUnit"></u-cell>
+        <u-cell title="生产地址:" titleStyle="font-weight:bolder" :value="detailInfo.address"></u-cell>
+        <u-cell title="功能主治:" titleStyle="font-weight:bolder" :value="detailInfo.indications"></u-cell>
+        <u-cell title="贮藏:" titleStyle="font-weight:bolder" :value="detailInfo.storage"></u-cell>
+        <u-cell title="药品成分:" titleStyle="font-weight:bolder" :value="detailInfo.ingredients"></u-cell>
+        <u-cell title="用法用量:" titleStyle="font-weight:bolder" :value="detailInfo.usage"></u-cell>
+        <u-cell title="性状:" titleStyle="font-weight:bolder" :value="detailInfo.character"></u-cell>
+        <u-cell title="不良反应:" titleStyle="font-weight:bolder" :value="detailInfo.adverseReaction"></u-cell>
+        <u-cell title="备注:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
+      </u-cell-group>
+      </view>
+      <u-toast ref="uToast"></u-toast>
+    </view>
+  </template>
+  
+<script setup>
+import { getMedicineBasic } from '@/api/health/medicineBasic'
+import { getDicts } from '@/api/system/dict/data.js'
+import {onLoad} from "@dcloudio/uni-app";
+import {reactive ,toRefs,ref,computed }from "vue";
+const id = ref('')
+const data = reactive({
+  detailInfo: {} 
+})
+const {detailInfo} = toRefs(data)
+onLoad((option) => {
+    id.value = option.id
+    getInfo()
+  })
+  function getInfo() {
+    getMedicineBasic(id.value).then(res => {
+          detailInfo.value = res.data
+                     // 类型
+            getDicts('dosage_form').then(result => {
+         detailInfo.value.dosageForm=dictStr(detailInfo.value.dosageForm, result.data)
+      })
+       // 类型
+       getDicts('mar_type').then(result => {
+         detailInfo.value.treatmentType=dictStr(detailInfo.value.treatmentType, result.data)
+      })
+       // 类型
+       getDicts('medicine_classification').then(result => {
+         detailInfo.value.classification=dictStr(detailInfo.value.classification, result.data)
+      })
+       // 类型
+       getDicts('medicine_category').then(result => {
+         detailInfo.value.category=dictStr(detailInfo.value.category, result.data)
+      })
+       // 类型
+       getDicts('package_unit').then(result => {
+         detailInfo.value.packageUnit=dictStr(detailInfo.value.packageUnit, result.data)
+      })
+       // 类型
+       getDicts('is_import').then(result => {
+         detailInfo.value.isImport=dictStr(detailInfo.value.isImport, result.data)
+      })
+       // 类型
+       getDicts('medical_unit').then(result => {
+         detailInfo.value.unit=dictStr(detailInfo.value.unit, result.data)
+      })
+                           // 类型
+            getDicts('content_unit').then(result => {
+         detailInfo.value.contentUnit=dictStr(detailInfo.value.contentUnit, result.data)
+      })
+        })
+  }
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+  </script>
+  
+  <style lang="scss" scoped>
+  .section {
+    margin: 24rpx;
+    padding: 16rpx 24rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+  
+    .section-title {
+      width: 280rpx;
+      color: #333333;
+      line-height: 44rpx;
+      font-size: 30rpx;
+      border-left: 6rpx solid #2681FF;
+      padding-left: 26rpx;
+    }
+  
+    .content {
+      width: 647rpx;
+      font-size: 28rpx;
+      color: #333333;
+      line-height: 40rpx;
+      text-align: left;
+    }
+  
+    .img-con {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 20rpx
+    }
+    .form-view {
+      padding: 20rpx 0rpx 0 10rpx;
+  
+      .form-btn {
+        padding-top: 20rpx;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/health/medicineBasic/list.vue b/src/pages/health/medicineBasic/list.vue
new file mode 100644
index 0000000..b57bc93
--- /dev/null
+++ b/src/pages/health/medicineBasic/list.vue
@@ -0,0 +1,487 @@
+<template>
+  <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         <view class="search-view">
+          <u-input v-model="queryParams.keys" border="false" type="select"  @click="searchBlur" placeholder="请输入名称编码品牌厂家" suffixIcon="search"
+	    suffixIconStyle="color: #909399" class="search-input">
+        </u-input>
+        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+       </view>
+       </u-sticky>
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择创建时间" suffixIcon="calendar"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+              <view class="filter-title">治疗类型</view>
+              <view class="state-list">
+                <view v-for="item in typeList" :key="item.id" class="state-item"
+                  :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
+              </view>
+              <view class="select-header">创建时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="datetime"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+    </u-sticky>
+    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+      <u-list-item v-for="(item, index) in listData" :key="index">
+        <view class="list-item">
+          <view class="item-header" @click="enterDetails(item)">
+            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="item.shortName +'-'+ item.brand +'('+ item.packaging+')' " size="30rpx" color="#333333" :bold="true"></u--text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">药品全称：</text>
+            <text class="row-value">{{ item.name }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">治疗类型：</text>
+            <text class="row-value">{{ dictStr(item.treatmentType, typeList) }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">药品编码：</text>
+            <text class="row-value">{{ item.code }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">药品分类：</text>
+            <text class="row-value">{{ dictStr(item.classification, classificationList) }}</text>
+          </view>
+  
+          <view class="item-row">
+            <text class="row-label">类别：</text>
+            <text class="row-value">{{ dictStr(item.category,categoryList) }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">药品剂型：</text>
+            <text class="row-value">{{ dictStr(item.dosageForm, dosageFormList) }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">生产厂家：</text>
+            <text class="row-value">{{ item.manufacturers }}</text>
+          </view>
+          <view class="operate" >
+            <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleCopy(item)">复制</view>
+            <view class="btn filling" @click="handleDelete(item)">删除</view>
+          </view>
+        </view>
+      </u-list-item>
+      <view>
+      </view>
+      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+    </u-list>
+    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import { listMedicineBasic, delMedicineBasic } from '@/api/health/medicineBasic'
+import { getDicts } from '@/api/system/dict/data.js'
+import { timeHandler } from '@/utils/common.ts'
+import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed }from "vue";
+const pageNum = ref(1)
+const listData = ref([])
+const isShow = ref(false)
+const status = ref('loadmore')
+const settingPickShow = ref(false)
+const settingColumns = ref([])
+const timeShow= ref(false)
+const typeList = ref([])
+const classificationList = ref([])
+const categoryList = ref([])
+const dosageFormList = ref([])
+
+const  flag= ref(true)
+const time =ref( Number(new Date()))
+const data = reactive({
+  filterPanel: false,
+  queryParams: {
+    name: null,
+    classification: null,
+    keys: null,
+    brand: null,
+    packaging: null,
+    manufacturers: null,
+    treatmentType: null,
+    isImport: null,
+    ingredients: null,
+    usage: null,
+    dosageForm: null,
+    code: null,
+    shortName: null
+   } 
+})
+const { filterPanel, queryParams} = toRefs(data)
+const windowHeight = computed(() => {
+			uni.getSystemInfoSync().windowHeight - 50
+		})	
+onLoad(() => {
+    getList()
+  });
+
+ onShow(() => {
+    if (isShow.value) {
+      listData.value=[]
+      getList()
+      isShow.value = false
+    }
+  });
+
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+
+  function selectType(item) {
+      queryParams.value.type = item.dictValue
+      typeList.value.map(ele => {
+        if (ele.dictValue == item.dictValue) {
+          ele.selected = true
+          Reflect.set(ele, 'selected', true)
+        } else {
+          Reflect.set(ele, 'selected', false)
+        }
+      })
+    }
+
+  function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+function loadmore() {
+      pageNum.value += 1
+      if (status.value == 'loadmore') {
+        getList()
+      }
+    }
+function getList() {
+       // 治疗类型
+       getDicts('mar_type').then(res => {
+        typeList.value = res.data
+      })
+       // 用药地点
+       getDicts('medicine_classification').then(res => {
+        classificationList.value = res.data
+      })
+            // 单位
+            getDicts('medicine_category').then(res => {
+              categoryList.value = res.data
+      })
+
+       // 药品类型
+       getDicts('dosage_form').then(res => {
+        dosageFormList.value = res.data
+      })
+      status.value = 'loading'
+      listMedicineBasic({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+        listData.value = listData.value.concat(res.rows)
+        if (listData.value.length < res.total) {
+          status.value = 'loadmore'
+        } else {
+          status.value = 'nomore'
+        }
+      }).catch(() => {
+        status.value = 'nomore'
+      })
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function settingConfirm(e) {
+      queryParams.value.settingId = e.value[0].settingId
+      queryParams.value.settingName = e.value[0].settingName
+      settingPickShow.value = false
+    }
+function settingCancel() {
+      settingPickShow.value = false
+    }
+    function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function searchBlur() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+    }
+    function resetQuery() {
+          queryParams.value.type = ''
+       queryParams.value.keys = ''
+        queryParams.value.startTime = ''
+         queryParams.value.time = ''
+        
+        queryParams.value.endTime = ''
+    }
+    function enterDetails(item) {
+      uni.navigateTo({ url: `/pages/health/medicineBasic/details?id=${item.id}` })
+    }
+    function handleEdit(item) {
+      uni.navigateTo({ url: `/pages/health/medicineBasic/addEdit?id=${item.id}` })
+      isShow.value = true
+    }
+    function handleCopy(item) {
+      uni.navigateTo({ url: `/pages/health/medicineBasic/addEdit?flag=copy&id=${item.id}` })
+      isShow.value = true
+    }
+    function handleAdd() {
+      uni.navigateTo({ url: `/pages/health/medicineBasic/addEdit` })
+      isShow.value = true
+    }
+    function handleDelete(item) {
+      uni.showModal({
+        	title: '提示',
+        	content: '你确定要删除吗',
+        	success: function (res) {
+        		if (res.confirm) {
+        		  delMedicineBasic(item.id)
+              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
+        		} else if (res.cancel) {
+        			console.log('取消');
+        		}
+        	}
+        });
+    }
+	
+</script>
+
+<style lang="scss" scoped>
+.btnAdd {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      display:float;
+      text-align: center;
+    }
+
+.search-view {
+  padding: 12rpx 32rpx;
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+
+  .search-input {
+    background: #F5F5F5;
+    color: #333333;
+    margin-right: 36rpx;
+  }
+
+  .filter-panel {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 96rpx;
+    background-color: rgba(0, 0, 0, 0.5);
+
+    .filter-panel-content {
+      background-color: #ffff;
+      padding: 0 30rpx 30rpx;
+
+      .filter-title {
+        color: #000000;
+        font-size: 30rpx;
+        font-weight: 500;
+        padding: 30rpx 0;
+      }
+
+      .state-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .state-item {
+          width: 210rpx;
+          height: 72rpx;
+          border: 1rpx solid rgba(0, 0, 0, 0.25);
+          border-radius: 72rpx;
+          text-align: center;
+          line-height: 72rpx;
+          margin: 0 20rpx 20rpx 0;
+          font-size: 28rpx;
+          color: #000000;
+        }
+
+        .active {
+          background-color: rgba(222, 241, 255, 1);
+          border: 1rpx solid rgba(22, 119, 255, 1);
+        }
+      }
+    }
+
+    .btn-box {
+      display: flex;
+      padding: 24rpx 30rpx;
+      background-color: #fff;
+      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+    }
+  }
+}
+
+.list-item {
+  margin: 0 24rpx 24rpx;
+  padding: 32rpx;
+  background-color: #fff;
+
+  .item-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: 16rpx;
+
+    .status {
+      .status-item {
+        width: 120rpx;
+        height: 44rpx;
+        text-align: center;
+        line-height: 44rpx;
+        border-radius: 4rpx;
+        font-size: 24rpx;
+      }
+
+      .status1 {
+        background: #F0F0F0;
+        color: #8C8C8C;
+      }
+
+      .status2 {
+        background: rgba(38, 129, 255, 0.2);
+        color: #2681FF;
+      }
+
+      .status3 {
+        background: #F7F7F7;
+        color: #2681FF;
+      }
+
+      .status4 {
+        background: rgba(255, 85, 51, 0.2);
+        color: #FF5533;
+      }
+
+      .status5 {
+        background: #F7F7F7;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .status7 {
+        background: rgba(255, 129, 51, 0.2);
+        color: #FF8133;
+      }
+
+      .status8 {
+        background: rgba(65, 217, 165, 0.2);
+        color: #41D9A5;
+      }
+    }
+  }
+
+  .item-row {
+    padding: 16rpx 0;
+
+    .row-label {
+      color: rgba(0, 0, 0, 0.55);
+    }
+
+    .row-value {
+      color: rgba(0, 0, 0, 0.85)
+    }
+  }
+
+  .operate {
+    display: flex;
+    justify-content: flex-end;
+
+    .btn {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      margin-left: 5rpx;
+      text-align: center;
+    }
+
+    .circulation {
+      background: rgba(0, 0, 0, 0.04);
+      margin-right: 24rpx;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    .filling {
+      background: #2681FF;
+      border-radius: 8rpx;
+      color: #FFFFFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStock/list.vue b/src/pages/health/medicineStock/list.vue
new file mode 100644
index 0000000..3634f2d
--- /dev/null
+++ b/src/pages/health/medicineStock/list.vue
@@ -0,0 +1,357 @@
+<template>
+  <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         <view class="search-view">
+          <u-input v-model="queryParams.medicalName" border="false" type="select"  @click="handleMedical" placeholder="请选择药品" suffixIcon="search"
+	    suffixIconStyle="color: #909399" class="search-input">
+        </u-input>
+       </view>
+       </u-sticky>
+    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+      <u-list-item v-for="(item, index) in listData" :key="index">
+        <view class="list-item">
+          <view class="item-header"  @click="enterDetails(item)">
+            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="item.medicineName" size="30rpx" color="#333333" :bold="true"></u--text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">规格总数：</text>
+            <text class="row-value">{{ item.totalCount }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">剩余数量：</text>
+            <text class="row-value">{{ item.leftCount }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">规格单位：</text>
+            <text class="row-value">{{ dictStr(item.unit, unitList) }}</text>
+          </view>
+        </view>
+      </u-list-item>
+      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+    </u-list>
+    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
+        @confirm="handleMedicalConfirm"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import { listMedicineRealtimeStock } from '@/api/health/medicineStockIn'
+import { listMedicineBasic } from '@/api/health/medicineBasic'
+import { getDicts } from '@/api/system/dict/data.js'
+import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed }from "vue";
+const pageNum = ref(1)
+const listData = ref([])
+const isShow = ref(false)
+const status = ref('loadmore')
+const settingPickShow = ref(false)
+const settingColumns = ref([])
+const timeShow= ref(false)
+const stateList = ref([])
+
+const unitList = ref([])
+const medicalList = ref([])
+const showMedical = ref(false)
+const  flag= ref(true)
+const data = reactive({
+  filterPanel: false,
+  queryMedicalParams: {
+    pageNum: 1,
+    pageSize: 100
+  },
+  queryParams: {
+    name: null,
+    type: null,
+    healthRecordId: null,
+    dosingTime: null,
+    dosage: null,
+    medicineId: null,
+    resource: null,
+    place: null
+   } 
+})
+const { filterPanel, queryMedicalParams, queryParams} = toRefs(data)
+const windowHeight = computed(() => {
+			uni.getSystemInfoSync().windowHeight - 50
+		})	
+onLoad(() => {
+    getList()
+  });
+
+ onShow(() => {
+    if (isShow.value) {
+      listData.value=[]
+      getList()
+      isShow.value = false
+    }
+  });
+
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+
+  function selectType(item) {
+      queryParams.value.state = item.dictValue
+      stateList.value.map(ele => {
+        if (ele.dictValue == item.dictValue) {
+          ele.selected = true
+          Reflect.set(ele, 'selected', true)
+        } else {
+          Reflect.set(ele, 'selected', false)
+        }
+      })
+    }
+
+  function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+function loadmore() {
+      pageNum.value += 1
+      if (status.value == 'loadmore') {
+        getList()
+      }
+    }
+function getList() {
+  listMedicineBasic(queryMedicalParams.value).then((response) => {
+        medicalList.value = [response.rows] 
+      })
+       // 用药地点
+       getDicts('medical_unit').then(res => {
+        unitList.value = res.data
+      })
+         
+      status.value = 'loading'
+      listMedicineRealtimeStock({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+        listData.value = listData.value.concat(res.rows)
+        if (listData.value.length < res.total) {
+          status.value = 'loadmore'
+        } else {
+          status.value = 'nomore'
+        }
+      }).catch(() => {
+        status.value = 'nomore'
+      })
+    }
+
+function settingConfirm(e) {
+      queryParams.value.settingId = e.value[0].settingId
+      queryParams.value.settingName = e.value[0].settingName
+      settingPickShow.value = false
+    }
+function settingCancel() {
+      settingPickShow.value = false
+    }
+
+    function handleMedical() {
+        if (medicalList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品名称为空  ', type: 'warning'
+          })
+        } else {
+          showMedical.value = true
+        }
+     }
+  function   handleMedicalConfirm(e) {
+    queryParams.value.medicalName = e.value[0].shortNameBrandPackaging
+    queryParams.value.medicineId= e.value[0].id
+        showMedical.value = false
+        pageNum.value = 1
+      listData.value = []
+      getList()
+  }
+ function handleMedicalCancel() {
+       showMedical.value = false
+       queryParams.value.medicalName =null
+       queryParams.value.medicineId= null
+       getList()
+  }
+
+
+
+	
+</script>
+
+<style lang="scss" scoped>
+.btnAdd {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      display:float;
+      text-align: center;
+    }
+
+.search-view {
+  padding: 12rpx 32rpx;
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+
+  .search-input {
+    background: #F5F5F5;
+    color: #333333;
+    margin-right: 36rpx;
+  }
+
+  .filter-panel {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 96rpx;
+    background-color: rgba(0, 0, 0, 0.5);
+
+    .filter-panel-content {
+      background-color: #ffff;
+      padding: 0 30rpx 30rpx;
+
+      .filter-title {
+        color: #000000;
+        font-size: 30rpx;
+        font-weight: 500;
+        padding: 30rpx 0;
+      }
+
+      .state-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .state-item {
+          width: 210rpx;
+          height: 72rpx;
+          border: 1rpx solid rgba(0, 0, 0, 0.25);
+          border-radius: 72rpx;
+          text-align: center;
+          line-height: 72rpx;
+          margin: 0 20rpx 20rpx 0;
+          font-size: 28rpx;
+          color: #000000;
+        }
+
+        .active {
+          background-color: rgba(222, 241, 255, 1);
+          border: 1rpx solid rgba(22, 119, 255, 1);
+        }
+      }
+    }
+
+    .btn-box {
+      display: flex;
+      padding: 24rpx 30rpx;
+      background-color: #fff;
+      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+    }
+  }
+}
+
+.list-item {
+  margin: 0 24rpx 24rpx;
+  padding: 32rpx;
+  background-color: #fff;
+
+  .item-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: 16rpx;
+
+    .status {
+      .status-item {
+        width: 120rpx;
+        height: 44rpx;
+        text-align: center;
+        line-height: 44rpx;
+        border-radius: 4rpx;
+        font-size: 24rpx;
+      }
+
+      .status1 {
+        background: #F0F0F0;
+        color: #8C8C8C;
+      }
+
+      .status2 {
+        background: rgba(38, 129, 255, 0.2);
+        color: #2681FF;
+      }
+
+      .status3 {
+        background: #F7F7F7;
+        color: #2681FF;
+      }
+
+      .status4 {
+        background: rgba(255, 85, 51, 0.2);
+        color: #FF5533;
+      }
+
+      .status5 {
+        background: #F7F7F7;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .status7 {
+        background: rgba(255, 129, 51, 0.2);
+        color: #FF8133;
+      }
+
+      .status8 {
+        background: rgba(65, 217, 165, 0.2);
+        color: #41D9A5;
+      }
+    }
+  }
+
+  .item-row {
+    padding: 16rpx 0;
+
+    .row-label {
+      color: rgba(0, 0, 0, 0.55);
+    }
+
+    .row-value {
+      color: rgba(0, 0, 0, 0.85)
+    }
+  }
+
+  .operate {
+    display: flex;
+    justify-content: flex-end;
+
+    .btn {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      margin-left: 5rpx;
+      text-align: center;
+    }
+
+    .circulation {
+      background: rgba(0, 0, 0, 0.04);
+      margin-right: 24rpx;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    .filling {
+      background: #2681FF;
+      border-radius: 8rpx;
+      color: #FFFFFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStockIn/addEdit.vue b/src/pages/health/medicineStockIn/addEdit.vue
new file mode 100644
index 0000000..9ddc9fb
--- /dev/null
+++ b/src/pages/health/medicineStockIn/addEdit.vue
@@ -0,0 +1,517 @@
+<template>
+  <view class="container" style="paddingBottom:1rpx;">
+    <u-navbar
+    leftIconSize="40rpx"
+    leftIconColor="#333333"
+    title="药品入库清单"
+  >
+  </u-navbar>
+    <view class="section">
+      <view class="section-title">{{ title}}</view>
+      <view class="form-view">
+        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+          <u-form-item label="治疗类型" prop="marTypeName"  @click="handleMarType">
+              <u--input v-model="form.marTypeName" disabled disabledColor="#ffffff" placeholder="请选择治疗类型"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="药品名称" prop="medicineName" required @click="handleMedical">
+            <u--input v-model="form.medicineName" disabled disabledColor="#ffffff" placeholder="请选择药品名称"
+              inputAlign="right" border="none"></u--input>
+            <u-icon slot="right" name="arrow-down"></u-icon>
+          </u-form-item>
+          <u-form-item label="入库编号" prop="code" required >
+              <u--input v-model="form.code"  placeholder="请填写入库编号"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="入库数量" prop="quantity" required >
+              <u--input v-model="form.quantity"  placeholder="请填写入库数量"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="购买时间" prop="purchaseDate" required @click="selectDate()">
+            <u--input v-model="form.purchaseDate" 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="stateName" required @click="handleState">
+              <u--input v-model="form.stateName" disabled disabledColor="#ffffff" placeholder="请选择使用状态"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="生产日期" prop="productionDate" required @click="selectProductionDate()">
+            <u--input v-model="form.productionDate" 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="expiringDate"  required @click="selectExpiringDate()">
+            <u--input v-model="form.expiringDate" 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="packageUnitName"  @click="handlePackageUnit">
+              <u--input v-model="form.packageUnitName" disabled disabledColor="#ffffff" placeholder="请选择包装单位"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="规格总数" prop="totalCount" required >
+              <u--input v-model="form.totalCount"  placeholder="请填写规格总数"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="规格单位" prop="unitName"  @click="handleUnit">
+              <u--input v-model="form.unitName" disabled disabledColor="#ffffff" placeholder="请选择规格单位"
+                inputAlign="right" border="none"></u--input>
+              <u-icon slot="right" name="arrow-down"></u-icon>
+            </u-form-item>
+            <u-form-item label="已使用数量" prop="usedCount"  >
+              <u--input v-model="form.usedCount"  placeholder="请填写已使用数量"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="剩余数量" prop="leftCount"  >
+              <u--input v-model="form.leftCount"  placeholder="请填写剩余数量"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="年龄体重" prop="ageWeight"  >
+              <u--input v-model="form.ageWeight"  placeholder="请填写年龄体重"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="药品单价" prop="purchasePrice"  >
+              <u--input v-model="form.purchasePrice"  placeholder="请填写药品单价"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="药品总价" prop="totalPrice"  >
+              <u--input v-model="form.totalPrice"  placeholder="请填写药品总价"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+            <u-form-item label="购买地址" prop="purchaseAddress"  labelPosition="top">
+              <u--input v-model="form.purchaseAddress"  placeholder="请填写购买地址"
+              inputAlign="right" border="none"></u--input>
+          </u-form-item>
+            <u-form-item label="医嘱" prop="usage"  labelPosition="top">
+            <u--textarea v-model="form.usage" placeholder="请填写医嘱" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+          <u-form-item label="备注" prop="remark"  labelPosition="top">
+            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+         
+        </u--form>
+        <view class="form-btn">
+          <u-button type="primary" text="提交" @click="submit"></u-button>
+        </view>
+      </view>
+    </view>
+    <u-toast ref="uToast"></u-toast>
+
+      <u-picker itemHeight="88" :show="showState" :columns="stateList" keyName="dictLabel" @cancel="handleStateCancel"
+        @confirm="handleStateConfirm"></u-picker>
+
+        <u-picker itemHeight="88" :show="showMarType" :columns="marTypeList" keyName="dictLabel" @cancel="handleMarTypeCancel"
+        @confirm="handleMarTypeConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
+      @confirm="handleMedicalConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showPackageUnit" :columns="packageUnitList" keyName="dictLabel" @cancel="handlePackageUnitCancel"
+      @confirm="handlePackageUnitConfirm"></u-picker>
+      <u-picker itemHeight="88" :show="showUnit" :columns="unitList" keyName="dictLabel" @cancel="handleUnitCancel"
+      @confirm="handleUnitConfirm"></u-picker>
+      <u-datetime-picker
+			:show="datePickShow"
+			mode="datetime"
+      ref="purchaseDateRef" 
+			@cancel="datePickShow=false"
+			@confirm="datePickConfirm"
+			itemHeight="88"
+		></u-datetime-picker>
+    <u-datetime-picker
+			:show="productionDateShow"
+			mode="date"
+      ref="productionDateRef" 
+			@cancel="productionDateShow=false"
+			@confirm="productionDateConfirm"
+			itemHeight="88"
+		></u-datetime-picker>
+
+    <u-datetime-picker
+			:show="expiringDateShow"
+			mode="date"
+      ref="expiringDateRef" 
+			@cancel="expiringDateShow=false"
+			@confirm="expiringDateConfirm"
+			itemHeight="88"
+		></u-datetime-picker>
+  </view>
+</template>
+
+<script setup>
+import {  getMedicineStockIn, addMedicineStockIn, updateMedicineStockIn } from '@/api/health/medicineStockIn'
+import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
+const { proxy } = getCurrentInstance()
+  import { getDicts } from '@/api/system/dict/data.js'
+import dayjs from 'dayjs'
+import {onLoad,onReady} from "@dcloudio/uni-app";
+  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
+const datePickShow = ref(false)
+const flag = ref('add')
+const title = ref("药品入库清单")
+
+const productionDateShow = ref(false)
+const expiringDateShow = ref(false)
+const medicalList = ref([])
+const showMedical = ref(false)
+
+const marTypeList = ref([])
+const showMarType = ref(false)
+
+const stateList = ref([])
+const showState = ref(false)
+
+const packageUnitList = ref([])
+const showPackageUnit = ref(false)
+
+const unitList = ref([])
+const showUnit = ref(false)
+
+const data = reactive({
+form: {
+  id: null,
+    medicineId: null,
+    quantity: 1,
+    productionDate: null,
+    expiringDate: null,
+    purchaseDate: null,
+    purchasePrice: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    code: null,
+    state: '0',
+    stateName: '未使用',
+    leftCount: null,
+    usedCount: null,
+    purchaseAddress: null,
+    totalPrice: null,
+    usage: null,
+    ageWeight: null,
+    totalCount: null,
+    unit: null,
+    packageUnit: null
+},
+queryPersonParams: {
+  pageNum: 1,
+  status: '1',
+  pageSize: 1000
+},
+queryHealthRecordParams: {
+  pageNum: 1,
+  personId:null,
+  pageSize: 1000
+},
+queryMedicineParams: {
+    pageNum: 1,
+    treatmentType: null,
+    pageSize: 1000
+  },
+rules: {
+  medicineName: [{ required: true, message: '药品名称不能为空', trigger: ['change', 'blur'] }],
+  quantity: [{type: 'number',  required: true, message: '数量不能为空', trigger: ['change', 'blur'] }],
+  productionDate: [{ required: true, message: '生产日期不能为空', trigger: ['change', 'blur'] }],
+  expiringDate: [{ required: true, message: '过期日期不能为空', trigger: ['change', 'blur'] }],
+  code: [{ type: 'number', required: true, message: '入库编号不能为空', trigger: ['change', 'blur'] }],
+
+  stateName: [{ required: true, message: '使用状态不能为空', trigger: ['change', 'blur'] }]
+}
+})
+const { form,queryMedicineParams, rules} = toRefs(data)
+
+
+onLoad((option) => {
+     form.value.id = option.id
+     flag.value = option.flag
+     if(flag.value==null){
+      if(form.value.id!=null){
+      title.value="药品入库清单-修改"
+     }else{
+      title.value="药品入库清单-新增"
+     }
+     }else{
+      title.value="药品入库清单-复制"
+     }
+    getData()
+})
+onReady(() => {
+     form.value.purchaseDate = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
+})
+function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+ }
+
+ function  selectProductionDate() {
+      productionDateShow.value = true
+      proxy.$refs['productionDateRef'].innerValue = new Date().getTime()
+  }
+function productionDateConfirm(e) {
+      form.value.productionDate = dayjs(e.value).format("YYYY-MM-DD")
+      productionDateShow.value = false
+  }
+
+  function  selectExpiringDate() {
+    expiringDateShow.value = true
+      proxy.$refs['expiringDateRef'].innerValue = new Date().getTime()
+  }
+function expiringDateConfirm(e) {
+      form.value.expiringDate = dayjs(e.value).format("YYYY-MM-DD")
+      expiringDateShow.value = false
+  }
+function  getData() {
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicalList.value = [response.rows] 
+  })
+     // 类型
+     getDicts('used_state').then(res => {
+        stateList.value =[res.data] 
+      })
+
+           // 类型
+     getDicts('mar_type').then(res => {
+        marTypeList.value =[res.data] 
+      })
+           // 类型
+     getDicts('medical_unit').then(res => {
+        unitList.value =[res.data] 
+      })
+         // 类型
+     getDicts('package_unit').then(res => {
+      packageUnitList.value =[res.data] 
+      })
+
+    if(form.value.id!=null){
+      getMedicineStockIn(form.value.id).then(res => {
+        form.value = res.data   
+     
+         getDicts('package_unit').then(result => {
+          form.value.packageUnitName=dictStr(form.value.packageUnit, result.data)
+         })
+                   // 药品来源
+        getDicts('medical_unit').then(result => {
+          form.value.unitName=dictStr(form.value.unit, result.data)
+         })
+                     // 药品来源
+        getDicts('used_state').then(result => {
+          form.value.stateName=dictStr(form.value.state, result.data)
+         })
+                // 用药类型
+           getDicts('mar_type').then(result => {
+          form.value.marTypeName=dictStr(form.value.type, result.data)
+         })
+      })
+    }else {
+
+      const date = new Date()
+  const year = date.getFullYear() // 年份
+  let month = date.getMonth() + 1 // 月份，返回值为0-11，所以需要加1
+  let day = date.getDate() // 日期
+  let hour = date.getHours()
+  let minute = date.getMinutes()
+  let second = date.getSeconds()
+  // 对月份和日期进行补零
+  month = month < 10 ? '0' + month : month.toString()
+  day = day < 10 ? '0' + day : day.toString()
+  hour = hour < 10 ? '0' + hour : hour.toString()
+  minute = minute < 10 ? '0' + minute : minute.toString()
+  second = second < 10 ? '0' + second : second.toString()
+  const currentDate = year + month + day + hour + minute + second
+  form.value.code = currentDate
+    }
+}
+
+function handlePackageUnit() {
+        if (packageUnitList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品来源为空  ', type: 'warning'
+          })
+        } else {
+          showPackageUnit.value = true
+        }
+     }
+  function   handlePackageUnitConfirm(e) {
+        form.value.packageUnitName = e.value[0].dictLabel
+        form.value.packageUnit = e.value[0].dictValue
+        showPackageUnit.value = false
+  }
+ function handlePackageUnitCancel() {
+  showPackageUnit.value = false
+      }
+  function handleMedical() {
+      if (medicalList.value[0].length === 0) {
+        proxy.$refs['uToast'].show({
+          message: '药品为空  ', type: 'warning'
+        })
+      } else {
+        showMedical.value = true
+      }
+   }
+function   handleMedicalConfirm(e) {
+     form.value.medicineName = e.value[0].shortNameBrandPackaging
+     form.value.name = e.value[0].shortNameBrandPackaging
+      form.value.medicineId = e.value[0].id
+      getMedicineBasic(e.value[0].id).then((response) => {
+    form.value.unit = response.data.unit
+       // 药品来源
+         getDicts('medical_unit').then(result => {
+          form.value.unitName=dictStr( response.data.unit, result.data)
+         })
+         form.value.packageUnit = response.data.packageUnit
+       // 药品来源
+         getDicts('package_unit').then(result => {
+          form.value.packageUnitName=dictStr( response.data.packageUnit, result.data)
+         })
+
+  })
+      showMedical.value = false
+      
+}
+function handleMedicalCancel() {
+     showMedical.value = false
+  }
+
+
+function handleState() {
+        if (stateList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '使用状态为空  ', type: 'warning'
+          })
+        } else {
+          showState.value = true
+        }
+     }
+  function   handleStateConfirm(e) {
+        form.value.stateName = e.value[0].dictLabel
+        form.value.state = e.value[0].dictValue
+        showState.value = false
+  }
+ function handleStateCancel() {
+      showState.value = false
+      }
+
+      function handleUnit() {
+        if (unitList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '规格单位为空  ', type: 'warning'
+          })
+        } else {
+          showUnit.value = true
+        }
+     }
+  function   handleUnitConfirm(e) {
+        form.value.unitName = e.value[0].dictLabel
+        form.value.unit = e.value[0].dictValue
+        showUnit.value = false
+  }
+ function handleUnitCancel() {
+      showUnit.value = false
+      }
+
+     
+
+  function handleMarType() {
+        if (marTypeList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '治疗类型为空  ', type: 'warning'
+          })
+        } else {
+          showMarType.value = true
+        }
+     }
+  function   handleMarTypeConfirm(e) {
+        form.value.marTypeName = e.value[0].dictLabel
+        form.value.type = e.value[0].dictValue
+
+        queryMedicineParams.value.treatmentType = e.value[0].dictValue
+        form.value.medicineName = ""
+     form.value.name = ""
+      form.value.medicineId = null
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicalList.value = [response.rows] 
+  })
+
+        showMarType.value = false
+  }
+ function handleMarTypeCancel() {
+       showMarType.value = false
+      }
+
+function  selectDate() {
+      datePickShow.value = true
+      proxy.$refs['purchaseDateRef'].innerValue = new Date().getTime()
+  }
+function datePickConfirm(e) {
+      form.value.purchaseDate = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
+      datePickShow.value = false
+  }
+function submit() {
+      proxy.$refs['uForm'].validate().then(() => {
+        if (form.value.id != null) {
+        if(flag.value==null){
+          updateMedicineStockIn(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '修改成功', complete() {
+              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
+            }
+          })
+        })
+          }else {
+            form.value.id == null
+            addMedicineStockIn(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
+            }
+          })
+        })
+          }
+        }else {
+          addMedicineStockIn(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
+            }
+          })
+        })
+        }
+      })
+    }
+</script>
+
+<style lang="scss" scoped>
+.section {
+  margin: 24rpx;
+  padding: 16rpx 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+
+  .section-title {
+    width: 360rpx;
+    color: #333333;
+    line-height: 44rpx;
+    font-size: 30rpx;
+    border-left: 6rpx solid #2681FF;
+    padding-left: 26rpx;
+  }
+
+  .form-view {
+    padding: 20rpx 0rpx 0 10rpx;
+
+    .form-btn {
+      padding-top: 20rpx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStockIn/details.vue b/src/pages/health/medicineStockIn/details.vue
new file mode 100644
index 0000000..b382526
--- /dev/null
+++ b/src/pages/health/medicineStockIn/details.vue
@@ -0,0 +1,117 @@
+<template>
+    <view class="container" style="paddingBottom:1rpx;">
+      <u-navbar
+			leftIconSize="40rpx"
+			leftIconColor="#333333"
+			title="药品入库清单详情"
+		>
+		</u-navbar>
+      <view class="section">
+        <u-cell-group>
+        <u-cell title="药品名称:" titleStyle="font-weight:bolder" :value="detailInfo.medicineName"></u-cell>
+        <u-cell title="入库编号:" titleStyle="font-weight:bolder" :value="detailInfo.code"></u-cell>
+        <u-cell title="入库数量:" titleStyle="font-weight:bolder" :value="detailInfo.quantity"></u-cell>
+        <u-cell title="购买时间:" titleStyle="font-weight:bolder" :value="detailInfo.purchaseDate"></u-cell>
+        <u-cell title="使用状态:" titleStyle="font-weight:bolder" center :value="detailInfo.state"> </u-cell>
+        <u-cell title="生产日期:" titleStyle="font-weight:bolder" :value="detailInfo.productionDate"></u-cell>
+        <u-cell title="过期日期:" titleStyle="font-weight:bolder" :value="detailInfo.expiringDate"></u-cell>
+        <u-cell title="包装单位:" titleStyle="font-weight:bolder" :value="detailInfo.packageUnit"></u-cell>
+        <u-cell title="规格总数:" titleStyle="font-weight:bolder" :value="detailInfo.totalCount"></u-cell>
+        <u-cell title="规格单位:" titleStyle="font-weight:bolder" :value="detailInfo.unit"></u-cell>
+        <u-cell title="已使用数量:" titleStyle="font-weight:bolder" :value="detailInfo.usedCount"></u-cell>
+        <u-cell title="剩余数量:" titleStyle="font-weight:bolder" :value="detailInfo.leftCount"></u-cell>
+        <u-cell title="年龄体重:" titleStyle="font-weight:bolder" :value="detailInfo.ageWeight"></u-cell>
+        <u-cell title="药品单价:" titleStyle="font-weight:bolder" :value="detailInfo.purchasePrice"></u-cell>
+        <u-cell title="药品总价:" titleStyle="font-weight:bolder" :value="detailInfo.totalPrice"></u-cell>
+        <u-cell title="医嘱:" titleStyle="font-weight:bolder" :value="detailInfo.usage"></u-cell>
+        <u-cell title="购买地址:" titleStyle="font-weight:bolder" :value="detailInfo.purchaseAddress"></u-cell>
+        <u-cell title="备注:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
+      </u-cell-group>
+      </view>
+      <u-toast ref="uToast"></u-toast>
+    </view>
+  </template>
+  
+<script setup>
+import { getMedicineStockIn } from '@/api/health/medicineStockIn'
+import { getDicts } from '@/api/system/dict/data.js'
+import {onLoad} from "@dcloudio/uni-app";
+import {reactive ,toRefs,ref,computed }from "vue";
+const id = ref('')
+const data = reactive({
+  detailInfo: {} 
+})
+const {detailInfo} = toRefs(data)
+onLoad((option) => {
+    id.value = option.id
+    getInfo()
+  })
+  function getInfo() {
+    getMedicineStockIn(id.value).then(res => {
+          detailInfo.value = res.data
+
+       // 类型
+       getDicts('used_state').then(result => {
+         detailInfo.value.state=dictStr(detailInfo.value.state, result.data)
+      })
+       // 类型
+       getDicts('package_unit').then(result => {
+         detailInfo.value.packageUnit=dictStr(detailInfo.value.packageUnit, result.data)
+      })
+    
+       // 类型
+       getDicts('medical_unit').then(result => {
+         detailInfo.value.unit=dictStr(detailInfo.value.unit, result.data)
+      })
+       
+        })
+  }
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+  </script>
+  
+  <style lang="scss" scoped>
+  .section {
+    margin: 24rpx;
+    padding: 16rpx 24rpx;
+    background-color: #fff;
+    border-radius: 8rpx;
+  
+    .section-title {
+      width: 280rpx;
+      color: #333333;
+      line-height: 44rpx;
+      font-size: 30rpx;
+      border-left: 6rpx solid #2681FF;
+      padding-left: 26rpx;
+    }
+  
+    .content {
+      width: 647rpx;
+      font-size: 28rpx;
+      color: #333333;
+      line-height: 40rpx;
+      text-align: left;
+    }
+  
+    .img-con {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 20rpx
+    }
+    .form-view {
+      padding: 20rpx 0rpx 0 10rpx;
+  
+      .form-btn {
+        padding-top: 20rpx;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStockIn/list.vue b/src/pages/health/medicineStockIn/list.vue
new file mode 100644
index 0000000..a6f551e
--- /dev/null
+++ b/src/pages/health/medicineStockIn/list.vue
@@ -0,0 +1,522 @@
+<template>
+  <view class="container">
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+         <view class="search-view">
+          <u-input v-model="queryParams.medicalName" border="false" type="select"  @click="handleMedical" placeholder="请选择药品" suffixIcon="search"
+	    suffixIconStyle="color: #909399" class="search-input">
+        </u-input>
+        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+       </view>
+       </u-sticky>
+    <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
+      <view class="search-view">
+        <u-input v-model="queryParams.time" border="false" type="select" readonly placeholder="请选择购买时间" suffixIcon="calendar"
+          suffixIconStyle="color: #909399" class="search-input">
+          </u-input>
+        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
+          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
+
+        <u-transition :show="filterPanel" mode="fade">
+          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
+            <view class="filter-panel-content">
+              <view class="filter-title">使用状态</view>
+              <view class="state-list">
+                <view v-for="item in stateList" :key="item.id" class="state-item"
+                  :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
+              </view>
+              <view class="select-header">购买时间</view>
+            <view class="selcet-content" style="padding: 0 24rpx">
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.startTime"
+                placeholder="请选择开始时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
+                </template>
+              </u-input>
+              <u-input
+                :disabled="true"
+                :disabledColor="'#fff'"
+                class="dateInput"
+                border="surround"
+                v-model="queryParams.endTime"
+                placeholder="请选择结束时间"
+              >
+                <template v-slot:suffix>
+                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
+                </template>
+              </u-input>
+            </view>
+            </view>
+            <view class="btn-box">
+              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
+              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
+            </view>
+            <u-datetime-picker
+              :closeOnClickOverlay="true"
+              :show="timeShow"
+              v-model="time"
+              mode="datetime"
+              @close="openOrCloseDate"
+              @cancel="openOrCloseDate"
+              @confirm="confirm"
+            ></u-datetime-picker>
+          </view>
+        </u-transition>
+      </view>
+    </u-sticky>
+    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
+      <u-list-item v-for="(item, index) in listData" :key="index">
+        <view class="list-item">
+          <view class="item-header"  @click="enterDetails(item)">
+            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+              :text="item.medicineName" size="30rpx" color="#333333" :bold="true"></u--text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">购买时间：</text>
+            <text class="row-value">{{ item.purchaseDate }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">使用状态：</text>
+            <text class="row-value">{{ dictStr(item.state, stateList) }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">入库编号：</text>
+            <text class="row-value">{{ item.code }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">入库数量：</text>
+            <text class="row-value">{{ item.quantity }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">包装单位：</text>
+            <text class="row-value">{{ dictStr(item.packageUnit, packageUnitList) }}</text>
+          </view>
+  
+          <view class="item-row">
+            <text class="row-label">过期日期：</text>
+            <text class="row-value">{{item.expiringDate }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">规格总数：</text>
+            <text class="row-value">{{ item.totalCount }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">规格单位：</text>
+            <text class="row-value">{{ dictStr(item.unit, unitList) }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">剩余数量：</text>
+            <text class="row-value">{{ item.leftCount }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">备注：</text>
+            <text class="row-value">{{ item.remark }}</text>
+          </view>
+          <view class="operate" >
+            <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleCopy(item)">复制</view>
+            <view class="btn filling" @click="handleDelete(item)">删除</view>
+          </view>
+        </view>
+      </u-list-item>
+      <view>
+      </view>
+      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
+    </u-list>
+    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
+      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
+      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
+        @confirm="handleMedicalConfirm"></u-picker>
+  </view>
+</template>
+
+<script setup>
+import { listMedicineStockIn,  delMedicineStockIn,  } from '@/api/health/medicineStockIn'
+import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
+import { getDicts } from '@/api/system/dict/data.js'
+import { timeHandler } from '@/utils/common.ts'
+import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
+    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import {reactive ,toRefs,ref,computed }from "vue";
+const pageNum = ref(1)
+const listData = ref([])
+const isShow = ref(false)
+const status = ref('loadmore')
+const settingPickShow = ref(false)
+const settingColumns = ref([])
+const timeShow= ref(false)
+const stateList = ref([])
+
+const unitList = ref([])
+const packageUnitList = ref([])
+const medicalList = ref([])
+const showMedical = ref(false)
+const  flag= ref(true)
+const time =ref( Number(new Date()))
+const data = reactive({
+  filterPanel: false,
+  queryMedicalParams: {
+    pageNum: 1,
+    pageSize: 100
+  },
+  queryParams: {
+    name: null,
+    type: null,
+    healthRecordId: null,
+    dosingTime: null,
+    dosage: null,
+    medicalId: null,
+    resource: null,
+    place: null
+   } 
+})
+const { filterPanel, queryMedicalParams, queryParams} = toRefs(data)
+const windowHeight = computed(() => {
+			uni.getSystemInfoSync().windowHeight - 50
+		})	
+onLoad(() => {
+    getList()
+  });
+
+ onShow(() => {
+    if (isShow.value) {
+      listData.value=[]
+      getList()
+      isShow.value = false
+    }
+  });
+
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+
+  function selectType(item) {
+      queryParams.value.state = item.dictValue
+      stateList.value.map(ele => {
+        if (ele.dictValue == item.dictValue) {
+          ele.selected = true
+          Reflect.set(ele, 'selected', true)
+        } else {
+          Reflect.set(ele, 'selected', false)
+        }
+      })
+    }
+
+  function  openOrCloseDate(data) {
+      timeShow.value = !timeShow.value
+      flag.value = data
+    }
+function loadmore() {
+      pageNum.value += 1
+      if (status.value == 'loadmore') {
+        getList()
+      }
+    }
+function getList() {
+  listMedicineBasic(queryMedicalParams.value).then((response) => {
+        medicalList.value = [response.rows] 
+      })
+       // 使用状态
+       getDicts('used_state').then(res => {
+        stateList.value = res.data
+      })
+       // 用药地点
+       getDicts('medical_unit').then(res => {
+        unitList.value = res.data
+      })
+            // 单位
+            getDicts('package_unit').then(res => {
+              packageUnitList.value = res.data
+      })
+
+      status.value = 'loading'
+      listMedicineStockIn({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+        listData.value = listData.value.concat(res.rows)
+        if (listData.value.length < res.total) {
+          status.value = 'loadmore'
+        } else {
+          status.value = 'nomore'
+        }
+      }).catch(() => {
+        status.value = 'nomore'
+      })
+    }
+    function confirm(e) {
+      const date = timeHandler(new Date(e.value), '-', ':')
+            let formatValue = 'YYYY-MM-DD'
+            dayjs(date).format(formatValue)
+      if (flag.value) {
+        queryParams.value.startTime =  dayjs(date).format(formatValue)
+      } else {
+        queryParams.value.endTime =  dayjs(date).format(formatValue)
+      }
+      timeShow.value = false
+    }
+function settingConfirm(e) {
+      queryParams.value.settingId = e.value[0].settingId
+      queryParams.value.settingName = e.value[0].settingName
+      settingPickShow.value = false
+    }
+function settingCancel() {
+      settingPickShow.value = false
+    }
+    function searchSubmit() {
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
+        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
+      } 
+      pageNum.value = 1
+      listData.value = []
+      getList()
+      filterPanel.value = false
+    }
+    function handleMedical() {
+        if (medicalList.value[0].length === 0) {
+          proxy.$refs['uToast'].show({
+            message: '药品名称为空  ', type: 'warning'
+          })
+        } else {
+          showMedical.value = true
+        }
+     }
+  function   handleMedicalConfirm(e) {
+    queryParams.value.medicalName = e.value[0].shortNameBrandPackaging
+    queryParams.value.medicineId= e.value[0].id
+        showMedical.value = false
+        pageNum.value = 1
+      listData.value = []
+      getList()
+  }
+ function handleMedicalCancel() {
+       showMedical.value = false
+  }
+    function searchBlur() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+    }
+    function resetQuery() {
+          queryParams.value.medicalName = ''
+       queryParams.value.state = ''
+        queryParams.value.startTime = ''
+         queryParams.value.time = ''
+        
+        queryParams.value.endTime = ''
+        queryParams.value.medicineId = ''
+    }
+    function enterDetails(item) {
+      uni.navigateTo({ url: `/pages/health/medicineStockIn/details?id=${item.id}` })
+    }
+    function handleEdit(item) {
+      uni.navigateTo({ url: `/pages/health/medicineStockIn/addEdit?id=${item.id}` })
+      isShow.value = true
+    }
+    function handleCopy(item) {
+      uni.navigateTo({ url: `/pages/health/medicineStockIn/addEdit?flag=copy&id=${item.id}` })
+      isShow.value = true
+    }
+    function handleAdd() {
+      uni.navigateTo({ url: `/pages/health/medicineStockIn/addEdit` })
+      isShow.value = true
+    }
+    function handleDelete(item) {
+      uni.showModal({
+        	title: '提示',
+        	content: '你确定要删除吗',
+        	success: function (res) {
+        		if (res.confirm) {
+        		  delMedicineStockIn(item.id)
+              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
+        		} else if (res.cancel) {
+        			console.log('取消');
+        		}
+        	}
+        });
+    }
+	
+</script>
+
+<style lang="scss" scoped>
+.btnAdd {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      display:float;
+      text-align: center;
+    }
+
+.search-view {
+  padding: 12rpx 32rpx;
+  background-color: #ffffff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+
+  .search-input {
+    background: #F5F5F5;
+    color: #333333;
+    margin-right: 36rpx;
+  }
+
+  .filter-panel {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: 96rpx;
+    background-color: rgba(0, 0, 0, 0.5);
+
+    .filter-panel-content {
+      background-color: #ffff;
+      padding: 0 30rpx 30rpx;
+
+      .filter-title {
+        color: #000000;
+        font-size: 30rpx;
+        font-weight: 500;
+        padding: 30rpx 0;
+      }
+
+      .state-list {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: flex-start;
+
+        .state-item {
+          width: 210rpx;
+          height: 72rpx;
+          border: 1rpx solid rgba(0, 0, 0, 0.25);
+          border-radius: 72rpx;
+          text-align: center;
+          line-height: 72rpx;
+          margin: 0 20rpx 20rpx 0;
+          font-size: 28rpx;
+          color: #000000;
+        }
+
+        .active {
+          background-color: rgba(222, 241, 255, 1);
+          border: 1rpx solid rgba(22, 119, 255, 1);
+        }
+      }
+    }
+
+    .btn-box {
+      display: flex;
+      padding: 24rpx 30rpx;
+      background-color: #fff;
+      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
+    }
+  }
+}
+
+.list-item {
+  margin: 0 24rpx 24rpx;
+  padding: 32rpx;
+  background-color: #fff;
+
+  .item-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-bottom: 16rpx;
+
+    .status {
+      .status-item {
+        width: 120rpx;
+        height: 44rpx;
+        text-align: center;
+        line-height: 44rpx;
+        border-radius: 4rpx;
+        font-size: 24rpx;
+      }
+
+      .status1 {
+        background: #F0F0F0;
+        color: #8C8C8C;
+      }
+
+      .status2 {
+        background: rgba(38, 129, 255, 0.2);
+        color: #2681FF;
+      }
+
+      .status3 {
+        background: #F7F7F7;
+        color: #2681FF;
+      }
+
+      .status4 {
+        background: rgba(255, 85, 51, 0.2);
+        color: #FF5533;
+      }
+
+      .status5 {
+        background: #F7F7F7;
+        color: rgba(0, 0, 0, 0.85);
+      }
+
+      .status7 {
+        background: rgba(255, 129, 51, 0.2);
+        color: #FF8133;
+      }
+
+      .status8 {
+        background: rgba(65, 217, 165, 0.2);
+        color: #41D9A5;
+      }
+    }
+  }
+
+  .item-row {
+    padding: 16rpx 0;
+
+    .row-label {
+      color: rgba(0, 0, 0, 0.55);
+    }
+
+    .row-value {
+      color: rgba(0, 0, 0, 0.85)
+    }
+  }
+
+  .operate {
+    display: flex;
+    justify-content: flex-end;
+
+    .btn {
+      width: 146rpx;
+      height: 56rpx;
+      line-height: 56rpx;
+      border-radius: 8rpx;
+      margin-left: 5rpx;
+      text-align: center;
+    }
+
+    .circulation {
+      background: rgba(0, 0, 0, 0.04);
+      margin-right: 24rpx;
+      color: rgba(0, 0, 0, 0.85);
+    }
+
+    .filling {
+      background: #2681FF;
+      border-radius: 8rpx;
+      color: #FFFFFF;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/person/addEdit.vue b/src/pages/health/person/addEdit.vue
index 62cf02d..806e55b 100644
--- a/src/pages/health/person/addEdit.vue
+++ b/src/pages/health/person/addEdit.vue
@@ -1,105 +1,135 @@
 <template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="心路历程"
-		>
-		</u-navbar>
-      <view class="section">
-        <view class="section-title">{{ title}}</view>
-        <view class="form-view">
-          <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-            :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-            <u-form-item label="标题" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写标题"
+  <view class="container" style="paddingBottom:1rpx;">
+    <u-navbar
+    leftIconSize="40rpx"
+    leftIconColor="#333333"
+    title="成员管理"
+  >
+  </u-navbar>
+    <view class="section">
+      <view class="section-title">{{ title}}</view>
+      <view class="form-view">
+        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
+          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
+          <u-form-item label="姓名" prop="name" required >
+              <u--input v-model="form.name"  placeholder="请填写姓名"
                 inputAlign="right" border="none"></u--input>
             </u-form-item>
-            <u-form-item label="类型" prop="typeName" required @click="handleShowTeam">
+            <u-form-item label="昵称" prop="nickName" required >
+              <u--input v-model="form.nickName"  placeholder="请填写昵称"
+                inputAlign="right" border="none"></u--input>
+            </u-form-item>
+          <u-form-item label="类型" prop="typeName" required @click="handleType">
               <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
                 inputAlign="right" border="none"></u--input>
               <u-icon slot="right" name="arrow-down"></u-icon>
             </u-form-item>
-            <u-form-item label="记录时间" prop="createTime" required @click="selectDate()">
-              <u--input v-model="form.createTime" disabled disabledColor="#ffffff" placeholder="请选择记录时间" inputAlign="right" border="none"></u--input>
-						<u-icon slot="right" name="arrow-right"></u-icon>
+          
+            <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-icon slot="right" name="arrow-right"></u-icon>
+          </u-form-item>
+          <u-form-item label="排序" prop="ranking" >
+              <u--input v-model="form.ranking" type="number" placeholder="请填写排序"
+                inputAlign="right" border="none"></u--input>
             </u-form-item>
-            <u-form-item label="内容" prop="remark" required labelPosition="top">
-              <u--textarea v-model="form.remark" placeholder="请填写内容" border="none" autoHeight inputAlign="right" count
-                maxlength="20000" style="padding:18rpx 0;"></u--textarea>
+            <u-form-item label="身高" prop="height" >
+              <u--input v-model="form.height"  placeholder="请填写身高"
+                inputAlign="right" border="none">
+                <template #suffix>
+					<up-text
+						text="CM"
+					></up-text>
+				</template></u--input>
             </u-form-item>
-          </u--form>
-          <view class="form-btn">
-            <u-button type="primary" text="提交" @click="submit"></u-button>
-          </view>
+            <u-form-item label="体重" prop="weight" >
+              <u--input v-model="form.weight"  placeholder="请填写体重"
+                inputAlign="right" border="none">
+                <template #suffix>
+					<up-text
+						text="KG"
+					></up-text>
+				</template></u--input>
+            </u-form-item>
+           
+          <u-form-item label="备注" prop="remark"  labelPosition="top">
+            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
+              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
+          </u-form-item>
+        </u--form>
+        <view class="form-btn">
+          <u-button type="primary" text="提交" @click="submit"></u-button>
         </view>
       </view>
-      <u-toast ref="uToast"></u-toast>
-      <u-picker itemHeight="88" :show="showTeam" :columns="journeyTypeList" keyName="dictLabel" @cancel="handleCancel"
-        @confirm="handleConfirm"></u-picker>
-        <u-datetime-picker
-			:show="datePickShow"
-			mode="datetime"
-      ref="createTimeRef" 
-			@cancel="datePickShow=false"
-			@confirm="datePickConfirm"
+    </view>
+    <u-toast ref="uToast"></u-toast>
+        <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleTypeCancel"
+        @confirm="handleTypeConfirm"></u-picker>
+      <u-datetime-picker
+			:show="birthdayShow"
+			mode="date"
+      ref="birthdayRef" 
+			@cancel="birthdayShow=false"
+			@confirm="birthdayConfirm"
 			itemHeight="88"
 		></u-datetime-picker>
-    </view>
-  </template>
-  
-  <script setup>
-  import {getHeartJourney, addHeartJourney, updateHeartJourney } from '@/api/invest/heartJourney'
+  </view>
+</template>
+
+<script setup>
+import { getPerson,addPerson, updatePerson } from '@/api/health/person'
+const { proxy } = getCurrentInstance()
   import { getDicts } from '@/api/system/dict/data.js'
-  const { proxy } = getCurrentInstance()
-  import dayjs from 'dayjs'
-  import {onLoad,onReady} from "@dcloudio/uni-app";
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
+import dayjs from 'dayjs'
+import {onLoad,onReady} from "@dcloudio/uni-app";
+  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const showTeam = ref(false)
-const title = ref("心路历程")
-const journeyTypeList = ref([])
+const birthdayShow = ref(false)
+const title = ref("成员管理")
+
+const typeList = ref([])
+const showType = ref(false)
 const data = reactive({
-  form: {},
-  rules: {
-          name: [{ type: 'string', required: true, message: '标题不能为空', trigger: ['change', 'blur'] }],
-          createTime: [{ type: 'string', required: true, message: '记录时间不能为空', trigger: ['change', 'blur'] }],
-          typeName: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
-          remark: [{ type: 'string', required: true, message: '内容不能为空', trigger: ['change', 'blur'] }],
-  }
+form: {
+  id: null,
+  id: null,
+    name: null,
+    type: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    birthday: null,
+    nickName: null,
+    height: null,
+    weight: null,
+    ranking: 0
+},
+rules: {
+  name: [{ required: true, message: '姓名不能为空', trigger:['change', 'blur'] }],
+  nickName: [{ required: true, message: '昵称不能为空', trigger: ['change', 'blur'] }],
+  birthday: [{ required: true, message: '生日不能为空', trigger: ['change', 'blur'] }],
+  typeName: [{ required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
+}
 })
 const { form, rules} = toRefs(data)
 
+
 onLoad((option) => {
-       form.value.id = option.id
-       if(form.value.id!=null){
-        title.value="心路历程-修改"
-       }else{
-        title.value="心路历程-新增"
-       }
-      getDict()
-  })
-  onReady(() => {
-    form.value.createTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-  })
-  function  getDict() {
-        // 类型
-        getDicts('journey_type').then(res => {
-        journeyTypeList.value =[res.data] 
-      })
-      if(form.value.id!=null){
-        getHeartJourney(form.value.id).then(res => {
-          form.value = res.data
-           // 类型
-        getDicts('journey_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-      })
-          
-        })
-      }
-  }
-  function dictStr(val, arr) {
+     form.value.id = option.id
+     if(form.value.id!=null){
+      title.value="成员管理-修改"
+     }else{
+      title.value="成员管理-新增"
+     }
+    getData()
+})
+onReady(() => {
+     form.value.birthday = dayjs(new Date().getTime()).format("YYYY-MM-DD")
+})
+function dictStr(val, arr) {
       let str = ''
       arr.map(item => {
         if (item.dictValue === val) {
@@ -107,78 +137,97 @@ onLoad((option) => {
         }
       })
       return str
+ }
+function  getData() {
+     // 类型
+     getDicts('person_type').then(res => {
+        typeList.value =[res.data] 
+      })
+    if(form.value.id!=null){
+      getPerson(form.value.id).then(res => {
+        form.value = res.data   
+            // 类型
+           getDicts('person_type').then(result => {
+          form.value.typeName=dictStr(form.value.type, result.data)
+         })
+      })
     }
+}
 
-  function handleShowTeam() {
-        if (journeyTypeList.value[0].length === 0) {
+
+  function handleType() {
+        if (typeList.value[0].length === 0) {
           proxy.$refs['uToast'].show({
             message: '类型为空  ', type: 'warning'
           })
         } else {
-          showTeam.value = true
+          showType.value = true
         }
-      }
-      function   handleConfirm(e) {
+     }
+  function   handleTypeConfirm(e) {
         form.value.typeName = e.value[0].dictLabel
         form.value.type = e.value[0].dictValue
-        showTeam.value = false
+        showType.value = false
+  }
+ function handleTypeCancel() {
+       showType.value = false
       }
-      function handleCancel() {
-       showTeam.value = false
-      }
-      function  selectDate() {
-				datePickShow.value = true
-        proxy.$refs['createTimeRef'].innerValue = new Date().getTime()
-			}
-			function datePickConfirm(e) {
-				form.value.createTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-				datePickShow.value = false
-			}
-      function submit() {
-        proxy.$refs['uForm'].validate().then(() => {
-          if (form.value.id != null) {
-            updateHeartJourney(form.value).then(res => {
-              proxy.$refs['uToast'].show({
-              message: '修改成功', complete() {
-                uni.navigateTo({ url: `/pages/work/heartJourney/list` })
-              }
-            })
+
+function  selectBirthday() {
+      birthdayShow.value = true
+      proxy.$refs['birthdayRef'].innerValue = new Date().getTime()
+  }
+function birthdayConfirm(e) {
+      form.value.birthday = dayjs(e.value).format("YYYY-MM-DD")
+      birthdayShow.value = false
+  }
+
+
+function submit() {
+      proxy.$refs['uForm'].validate().then(() => {
+        if (form.value.id != null) {
+          updatePerson(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '修改成功', complete() {
+              uni.navigateTo({ url: `/pages/health/person/list` })
+            }
           })
-          }else {
-            addHeartJourney(form.value).then(res => {
-              proxy.$refs['uToast'].show({
-              message: '新增成功', complete() {
-                uni.navigateTo({ url: `/pages/work/heartJourney/list` })
-              }
-            })
-          })
-          }
         })
-      }
-  </script>
-  
-  <style lang="scss" scoped>
-  .section {
-    margin: 24rpx;
-    padding: 16rpx 24rpx;
-    background-color: #fff;
-    border-radius: 8rpx;
-  
-    .section-title {
-      width: 360rpx;
-      color: #333333;
-      line-height: 44rpx;
-      font-size: 30rpx;
-      border-left: 6rpx solid #2681FF;
-      padding-left: 26rpx;
+        }else {
+          addPerson(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/person/list` })
+            }
+          })
+        })
+        }
+      })
     }
-  
-    .form-view {
-      padding: 20rpx 0rpx 0 10rpx;
-  
-      .form-btn {
-        padding-top: 20rpx;
-      }
+</script>
+
+<style lang="scss" scoped>
+.section {
+  margin: 24rpx;
+  padding: 16rpx 24rpx;
+  background-color: #fff;
+  border-radius: 8rpx;
+
+  .section-title {
+    width: 360rpx;
+    color: #333333;
+    line-height: 44rpx;
+    font-size: 30rpx;
+    border-left: 6rpx solid #2681FF;
+    padding-left: 26rpx;
+  }
+
+  .form-view {
+    padding: 20rpx 0rpx 0 10rpx;
+
+    .form-btn {
+      padding-top: 20rpx;
     }
   }
-  </style>
\ No newline at end of file
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/health/person/details.vue b/src/pages/health/person/details.vue
deleted file mode 100644
index d66166f..0000000
--- a/src/pages/health/person/details.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="心路历程详情"
-		>
-		</u-navbar>
-      <view class="section">
-        <u-cell-group>
-        <u-cell title="标题:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
-        <u-cell title="类型:" titleStyle="font-weight:bolder" :value="detailInfo.type"></u-cell>
-        <u-cell title="记录时间:" titleStyle="font-weight:bolder" :value="detailInfo.createTime"></u-cell>
-        <u-cell title="内容:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
-      </u-cell-group>
-      </view>
-      <u-toast ref="uToast"></u-toast>
-    </view>
-  </template>
-  
-<script setup>
-import { getHeartJourney} from '@/api/invest/heartJourney'
-import { getDicts } from '@/api/system/dict/data.js'
-import {onLoad} from "@dcloudio/uni-app";
-import {reactive ,toRefs,ref,computed }from "vue";
-const id = ref('')
-const data = reactive({
-  detailInfo: {} 
-})
-const {detailInfo} = toRefs(data)
-onLoad((option) => {
-    id.value = option.id
-    getInfo()
-  })
-  function getInfo() {
-    getHeartJourney(id.value).then(res => {
-          detailInfo.value = res.data
-                     // 类型
-            getDicts('journey_type').then(result => {
-         detailInfo.value.type=dictStr(detailInfo.value.type, result.data)
-      })
-        })
-  }
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-  </script>
-  
-  <style lang="scss" scoped>
-  .section {
-    margin: 24rpx;
-    padding: 16rpx 24rpx;
-    background-color: #fff;
-    border-radius: 8rpx;
-  
-    .section-title {
-      width: 280rpx;
-      color: #333333;
-      line-height: 44rpx;
-      font-size: 30rpx;
-      border-left: 6rpx solid #2681FF;
-      padding-left: 26rpx;
-    }
-  
-    .content {
-      width: 647rpx;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-    }
-  
-    .img-con {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 20rpx
-    }
-    .form-view {
-      padding: 20rpx 0rpx 0 10rpx;
-  
-      .form-btn {
-        padding-top: 20rpx;
-      }
-    }
-  }
-  </style>
\ No newline at end of file
diff --git a/src/pages/health/person/list.vue b/src/pages/health/person/list.vue
index 386a02c..df70669 100644
--- a/src/pages/health/person/list.vue
+++ b/src/pages/health/person/list.vue
@@ -1,53 +1,55 @@
 <template>
   <view class="container">
     <u-sticky offsetTop="8rpx" customNavHeight="8rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.name" border="false" placeholder="请输入标题" class="search-input"
-          @blur="searchBlur" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-        <u-icon :name="filterPanel ? 'arrow-up-fill' : 'arrow-down-fill'" color="#666666" size="28" label="筛选"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="filterPanel = !filterPanel"></u-icon>
-          <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
-          labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">类型</view>
-              <view class="state-list">
-                <view v-for="item in journeyTypeList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectStatus(item)">{{ item.dictLabel }}</view>
-              </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
+         <view class="search-view">
+          <u-input v-model="queryParams.name" border="false" type="select"   @click="handleSearch" placeholder="请填入名称或昵称" suffixIcon="search"
+	    suffixIconStyle="color: #909399" class="search-input">
+        </u-input>
+        <u-icon name="plus-circle-fill" color="#666666" size="28" style="margin-left:10px" label="新增"
+        labelPos="left" labelSize="32rpx" labelColor="#666666" @click="handleAdd()"></u-icon>
+       </view>
+       </u-sticky>
     <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
       <u-list-item v-for="(item, index) in listData" :key="index">
         <view class="list-item">
-          <view class="item-header" @click="enterDetails(item)">
-            <u--text suffixIcon="arrow-right" lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
+          <view class="item-header">
+            <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
               :text="item.name" size="30rpx" color="#333333" :bold="true"></u--text>
           </view>
+          <view class="item-row">
+            <text class="row-label">昵称：</text>
+            <text class="row-value">{{ item.nickName }}</text>
+          </view>
           <view class="item-row">
             <text class="row-label">类型：</text>
-            <text class="row-value">{{ dictStr(item.type, journeyTypeList) }}</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.createTime }}</text>
+            <text class="row-label">生日：</text>
+            <text class="row-value">{{ item.birthday }}</text>
           </view>
           <view class="item-row">
-            <text class="row-label">内容：</text>
+            <text class="row-label">年龄：</text>
+            <text class="row-value">{{ item.age }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">身高（CM）：</text>
+            <text class="row-value">{{ item.height }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">体重（KG）：</text>
+            <text class="row-value">{{ item.weight }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">排序：</text>
+            <text class="row-value">{{ item.ranking }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">备注：</text>
             <text class="row-value">{{ item.remark }}</text>
           </view>
           <view class="operate" >
-            <!-- <view class="btn filling" @click="enterDetails(item)">查看</view > -->
-               <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleEdit(item)">修改</view>
             <view class="btn filling" @click="handleDelete(item)">删除</view>
           </view>
         </view>
@@ -56,29 +58,30 @@
       </view>
       <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
     </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
   </view>
 </template>
 
 <script setup>
-import { listHeartJourney, delHeartJourney } from '@/api/invest/heartJourney'
+import { listPerson, delPerson } from '@/api/health/person'
 import { getDicts } from '@/api/system/dict/data.js'
+import { timeHandler } from '@/utils/common.ts'
 import {onLoad,onShow} from "@dcloudio/uni-app";
+import dayjs from 'dayjs'
     // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed }from "vue";
 const pageNum = ref(1)
 const listData = ref([])
 const isShow = ref(false)
 const status = ref('loadmore')
-const journeyTypeList = ref([])
-const settingPickShow = ref(false)
-const settingColumns = ref([])
+const typeList = ref([])
+
+const  flag= ref(true)
 const data = reactive({
   filterPanel: false,
   queryParams: {
-      name: '',
-      type: '',
+    name: null,
+    type: null,
+    nickName: null
    } 
 })
 const { filterPanel, queryParams} = toRefs(data)
@@ -86,7 +89,6 @@ const windowHeight = computed(() => {
 			uni.getSystemInfoSync().windowHeight - 50
 		})	
 onLoad(() => {
-    getDict()
     getList()
   });
 
@@ -98,6 +100,22 @@ onLoad(() => {
     }
   });
 
+  function handleSearch() {
+      pageNum.value = 1
+      listData.value = []
+      getList()
+     }
+
+  function dictStr(val, arr) {
+      let str = ''
+      arr.map(item => {
+        if (item.dictValue === val) {
+          str = item.dictLabel
+        }
+      })
+      return str
+    }
+
 function loadmore() {
       pageNum.value += 1
       if (status.value == 'loadmore') {
@@ -105,8 +123,12 @@ function loadmore() {
       }
     }
 function getList() {
+       // 类型
+       getDicts('person_type').then(res => {
+        typeList.value = res.data
+      })
       status.value = 'loading'
-      listHeartJourney({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
+      listPerson({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
         listData.value = listData.value.concat(res.rows)
         if (listData.value.length < res.total) {
           status.value = 'loadmore'
@@ -117,67 +139,13 @@ function getList() {
         status.value = 'nomore'
       })
     }
-function   getDict() {
-      // 类型
-      getDicts('journey_type').then(res => {
-        journeyTypeList.value = res.data
-      })
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-function selectStatus(item) {
-      queryParams.value.type = item.dictValue
-      journeyTypeList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-    function searchSubmit() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-        queryParams.value.name = '',
-        queryParams.value.type = ''
-      journeyTypeList.value.map(ele => {
-        Reflect.set(ele, 'selected', false)
-      })
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/work/heartJourney/details?id=${item.id}` })
-    }
+
     function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/work/heartJourney/addEdit?id=${item.id}` })
+      uni.navigateTo({ url: `/pages/health/person/addEdit?id=${item.id}` })
       isShow.value = true
     }
     function handleAdd() {
-      uni.navigateTo({ url: `/pages/work/heartJourney/addEdit` })
+      uni.navigateTo({ url: `/pages/health/person/addEdit` })
       isShow.value = true
     }
     function handleDelete(item) {
@@ -186,8 +154,8 @@ function selectStatus(item) {
         	content: '你确定要删除吗',
         	success: function (res) {
         		if (res.confirm) {
-        		  delHeartJourney(item.id)
-              uni.navigateTo({ url: `/pages/work/heartJourney/list` })
+        		  delPerson(item.id)
+              uni.navigateTo({ url: `/pages/health/person/list` })
         		} else if (res.cancel) {
         			console.log('取消');
         		}
@@ -214,7 +182,6 @@ function selectStatus(item) {
   justify-content: space-between;
   align-items: center;
   position: relative;
-  margin-bottom: 24rpx;
 
   .search-input {
     background: #F5F5F5;
diff --git a/src/pages/health/statistic/index.vue b/src/pages/health/statistic/index.vue
index a376835..8878e82 100644
--- a/src/pages/health/statistic/index.vue
+++ b/src/pages/health/statistic/index.vue
@@ -26,12 +26,9 @@ import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
 	import { ref } from "vue";
 
   const healthGridList=ref([
-        { path: '/pages/health/healthRecord/list', text: '健康档案', icon: 'wallet-filled', permission: 'health:healthRecord:list'  },
-        { path: '/pages/health/temperatureRecord/list', text: '体温记录', icon: 'wallet', permission: 'health:temperatureRecord:list'  },
-        { path: '/pages/health/doctorRecord/list', text: '就医记录', icon: 'upload', permission: 'health:doctorRecord:list'  },
-        { path: '/pages/health/marRecord/list', text: '用药记录', icon: 'shop-filled', permission: 'health:marRecord:list' },
-        { path: '/pages/health/weightRecord/list', text: '体重记录', icon: 'calendar', permission: 'health:weightRecord:list'  },
-        { path: '/pages/health/person/list', text: '成员管理', icon: 'paperplane-filled', permission: 'health:person:list'  }
+        { path: '/pages/health/temperatureRecord/list', text: '体温统计', icon: 'spinner-cycle', permission: 'health:temperatureRecord:list'  },
+        { path: '/pages/health/marRecord/list', text: '用药统计', icon: 'shop-filled', permission: 'health:marRecord:list' }
+        
       ])
 	function navigateTo(path) {
     uni.navigateTo({
diff --git a/src/pages/health/temperatureRecord/addEdit.vue b/src/pages/health/temperatureRecord/addEdit.vue
index 8fa515d..3ec722c 100644
--- a/src/pages/health/temperatureRecord/addEdit.vue
+++ b/src/pages/health/temperatureRecord/addEdit.vue
@@ -71,6 +71,7 @@ import {onLoad,onReady} from "@dcloudio/uni-app";
   // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
 import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
 const datePickShow = ref(false)
+const flag = ref('add')
 const showPerson = ref(false)
 const showHealthRecord = ref(false)
 const title = ref("体温记录")
@@ -111,12 +112,18 @@ const { form, queryPersonParams, queryHealthRecordParams, rules} = toRefs(data)
 
 
 onLoad((option) => {
-     form.value.id = option.id
-     if(form.value.id!=null){
+  form.value.id = option.id
+     flag.value = option.flag
+     alert(flag.value)
+     if(flag.value==null){
+      if(form.value.id!=null){
       title.value="体温记录-修改"
      }else{
       title.value="体温记录-新增"
      }
+     }else{
+      title.value="体温记录-复制"
+     }
     getData()
 })
 onReady(() => {
@@ -198,6 +205,7 @@ function datePickConfirm(e) {
 function submit() {
       proxy.$refs['uForm'].validate().then(() => {
         if (form.value.id != null) {
+        if(flag.value==null){
           updateTemperatureRecord(form.value).then(res => {
             proxy.$refs['uToast'].show({
             message: '修改成功', complete() {
@@ -205,6 +213,18 @@ function submit() {
             }
           })
         })
+          }else {
+            form.value.id == null
+            addTemperatureRecord(form.value).then(res => {
+            proxy.$refs['uToast'].show({
+            message: '新增成功', complete() {
+              uni.navigateTo({ url: `/pages/health/temperatureRecord/list` })
+            }
+          })
+        })
+          }
+
+
         }else {
           addTemperatureRecord(form.value).then(res => {
             proxy.$refs['uToast'].show({
diff --git a/src/pages/health/temperatureRecord/list.vue b/src/pages/health/temperatureRecord/list.vue
index 7e0a815..6f693cb 100644
--- a/src/pages/health/temperatureRecord/list.vue
+++ b/src/pages/health/temperatureRecord/list.vue
@@ -72,17 +72,21 @@
             <u--text lines="1" iconStyle="font-size: 18px; color: #333333; font-weight:bold"
               :text="item.personName+'，体温：'+item.temperature +'℃'" size="30rpx" color="#333333" :bold="true"></u--text>
           </view>
-          <view class="item-row">
-            <text class="row-label">健康档案：</text>
-            <text class="row-value">{{ item.healthRecordName }}</text>
-          </view>
-         
           <view class="item-row">
             <text class="row-label">测量时间：</text>
             <text class="row-value">{{ item.measureTime }}</text>
           </view>
+          <view class="item-row">
+            <text class="row-label">健康档案：</text>
+            <text class="row-value">{{ item.healthRecordName }}</text>
+          </view>
+          <view class="item-row">
+            <text class="row-label">备注：</text>
+            <text class="row-value">{{ item.remark }}</text>
+          </view>
           <view class="operate" >
             <view class="btn filling" @click="handleEdit(item)">修改</view>
+            <view class="btn filling" @click="handleCopy(item)">复制</view>
             <view class="btn filling" @click="handleDelete(item)">删除</view>
           </view>
         </view>
@@ -191,7 +195,7 @@ function settingCancel() {
       settingPickShow.value = false
     }
     function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
         queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
       } 
       pageNum.value = 1
@@ -240,6 +244,10 @@ function settingCancel() {
       uni.navigateTo({ url: `/pages/health/temperatureRecord/addEdit?id=${item.id}` })
       isShow.value = true
     }
+    function handleCopy(item) {
+      uni.navigateTo({ url: `/pages/health/temperatureRecord/addEdit?flag=copy&id=${item.id}` })
+      isShow.value = true
+    }
     function handleAdd() {
       uni.navigateTo({ url: `/pages/health/temperatureRecord/addEdit` })
       isShow.value = true
diff --git a/src/pages/health/weightRecord/addEdit.vue b/src/pages/health/weightRecord/addEdit.vue
deleted file mode 100644
index 62cf02d..0000000
--- a/src/pages/health/weightRecord/addEdit.vue
+++ /dev/null
@@ -1,184 +0,0 @@
-<template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="心路历程"
-		>
-		</u-navbar>
-      <view class="section">
-        <view class="section-title">{{ title}}</view>
-        <view class="form-view">
-          <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-            :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-            <u-form-item label="标题" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写标题"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="类型" prop="typeName" required @click="handleShowTeam">
-              <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="记录时间" prop="createTime" required @click="selectDate()">
-              <u--input v-model="form.createTime" 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" required labelPosition="top">
-              <u--textarea v-model="form.remark" placeholder="请填写内容" border="none" autoHeight inputAlign="right" count
-                maxlength="20000" style="padding:18rpx 0;"></u--textarea>
-            </u-form-item>
-          </u--form>
-          <view class="form-btn">
-            <u-button type="primary" text="提交" @click="submit"></u-button>
-          </view>
-        </view>
-      </view>
-      <u-toast ref="uToast"></u-toast>
-      <u-picker itemHeight="88" :show="showTeam" :columns="journeyTypeList" keyName="dictLabel" @cancel="handleCancel"
-        @confirm="handleConfirm"></u-picker>
-        <u-datetime-picker
-			:show="datePickShow"
-			mode="datetime"
-      ref="createTimeRef" 
-			@cancel="datePickShow=false"
-			@confirm="datePickConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-    </view>
-  </template>
-  
-  <script setup>
-  import {getHeartJourney, addHeartJourney, updateHeartJourney } from '@/api/invest/heartJourney'
-  import { getDicts } from '@/api/system/dict/data.js'
-  const { proxy } = getCurrentInstance()
-  import dayjs from 'dayjs'
-  import {onLoad,onReady} from "@dcloudio/uni-app";
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const showTeam = ref(false)
-const title = ref("心路历程")
-const journeyTypeList = ref([])
-const data = reactive({
-  form: {},
-  rules: {
-          name: [{ type: 'string', required: true, message: '标题不能为空', trigger: ['change', 'blur'] }],
-          createTime: [{ type: 'string', required: true, message: '记录时间不能为空', trigger: ['change', 'blur'] }],
-          typeName: [{ type: 'string', required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
-          remark: [{ type: 'string', required: true, message: '内容不能为空', trigger: ['change', 'blur'] }],
-  }
-})
-const { form, rules} = toRefs(data)
-
-onLoad((option) => {
-       form.value.id = option.id
-       if(form.value.id!=null){
-        title.value="心路历程-修改"
-       }else{
-        title.value="心路历程-新增"
-       }
-      getDict()
-  })
-  onReady(() => {
-    form.value.createTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-  })
-  function  getDict() {
-        // 类型
-        getDicts('journey_type').then(res => {
-        journeyTypeList.value =[res.data] 
-      })
-      if(form.value.id!=null){
-        getHeartJourney(form.value.id).then(res => {
-          form.value = res.data
-           // 类型
-        getDicts('journey_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-      })
-          
-        })
-      }
-  }
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-  function handleShowTeam() {
-        if (journeyTypeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '类型为空  ', type: 'warning'
-          })
-        } else {
-          showTeam.value = true
-        }
-      }
-      function   handleConfirm(e) {
-        form.value.typeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-        showTeam.value = false
-      }
-      function handleCancel() {
-       showTeam.value = false
-      }
-      function  selectDate() {
-				datePickShow.value = true
-        proxy.$refs['createTimeRef'].innerValue = new Date().getTime()
-			}
-			function datePickConfirm(e) {
-				form.value.createTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-				datePickShow.value = false
-			}
-      function submit() {
-        proxy.$refs['uForm'].validate().then(() => {
-          if (form.value.id != null) {
-            updateHeartJourney(form.value).then(res => {
-              proxy.$refs['uToast'].show({
-              message: '修改成功', complete() {
-                uni.navigateTo({ url: `/pages/work/heartJourney/list` })
-              }
-            })
-          })
-          }else {
-            addHeartJourney(form.value).then(res => {
-              proxy.$refs['uToast'].show({
-              message: '新增成功', complete() {
-                uni.navigateTo({ url: `/pages/work/heartJourney/list` })
-              }
-            })
-          })
-          }
-        })
-      }
-  </script>
-  
-  <style lang="scss" scoped>
-  .section {
-    margin: 24rpx;
-    padding: 16rpx 24rpx;
-    background-color: #fff;
-    border-radius: 8rpx;
-  
-    .section-title {
-      width: 360rpx;
-      color: #333333;
-      line-height: 44rpx;
-      font-size: 30rpx;
-      border-left: 6rpx solid #2681FF;
-      padding-left: 26rpx;
-    }
-  
-    .form-view {
-      padding: 20rpx 0rpx 0 10rpx;
-  
-      .form-btn {
-        padding-top: 20rpx;
-      }
-    }
-  }
-  </style>
\ No newline at end of file
diff --git a/src/pages/health/weightRecord/details.vue b/src/pages/health/weightRecord/details.vue
deleted file mode 100644
index d66166f..0000000
--- a/src/pages/health/weightRecord/details.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="心路历程详情"
-		>
-		</u-navbar>
-      <view class="section">
-        <u-cell-group>
-        <u-cell title="标题:" titleStyle="font-weight:bolder" :value="detailInfo.name"></u-cell>
-        <u-cell title="类型:" titleStyle="font-weight:bolder" :value="detailInfo.type"></u-cell>
-        <u-cell title="记录时间:" titleStyle="font-weight:bolder" :value="detailInfo.createTime"></u-cell>
-        <u-cell title="内容:" titleStyle="font-weight:bolder" center :value="detailInfo.remark"> </u-cell>
-      </u-cell-group>
-      </view>
-      <u-toast ref="uToast"></u-toast>
-    </view>
-  </template>
-  
-<script setup>
-import { getHeartJourney} from '@/api/invest/heartJourney'
-import { getDicts } from '@/api/system/dict/data.js'
-import {onLoad} from "@dcloudio/uni-app";
-import {reactive ,toRefs,ref,computed }from "vue";
-const id = ref('')
-const data = reactive({
-  detailInfo: {} 
-})
-const {detailInfo} = toRefs(data)
-onLoad((option) => {
-    id.value = option.id
-    getInfo()
-  })
-  function getInfo() {
-    getHeartJourney(id.value).then(res => {
-          detailInfo.value = res.data
-                     // 类型
-            getDicts('journey_type').then(result => {
-         detailInfo.value.type=dictStr(detailInfo.value.type, result.data)
-      })
-        })
-  }
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-  </script>
-  
-  <style lang="scss" scoped>
-  .section {
-    margin: 24rpx;
-    padding: 16rpx 24rpx;
-    background-color: #fff;
-    border-radius: 8rpx;
-  
-    .section-title {
-      width: 280rpx;
-      color: #333333;
-      line-height: 44rpx;
-      font-size: 30rpx;
-      border-left: 6rpx solid #2681FF;
-      padding-left: 26rpx;
-    }
-  
-    .content {
-      width: 647rpx;
-      font-size: 28rpx;
-      color: #333333;
-      line-height: 40rpx;
-      text-align: left;
-    }
-  
-    .img-con {
-      display: flex;
-      flex-wrap: wrap;
-      gap: 20rpx
-    }
-    .form-view {
-      padding: 20rpx 0rpx 0 10rpx;
-  
-      .form-btn {
-        padding-top: 20rpx;
-      }
-    }
-  }
-  </style>
\ No newline at end of file
diff --git a/src/pages/work/accounts/accountDealRecord/list.vue b/src/pages/work/accounts/accountDealRecord/list.vue
index be8d4a6..42096a3 100644
--- a/src/pages/work/accounts/accountDealRecord/list.vue
+++ b/src/pages/work/accounts/accountDealRecord/list.vue
@@ -317,7 +317,7 @@ function selectAccountType(item) {
       })
     }
     function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
         queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
       } 
       pageNum.value = 1
diff --git a/src/pages/work/accounts/creditTransferRecord/list.vue b/src/pages/work/accounts/creditTransferRecord/list.vue
index e5b25fc..8d630cc 100644
--- a/src/pages/work/accounts/creditTransferRecord/list.vue
+++ b/src/pages/work/accounts/creditTransferRecord/list.vue
@@ -246,7 +246,7 @@ function dictStr(val, arr) {
       return str
     }
     function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
         queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
       } 
       pageNum.value = 1
diff --git a/src/pages/work/accounts/debitTransferRecord/list.vue b/src/pages/work/accounts/debitTransferRecord/list.vue
index 68029c7..b87ca7c 100644
--- a/src/pages/work/accounts/debitTransferRecord/list.vue
+++ b/src/pages/work/accounts/debitTransferRecord/list.vue
@@ -235,7 +235,7 @@ function dictStr(val, arr) {
       return str
     }
     function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
         queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
       } 
       pageNum.value = 1
diff --git a/src/pages/work/accounts/investAccountDeal/list.vue b/src/pages/work/accounts/investAccountDeal/list.vue
index d2c69aa..7087a8c 100644
--- a/src/pages/work/accounts/investAccountDeal/list.vue
+++ b/src/pages/work/accounts/investAccountDeal/list.vue
@@ -255,7 +255,7 @@ function selectAccountType(item) {
       })
     }
     function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
         queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
       } 
       pageNum.value = 1
diff --git a/src/pages/work/accounts/investTransferRecord/list.vue b/src/pages/work/accounts/investTransferRecord/list.vue
index 56bfcb2..c17b05e 100644
--- a/src/pages/work/accounts/investTransferRecord/list.vue
+++ b/src/pages/work/accounts/investTransferRecord/list.vue
@@ -232,7 +232,7 @@ function dictStr(val, arr) {
       return str
     }
     function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
         queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
       } 
       pageNum.value = 1
diff --git a/src/pages/work/accounts/lendTransferRecord/list.vue b/src/pages/work/accounts/lendTransferRecord/list.vue
index 0bf3c4e..453f6ad 100644
--- a/src/pages/work/accounts/lendTransferRecord/list.vue
+++ b/src/pages/work/accounts/lendTransferRecord/list.vue
@@ -230,7 +230,7 @@ function dictStr(val, arr) {
       return str
     }
     function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
         queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
       } 
       pageNum.value = 1
diff --git a/src/pages/work/accounts/posTransferRecord/list.vue b/src/pages/work/accounts/posTransferRecord/list.vue
index 321737b..79a3a55 100644
--- a/src/pages/work/accounts/posTransferRecord/list.vue
+++ b/src/pages/work/accounts/posTransferRecord/list.vue
@@ -222,7 +222,7 @@ function settingCancel() {
       settingPickShow.value = false
     }
     function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.endTime!=''){
+      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
         queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
       } 
       pageNum.value = 1