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
new file mode 100644
index 0000000..055d389
--- /dev/null
+++ b/src/api/health/doctorRecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询就医记录列表
+export function listDoctorRecord(query) {
+  return request({
+    url: '/health/doctorRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询就医记录详细
+export function getDoctorRecord(id) {
+  return request({
+    url: '/health/doctorRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增就医记录
+export function addDoctorRecord(data) {
+  return request({
+    url: '/health/doctorRecord',
+    method: 'post',
+    data
+  })
+}
+
+// 修改就医记录
+export function updateDoctorRecord(data) {
+  return request({
+    url: '/health/doctorRecord',
+    method: 'put',
+    data
+  })
+}
+
+// 删除就医记录
+export function delDoctorRecord(id) {
+  return request({
+    url: '/health/doctorRecord/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/health/doctorRecordCost.js b/src/api/health/doctorRecordCost.js
new file mode 100644
index 0000000..eea98b0
--- /dev/null
+++ b/src/api/health/doctorRecordCost.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询就医记录费用明细列表
+export function listDoctorRecordCost(query) {
+  return request({
+    url: '/health/doctorRecordCost/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询就医记录费用明细详细
+export function getDoctorRecordCost(id) {
+  return request({
+    url: '/health/doctorRecordCost/' + id,
+    method: 'get'
+  })
+}
+
+// 新增就医记录费用明细
+export function addDoctorRecordCost(data) {
+  return request({
+    url: '/health/doctorRecordCost',
+    method: 'post',
+    data
+  })
+}
+
+// 修改就医记录费用明细
+export function updateDoctorRecordCost(data) {
+  return request({
+    url: '/health/doctorRecordCost',
+    method: 'put',
+    data
+  })
+}
+
+// 删除就医记录费用明细
+export function delDoctorRecordCost(id) {
+  return request({
+    url: '/health/doctorRecordCost/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/health/healthRecord.js b/src/api/health/healthRecord.js
new file mode 100644
index 0000000..8997827
--- /dev/null
+++ b/src/api/health/healthRecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询健康档案列表
+export function listHealthRecord(query) {
+  return request({
+    url: '/health/healthRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询健康档案详细
+export function getHealthRecord(id) {
+  return request({
+    url: '/health/healthRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增健康档案
+export function addHealthRecord(data) {
+  return request({
+    url: '/health/healthRecord',
+    method: 'post',
+    data
+  })
+}
+
+// 修改健康档案
+export function updateHealthRecord(data) {
+  return request({
+    url: '/health/healthRecord',
+    method: 'put',
+    data
+  })
+}
+
+// 删除健康档案
+export function delHealthRecord(id) {
+  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
new file mode 100644
index 0000000..ddb437f
--- /dev/null
+++ b/src/api/health/marRecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询用药记录列表
+export function listMarRecord(query) {
+  return request({
+    url: '/health/marRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用药记录详细
+export function getMarRecord(id) {
+  return request({
+    url: '/health/marRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增用药记录
+export function addMarRecord(data) {
+  return request({
+    url: '/health/marRecord',
+    method: 'post',
+    data
+  })
+}
+
+// 修改用药记录
+export function updateMarRecord(data) {
+  return request({
+    url: '/health/marRecord',
+    method: 'put',
+    data
+  })
+}
+
+// 删除用药记录
+export function delMarRecord(id) {
+  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/person.js b/src/api/health/person.js
new file mode 100644
index 0000000..3f92fe1
--- /dev/null
+++ b/src/api/health/person.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询成员管理列表
+export function listPerson(query) {
+  return request({
+    url: '/health/person/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询成员管理详细
+export function getPerson(id) {
+  return request({
+    url: '/health/person/' + id,
+    method: 'get'
+  })
+}
+
+// 新增成员管理
+export function addPerson(data) {
+  return request({
+    url: '/health/person',
+    method: 'post',
+    data
+  })
+}
+
+// 修改成员管理
+export function updatePerson(data) {
+  return request({
+    url: '/health/person',
+    method: 'put',
+    data
+  })
+}
+
+// 删除成员管理
+export function delPerson(id) {
+  return request({
+    url: '/health/person/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/health/processRecord.js b/src/api/health/processRecord.js
new file mode 100644
index 0000000..3a024d8
--- /dev/null
+++ b/src/api/health/processRecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询档案过程记录列表
+export function listProcessRecord(query) {
+  return request({
+    url: '/health/processRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询档案过程记录详细
+export function getProcessRecord(id) {
+  return request({
+    url: '/health/processRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增档案过程记录
+export function addProcessRecord(data) {
+  return request({
+    url: '/health/processRecord',
+    method: 'post',
+    data
+  })
+}
+
+// 修改档案过程记录
+export function updateProcessRecord(data) {
+  return request({
+    url: '/health/processRecord',
+    method: 'put',
+    data
+  })
+}
+
+// 删除档案过程记录
+export function delProcessRecord(id) {
+  return request({
+    url: '/health/processRecord/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/api/health/statisticAnalysis.js b/src/api/health/statisticAnalysis.js
new file mode 100644
index 0000000..cd24c67
--- /dev/null
+++ b/src/api/health/statisticAnalysis.js
@@ -0,0 +1,41 @@
+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
+  })
+}
+
+export function getHealthAnalysis(query) {
+  return request({
+    url: '/health/analysis/healthAnalysis',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getRecordAnalysis(query) {
+  return request({
+    url: '/health/analysis/recordAnalysis',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getDoctorAnalysis(query) {
+  return request({
+    url: '/health/analysis/doctorAnalysis',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/health/temperatureRecord.js b/src/api/health/temperatureRecord.js
new file mode 100644
index 0000000..77355b1
--- /dev/null
+++ b/src/api/health/temperatureRecord.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询体温记录列表
+export function listTemperatureRecord(query) {
+  return request({
+    url: '/health/temperatureRecord/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询体温记录详细
+export function getTemperatureRecord(id) {
+  return request({
+    url: '/health/temperatureRecord/' + id,
+    method: 'get'
+  })
+}
+
+// 新增体温记录
+export function addTemperatureRecord(data) {
+  return request({
+    url: '/health/temperatureRecord',
+    method: 'post',
+    data
+  })
+}
+
+// 修改体温记录
+export function updateTemperatureRecord(data) {
+  return request({
+    url: '/health/temperatureRecord',
+    method: 'put',
+    data
+  })
+}
+
+// 删除体温记录
+export function delTemperatureRecord(id) {
+  return request({
+    url: '/health/temperatureRecord/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/health/activity/index.vue b/src/views/health/activity/index.vue
new file mode 100644
index 0000000..65061a5
--- /dev/null
+++ b/src/views/health/activity/index.vue
@@ -0,0 +1,326 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="活动名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入活动名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="queryParams.type" placeholder="请选择类型" clearable>
+            <el-option v-for="dict in activity_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="活动地点" prop="place">
+          <el-input v-model="queryParams.place" placeholder="请输入活动地点" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['health:activity:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['health:activity:remove']">删除</el-button>
+          <!-- <el-button @click="handleExport" icon="Download" v-hasPermi="['health:activity:export']">导出</el-button> -->
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="activityList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="活动名称" align="center" prop="name" />
+          <el-table-column label="类型" width="100" align="center" prop="type">
+            <template #default="scope">
+              <dict-tag :options="activity_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="活动地点" align="center" prop="place" />
+          <el-table-column label="开始时间" align="center" prop="startTime" width="160"> </el-table-column>
+          <el-table-column label="结束时间" align="center" prop="endTime" width="160"> </el-table-column>
+          <el-table-column label="活动量" width="100" align="center" prop="activityVolume">
+            <template #default="scope">
+              <dict-tag :options="activity_exercise" :value="scope.row.activityVolume" />
+            </template>
+          </el-table-column>
+          <el-table-column label="活动时长" align="center" prop="exerciseTimeStr" width="150"> </el-table-column>
+          <el-table-column label="成员" align="center" prop="partner" />
+          <el-table-column label="总费用（元）" width="120" align="center" prop="totalCost" />
+          <el-table-column label="操作" width="140" align="center" class-name="small-padding fixed-width">
+            <template v-slot="scope">
+              <div class="ctrl-btn d-flex">
+                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                  <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 添加或修改活动记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="880px" append-to-body>
+      <el-form ref="activityRef" :model="form" :inline="true" :rules="rules" label-width="120px">
+        <el-form-item label="活动名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入活动名称" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option v-for="dict in activity_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="活动地点" prop="place">
+          <el-input v-model="form.place" placeholder="请输入活动地点" />
+        </el-form-item>
+        <el-form-item label="成员" prop="partner">
+          <el-input v-model="form.partner" placeholder="请输入成员" />
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker clearable v-model="form.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker clearable v-model="form.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间"> </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="活动时长" prop="exerciseTime">
+          <el-input v-model="form.exerciseTime" placeholder="请输入活动时长" />
+        </el-form-item> -->
+        <el-form-item label="活动量" prop="activityVolume">
+          <el-select v-model="form.activityVolume" placeholder="请选择活动量">
+            <el-option v-for="dict in activity_exercise" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="总费用" prop="totalCost">
+          <el-input v-model="form.totalCost" type="number" placeholder="请输入总费用">
+            <template #suffix>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="费用明细" style="width: 792px" prop="costDetail">
+          <el-input v-model="form.costDetail" type="textarea" placeholder="请输入费用明细" />
+        </el-form-item>
+        <el-form-item label="饮食" style="width: 792px" prop="foods">
+          <el-input v-model="form.foods" type="textarea" placeholder="请输入饮食" />
+        </el-form-item>
+        <el-form-item label="收获" style="width: 792px" prop="harvest">
+          <el-input v-model="form.harvest" type="textarea" placeholder="请输入收获" />
+        </el-form-item>
+        <el-form-item label="备注" style="width: 792px" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template v-if="title !== '查看活动记录'" #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Activity">
+import { listActivity, getActivity, delActivity, addActivity, updateActivity } from '@/api/health/activity'
+// eslint-disable-next-line no-unused-vars
+import { require } from '@/utils/require'
+const { proxy } = getCurrentInstance()
+const { activity_type, activity_exercise } = proxy.useDict('activity_type', 'activity_exercise')
+
+const activityList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const operateList = ref([
+  { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:activity:query'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:activity:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:activity:remove'] }
+])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: null,
+    type: null,
+    place: null,
+    activityVolume: null,
+    startTime: null,
+    endTime: null
+  },
+  rules: {
+    name: [{ required: true, message: '活动名称不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
+    activityVolume: [{ required: true, message: '活动量不能为空', trigger: 'change' }],
+    place: [{ required: true, message: '活动地点不能为空', trigger: 'blur' }],
+    startTime: [{ required: true, message: '开始时间不能为空', trigger: 'blur' }],
+    endTime: [{ required: true, message: '结束时间不能为空', trigger: 'blur' }],
+    partner: [{ required: true, message: '成员不能为空', trigger: 'blur' }]
+  }
+})
+
+const handleOperate = (operate, row) => {
+  switch (operate) {
+    case 'view':
+      handleView(row)
+      break
+    case 'edit':
+      handleUpdate(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    default:
+      break
+  }
+}
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询活动记录列表 */
+function getList() {
+  loading.value = true
+  listActivity(queryParams.value).then((response) => {
+    activityList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    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: 0,
+    partner: null,
+    costDetail: null
+  }
+  proxy.resetForm('activityRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  title.value = '查看活动记录'
+  form.value = row
+  open.value = true
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = '添加活动记录'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getActivity(_id).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改活动记录'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.activityRef.validate((valid) => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateActivity(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addActivity(form.value).then((response) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delActivity(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    'health/activity/export',
+    {
+      ...queryParams.value
+    },
+    `activity_${new Date().getTime()}.xlsx`
+  )
+}
+
+getList()
+</script>
diff --git a/src/views/health/doctorRecord/index.vue b/src/views/health/doctorRecord/index.vue
new file mode 100644
index 0000000..112bc73
--- /dev/null
+++ b/src/views/health/doctorRecord/index.vue
@@ -0,0 +1,896 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="queryParams.personId" placeholder="请选择人员姓名" clearable @change="handleQueryPersonChange">
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="healthRecordId">
+          <el-select v-model="queryParams.healthRecordId" placeholder="请选择健康档案" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="医院名称" prop="hospitalName">
+          <el-input v-model="queryParams.hospitalName" placeholder="请输入医院名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="就医类型" prop="type">
+          <el-select v-model="queryParams.type" placeholder="请选择就医类型" clearable>
+            <el-option v-for="dict in doctor_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科室" prop="departments">
+          <el-input v-model="queryParams.departments" placeholder="请输入科室" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="大夫" prop="doctor">
+          <el-input v-model="queryParams.doctor" placeholder="请输入大夫" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="就诊时间" prop="time">
+          <el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['health:doctorRecord:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['health:doctorRecord:remove']">删除</el-button>
+          <!-- <el-button @click="handleExport" icon="Download" v-hasPermi="['health:doctorRecord:export']">导出</el-button> -->
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="doctorRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="人员姓名" align="center" width="100" prop="personName" />
+          <el-table-column label="健康档案" align="center" width="160" prop="healthRecordName" />
+          <el-table-column label="医院名称" align="center" width="160" prop="hospitalName" />
+          <el-table-column label="就医类型" align="center" width="120" prop="type">
+            <template #default="scope">
+              <dict-tag :options="doctor_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="科室" align="center" width="150" prop="departments" />
+          <el-table-column label="大夫" align="center" width="80" prop="doctor" />
+          <el-table-column label="陪同人" align="center" width="120" prop="partner" />
+          <el-table-column label="就诊时间" align="center" prop="visitingTime" width="160"> </el-table-column>
+          <el-table-column label="总费用（元）" align="center" width="120" prop="totalCost" />
+          <el-table-column label="诊断结果" align="center" prop="diagnosis" />
+          <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
+            <template v-slot="scope">
+              <div class="ctrl-btn d-flex">
+                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                  <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 添加或修改就医记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="880px" append-to-body>
+      <el-form ref="doctorRecordRef" :model="form" :inline="true" :rules="rules" label-width="120px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="form.personId" placeholder="请选择人员姓名" @change="handlePersonChange" clearable>
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="healthRecordId">
+          <el-select v-model="form.healthRecordId" placeholder="请选择健康档案" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="医院名称" prop="hospitalName">
+          <el-input v-model="form.hospitalName" placeholder="请输入医院名称" />
+        </el-form-item>
+        <el-form-item label="就医类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择就医类型">
+            <el-option v-for="dict in doctor_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="科室" prop="departments">
+          <el-input v-model="form.departments" placeholder="请输入科室" />
+        </el-form-item>
+        <el-form-item label="大夫" prop="doctor">
+          <el-input v-model="form.doctor" placeholder="请输入大夫" />
+        </el-form-item>
+        <el-form-item label="就诊时间" prop="visitingTime">
+          <el-date-picker clearable v-model="form.visitingTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择就诊时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="陪同人" prop="partner">
+          <el-input v-model="form.partner" placeholder="请输入陪同人" />
+        </el-form-item>
+
+        <el-form-item label="总费用" style="width: 792px" prop="totalCost">
+          <el-input v-model="form.totalCost" type="number" placeholder="请输入总费用">
+            <template #suffix>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="诊断结果" style="width: 792px" prop="diagnosis">
+          <el-input v-model="form.diagnosis" placeholder="请输入诊断结果" />
+        </el-form-item>
+        <el-form-item label="处理及医嘱" style="width: 792px" prop="prescribe">
+          <el-input v-model="form.prescribe" type="textarea" placeholder="请输入处理及医嘱" />
+        </el-form-item>
+        <el-form-item label="费用明细" style="width: 792px" prop="costDetail">
+          <el-input v-model="form.costDetail" type="textarea" placeholder="请输入费用明细" />
+        </el-form-item>
+        <el-form-item label="备注" style="width: 792px" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template v-if="title !== '查看就医记录'" #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 添加或修改分期历史明细对话框 -->
+    <el-dialog title="添加费用明细" v-model="openDetail" width="500px" append-to-body>
+      <el-form ref="doctorRecordCostRef" :model="formDetail" :rules="rulesDetail" label-width="120px">
+        <el-form-item label="费用类型" prop="type">
+          <el-select v-model="formDetail.type" @change="handleTypeChange" placeholder="请选择费用类型">
+            <el-option v-for="dict in cost_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="产生时间" prop="costTime">
+          <el-date-picker clearable v-model="formDetail.costTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择产生时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="治疗类型" v-show="showMedicine" prop="treatType">
+          <el-select v-model="form.treatType" placeholder="请选择用药类型" @change="handleTreatTypeChange">
+            <el-option v-for="dict in mar_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-show="showMedicine" label="药品名称" prop="medicineId">
+          <el-select v-model="formDetail.medicineId" placeholder="请选择药品名称" @change="handleMedicineChange" clearable>
+            <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.shortNameBrandPackaging" :value="medicine.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-show="showCheckType" label="检查类型" prop="checkType">
+          <el-select v-model="formDetail.checkType" @change="handleCheckTypechange" clearable placeholder="请选择检查类型">
+            <el-option v-for="dict in check_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-show="showNursingType" clearable label="护理治疗" prop="checkType">
+          <el-select v-model="formDetail.checkType" @change="handleNursingTypechange" placeholder="请选择护理治疗">
+            <el-option v-for="dict in nursing_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="费用名称" v-show="false" prop="costName">
+          <el-input v-model="formDetail.costName" placeholder="请输入费用名称" />
+        </el-form-item>
+        <el-form-item label="单价" prop="price">
+          <el-input v-model="formDetail.price" type="number" @change="handlePriceChange" placeholder="请输入单价">
+            <template #suffix>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="数量" prop="count">
+          <el-input v-model="formDetail.count" type="number" @change="handleCountChange" placeholder="请输入数量"> </el-input>
+        </el-form-item>
+        <el-form-item label="单位" disabled prop="unit">
+          <el-select v-model="formDetail.unit" clearable placeholder="请选择单位">
+            <el-option v-for="dict in package_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="总价" prop="totalCost">
+          <el-input v-model="formDetail.totalCost" type="number" placeholder="请输入总价">
+            <template #suffix>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formDetail.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFormDetail">确 定</el-button>
+          <el-button @click="cancelDetail">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 添加或修改费用明细对话框 -->
+    <el-dialog title="查看添加费用明细" v-model="detailOpen" width="1150px" append-to-body>
+      <div class="basic-information">
+        <div class="main-con">
+          <div class="title-con">
+            <div class="title">基本信息</div>
+            <div class="operate-btn-con">
+              <el-button @click="handleAddDetail" icon="Plus" v-hasPermi="['health:doctorRecord:add']">新增</el-button>
+              <el-button icon="Delete" @click="handleDeleteDetail" v-hasPermi="['health:doctorRecord:remove']">删除明细</el-button>
+              <el-button @click="handleUpdateCost" icon="Expand" v-hasPermi="['health:doctorRecord:add']">总费用汇总</el-button>
+            </div>
+          </div>
+          <div class="content-con">
+            <el-table v-loading="loading" @selection-change="handleSelectionChange" :data="doctorRecordCostList">
+              <el-table-column type="selection" width="55" align="center" />
+              <el-table-column label="产生时间" align="center" prop="costTime" width="170"> </el-table-column>
+              <el-table-column label="费用类型" width="100" align="center" prop="type">
+                <template #default="scope">
+                  <dict-tag :options="cost_type" :value="scope.row.type" />
+                </template>
+              </el-table-column>
+              <el-table-column label="费用名称" align="center" prop="costName" />
+              <el-table-column label="单价（元）" align="center" width="100" prop="price" />
+              <el-table-column label="数量" align="center" width="80" prop="count" />
+              <el-table-column label="单位" align="center" width="80" prop="unit">
+                <template #default="scope">
+                  <dict-tag :options="package_unit" :value="scope.row.unit" />
+                </template>
+              </el-table-column>
+              <el-table-column label="总价（元）" align="center" width="100" prop="totalCost" />
+
+              <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width">
+                <template v-slot="scope">
+                  <div class="ctrl-btn d-flex">
+                    <el-tooltip v-for="item in operateDetailList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                      <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleDetailOperate(item.id, scope.row)"></el-button>
+                    </el-tooltip>
+                  </div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <template #footer> </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DoctorRecord">
+import { listDoctorRecord, getDoctorRecord, delDoctorRecord, addDoctorRecord, updateDoctorRecord } from '@/api/health/doctorRecord'
+import { listDoctorRecordCost, getDoctorRecordCost, delDoctorRecordCost, addDoctorRecordCost, updateDoctorRecordCost } from '@/api/health/doctorRecordCost'
+import { listPerson, getPerson } from '@/api/health/person'
+import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
+import { listHealthRecord } from '@/api/health/healthRecord'
+import dayjs from 'dayjs'
+// eslint-disable-next-line no-unused-vars
+import { require } from '@/utils/require'
+const { proxy } = getCurrentInstance()
+const { doctor_type, cost_type, check_type, package_unit, nursing_type, mar_type } = proxy.useDict(
+  'doctor_type',
+  'cost_type',
+  'check_type',
+  'package_unit',
+  'nursing_type',
+  'mar_type'
+)
+const medicineList = ref([])
+const doctorRecordList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const personList = ref([])
+const healthRecordList = ref([])
+
+const detailOpen = ref(false)
+const openDetail = ref(false)
+const titleDetail = ref('')
+const doctorRecordCostList = ref([])
+const currentDoctorRecordId = ref('')
+const currentHealthRecordId = ref('')
+const currentPersonId = ref('')
+const showCheckType = ref(false)
+const showNursingType = ref(false)
+const showMedicine = ref(false)
+const operateList = ref([
+  { id: 'detail', icon: 'Grid', title: '费用明细', hasPermi: ['health:doctorRecord:query'] },
+  { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:doctorRecord:query'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:doctorRecord:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:doctorRecord:remove'] }
+])
+const operateDetailList = ref([
+  { id: 'copy', icon: 'Link', title: '复制', hasPermi: ['health:doctorRecord:edit'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:doctorRecord:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:doctorRecord:remove'] }
+])
+const data = reactive({
+  form: {},
+  formDetail: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    hospitalName: null,
+    departments: null,
+    doctor: null,
+    healthRecordId: null,
+    time: '',
+    personId: null
+  },
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  queryMedicineParams: {
+    pageNum: 1,
+    treatmentType: null,
+    pageSize: 1000
+  },
+  queryHealthRecordParams: {
+    pageNum: 1,
+    personId: null,
+    state: '1',
+    pageSize: 1000
+  },
+  rules: {
+    personId: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }],
+    hospitalName: [{ required: true, message: '医院名称不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '就医类型不能为空', trigger: 'change' }],
+    departments: [{ required: true, message: '科室不能为空', trigger: 'blur' }],
+    doctor: [{ required: true, message: '大夫不能为空', trigger: 'blur' }],
+    partner: [{ required: true, message: '陪同人不能为空', trigger: 'blur' }],
+    totalCost: [{ required: true, message: '总费用不能为空', trigger: 'blur' }],
+    healthRecordId: [{ required: true, message: '健康档案不能为空', trigger: 'blur' }],
+    visitingTime: [{ required: true, message: '就诊时间不能为空', trigger: 'blur' }],
+    prescribe: [{ required: true, message: '处理及医嘱不能为空', trigger: 'blur' }],
+    diagnosis: [{ required: true, message: '诊断结果不能为空', trigger: 'blur' }]
+  },
+  rulesDetail: {
+    doctorRecordId: [{ required: true, message: '费用id不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '费用类型不能为空', trigger: 'blur' }],
+    costTime: [{ required: true, message: '产生时间不能为空', trigger: 'blur' }],
+    costName: [{ required: true, message: '费用名称不能为空', trigger: 'blur' }],
+    price: [{ required: true, message: '单价不能为空', trigger: 'blur' }],
+    totalCost: [{ required: true, message: '总价不能为空', trigger: 'blur' }],
+    unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
+    count: [{ required: true, message: '数量不能为空', trigger: 'blur' }]
+  }
+})
+/** 查询药品管理列表 */
+function getMedicineList() {
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicineList.value = response.rows
+  })
+}
+const handleTreatTypeChange = (type) => {
+  queryMedicineParams.value.treatmentType = type
+
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicineList.value = response.rows
+  })
+}
+const handleOperate = (operate, row) => {
+  switch (operate) {
+    case 'detail':
+      handleDetail(row)
+      break
+    case 'view':
+      handleView(row)
+      break
+    case 'edit':
+      handleUpdate(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    default:
+      break
+  }
+}
+
+const { queryParams, form, formDetail, rules, queryPersonParams, queryMedicineParams, queryHealthRecordParams, rulesDetail } = toRefs(data)
+
+const handlePersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+    if (response.rows.length > 0) {
+      form.value.healthRecordId = healthRecordList.value[0].id
+    }
+  })
+}
+const handleQueryPersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  queryParams.value.healthRecordId = null
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+}
+
+const handleCountChange = (count) => {
+  if (formDetail.value.price != null) {
+    formDetail.value.totalCost = parseFloat(count * formDetail.value.price).toFixed(2)
+  }
+}
+const handlePriceChange = (price) => {
+  if (formDetail.value.count != null) {
+    formDetail.value.totalCost = parseFloat(price * formDetail.value.count).toFixed(2)
+  }
+}
+const handleNursingTypechange = (type) => {
+  const selectedOption = nursing_type.value.find((option) => option.value === type)
+  if (selectedOption) {
+    formDetail.value.costName = selectedOption.label
+  }
+}
+
+const handleCheckTypechange = (type) => {
+  const selectedOption = check_type.value.find((option) => option.value === type)
+  if (selectedOption) {
+    formDetail.value.costName = selectedOption.label
+  }
+}
+
+const handleMedicineChange = (medicineId) => {
+  getMedicineBasic(medicineId).then((response) => {
+    formDetail.value.unit = response.data.packageUnit
+    formDetail.value.costName = response.data.shortNameBrandPackaging
+  })
+}
+
+const handleTypeChange = (type) => {
+  //挂号费
+  if (type == '1') {
+    showCheckType.value = false
+    showNursingType.value = false
+    showMedicine.value = false
+    formDetail.value.costName = '挂号费'
+    formDetail.value.count = 1
+    formDetail.value.unit = '6'
+  } else if (type == '2') {
+    //检测检查
+    showCheckType.value = true
+    showNursingType.value = false
+    showMedicine.value = false
+    formDetail.value.count = 1
+    formDetail.value.unit = '5'
+  } else if (type == '3') {
+    //药品
+    getMedicineList()
+    showCheckType.value = false
+    showNursingType.value = false
+    showMedicine.value = true
+    formDetail.value.count = 1
+  } else if (type == '4') {
+    //护理治疗
+    showCheckType.value = false
+    showNursingType.value = true
+    showMedicine.value = false
+    formDetail.value.unit = '6'
+    formDetail.value.count = 1
+  } else if (type == '5') {
+    showCheckType.value = false
+    showNursingType.value = false
+    showMedicine.value = false
+    formDetail.value.costName = '交通费'
+    formDetail.value.unit = '6'
+    formDetail.value.count = 1
+  } else if (type == '6') {
+    showCheckType.value = false
+    showNursingType.value = false
+    showMedicine.value = false
+    formDetail.value.costName = '餐饮'
+    formDetail.value.unit = '6'
+    formDetail.value.count = 1
+  } else if (type == '7') {
+    showCheckType.value = false
+    showNursingType.value = false
+    showMedicine.value = false
+    formDetail.value.costName = ''
+    formDetail.value.count = 1
+    formDetail.value.unit = null
+  }
+}
+
+/** 新增按钮操作 */
+function handleAddDetail() {
+  resetDetail()
+  getMedicineList()
+  titleDetail.value = '添加费用明细'
+  openDetail.value = true
+}
+
+const handleDetailOperate = (operate, row) => {
+  switch (operate) {
+    case 'copy':
+      handleCopy(row)
+      break
+    case 'edit':
+      handleUpdateDetail(row)
+      break
+    case 'delete':
+      handleDeleteDetail(row)
+      break
+    default:
+      break
+  }
+}
+/** 复制按钮操作 */
+function handleCopy(row) {
+  resetDetail()
+  getDoctorRecordCost(row.id).then((response) => {
+    formDetail.value = response.data
+    const type = response.data.type
+    //挂号费
+    if (type == '1') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '2') {
+      //检测检查
+      showCheckType.value = true
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '3') {
+      //药品
+      getMedicineList()
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = true
+    } else if (type == '4') {
+      //护理治疗
+      showCheckType.value = false
+      showNursingType.value = true
+      showMedicine.value = false
+    } else if (type == '5') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '6') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '7') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    }
+    formDetail.value.id = null
+    openDetail.value = true
+    titleDetail.value = '复制费用明细'
+  })
+}
+// 取消按钮
+function cancelDetail() {
+  openDetail.value = false
+  resetDetail()
+  //检测检查
+  showCheckType.value = false
+  showNursingType.value = false
+  showMedicine.value = false
+}
+/** 总利息按钮操作 */
+function handleUpdateCost() {
+  let totalCost = 0
+  for (let i = 0; i < doctorRecordCostList.value.length; i++) {
+    if (doctorRecordCostList.value[i].totalCost) {
+      totalCost = totalCost + doctorRecordCostList.value[i].totalCost
+    }
+  }
+  getDoctorRecord(currentDoctorRecordId.value).then((response) => {
+    form.value = response.data
+    form.value.totalCost = totalCost
+    if (form.value.id != null) {
+      updateDoctorRecord(form.value).then((response) => {
+        proxy.$modal.msgSuccess('总费用汇总成功！')
+        openDetail.value = false
+        getList()
+      })
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDeleteDetail(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delDoctorRecordCost(_ids)
+    })
+    .then(() => {
+      listDoctorRecordCost({ doctorRecordId: currentDoctorRecordId.value, pageNum: 1, pageSize: 1000 }).then((response) => {
+        doctorRecordCostList.value = response.rows
+      })
+      proxy.$modal.msgSuccess('删除费用明细成功')
+    })
+    .catch(() => {})
+}
+
+/** 提交按钮 */
+function submitFormDetail() {
+  formDetail.value.personId = currentPersonId.value
+  formDetail.value.doctorRecordId = currentDoctorRecordId.value
+  formDetail.value.healthRecordId = currentHealthRecordId.value
+  proxy.$refs.doctorRecordCostRef.validate((valid) => {
+    if (valid) {
+      if (formDetail.value.id != null) {
+        updateDoctorRecordCost(formDetail.value).then((response) => {
+          proxy.$modal.msgSuccess('修改明细成功')
+          openDetail.value = false
+          listDoctorRecordCost({ doctorRecordId: currentDoctorRecordId.value, pageNum: 1, pageSize: 1000 }).then((response) => {
+            doctorRecordCostList.value = response.rows
+          })
+        })
+      } else {
+        addDoctorRecordCost(formDetail.value).then((response) => {
+          proxy.$modal.msgSuccess('新增明细成功')
+          openDetail.value = false
+          listDoctorRecordCost({ doctorRecordId: currentDoctorRecordId.value, pageNum: 1, pageSize: 1000 }).then((response) => {
+            doctorRecordCostList.value = response.rows
+          })
+        })
+      }
+    }
+  })
+}
+
+/** 修改按钮操作 */
+function handleUpdateDetail(row) {
+  resetDetail()
+  getDoctorRecordCost(row.id).then((response) => {
+    formDetail.value = response.data
+    const type = response.data.type
+    //挂号费
+    if (type == '1') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '2') {
+      //检测检查
+      showCheckType.value = true
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '3') {
+      //药品
+      getMedicineList()
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = true
+    } else if (type == '4') {
+      //护理治疗
+      showCheckType.value = false
+      showNursingType.value = true
+      showMedicine.value = false
+    } else if (type == '5') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '6') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    } else if (type == '7') {
+      showCheckType.value = false
+      showNursingType.value = false
+      showMedicine.value = false
+    }
+    openDetail.value = true
+    titleDetail.value = '修改费用明细'
+  })
+}
+
+// 表单重置
+function resetDetail() {
+  formDetail.value = {
+    id: null,
+    doctorRecordId: null,
+    type: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    healthRecordId: null,
+    costTime: null,
+    costName: null,
+    personId: null,
+    totalCost: null,
+    price: null,
+    count: null,
+    unit: null,
+    medicineId: null,
+    checkType: null
+  }
+  proxy.resetForm('doctorRecordCostRef')
+}
+/** 新增按钮操作 */
+function handleDetail(row) {
+  detailOpen.value = true
+  formDetail.value.doctorRecordId = row.id
+  currentDoctorRecordId.value = row.id
+  currentPersonId.value = row.personId
+  currentHealthRecordId.value = row.healthRecordId
+  formDetail.value.personId = row.personId
+  formDetail.value.doctorRecordId = row.id
+  formDetail.value.healthRecordId = row.healthRecordId
+  listDoctorRecordCost({ doctorRecordId: row.id, pageNum: 1, pageSize: 1000 }).then((response) => {
+    doctorRecordCostList.value = response.rows
+  })
+}
+
+/** 查询就医记录列表 */
+function getList() {
+  loading.value = true
+  const timeRange = queryParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length === 2) {
+    st = dayjs(timeRange[0]).format('YYYY-MM-DD')
+    et = dayjs(timeRange[1]).format('YYYY-MM-DD')
+  }
+  queryParams.value.startTime = st
+  queryParams.value.endTime = et
+  listDoctorRecord(queryParams.value).then((response) => {
+    doctorRecordList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+/** 查询成员管理列表 */
+function getPersonList() {
+  listPerson(queryPersonParams.value).then((response) => {
+    personList.value = response.rows
+    if (response.rows.length > 0) {
+      listHealthRecord(queryHealthRecordParams).then((res) => {
+        healthRecordList.value = res.rows
+      })
+    }
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    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: 0,
+    partner: null,
+    costDetail: null
+  }
+  proxy.resetForm('doctorRecordRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  title.value = '查看就医记录'
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  form.value = row
+  open.value = true
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  if (personList.value.length > 0) {
+    form.value.personId = personList.value[0].id
+    queryHealthRecordParams.personId = personList.value[0].id
+    listHealthRecord(queryHealthRecordParams).then((response) => {
+      healthRecordList.value = response.rows
+      if (response.rows.length > 0) {
+        form.value.healthRecordId = healthRecordList.value[0].id
+      }
+    })
+  }
+  open.value = true
+  title.value = '添加就医记录'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  const _id = row.id || ids.value
+  getDoctorRecord(_id).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改就医记录'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.doctorRecordRef.validate((valid) => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateDoctorRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addDoctorRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delDoctorRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    'health/doctorRecord/export',
+    {
+      ...queryParams.value
+    },
+    `doctorRecord_${new Date().getTime()}.xlsx`
+  )
+}
+
+getList()
+getPersonList()
+</script>
diff --git a/src/views/health/doctorStatistic/index.vue b/src/views/health/doctorStatistic/index.vue
new file mode 100644
index 0000000..a94440b
--- /dev/null
+++ b/src/views/health/doctorStatistic/index.vue
@@ -0,0 +1,665 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
+        <el-form-item label="人员姓名" prop="id">
+          <el-select v-model="queryParams.id" placeholder="请选择人员姓名" @change="handlePersonChange">
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="recordId">
+          <el-select v-model="queryParams.recordId" placeholder="请选择健康档案" @change="handleRecordChange" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="就医日期" prop="time" v-if="queryParams.type === 1">
+          <el-date-picker
+            v-model="queryParams.time"
+            type="daterange"
+            range-separator="~"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            format="YYYY-MM-DD"
+            @calendar-change="calendarChange"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="time" v-if="queryParams.type === 2">
+          <el-date-picker
+            v-model="queryParams.time"
+            type="monthrange"
+            range-separator="~"
+            format="YYYY-MM"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :disabled-date="disabledDateFun"
+            @calendar-change="calendarChange"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="time" v-if="queryParams.type === 3">
+          <yearPicker
+            v-model="queryParams.time"
+            ref="statisticPicker"
+            labelText="选择年份"
+            :initYear="dateValue"
+            :showYear="showYearValue"
+            :maxLength="5"
+            sp="~"
+            @updateTimeRange="updateStatisticYear"
+          />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con" style="height: calc(100% - 1.45rem)">
+      <div class="summary-con" style="height: 115px">
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">就医次数</div>
+            <div>
+              <span class="num">{{ doctor.doctorCount }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">就医费用</div>
+            <div>
+              <span class="num">{{ doctor.doctorCost }}</span
+              ><span class="unit">元 </span>
+            </div>
+          </div>
+        </div>
+
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">常去医院</div>
+            <div>
+              <span class="num" style="font-size: 16px">{{ doctor.commonHospital }}</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">常去科室</div>
+            <div>
+              <span style="font-size: 18px" class="num">{{ doctor.commonDepartments }}</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">常看大夫</div>
+            <div>
+              <span class="num" style="font-size: 18px">{{ doctor.commonDoctor }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="summary-con" style="height: 115px">
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">门诊次数</div>
+            <div>
+              <span class="num">{{ doctor.clinicCount }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">急诊次数</div>
+            <div>
+              <span class="num">{{ doctor.emergencyCount }}</span
+              ><span class="unit">次 </span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">输液次数</div>
+            <div>
+              <span class="num">{{ doctor.infusionCount }}</span
+              ><span class="unit">次 </span>
+            </div>
+          </div>
+        </div>
+
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">住院次数</div>
+            <div>
+              <span class="num">{{ doctor.hospitalizedCount }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">线上问诊次数</div>
+            <div>
+              <span class="num">{{ doctor.onlineCount }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="title-con" style="margin-top: 18px">
+        <div class="title">就医统计</div>
+        <div class="operate-btn-con">
+          <el-radio-group v-model="radioVal" @change="handleRadioChange">
+            <el-radio-button label="就医明细统计" />
+            <el-radio-button label="就诊医院统计" />
+            <el-radio-button label="就诊科室统计" />
+            <el-radio-button label="就诊大夫统计" />
+            <el-radio-button label="就医费用柱状图" />
+            <el-radio-button label="就医费用折线图" />
+          </el-radio-group>
+        </div>
+      </div>
+      <div class="content-con">
+        <div v-show="radioVal === '就医费用柱状图'" class="chart" id="chartBar" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <div v-show="radioVal === '就医费用折线图'" class="chart" id="chartLine" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <el-table v-show="radioVal === '就诊医院统计'" v-loading="loading" :data="doctor.hospitalStaticList" height="calc(100% - 245px)">
+          <el-table-column label="序号" width="50" type="index" align="center">
+            <template #default="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="医院名称" align="center" prop="hospitalName" />
+          <el-table-column label="就诊次数" align="center" prop="count" />
+        </el-table>
+        <el-table v-show="radioVal === '就诊科室统计'" v-loading="loading" :data="doctor.departStaticList" height="calc(100% - 245px)">
+          <el-table-column label="序号" width="50" type="index" align="center">
+            <template #default="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="就诊科室" align="center" prop="departments" />
+          <el-table-column label="就诊次数" align="center" prop="count" />
+        </el-table>
+        <el-table v-show="radioVal === '就诊大夫统计'" v-loading="loading" :data="doctor.doctorStaticList" height="calc(100% - 245px)">
+          <el-table-column label="序号" width="50" type="index" align="center">
+            <template #default="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="就诊大夫" align="center" prop="doctor" />
+          <el-table-column label="所在医院" align="center" prop="hospitalName" />
+          <el-table-column label="就诊次数" align="center" prop="count" />
+        </el-table>
+        <el-table v-show="radioVal === '就医明细统计'" v-loading="loading" :data="doctor.doctorTableList" height="calc(100% - 245px)">
+          <el-table-column label="序号" width="50" type="index" align="center">
+            <template #default="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="就诊医院" align="center" width="250" prop="hospitalName" />
+          <el-table-column label="就医类型" align="center" width="150" prop="type">
+            <template #default="scope">
+              <dict-tag :options="doctor_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="就诊大夫" align="center" width="150" prop="doctor" />
+          <el-table-column label="就诊时间" align="center" width="160" prop="visitingTime" />
+          <el-table-column label="诊断结果" align="center" prop="diagnosis" />
+          <el-table-column label="就诊费用（元）" align="center" width="150" prop="totalCost" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="CreditAnalysis">
+import dayjs from 'dayjs'
+import * as echarts from 'echarts'
+import { ElMessage } from 'element-plus'
+import yearPicker from '@/components/YearPicker/index.vue'
+import { getDoctorAnalysis } from '@/api/health/statisticAnalysis'
+import { listPerson, getPerson } from '@/api/health/person'
+import { listHealthRecord } from '@/api/health/healthRecord'
+const { proxy } = getCurrentInstance()
+const personList = ref([])
+const healthRecordList = ref([])
+const { doctor_type, cost_type, check_type, package_unit, nursing_type, mar_type } = proxy.useDict(
+  'doctor_type',
+  'cost_type',
+  'check_type',
+  'package_unit',
+  'nursing_type',
+  'mar_type'
+)
+const dateValue = ref({ startYear: 2000, endYear: new Date().getFullYear() })
+const showYearValue = ref({ startShowYear: '', endShowYear: '' })
+const updateStatisticYear = (startYear, endYear) => {
+  queryParams.value.time = [new Date(startYear, 0, 1), new Date(endYear, 0, 1)]
+  if (endYear - startYear > 5) {
+    ElMessage.warning('时间跨度不能大于5年，默认选择开始日期的5年')
+    queryParams.value.time = [new Date(startYear, 0, 1), new Date(startYear + 5, 0, 1)]
+  }
+}
+
+const dates = [{ value: 1, label: '日' }]
+const accountsList = ref([])
+const loading = ref(true)
+const total = ref(0)
+const radioVal = ref('就医明细统计')
+const dateValidate = (rules, value, callback) => {
+  const dateType = rules.dateType || 'days'
+  const num = rules.num || 31
+  const dateString = rules.dateString || '天'
+  const message = rules.message || `时间跨度不能超过${num}${dateString}`
+
+  if (value && value.length === 2) {
+    const start = value[0]
+    const end = value[1]
+    if (dayjs(end).diff(dayjs(start), dateType) > num) {
+      queryParams.value.time = [start, dayjs(start).add(23, 'months')]
+      ElMessage.warning(message)
+    }
+  }
+}
+
+const data = reactive({
+  queryParams: {
+    type: 1,
+    time: null,
+    id: null,
+    dataType: '1',
+    dealType: null,
+    dealCategory: null
+  },
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  queryHealthRecordParams: {
+    pageNum: 1,
+    personId: null,
+    state: '1',
+    pageSize: 1000
+  },
+  rules: {
+    time: [{ validator: dateValidate, dateType: 'months', num: 23, dateRange: '月', message: '时间跨度不能大于24个月，默认选择开始日期的24个月' }]
+  }
+})
+
+const { queryParams, rules, queryPersonParams, queryHealthRecordParams } = toRefs(data)
+
+const handleRecordChange = (recordId) => {
+  queryParams.value.recordId = recordId
+  getList()
+}
+
+const handlePersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+    if (response.rows.length > 0) {
+      queryParams.value.recordId = response.rows[0].id
+      getList()
+    }
+  })
+}
+
+/** 查询成员管理列表 */
+function getPersonList() {
+  listPerson(queryPersonParams.value).then((response) => {
+    personList.value = response.rows
+    if (response.rows.length > 0) {
+      queryParams.value.id = response.rows[0].id
+      queryHealthRecordParams.personId = response.rows[0].id
+      listHealthRecord(queryHealthRecordParams).then((res) => {
+        healthRecordList.value = res.rows
+        if (res.rows.length > 0) {
+          queryParams.value.recordId = res.rows[0].id
+          getList()
+        }
+      })
+    }
+  })
+}
+
+const today = new Date()
+// const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+// const start = dayjs(end).add(-60, 'day')
+// queryParams.value.time = [start, end]
+const handleTimeChange = (type) => {
+  queryParams.value.time = null
+  if (type === 1) {
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+    const start = dayjs(end).add(-60, 'day')
+    queryParams.value.time = [start, end]
+  } else if (type === 2) {
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+    const start = dayjs(end).add(-11, 'months')
+    queryParams.value.time = [start, end]
+  } else if (type === 3) {
+    const today = new Date()
+    const endYear = today.getFullYear()
+    queryParams.value.time = [new Date(endYear - 2, 0, 1), new Date(endYear, 0, 1)]
+    showYearValue.value = { startShowYear: endYear - 2, endShowYear: endYear }
+  }
+  getList()
+}
+function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '<br/>')
+  }
+}
+const disabledDateFun = (time) => {
+  const arr = [0, 30, 365, 365 * 5]
+  const days = arr[queryParams.value.type]
+
+  if (firstChooseDate.value) {
+    const one = days * 24 * 3600 * 1000
+    const minTime = firstChooseDate.value - one
+    const maxTime = firstChooseDate.value + one
+    const startTime = minTime
+    const endTime = maxTime > Date.now() - 8.64e7 ? Date.now() - 8.64e7 : maxTime
+    return time.getTime() > endTime || time.getTime() < startTime
+  } else {
+    return time.getTime() > Date.now() - 8.64e7
+  }
+}
+
+const firstChooseDate = ref('')
+const calendarChange = (val) => {
+  firstChooseDate.value = val[0].getTime()
+  if (val[1]) firstChooseDate.value = ''
+}
+
+const doctor = ref({})
+const chartData = ref({
+  name: [],
+  value1: []
+})
+
+function getList() {
+  loading.value = true
+  chartData.value = { name: [], value1: [] }
+  const { type, time, id, recordId } = queryParams.value
+  let formatValue = 'YYYY-MM-DD'
+  if (type === 1) {
+    formatValue = 'YYYY-MM-DD'
+  } else if (type === 2) {
+    formatValue = 'YYYY-MM'
+  } else {
+    formatValue = 'YYYY'
+  }
+  const params = {
+    type,
+    startTime: time && time.length > 0 ? dayjs(time[0]).format(formatValue) : '',
+    endTime: time && time.length > 0 ? dayjs(time[1]).format(formatValue) : '',
+    id,
+    recordId
+  }
+  getDoctorAnalysis(params).then((response) => {
+    loading.value = false
+    doctor.value = { ...response.data }
+    doctor.value.doctorCostList.map((item) => {
+      return {
+        name: item.time,
+        value: item.value
+      }
+    })
+    response.data.doctorCostList.map((item) => {
+      chartData.value.name.push(item.time)
+      chartData.value.value1.push(item.value)
+    })
+    handleRadioChange(currentType.value)
+  })
+}
+
+function handleQuery() {
+  getList()
+}
+
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  queryParams.value.id = null
+  // const today = new Date()
+  // const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+  // const start = dayjs(end).add(-60, 'day')
+  // queryParams.value.time = [start, end]
+  total.value = 0
+  getPersonList()
+}
+
+const drawBar = (data) => {
+  if (document.getElementById('chartBar') === null) {
+    return
+  }
+  echarts.dispose(document.getElementById('chartBar'))
+  const myChart = echarts.init(document.getElementById('chartBar'))
+
+  const option = {
+    legend: {
+      // 图示例样式
+      show: true,
+      top: 50,
+      right: 50,
+      itemGap: 20
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      },
+      formatter: function (params) {
+        return params[0].name + '<br>' + '费用：' + params[0].value + '元'
+      }
+    },
+    grid: {
+      left: '5%',
+      right: '5%',
+      bottom: '5%',
+      containLabel: true
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: data.name,
+        axisTick: {
+          alignWithLabel: true // 刻度线是否与标签对齐，默认false
+        },
+        // 设置 X 轴线条粗细
+        axisLine: {
+          lineStyle: {
+            width: 1, // 根据需求调整数值大小，单位是像素
+            color: '#999'
+          }
+        }
+      }
+    ],
+    yAxis: [
+      {
+        type: 'value',
+        // min: 1, // 设置 y 轴的最小值为 0
+        // max: 16, // 设置 y 轴的最大值为 100
+        // interval: 1, //设置y轴刻度间隔
+        axisTick: {
+          show: true // 默认为true，如果要隐藏，则改为 false
+        },
+        axisLine: {
+          show: true,
+          lineStyle: {
+            width: 1,
+            color: '#999'
+          }
+        }
+      }
+    ],
+    series: [
+      {
+        data: data.value1,
+        type: 'bar',
+        barWidth: 10, // 根据需求调整数值大小，单位是像素
+        itemStyle: {
+          // 此处可以是一个固定颜色值，也可以是一个回调函数根据数据动态计算颜色
+          color: function (params) {
+            return '#2283cf' // 数据在50到99之间为蓝色
+          }
+        }
+      }
+    ],
+    // 添加点击事件的处理函数
+    emphasis: {
+      // itemStyle: {
+      //   color: '#2283cf',
+      //   barWidth: 20 // 根据需求调整数值大小，单位是像素
+      // },
+      barWidth: 24 // 根据需求调整数值大小，单位是像素
+    }
+  }
+
+  myChart.setOption(option)
+}
+
+const drawLine = (data) => {
+  if (document.getElementById('chartLine') === null) {
+    return
+  }
+  echarts.dispose(document.getElementById('chartLine'))
+  const myChart = echarts.init(document.getElementById('chartLine'))
+
+  const option = {
+    grid: {
+      left: '5%',
+      right: '5%',
+      bottom: '5%',
+      containLabel: true
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      },
+      formatter: function (params) {
+        return params[0].name + '<br>' + '费用：' + params[0].value + '元'
+      }
+    },
+    xAxis: {
+      type: 'category',
+      data: data.name,
+      axisTick: {
+        alignWithLabel: true
+      },
+      axisLine: {
+        lineStyle: {
+          width: 1,
+          color: '#999'
+        }
+      }
+    },
+    yAxis: {
+      type: 'value',
+      // min: 1, // 设置 y 轴的最小值为 0
+      // // max: 16, // 设置 y 轴的最大值为 100
+      // interval: 1, //设置y轴刻度间隔
+      axisTick: {
+        show: true
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          width: 1,
+          color: '#999'
+        }
+      }
+    },
+    series: [
+      {
+        data: data.value1,
+        type: 'line',
+        lineStyle: {
+          color: '#4181c9'
+        },
+        itemStyle: {
+          // 此处可以是一个固定颜色值，也可以是一个回调函数根据数据动态计算颜色
+          color: function (params) {
+            return '#2283cf' // 数据在50到99之间为蓝色
+          }
+        },
+        smooth: true,
+        symbol: 'emptyCircle',
+        areaStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: 'rgba(65,129,201, 0.70)'
+              },
+              {
+                offset: 1,
+                color: 'rgba(65,129,201, 0.10)'
+              }
+            ],
+            false
+          ),
+          shadowColor: 'rgba(65,129,201, 0.10)',
+          shadowBlur: 10
+        }
+      }
+    ]
+  }
+
+  myChart.setOption(option)
+}
+
+const currentType = ref('就医费用柱状图')
+const handleRadioChange = (type) => {
+  currentType.value = type
+  switch (type) {
+    case '就医费用柱状图':
+      drawBar(chartData.value)
+      break
+    case '就医费用折线图':
+      drawLine(chartData.value)
+      break
+    default:
+      break
+  }
+}
+getPersonList()
+</script>
diff --git a/src/views/health/healthAnalysis/assets/completionTickets.png b/src/views/health/healthAnalysis/assets/completionTickets.png
new file mode 100644
index 0000000..a6f34bf
Binary files /dev/null and b/src/views/health/healthAnalysis/assets/completionTickets.png differ
diff --git a/src/views/health/healthAnalysis/assets/completionTime.png b/src/views/health/healthAnalysis/assets/completionTime.png
new file mode 100644
index 0000000..8a1114f
Binary files /dev/null and b/src/views/health/healthAnalysis/assets/completionTime.png differ
diff --git a/src/views/health/healthAnalysis/assets/four.png b/src/views/health/healthAnalysis/assets/four.png
new file mode 100644
index 0000000..a12edd7
Binary files /dev/null and b/src/views/health/healthAnalysis/assets/four.png differ
diff --git a/src/views/health/healthAnalysis/assets/one.png b/src/views/health/healthAnalysis/assets/one.png
new file mode 100644
index 0000000..78d2c2b
Binary files /dev/null and b/src/views/health/healthAnalysis/assets/one.png differ
diff --git a/src/views/health/healthAnalysis/assets/positiveRating.png b/src/views/health/healthAnalysis/assets/positiveRating.png
new file mode 100644
index 0000000..f4103ec
Binary files /dev/null and b/src/views/health/healthAnalysis/assets/positiveRating.png differ
diff --git a/src/views/health/healthAnalysis/assets/three.png b/src/views/health/healthAnalysis/assets/three.png
new file mode 100644
index 0000000..d1e8225
Binary files /dev/null and b/src/views/health/healthAnalysis/assets/three.png differ
diff --git a/src/views/health/healthAnalysis/assets/ticketSum.png b/src/views/health/healthAnalysis/assets/ticketSum.png
new file mode 100644
index 0000000..fc1246c
Binary files /dev/null and b/src/views/health/healthAnalysis/assets/ticketSum.png differ
diff --git a/src/views/health/healthAnalysis/assets/two.png b/src/views/health/healthAnalysis/assets/two.png
new file mode 100644
index 0000000..0f474ce
Binary files /dev/null and b/src/views/health/healthAnalysis/assets/two.png differ
diff --git a/src/views/health/healthAnalysis/index.vue b/src/views/health/healthAnalysis/index.vue
new file mode 100644
index 0000000..b110d8c
--- /dev/null
+++ b/src/views/health/healthAnalysis/index.vue
@@ -0,0 +1,281 @@
+<template>
+  <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">{{ personCount }}<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">{{ healthRecordCount }}<span>份</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">活动次数</div>
+          <div class="num">{{ activityCount }}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">活动费用</div>
+          <div class="num">{{ activityCost }}<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">{{ hospitalCount }}<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">{{ doctorTotalCount }}<span>个</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">就医次数</div>
+          <div class="num">{{ doctorCount }}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">就医费用</div>
+          <div class="num">{{ doctorCost }}<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">{{ marDayCount }}<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">{{ marCount }}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">用药种类</div>
+          <div class="num">{{ medicalTypeCount }}<span>种</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">测量体温次数</div>
+          <div class="num">{{ temperatureTotalCount }}<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">发烧天数（>=37℃）</div>
+          <div class="num">{{ feverDayCount }}<span>天</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">低烧次数（36.9~37.5℃）</div>
+          <div class="num">{{ lowerTempCount }}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">中烧次数（37.5~38.5℃）</div>
+          <div class="num">{{ middleTempCount }}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/completionTime.png" alt="" />
+        <div class="info-sum">
+          <div class="title">高烧次数（>=38.5℃）</div>
+          <div class="num">{{ higherTempCount }}<span>次</span></div>
+        </div>
+      </div>
+    </div>
+    <div v-for="(item, index) in personList" :key="index">
+      <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;{{ item.personName + '-健康档案概览' }}</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">{{ item.healthRecordCount }}<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">{{ item.hospitalCount }}<span>个</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">就诊大夫</div>
+            <div class="num">{{ item.doctorTotalCount }}<span>个</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">就医次数</div>
+            <div class="num">{{ item.doctorCount }}<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">{{ item.doctorCost }}<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">{{ item.marDayCount }}<span>天</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">用药次数</div>
+            <div class="num">{{ item.marCount }}<span>次</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">发烧天数（>=37℃）</div>
+            <div class="num">{{ item.feverDayCount }}<span>天</span></div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div></div>
+  </div>
+</template>
+<script setup name="facilityType">
+import { getHealthAnalysis } from '@/api/health/statisticAnalysis.js'
+
+//信息
+const personCount = ref(0) //成员总数
+const healthRecordCount = ref(0) //健康档案总数
+const activityCount = ref(0) //活动总数
+const activityCost = ref(0) //活动费用
+const doctorCount = ref(0) //就医总数
+const doctorCost = ref(0) //就医费用
+const hospitalCount = ref(0) //医院总数
+const doctorTotalCount = ref(0) //医生总数
+const marDayCount = ref(0) //用药天数
+const marCount = ref(0) //用药次数
+const medicalTypeCount = ref(0) //用药类别
+const feverDayCount = ref(0) //发烧天数
+const temperatureTotalCount = ref(0) //体温测量次数
+const lowerTempCount = ref(0) //低烧次数
+const middleTempCount = ref(0) //中烧次数
+const higherTempCount = ref(0) //高烧次数
+const personList = ref([]) //人员记录
+
+const getHealthAnalysisData = () => {
+  getHealthAnalysis().then((res) => {
+    personCount.value = res.data.personCount
+    healthRecordCount.value = res.data.healthRecordCount
+    activityCount.value = res.data.activityCount
+    activityCost.value = res.data.activityCost
+    doctorCount.value = res.data.doctorCount
+    doctorCost.value = res.data.doctorCost
+    hospitalCount.value = res.data.hospitalCount
+    doctorTotalCount.value = res.data.doctorTotalCount
+    marCount.value = res.data.marCount
+    feverDayCount.value = res.data.feverDayCount
+    marDayCount.value = res.data.marDayCount
+    medicalTypeCount.value = res.data.medicalTypeCount
+    temperatureTotalCount.value = res.data.temperatureTotalCount
+    lowerTempCount.value = res.data.lowerTempCount
+    middleTempCount.value = res.data.middleTempCount
+    higherTempCount.value = res.data.higherTempCount
+    personList.value = res.data.personList
+  })
+}
+
+onMounted(() => {
+  getHealthAnalysisData()
+})
+</script>
+<style lang="scss" scoped>
+.app-container {
+  .header-con {
+    width: 100%;
+    height: 120px;
+    background-color: #ffffff;
+    margin-bottom: 10px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .item {
+      width: 20%;
+      height: 100%;
+      display: flex;
+      position: relative;
+      align-items: center;
+      margin: 30px 60px 30px 60px;
+      .title {
+        margin-left: 20px;
+        color: rgb(133, 133, 148);
+        margin-bottom: 8px;
+      }
+      .num {
+        margin-left: 20px;
+        font-weight: bold;
+      }
+    }
+    img {
+      height: 50px;
+      width: 50px;
+    }
+  }
+  .header-title {
+    width: 100%;
+    height: 30px;
+    background-color: #ffffff;
+    margin-bottom: 3px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+}
+</style>
diff --git a/src/views/health/healthRecord/index.vue b/src/views/health/healthRecord/index.vue
new file mode 100644
index 0000000..6b35adb
--- /dev/null
+++ b/src/views/health/healthRecord/index.vue
@@ -0,0 +1,608 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="queryParams.personId" placeholder="请选择人员" clearable>
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="档案名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入档案名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="queryParams.type" placeholder="请选择类型" clearable>
+            <el-option v-for="dict in record_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发生原因" prop="etiology">
+          <el-select v-model="queryParams.etiology" placeholder="请选择发生原因" clearable>
+            <el-option v-for="dict in etiology" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="档案状态" prop="state">
+          <el-select v-model="queryParams.state" placeholder="请选择档案状态" clearable>
+            <el-option v-for="dict in health_record_state" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发生时间" prop="time">
+          <el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['health:healthRecord:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['health:healthRecord:remove']">删除</el-button>
+          <!-- <el-button @click="handleExport" icon="Download" v-hasPermi="['health:healthRecord:export']">导出</el-button> -->
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="healthRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="人员姓名" align="center" width="100" prop="personName" />
+          <el-table-column label="档案名称" align="center" width="160" prop="name" />
+          <el-table-column label="类型" align="center" width="100" prop="type">
+            <template #default="scope">
+              <dict-tag :options="record_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="档案状态" align="center" width="100" prop="state">
+            <template #default="scope">
+              <dict-tag :options="health_record_state" :value="scope.row.state" />
+            </template>
+          </el-table-column>
+          <el-table-column label="发生时间" align="center" prop="occurTime" width="160"> </el-table-column>
+          <el-table-column label="康复时间" align="center" prop="rehabilitationTime" width="160"> </el-table-column>
+          <el-table-column label="康复周期" align="center" prop="duration" width="160"> </el-table-column>
+          <el-table-column label="发生原因" align="center" width="120" prop="etiology">
+            <template #default="scope">
+              <dict-tag :options="etiology" :value="scope.row.etiology" />
+            </template>
+          </el-table-column>
+          <el-table-column label="初期症状" align="center" prop="initialSymptoms" />
+          <!-- <el-table-column label="中期症状" align="center" prop="mediumTermSymptoms" />
+          <el-table-column label="后期症状" align="center" prop="laterStageSymptoms" /> -->
+          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+            <template v-slot="scope">
+              <div class="ctrl-btn d-flex">
+                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                  <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 添加或修改健康档案对话框 -->
+    <el-dialog :title="title" v-model="open" width="880px" append-to-body>
+      <el-form ref="healthRecordRef" :model="form" :inline="true" :rules="rules" label-width="120px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="form.personId" placeholder="请选择人员" @change="handlePersonChange" clearable>
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="档案名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入档案名称" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option v-for="dict in record_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="档案状态" prop="state">
+          <el-select v-model="form.state" placeholder="请选择档案状态">
+            <el-option v-for="dict in health_record_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发生时间" prop="occurTime">
+          <el-date-picker clearable v-model="form.occurTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择发生时间"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="发生原因" prop="etiology">
+          <el-select v-model="form.etiology" placeholder="请选择发生原因">
+            <el-option v-for="dict in etiology" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="康复时间" style="width: 792px" prop="rehabilitationTime">
+          <el-date-picker clearable v-model="form.rehabilitationTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择康复时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="初期症状" style="width: 792px" prop="initialSymptoms">
+          <el-input v-model="form.initialSymptoms" type="textarea" placeholder="请输入初期症状" />
+        </el-form-item>
+
+        <el-form-item label="中期症状" style="width: 792px" prop="mediumTermSymptoms">
+          <el-input v-model="form.mediumTermSymptoms" type="textarea" placeholder="请输入中期症状" />
+        </el-form-item>
+        <el-form-item label="后期症状" style="width: 792px" prop="laterStageSymptoms">
+          <el-input v-model="form.laterStageSymptoms" type="textarea" placeholder="请输入后期症状" />
+        </el-form-item>
+
+        <el-form-item label="备注" style="width: 792px" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template v-if="title !== '查看健康档案'" #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <el-dialog :title="detailTitle" v-model="detailOpen" width="1150px" append-to-body>
+      <el-radio-group v-model="activeName" style="margin-bottom: 20px">
+        <el-radio-button label="first">基本信息</el-radio-button>
+        <el-radio-button label="second">就医记录</el-radio-button>
+        <el-radio-button label="third">过程记录</el-radio-button>
+        <el-radio-button label="marStatic">用药统计</el-radio-button>
+        <el-radio-button label="fourth">体温记录</el-radio-button>
+      </el-radio-group>
+      <div v-if="activeName === 'first'" class="basic-information">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <span class="title">人员姓名：</span><span class="content">{{ basicInformation.personName }}</span>
+          </el-col>
+          <el-col :span="8">
+            <span class="title">档案名称：</span><span class="content">{{ basicInformation.name }}</span>
+          </el-col>
+          <el-col :span="8">
+            <span class="title">类型：</span>
+            <span class="content"><dict-tag style="display: inline" :options="record_type" :value="basicInformation.type" /></span>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <span class="title">档案状态：</span>
+            <span class="content"><dict-tag style="display: inline" :options="health_record_state" :value="basicInformation.state" /></span>
+          </el-col>
+          <el-col :span="8">
+            <span class="title">发生时间：</span><span class="content">{{ basicInformation.occurTime }}</span>
+          </el-col>
+          <el-col :span="8">
+            <span class="title">发生原因：</span>
+            <span class="content"><dict-tag style="display: inline" :options="etiology" :value="basicInformation.etiology" /></span>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <span class="title">康复时间：</span><span class="content">{{ basicInformation.rehabilitationTime }}</span>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <span class="title">初期症状：</span><span class="content">{{ basicInformation.initialSymptoms }}</span>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <span class="title">中期症状：</span><span class="content">{{ basicInformation.mediumTermSymptoms }}</span>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <span class="title">后期症状：</span><span class="content">{{ basicInformation.laterStageSymptoms }}</span>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <span class="title">备注：</span><span class="content">{{ basicInformation.remark }}</span>
+          </el-col>
+        </el-row>
+      </div>
+      <div v-if="activeName === 'second'" class="basic-information">
+        <div class="main-con">
+          <div class="content-con">
+            <el-table v-loading="doctorRecordLoading" :data="doctorRecordList">
+              <el-table-column label="医院名称" align="center" width="180" prop="hospitalName" />
+              <el-table-column label="科室" align="center" width="120px" prop="departments" />
+              <el-table-column label="大夫" align="center" width="100px" prop="doctor" />
+              <el-table-column label="就诊时间" align="center" prop="visitingTime" width="180"> </el-table-column>
+              <el-table-column label="诊断及开药" align="center" prop="prescribe" />
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <div v-if="activeName === 'marStatic'" class="basic-information">
+        <div class="main-con">
+          <div class="content-con">
+            <el-table v-loading="doctorRecordLoading" :data="mar.marMapList">
+              <el-table-column label="序号" width="50" type="index" align="center">
+                <template #default="scope">
+                  <span>{{ scope.$index + 1 }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="药品名称" align="center" prop="medicalName" />
+              <el-table-column label="用药天数" width="150" align="center" prop="useDays" />
+              <el-table-column label="用药次数" width="150" align="center" prop="count" />
+              <el-table-column label="用药总量" width="150" align="center" prop="dosage" />
+              <el-table-column label="单位" width="150" align="center" prop="unit" />
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <div v-if="activeName === 'third'" class="basic-information">
+        <div class="main-con">
+          <div class="content-con">
+            <el-table v-loading="processRecordLoading" :data="processRecordList">
+              <el-table-column label="记录时间" align="center" prop="createTime" width="180"> </el-table-column>
+              <el-table-column label="记录内容" align="center" prop="content" />
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <div v-if="activeName === 'fourth'" class="basic-information">
+        <div class="main-con">
+          <div class="content-con">
+            <el-table v-loading="temperatureRecordLoading" :data="temp.tableList">
+              <el-table-column label="序号" width="50" type="index" align="center">
+                <template #default="scope">
+                  <span>{{ scope.$index + 1 }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="测量日期" align="center" prop="time" />
+              <el-table-column label="测量次数" align="center" prop="count" />
+              <el-table-column label="最高体温（℃）" align="center" prop="max" />
+              <el-table-column label="最低体温（℃）" align="center" prop="min" />
+              <el-table-column label="平均体温（℃" align="center" prop="average" />
+              <el-table-column prop="detail" width="300" label="测量明细">
+                <template #default="scope">
+                  <span v-html="formatMultiLineData(scope.row.detail)"></span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <template #footer> </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="HealthRecord">
+import { listHealthRecord, getHealthRecord, delHealthRecord, addHealthRecord, updateHealthRecord } from '@/api/health/healthRecord'
+import { listPerson, getPerson } from '@/api/health/person'
+import { listTemperatureRecord } from '@/api/health/temperatureRecord'
+import { listMarRecord } from '@/api/health/marRecord'
+import { listProcessRecord } from '@/api/health/processRecord'
+import { getMarAnalysis, getTemperatureAnalysis } from '@/api/health/statisticAnalysis'
+import { listDoctorRecord } from '@/api/health/doctorRecord'
+import dayjs from 'dayjs'
+// eslint-disable-next-line no-unused-vars
+import { require } from '@/utils/require'
+import { nextTick, reactive, toRefs } from 'vue'
+const { proxy } = getCurrentInstance()
+const { record_type, etiology, health_record_state } = proxy.useDict('record_type', 'etiology', 'health_record_state')
+const healthRecordList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const personList = ref([])
+
+const detailTitle = ref('')
+const detailOpen = ref(false)
+const basicInformation = ref(null)
+const activeName = ref('first')
+const currentId = ref('')
+const marRecordLoading = ref(false)
+const marRecordList = ref([])
+const marTotal = ref(0)
+const mar = ref({})
+
+const temperatureRecordLoading = ref(false)
+const temperatureRecordList = ref([])
+const tempTotal = ref(0)
+const temp = ref({})
+
+const doctorRecordLoading = ref(false)
+const doctorRecordList = ref([])
+
+const processRecordLoading = ref(false)
+const processRecordList = ref([])
+
+const operateList = ref([
+  { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:healthRecord:query'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:healthRecord:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:healthRecord:remove'] }
+])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: null,
+    type: null,
+    time: '',
+    etiology: null,
+    personId: null,
+    state: null
+  },
+  queryMarRecordParams: {
+    pageNum: 1,
+    pageSize: 100,
+    healthRecordId: null
+  },
+  queryDoctorRecordParams: {
+    pageNum: 1,
+    pageSize: 100,
+    healthRecordId: null
+  },
+  queryTemperatureRecordParams: {
+    pageNum: 1,
+    pageSize: 100,
+    healthRecordId: null
+  },
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  rules: {
+    name: [{ required: true, message: '档案名称不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
+    occurTime: [{ required: true, message: '发生时间不能为空', trigger: 'blur' }],
+    initialSymptoms: [{ required: true, message: '初期症状不能为空', trigger: 'blur' }],
+    etiology: [{ required: true, message: '发生原因不能为空', trigger: 'blur' }],
+    personId: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }],
+    state: [{ required: true, message: '档案状态不能为空', trigger: 'blur' }]
+  }
+})
+
+function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '<br/>')
+  }
+}
+const handleOperate = (operate, row) => {
+  switch (operate) {
+    case 'view':
+      handleView(row)
+      break
+    case 'edit':
+      handleUpdate(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    default:
+      break
+  }
+}
+
+const { queryParams, form, rules, queryPersonParams, queryMarRecordParams, queryTemperatureRecordParams, queryDoctorRecordParams } = toRefs(data)
+
+const handlePersonChange = (personId) => {
+  getPerson(personId).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 + '档案'
+  })
+}
+
+/** 查询健康档案列表 */
+function getList() {
+  loading.value = true
+  const timeRange = queryParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length === 2) {
+    st = dayjs(timeRange[0]).format('YYYY-MM-DD')
+    et = dayjs(timeRange[1]).format('YYYY-MM-DD')
+  }
+  queryParams.value.startTime = st
+  queryParams.value.endTime = et
+  listHealthRecord(queryParams.value).then((response) => {
+    healthRecordList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+/** 查询成员管理列表 */
+function getPersonList() {
+  listPerson(queryPersonParams.value).then((response) => {
+    personList.value = response.rows
+  })
+}
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    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'
+  }
+  proxy.resetForm('healthRecordRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+// 分页
+const handleTempCurrentChange = (val) => {
+  queryTemperatureRecordParams.value.pageNum = val
+  // 体温记录
+  listTemperatureRecord(queryTemperatureRecordParams.value).then((res) => {
+    temperatureRecordList.value = res.rows
+    tempTotal.value = res.total
+  })
+}
+
+// 分页
+const handleMarCurrentChange = (val) => {
+  queryMarRecordParams.value.pageNum = val
+  // 用药记录
+  listMarRecord(queryMarRecordParams.value).then((res) => {
+    marRecordList.value = res.rows
+    marTotal.value = res.total
+  })
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  const _id = row.id || ids.value
+  currentId.value = _id
+  activeName.value = 'first'
+  getHealthRecord(_id).then((response) => {
+    basicInformation.value = response.data
+    detailOpen.value = true
+    detailTitle.value = '查看健康档案'
+  })
+  queryMarRecordParams.value.healthRecordId = _id
+  queryTemperatureRecordParams.value.healthRecordId = _id
+  queryDoctorRecordParams.value.healthRecordId = _id
+  // 体温记录
+  listTemperatureRecord(queryMarRecordParams.value).then((res) => {
+    temperatureRecordList.value = res.rows
+    tempTotal.value = res.total
+  })
+  //用药记录
+  listMarRecord(queryMarRecordParams.value).then((res) => {
+    marRecordList.value = res.rows
+    marTotal.value = res.total
+  })
+  getMarAnalysis({ recordId: _id, dataType: '1', type: 1 }).then((response) => {
+    loading.value = false
+    mar.value = { ...response.data }
+  })
+
+  getTemperatureAnalysis({ recordId: _id, dataType: '1', type: 1 }).then((response) => {
+    loading.value = false
+    temp.value = { ...response.data }
+  })
+  // 就医记录
+  listDoctorRecord(queryDoctorRecordParams.value).then((res) => {
+    doctorRecordList.value = res.rows
+  })
+  // 过程记录
+  listProcessRecord(queryDoctorRecordParams.value).then((res) => {
+    processRecordList.value = res.rows
+  })
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = '添加健康档案'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getHealthRecord(_id).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改健康档案'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.healthRecordRef.validate((valid) => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateHealthRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addHealthRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delHealthRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    'health/healthRecord/export',
+    {
+      ...queryParams.value
+    },
+    `healthRecord_${new Date().getTime()}.xlsx`
+  )
+}
+
+getList()
+getPersonList()
+</script>
diff --git a/src/views/health/healthStatistic/index.vue b/src/views/health/healthStatistic/index.vue
new file mode 100644
index 0000000..b1eeffc
--- /dev/null
+++ b/src/views/health/healthStatistic/index.vue
@@ -0,0 +1,624 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
+        <el-form-item label="人员姓名" prop="id">
+          <el-select v-model="queryParams.id" placeholder="请选择人员姓名" @change="handlePersonChange">
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="recordId">
+          <el-select v-model="queryParams.recordId" placeholder="请选择健康档案" clearable @change="handleRecordChange">
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="建档日期" prop="time" v-if="queryParams.type === 1">
+          <el-date-picker
+            v-model="queryParams.time"
+            type="daterange"
+            range-separator="~"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            format="YYYY-MM-DD"
+            @calendar-change="calendarChange"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="time" v-if="queryParams.type === 2">
+          <el-date-picker
+            v-model="queryParams.time"
+            type="monthrange"
+            range-separator="~"
+            format="YYYY-MM"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :disabled-date="disabledDateFun"
+            @calendar-change="calendarChange"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="time" v-if="queryParams.type === 3">
+          <yearPicker
+            v-model="queryParams.time"
+            ref="statisticPicker"
+            labelText="选择年份"
+            :initYear="dateValue"
+            :showYear="showYearValue"
+            :maxLength="5"
+            sp="~"
+            @updateTimeRange="updateStatisticYear"
+          />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con" style="height: calc(100% - 1.45rem)">
+      <div class="summary-con" style="height: 115px">
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">档案数量</div>
+            <div>
+              <span class="num">{{ record.healthRecordCount }}</span
+              ><span class="unit">份</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">档案过程记录次数</div>
+            <div>
+              <span class="num">{{ record.processRecordCount }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">平均康复周期</div>
+            <div>
+              <span class="num">{{ record.perDuration.split(',')[0] }}</span
+              ><span class="unit">天</span> <span class="num">{{ record.perDuration.split(',')[1] }}</span
+              ><span class="unit">小时</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">就医医院</div>
+            <div>
+              <span class="num">{{ record.hospitalCount }}</span
+              ><span class="unit">个</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">就诊大夫</div>
+            <div>
+              <span class="num">{{ record.doctorTotalCount }}</span
+              ><span class="unit">个</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="summary-con" style="height: 115px">
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">就医次数</div>
+            <div>
+              <span class="num">{{ record.doctorCount }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">就医费用</div>
+            <div>
+              <span class="num">{{ record.doctorCost }}</span
+              ><span class="unit">元</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">用药天数</div>
+            <div>
+              <span class="num">{{ record.marDayCount }}</span
+              ><span class="unit">天</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">用药次数</div>
+            <div>
+              <span class="num">{{ record.marCount }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">发烧天数</div>
+            <div>
+              <span class="num">{{ record.feverDayCount }}</span> <span class="unit">天(>=37℃)</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="title-con" style="margin-top: 18px">
+        <div class="title">档案统计</div>
+        <div class="operate-btn-con">
+          <el-radio-group v-model="radioVal" @change="handleRadioChange">
+            <el-radio-button label="档案明细" />
+            <el-radio-button label="档案费用柱状图" />
+            <el-radio-button label="档案费用折线图" />
+          </el-radio-group>
+        </div>
+      </div>
+      <div class="content-con">
+        <div v-show="radioVal === '档案费用柱状图'" class="chart" id="chartBar" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <div v-show="radioVal === '档案费用折线图'" class="chart" id="chartLine" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <el-table v-show="radioVal === '档案明细'" v-loading="loading" :data="record.recordList" height="calc(100% - 245px)">
+          <el-table-column label="序号" width="50" type="index" align="center">
+            <template #default="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="档案名称" align="center" prop="name" />
+          <el-table-column label="发生时间" align="center" prop="occurTime" />
+          <el-table-column label="持续时间" align="center" prop="duration" />
+          <el-table-column label="过程记录次数" align="center" prop="processCount" />
+          <el-table-column label="就医次数" align="center" prop="doctorCount" />
+          <el-table-column label="就医费用" align="center" prop="doctorCost" />
+          <el-table-column label="用药天数" align="center" prop="marDayCount" />
+          <el-table-column label="用药次数" align="center" prop="marCount" />
+          <el-table-column label="发烧天数" align="center" prop="feverDayCount" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="CreditAnalysis">
+import dayjs from 'dayjs'
+import * as echarts from 'echarts'
+import { ElMessage } from 'element-plus'
+import yearPicker from '@/components/YearPicker/index.vue'
+import { getRecordAnalysis } from '@/api/health/statisticAnalysis'
+import { listPerson } from '@/api/health/person'
+import { listHealthRecord } from '@/api/health/healthRecord'
+const { proxy } = getCurrentInstance()
+const personList = ref([])
+const healthRecordList = ref([])
+
+const dateValue = ref({ startYear: 2000, endYear: new Date().getFullYear() })
+const showYearValue = ref({ startShowYear: '', endShowYear: '' })
+const updateStatisticYear = (startYear, endYear) => {
+  queryParams.value.time = [new Date(startYear, 0, 1), new Date(endYear, 0, 1)]
+  if (endYear - startYear > 5) {
+    ElMessage.warning('时间跨度不能大于5年，默认选择开始日期的5年')
+    queryParams.value.time = [new Date(startYear, 0, 1), new Date(startYear + 5, 0, 1)]
+  }
+}
+
+const dates = [{ value: 1, label: '日' }]
+const accountsList = ref([])
+const loading = ref(true)
+const total = ref(0)
+const radioVal = ref('档案明细')
+const dateValidate = (rules, value, callback) => {
+  const dateType = rules.dateType || 'days'
+  const num = rules.num || 31
+  const dateString = rules.dateString || '天'
+  const message = rules.message || `时间跨度不能超过${num}${dateString}`
+
+  if (value && value.length === 2) {
+    const start = value[0]
+    const end = value[1]
+    if (dayjs(end).diff(dayjs(start), dateType) > num) {
+      queryParams.value.time = [start, dayjs(start).add(23, 'months')]
+      ElMessage.warning(message)
+    }
+  }
+}
+
+const data = reactive({
+  queryParams: {
+    type: 1,
+    time: null,
+    id: null,
+    dataType: '1',
+    dealType: null,
+    dealCategory: null
+  },
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  queryHealthRecordParams: {
+    pageNum: 1,
+    personId: null,
+    state: '1',
+    pageSize: 1000
+  },
+  rules: {
+    time: [{ validator: dateValidate, dateType: 'months', num: 23, dateRange: '月', message: '时间跨度不能大于24个月，默认选择开始日期的24个月' }]
+  }
+})
+
+const { queryParams, rules, queryPersonParams, queryHealthRecordParams } = toRefs(data)
+
+const handleRecordChange = (recordId) => {
+  queryParams.value.recordId = recordId
+  getList()
+}
+
+const handlePersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+    getList()
+  })
+}
+
+/** 查询成员管理列表 */
+function getPersonList() {
+  listPerson(queryPersonParams.value).then((response) => {
+    personList.value = response.rows
+    if (response.rows.length > 0) {
+      queryParams.value.id = response.rows[0].id
+      queryHealthRecordParams.personId = response.rows[0].id
+      listHealthRecord(queryHealthRecordParams).then((res) => {
+        healthRecordList.value = res.rows
+        getList()
+      })
+    }
+  })
+}
+
+const today = new Date()
+// const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+// const start = dayjs(end).add(-90, 'day')
+// queryParams.value.time = [start, end]
+// const handleTimeChange = (type) => {
+//   queryParams.value.time = null
+//   if (type === 1) {
+//     const today = new Date()
+//     const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+//     const start = dayjs(end).add(-90, 'day')
+//     queryParams.value.time = [start, end]
+//   } else if (type === 2) {
+//     const today = new Date()
+//     const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+//     const start = dayjs(end).add(-11, 'months')
+//     queryParams.value.time = [start, end]
+//   } else if (type === 3) {
+//     const today = new Date()
+//     const endYear = today.getFullYear()
+//     queryParams.value.time = [new Date(endYear - 2, 0, 1), new Date(endYear, 0, 1)]
+//     showYearValue.value = { startShowYear: endYear - 2, endShowYear: endYear }
+//   }
+//   getList()
+// }
+function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '<br/>')
+  }
+}
+const disabledDateFun = (time) => {
+  const arr = [0, 30, 365, 365 * 5]
+  const days = arr[queryParams.value.type]
+
+  if (firstChooseDate.value) {
+    const one = days * 24 * 3600 * 1000
+    const minTime = firstChooseDate.value - one
+    const maxTime = firstChooseDate.value + one
+    const startTime = minTime
+    const endTime = maxTime > Date.now() - 8.64e7 ? Date.now() - 8.64e7 : maxTime
+    return time.getTime() > endTime || time.getTime() < startTime
+  } else {
+    return time.getTime() > Date.now() - 8.64e7
+  }
+}
+
+const firstChooseDate = ref('')
+const calendarChange = (val) => {
+  firstChooseDate.value = val[0].getTime()
+  if (val[1]) firstChooseDate.value = ''
+}
+
+const record = ref({})
+const chartData = ref({
+  name: [],
+  value1: []
+})
+
+function getList() {
+  loading.value = true
+  chartData.value = { name: [], value1: [] }
+  const { type, time, id, recordId } = queryParams.value
+  let formatValue = 'YYYY-MM-DD'
+  if (type === 1) {
+    formatValue = 'YYYY-MM-DD'
+  } else if (type === 2) {
+    formatValue = 'YYYY-MM'
+  } else {
+    formatValue = 'YYYY'
+  }
+  const params = {
+    type,
+    startTime: time && time.length > 0 ? dayjs(time[0]).format(formatValue) : '',
+    endTime: time && time.length > 0 ? dayjs(time[1]).format(formatValue) : '',
+    id,
+    recordId
+  }
+  getRecordAnalysis(params).then((response) => {
+    loading.value = false
+    record.value = { ...response.data }
+    record.value.recordCostList.map((item) => {
+      return {
+        name: item.time,
+        value: item.value
+      }
+    })
+    response.data.recordCostList.map((item) => {
+      chartData.value.name.push(item.time)
+      chartData.value.value1.push(item.value)
+    })
+    handleRadioChange(currentType.value)
+  })
+}
+
+function handleQuery() {
+  getList()
+}
+
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  queryParams.value.id = null
+  // const today = new Date()
+  // const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+  // const start = dayjs(end).add(-60, 'day')
+  // queryParams.value.time = [start, end]
+  total.value = 0
+  getPersonList()
+}
+
+const drawBar = (data) => {
+  if (document.getElementById('chartBar') === null) {
+    return
+  }
+  echarts.dispose(document.getElementById('chartBar'))
+  const myChart = echarts.init(document.getElementById('chartBar'))
+
+  const option = {
+    legend: {
+      // 图示例样式
+      show: true,
+      top: 50,
+      right: 50,
+      itemGap: 20
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      },
+      formatter: function (params) {
+        return params[0].name + '<br>' + '费用：' + params[0].value + '元'
+      }
+    },
+    grid: {
+      left: '5%',
+      right: '5%',
+      bottom: '5%',
+      containLabel: true
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: data.name,
+        axisTick: {
+          alignWithLabel: true // 刻度线是否与标签对齐，默认false
+        },
+        // 设置 X 轴线条粗细
+        axisLine: {
+          lineStyle: {
+            width: 1, // 根据需求调整数值大小，单位是像素
+            color: '#999'
+          }
+        }
+      }
+    ],
+    yAxis: [
+      {
+        type: 'value',
+        // min: 1, // 设置 y 轴的最小值为 0
+        // max: 16, // 设置 y 轴的最大值为 100
+        // interval: 1, //设置y轴刻度间隔
+        axisTick: {
+          show: true // 默认为true，如果要隐藏，则改为 false
+        },
+        axisLine: {
+          show: true,
+          lineStyle: {
+            width: 1,
+            color: '#999'
+          }
+        }
+      }
+    ],
+    series: [
+      {
+        data: data.value1,
+        type: 'bar',
+        barWidth: 10, // 根据需求调整数值大小，单位是像素
+        itemStyle: {
+          // 此处可以是一个固定颜色值，也可以是一个回调函数根据数据动态计算颜色
+          color: function (params) {
+            // 这里可以根据需要设置不同的颜色，比如根据数据值
+            return '#2283cf' // 数据在50到99之间为蓝色
+          }
+        }
+      }
+    ],
+    // 添加点击事件的处理函数
+    emphasis: {
+      // itemStyle: {
+      //   color: '#2283cf',
+      //   barWidth: 20 // 根据需求调整数值大小，单位是像素
+      // },
+      barWidth: 24 // 根据需求调整数值大小，单位是像素
+    }
+  }
+
+  myChart.setOption(option)
+}
+
+const drawLine = (data) => {
+  if (document.getElementById('chartLine') === null) {
+    return
+  }
+  echarts.dispose(document.getElementById('chartLine'))
+  const myChart = echarts.init(document.getElementById('chartLine'))
+
+  const option = {
+    grid: {
+      left: '5%',
+      right: '5%',
+      bottom: '5%',
+      containLabel: true
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      },
+      formatter: function (params) {
+        return params[0].name + '<br>' + '费用：' + params[0].value + '元'
+      }
+    },
+    xAxis: {
+      type: 'category',
+      data: data.name,
+      axisTick: {
+        alignWithLabel: true
+      },
+      axisLine: {
+        lineStyle: {
+          width: 1,
+          color: '#999'
+        }
+      }
+    },
+    yAxis: {
+      type: 'value',
+      // min: 1, // 设置 y 轴的最小值为 0
+      // max: 16, // 设置 y 轴的最大值为 100
+      // interval: 1, //设置y轴刻度间隔
+      axisTick: {
+        show: true
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          width: 1,
+          color: '#999'
+        }
+      }
+    },
+    series: [
+      {
+        data: data.value1,
+        type: 'line',
+        lineStyle: {
+          color: '#4181c9'
+        },
+        itemStyle: {
+          // 此处可以是一个固定颜色值，也可以是一个回调函数根据数据动态计算颜色
+          color: function (params) {
+            // 这里可以根据需要设置不同的颜色，比如根据数据值
+            return '#2283cf' // 数据在50到99之间为蓝色
+          }
+        },
+        smooth: true,
+        symbol: 'emptyCircle',
+        areaStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: 'rgba(65,129,201, 0.70)'
+              },
+              {
+                offset: 1,
+                color: 'rgba(65,129,201, 0.10)'
+              }
+            ],
+            false
+          ),
+          shadowColor: 'rgba(65,129,201, 0.10)',
+          shadowBlur: 10
+        }
+      }
+    ]
+  }
+
+  myChart.setOption(option)
+}
+
+const currentType = ref('档案费用柱状图')
+const handleRadioChange = (type) => {
+  currentType.value = type
+  switch (type) {
+    case '档案费用柱状图':
+      drawBar(chartData.value)
+      break
+    case '档案费用折线图':
+      drawLine(chartData.value)
+      break
+    default:
+      break
+  }
+}
+getPersonList()
+</script>
diff --git a/src/views/health/heightWeightRecord/index.vue b/src/views/health/heightWeightRecord/index.vue
new file mode 100644
index 0000000..13344d0
--- /dev/null
+++ b/src/views/health/heightWeightRecord/index.vue
@@ -0,0 +1,306 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="queryParams.personId" placeholder="请选择人员姓名" clearable>
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="测量时间" prop="time">
+          <el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['health:heightWeightRecord:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['health:heightWeightRecord:remove']">删除</el-button>
+          <!-- <el-button @click="handleExport" icon="Download" v-hasPermi="['health:heightWeightRecord:export']">导出</el-button> -->
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="heightWeightRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="人员姓名" align="center" prop="personName" />
+          <el-table-column label="测量时间" align="center" prop="measureTime" width="180"> </el-table-column>
+          <el-table-column label="身高（CM）" align="center" prop="height" />
+          <el-table-column label="体重(KG)" align="center" prop="weight" />
+
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template v-slot="scope">
+              <div class="ctrl-btn d-flex">
+                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                  <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 添加或修改身高体重记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="heightWeightRecordRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="form.personId" placeholder="请选择人员姓名" @change="handlePersonChange" clearable>
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="测量时间" prop="measureTime">
+          <el-date-picker clearable v-model="form.measureTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择测量时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="身高" prop="height">
+          <el-input v-model="form.height" type="number" placeholder="请输入身高">
+            <template #suffix>CM</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="体重" prop="weight">
+          <el-input v-model="form.weight" type="number" placeholder="请输入体重">
+            <template #suffix>KG</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template v-if="title !== '查看身高体重记录'" #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="HeightWeightRecord">
+import {
+  listHeightWeightRecord,
+  getHeightWeightRecord,
+  delHeightWeightRecord,
+  addHeightWeightRecord,
+  updateHeightWeightRecord
+} from '@/api/health/heightWeightRecord'
+// eslint-disable-next-line no-unused-vars
+import { listPerson, getPerson } from '@/api/health/person'
+import dayjs from 'dayjs'
+import { require } from '@/utils/require'
+const { proxy } = getCurrentInstance()
+
+const heightWeightRecordList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const personList = ref([])
+const operateList = ref([
+  { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:heightWeightRecord:query'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:heightWeightRecord:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:heightWeightRecord:remove'] }
+])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    measureTime: null,
+    weight: null,
+    personId: null,
+    height: null
+  },
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  rules: {
+    personId: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }],
+    measureTime: [{ required: true, message: '测量时间不能为空', trigger: 'blur' }]
+  }
+})
+
+const handleOperate = (operate, row) => {
+  switch (operate) {
+    case 'view':
+      handleView(row)
+      break
+    case 'edit':
+      handleUpdate(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    default:
+      break
+  }
+}
+
+const { queryParams, form, rules, queryPersonParams } = toRefs(data)
+
+/** 查询成员管理列表 */
+function getPersonList() {
+  listPerson(queryPersonParams.value).then((response) => {
+    personList.value = response.rows
+  })
+}
+
+/** 查询身高体重记录列表 */
+function getList() {
+  loading.value = true
+  const timeRange = queryParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length === 2) {
+    st = dayjs(timeRange[0]).format('YYYY-MM-DD')
+    et = dayjs(timeRange[1]).format('YYYY-MM-DD')
+  }
+  queryParams.value.startTime = st
+  queryParams.value.endTime = et
+  listHeightWeightRecord(queryParams.value).then((response) => {
+    heightWeightRecordList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    measureTime: null,
+    weight: null,
+    personId: null,
+    height: null
+  }
+  proxy.resetForm('heightWeightRecordRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  title.value = '查看身高体重记录'
+  form.value = row
+  open.value = true
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = '添加身高体重记录'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getHeightWeightRecord(_id).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改身高体重记录'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.heightWeightRecordRef.validate((valid) => {
+    if (valid) {
+      if (form.value.weight == null && form.value.height == null) {
+        proxy.$modal.msgError('身高体重不能同时为空')
+        return
+      }
+      if (form.value.id != null) {
+        updateHeightWeightRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addHeightWeightRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delHeightWeightRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    'health/heightWeightRecord/export',
+    {
+      ...queryParams.value
+    },
+    `heightWeightRecord_${new Date().getTime()}.xlsx`
+  )
+}
+
+getList()
+getPersonList()
+</script>
diff --git a/src/views/health/marRecord/index.vue b/src/views/health/marRecord/index.vue
new file mode 100644
index 0000000..710e940
--- /dev/null
+++ b/src/views/health/marRecord/index.vue
@@ -0,0 +1,498 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="queryParams.personId" placeholder="请选择人员姓名" clearable @change="handleQueryPersonChange">
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="healthRecordId">
+          <el-select v-model="queryParams.healthRecordId" placeholder="请选择健康档案" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用药类型" prop="type">
+          <el-select v-model="queryParams.type" placeholder="请选择用药类型" @change="handleTypeChange" clearable>
+            <el-option v-for="dict in mar_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="药品名称" prop="medicineId">
+          <el-select v-model="queryParams.medicineId" placeholder="请选择药品名称" clearable>
+            <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.shortNameBrandPackaging" :value="medicine.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="药品来源" prop="resource">
+          <el-select v-model="queryParams.resource" placeholder="请选择药品来源" clearable>
+            <el-option v-for="dict in mar_resource" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用药地点" prop="place">
+          <el-select v-model="queryParams.place" placeholder="请选择用药地点" clearable>
+            <el-option v-for="dict in mar_place" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用药时间" prop="time">
+          <el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['health:marRecord:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['health:marRecord:remove']">删除</el-button>
+          <!-- <el-button @click="handleExport" icon="Download" v-hasPermi="['health:marRecord:export']">导出</el-button> -->
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="marRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="人员姓名" align="center" width="120" prop="personName" />
+          <el-table-column label="健康档案" align="center" width="180" prop="healthRecordName" />
+          <el-table-column label="用药名称" align="center" prop="name" />
+          <el-table-column label="用药类型" align="center" width="180" prop="type">
+            <template #default="scope">
+              <dict-tag :options="mar_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="药品来源" width="100" align="center" prop="resource">
+            <template #default="scope">
+              <dict-tag :options="mar_resource" :value="scope.row.resource" />
+            </template>
+          </el-table-column>
+          <el-table-column label="用药地点" align="center" width="100" prop="place">
+            <template #default="scope">
+              <dict-tag :options="mar_place" :value="scope.row.place" />
+            </template>
+          </el-table-column>
+          <el-table-column label="用药时间" align="center" prop="dosingTime" width="180"> </el-table-column>
+          <el-table-column label="用药剂量" align="center" width="100" prop="dosage" />
+          <el-table-column label="用药单位" align="center" width="100" prop="unit">
+            <template #default="scope">
+              <dict-tag :options="medical_unit" :value="scope.row.unit" />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+            <template v-slot="scope">
+              <div class="ctrl-btn d-flex">
+                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                  <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 添加或修改用药记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="880px" append-to-body>
+      <el-form ref="marRecordRef" :model="form" :inline="true" :rules="rules" label-width="120px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="form.personId" placeholder="请选择人员姓名" @change="handlePersonChange">
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="healthRecordId">
+          <el-select v-model="form.healthRecordId" placeholder="请选择健康档案" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用药类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择用药类型" @change="handleTypeChange">
+            <el-option v-for="dict in mar_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="药品名称" prop="medicineId">
+          <el-select v-model="form.medicineId" placeholder="请选择药品名称" @change="handleMedicineChange" clearable>
+            <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.shortNameBrandPackaging" :value="medicine.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用药名称" v-show="false" prop="name">
+          <el-input v-model="form.name" placeholder="请输入用药名称" />
+        </el-form-item>
+        <el-form-item label="药品来源" prop="resource">
+          <el-select v-model="form.resource" placeholder="请选择药品来源">
+            <el-option v-for="dict in mar_resource" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用药地点" prop="place">
+          <el-select v-model="form.place" placeholder="请选择用药地点">
+            <el-option v-for="dict in mar_place" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用药时间" prop="dosingTime">
+          <el-date-picker clearable v-model="form.dosingTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择用药时间"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="用药剂量" prop="dosage">
+          <el-input @change="handleDosageChange" v-model="form.dosage" placeholder="请输入用药剂量"
+        /></el-form-item>
+        <el-form-item label="用药单位" disabled prop="unit">
+          <el-select v-model="form.unit" placeholder="请选择用药单位">
+            <el-option v-for="dict in medical_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item v-show="false" label="含量" prop="content"> <el-input disabled v-model="form.content" placeholder="请输入含量" /></el-form-item>
+        <el-form-item v-show="false" label="含量单位" prop="contentUnit">
+          <el-select disabled v-model="form.contentUnit" placeholder="请选择含量单位">
+            <el-option v-for="dict in content_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" style="width: 792px" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template v-if="title !== '查看用药记录'" #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MarRecord">
+import { listMarRecord, getMarRecord, delMarRecord, 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'
+import dayjs from 'dayjs'
+// eslint-disable-next-line no-unused-vars
+import { require } from '@/utils/require'
+const { proxy } = getCurrentInstance()
+const { mar_type, mar_place, mar_resource, medical_unit, content_unit } = proxy.useDict('mar_type', 'mar_place', 'mar_resource', 'medical_unit', 'content_unit')
+
+const marRecordList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const personList = ref([])
+const healthRecordList = ref([])
+const medicineList = ref([])
+const operateList = ref([
+  { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:marRecord:query'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:marRecord:edit'] },
+  { id: 'copy', icon: 'Link', title: '复制', hasPermi: ['health:marRecord:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:marRecord:remove'] }
+])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: null,
+    type: null,
+    healthRecordId: null,
+    time: '',
+    dosage: null,
+    personId: null,
+    resource: null,
+    place: null
+  },
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  queryHealthRecordParams: {
+    pageNum: 1,
+    personId: null,
+    state: '1',
+    pageSize: 1000
+  },
+  queryMedicineParams: {
+    pageNum: 1,
+    treatmentType: null,
+    pageSize: 1000
+  },
+  rules: {
+    medicineId: [{ required: true, message: '药品名称不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '用药类型不能为空', trigger: 'change' }],
+    healthRecordId: [{ required: true, message: '健康档案不能为空', trigger: 'change' }],
+    dosingTime: [{ required: true, message: '用药时间不能为空', trigger: 'blur' }],
+    dosage: [{ required: true, message: '用药剂量不能为空', trigger: 'blur' }],
+    resource: [{ required: true, message: '药品来源不能为空', trigger: 'blur' }],
+    place: [{ required: true, message: '用药地点不能为空', trigger: 'blur' }],
+    unit: [{ required: true, message: '用药单位不能为空', trigger: 'blur' }],
+    personId: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }]
+  }
+})
+
+const handleOperate = (operate, row) => {
+  switch (operate) {
+    case 'view':
+      handleView(row)
+      break
+    case 'edit':
+      handleUpdate(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    case 'copy':
+      handleCopy(row)
+      break
+    default:
+      break
+  }
+}
+
+const { queryParams, form, rules, queryPersonParams, queryHealthRecordParams, queryMedicineParams } = toRefs(data)
+
+const handleDosageChange = (val) => {}
+
+const handlePersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+    if (response.rows.length > 0) {
+      form.value.healthRecordId = healthRecordList.value[0].id
+    }
+  })
+}
+const handleQueryPersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  queryParams.value.healthRecordId = null
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+}
+
+const handleTypeChange = (type) => {
+  queryMedicineParams.value.treatmentType = type
+
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicineList.value = response.rows
+  })
+}
+const handleMedicineChange = (medicineId) => {
+  getMedicineBasic(medicineId).then((response) => {
+    form.value.name = response.data.name
+    form.value.unit = response.data.unit
+    form.value.contentUnit = response.data.contentUnit
+  })
+}
+
+/** 查询成员管理列表 */
+function getPersonList() {
+  listPerson(queryPersonParams.value).then((response) => {
+    personList.value = response.rows
+    if (response.rows.length > 0) {
+      listHealthRecord(queryHealthRecordParams).then((res) => {
+        healthRecordList.value = res.rows
+      })
+    }
+  })
+}
+
+/** 查询药品管理列表 */
+function getMedicineList() {
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicineList.value = response.rows
+  })
+}
+
+/** 查询用药记录列表 */
+function getList() {
+  loading.value = true
+  const timeRange = queryParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length === 2) {
+    st = dayjs(timeRange[0]).format('YYYY-MM-DD')
+    et = dayjs(timeRange[1]).format('YYYY-MM-DD')
+  }
+  queryParams.value.startTime = st
+  queryParams.value.endTime = et
+  listMarRecord(queryParams.value).then((response) => {
+    marRecordList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  queryMedicineParams.value.treatmentType = null
+  getMedicineList()
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    name: null,
+    type: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    healthRecordId: null,
+    dosingTime: null,
+    dosage: null,
+    personId: null,
+    resource: '1',
+    place: '1',
+    medicineId: null,
+    unit: null,
+    content: '1',
+    contentUnit: null
+  }
+  proxy.resetForm('marRecordRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  queryMedicineParams.value.treatmentType = null
+  getMedicineList()
+  handleQuery()
+}
+
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  title.value = '查看用药记录'
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  form.value = row
+  open.value = true
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  if (personList.value.length > 0) {
+    form.value.personId = personList.value[0].id
+    queryHealthRecordParams.personId = personList.value[0].id
+    listHealthRecord(queryHealthRecordParams).then((response) => {
+      healthRecordList.value = response.rows
+      if (response.rows.length > 0) {
+        form.value.healthRecordId = healthRecordList.value[0].id
+      }
+    })
+  }
+  queryMedicineParams.value.treatmentType = null
+  getMedicineList()
+  open.value = true
+  title.value = '添加用药记录'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  const _id = row.id || ids.value
+  getMarRecord(_id).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改用药记录'
+  })
+}
+
+/** 复制按钮操作 */
+function handleCopy(row) {
+  reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  const _id = row.id || ids.value
+  getMarRecord(_id).then((response) => {
+    form.value = response.data
+    form.value.id = null
+    open.value = true
+    title.value = '复制用药记录'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.marRecordRef.validate((valid) => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateMarRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addMarRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delMarRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    'health/marRecord/export',
+    {
+      ...queryParams.value
+    },
+    `marRecord_${new Date().getTime()}.xlsx`
+  )
+}
+
+getList()
+getPersonList()
+getMedicineList()
+</script>
diff --git a/src/views/health/marStatistic/index.vue b/src/views/health/marStatistic/index.vue
new file mode 100644
index 0000000..30150c4
--- /dev/null
+++ b/src/views/health/marStatistic/index.vue
@@ -0,0 +1,693 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
+        <el-form-item label="人员姓名" prop="id">
+          <el-select v-model="queryParams.id" placeholder="请选择人员姓名" @change="handlePersonChange">
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="recordId">
+          <el-select v-model="queryParams.recordId" placeholder="请选择健康档案" @change="handleRecordChange" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用药日期" prop="time" v-if="queryParams.type === 1">
+          <el-date-picker
+            v-model="queryParams.time"
+            type="daterange"
+            range-separator="~"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            format="YYYY-MM-DD"
+            @calendar-change="calendarChange"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="time" v-if="queryParams.type === 2">
+          <el-date-picker
+            v-model="queryParams.time"
+            type="monthrange"
+            range-separator="~"
+            format="YYYY-MM"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :disabled-date="disabledDateFun"
+            @calendar-change="calendarChange"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="time" v-if="queryParams.type === 3">
+          <yearPicker
+            v-model="queryParams.time"
+            ref="statisticPicker"
+            labelText="选择年份"
+            :initYear="dateValue"
+            :showYear="showYearValue"
+            :maxLength="5"
+            sp="~"
+            @updateTimeRange="updateStatisticYear"
+          />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con" style="height: calc(100% - 1.45rem)">
+      <div class="summary-con" style="height: 115px">
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">用药天数</div>
+            <div>
+              <span class="num">{{ mar.marDays }}</span
+              ><span class="unit">天</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">用药种类</div>
+            <div>
+              <span class="num">{{ mar.marCategoryCount }}</span
+              ><span class="unit">种</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">用药次数</div>
+            <div>
+              <span class="num">{{ mar.marCount }}</span
+              ><span class="unit">次 </span>
+            </div>
+          </div>
+        </div>
+
+        <div class="right-con" v-show="mar.top1 > 0">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">{{ mar.top1Name }}</div>
+            <div>
+              <span class="num">{{ mar.top1 }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con" v-show="mar.top2 > 0">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">{{ mar.top2Name }}</div>
+            <div>
+              <span class="num">{{ mar.top2 }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con" v-show="mar.top3 > 0">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">{{ mar.top3Name }}</div>
+            <div>
+              <span class="num">{{ mar.top3 }}</span> <span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="summary-con" v-show="mar.top4 > 0 || mar.top5 > 0 || mar.top6 > 0 || mar.top7 > 0 || mar.top8 > 0 || mar.top9 > 0" style="height: 115px">
+        <div class="right-con" v-show="mar.top4 > 0">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">{{ mar.top4Name }}</div>
+            <div>
+              <span class="num">{{ mar.top4 }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con" v-show="mar.top5 > 0">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">{{ mar.top5Name }}</div>
+            <div>
+              <span class="num">{{ mar.top5 }}</span> <span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con" v-show="mar.top6 > 0">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">{{ mar.top6Name }}</div>
+            <div>
+              <span class="num">{{ mar.top6 }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con" v-show="mar.top7 > 0">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">{{ mar.top7Name }}</div>
+            <div>
+              <span class="num">{{ mar.top7 }}</span
+              ><span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con" v-show="mar.top8 > 0">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">{{ mar.top8Name }}</div>
+            <div>
+              <span class="num">{{ mar.top8 }}</span> <span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con" v-show="mar.top9 > 0">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">{{ mar.top9Name }}</div>
+            <div>
+              <span class="num">{{ mar.top9 }}</span> <span class="unit">次</span>
+            </div>
+          </div>
+        </div>
+        <!-- <div class="right-con" v-show="mar.mianyili > 0">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">免疫力</div>
+            <div>
+              <span class="num">{{ mar.mianyili }}</span> <span class="unit">次</span>
+            </div>
+          </div>
+        </div> -->
+      </div>
+      <div class="title-con" style="margin-top: 18px">
+        <div class="title">用药统计</div>
+        <div class="operate-btn-con">
+          <el-radio-group v-model="radioVal" @change="handleRadioChange">
+            <el-radio-button label="用药明细" />
+            <!-- <el-radio-button label="按天用药明细" /> -->
+            <el-radio-button label="用药次数柱状图" />
+            <el-radio-button label="用药次数折线图" />
+          </el-radio-group>
+        </div>
+      </div>
+      <div class="content-con">
+        <div v-show="radioVal === '用药次数柱状图'" class="chart" id="chartBar" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <div v-show="radioVal === '用药次数折线图'" class="chart" id="chartLine" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <!-- <el-table v-show="radioVal === '按天用药明细'" v-loading="loading" :data="mar.tableMarList" height="calc(100% - 245px)">
+          <el-table-column label="序号" width="50" type="index" align="center">
+            <template #default="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="用药日期" align="center" prop="time" />
+          <el-table-column prop="detail" label="用药明细" v-if="queryParams.type === 1">
+            <template #default="scope">
+              <span v-html="formatMultiLineData(scope.row.detail)"></span>
+            </template>
+          </el-table-column>
+        </el-table> -->
+
+        <el-table v-show="radioVal === '用药明细'" v-loading="loading" :data="mar.marMapList" height="calc(100% - 245px)">
+          <el-table-column label="序号" width="50" type="index" align="center">
+            <template #default="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="药品名称" align="center" prop="medicalName" />
+          <el-table-column label="用药天数" align="center" prop="useDays" />
+          <el-table-column label="用药次数" align="center" prop="count" />
+          <el-table-column label="用药总量" align="center" prop="dosage" />
+          <el-table-column label="单位" align="center" prop="unit" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="CreditAnalysis">
+import dayjs from 'dayjs'
+import * as echarts from 'echarts'
+import { ElMessage } from 'element-plus'
+import yearPicker from '@/components/YearPicker/index.vue'
+import { getMarAnalysis } from '@/api/health/statisticAnalysis'
+import { listPerson, getPerson } from '@/api/health/person'
+import { listHealthRecord } from '@/api/health/healthRecord'
+const { proxy } = getCurrentInstance()
+const { deal_type, account_type, deal_category } = proxy.useDict('deal_type', 'account_type', 'deal_category')
+const personList = ref([])
+const healthRecordList = ref([])
+
+const dateValue = ref({ startYear: 2000, endYear: new Date().getFullYear() })
+const showYearValue = ref({ startShowYear: '', endShowYear: '' })
+const updateStatisticYear = (startYear, endYear) => {
+  queryParams.value.time = [new Date(startYear, 0, 1), new Date(endYear, 0, 1)]
+  if (endYear - startYear > 5) {
+    ElMessage.warning('时间跨度不能大于5年，默认选择开始日期的5年')
+    queryParams.value.time = [new Date(startYear, 0, 1), new Date(startYear + 5, 0, 1)]
+  }
+}
+
+const dates = [{ value: 1, label: '日' }]
+const accountsList = ref([])
+const loading = ref(true)
+const total = ref(0)
+const radioVal = ref('用药明细')
+const dateValidate = (rules, value, callback) => {
+  const dateType = rules.dateType || 'days'
+  const num = rules.num || 31
+  const dateString = rules.dateString || '天'
+  const message = rules.message || `时间跨度不能超过${num}${dateString}`
+
+  if (value && value.length === 2) {
+    const start = value[0]
+    const end = value[1]
+    if (dayjs(end).diff(dayjs(start), dateType) > num) {
+      queryParams.value.time = [start, dayjs(start).add(23, 'months')]
+      ElMessage.warning(message)
+    }
+  }
+}
+
+const data = reactive({
+  queryParams: {
+    type: 1,
+    time: null,
+    id: null,
+    dataType: '1',
+    dealType: null,
+    dealCategory: null
+  },
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  queryHealthRecordParams: {
+    pageNum: 1,
+    personId: null,
+    state: '1',
+    pageSize: 1000
+  },
+  rules: {
+    time: [{ validator: dateValidate, dateType: 'months', num: 23, dateRange: '月', message: '时间跨度不能大于24个月，默认选择开始日期的24个月' }]
+  }
+})
+
+const { queryParams, rules, queryPersonParams, queryHealthRecordParams } = toRefs(data)
+
+const handleRecordChange = (recordId) => {
+  queryParams.value.recordId = recordId
+  getList()
+}
+
+const handlePersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+    if (response.rows.length > 0) {
+      queryParams.value.recordId = response.rows[0].id
+      getList()
+    }
+  })
+}
+
+/** 查询成员管理列表 */
+function getPersonList() {
+  listPerson(queryPersonParams.value).then((response) => {
+    personList.value = response.rows
+    if (response.rows.length > 0) {
+      queryParams.value.id = response.rows[0].id
+      queryHealthRecordParams.personId = response.rows[0].id
+      listHealthRecord(queryHealthRecordParams).then((res) => {
+        healthRecordList.value = res.rows
+        if (res.rows.length > 0) {
+          queryParams.value.recordId = res.rows[0].id
+          getList()
+        }
+      })
+    }
+  })
+}
+
+// const today = new Date()
+// const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+// const start = dayjs(end).add(-60, 'day')
+// queryParams.value.time = [start, end]
+const handleTimeChange = (type) => {
+  queryParams.value.time = null
+  if (type === 1) {
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+    const start = dayjs(end).add(-60, 'day')
+    queryParams.value.time = [start, end]
+  } else if (type === 2) {
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+    const start = dayjs(end).add(-11, 'months')
+    queryParams.value.time = [start, end]
+  } else if (type === 3) {
+    const today = new Date()
+    const endYear = today.getFullYear()
+    queryParams.value.time = [new Date(endYear - 2, 0, 1), new Date(endYear, 0, 1)]
+    showYearValue.value = { startShowYear: endYear - 2, endShowYear: endYear }
+  }
+  getList()
+}
+function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '<br/>')
+  }
+}
+const disabledDateFun = (time) => {
+  const arr = [0, 30, 365, 365 * 5]
+  const days = arr[queryParams.value.type]
+
+  if (firstChooseDate.value) {
+    const one = days * 24 * 3600 * 1000
+    const minTime = firstChooseDate.value - one
+    const maxTime = firstChooseDate.value + one
+    const startTime = minTime
+    const endTime = maxTime > Date.now() - 8.64e7 ? Date.now() - 8.64e7 : maxTime
+    return time.getTime() > endTime || time.getTime() < startTime
+  } else {
+    return time.getTime() > Date.now() - 8.64e7
+  }
+}
+
+const firstChooseDate = ref('')
+const calendarChange = (val) => {
+  firstChooseDate.value = val[0].getTime()
+  if (val[1]) firstChooseDate.value = ''
+}
+
+const mar = ref({})
+const chartData = ref({
+  name: [],
+  value1: []
+})
+
+function getList() {
+  loading.value = true
+  chartData.value = { name: [], value1: [] }
+  const { type, time, id, recordId } = queryParams.value
+  let formatValue = 'YYYY-MM-DD'
+  if (type === 1) {
+    formatValue = 'YYYY-MM-DD'
+  } else if (type === 2) {
+    formatValue = 'YYYY-MM'
+  } else {
+    formatValue = 'YYYY'
+  }
+  const params = {
+    type,
+    startTime: time && time.length > 0 ? dayjs(time[0]).format(formatValue) : '',
+    endTime: time && time.length > 0 ? dayjs(time[1]).format(formatValue) : '',
+    id,
+    recordId
+  }
+  getMarAnalysis(params).then((response) => {
+    loading.value = false
+    mar.value = { ...response.data }
+    mar.value.marList.map((item) => {
+      return {
+        name: item.time,
+        value: item.value
+      }
+    })
+    response.data.marList.map((item) => {
+      chartData.value.name.push(item.time)
+      chartData.value.value1.push(item.value)
+    })
+    handleRadioChange(currentType.value)
+  })
+}
+
+function handleQuery() {
+  getList()
+}
+
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  queryParams.value.id = null
+  const today = new Date()
+  const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+  const start = dayjs(end).add(-60, 'day')
+  queryParams.value.time = [start, end]
+  total.value = 0
+  getPersonList()
+}
+
+const drawBar = (data) => {
+  if (document.getElementById('chartBar') === null) {
+    return
+  }
+  echarts.dispose(document.getElementById('chartBar'))
+  const myChart = echarts.init(document.getElementById('chartBar'))
+
+  const option = {
+    legend: {
+      // 图示例样式
+      show: true,
+      top: 50,
+      right: 50,
+      itemGap: 20
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      },
+      formatter: function (params) {
+        return params[0].name + '<br>' + '用药：' + params[0].value + '次'
+      }
+    },
+    grid: {
+      left: '5%',
+      right: '5%',
+      bottom: '5%',
+      containLabel: true
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: data.name,
+        axisTick: {
+          alignWithLabel: true // 刻度线是否与标签对齐，默认false
+        },
+        // 设置 X 轴线条粗细
+        axisLine: {
+          lineStyle: {
+            width: 1, // 根据需求调整数值大小，单位是像素
+            color: '#999'
+          }
+        }
+      }
+    ],
+    yAxis: [
+      {
+        type: 'value',
+        // min: 1, // 设置 y 轴的最小值为 0
+        // max: 16, // 设置 y 轴的最大值为 100
+        interval: 1, //设置y轴刻度间隔
+        axisTick: {
+          show: true // 默认为true，如果要隐藏，则改为 false
+        },
+        axisLine: {
+          show: true,
+          lineStyle: {
+            width: 1,
+            color: '#999'
+          }
+        }
+      }
+    ],
+    series: [
+      {
+        data: data.value1,
+        type: 'bar',
+        barWidth: 10, // 根据需求调整数值大小，单位是像素
+        itemStyle: {
+          // 此处可以是一个固定颜色值，也可以是一个回调函数根据数据动态计算颜色
+          color: function (params) {
+            // 这里可以根据需要设置不同的颜色，比如根据数据值
+            if (params.data < 4) {
+              return '#37b328'
+            } else if (params.data >= 4 && params.data < 8) {
+              return '#ff00ff'
+            } else if (params.data >= 8 && params.data < 12) {
+              return '#ff0066'
+            } else if (params.data >= 12 && params.data < 15) {
+              return '#ff0000'
+            } else if (params.data >= 15) {
+              return '#990000' // 数据在50到99之间为蓝色
+            }
+          }
+        }
+      }
+    ],
+    // 添加点击事件的处理函数
+    emphasis: {
+      // itemStyle: {
+      //   color: '#2283cf',
+      //   barWidth: 20 // 根据需求调整数值大小，单位是像素
+      // },
+      barWidth: 24 // 根据需求调整数值大小，单位是像素
+    }
+  }
+
+  myChart.setOption(option)
+}
+
+const drawLine = (data) => {
+  if (document.getElementById('chartLine') === null) {
+    return
+  }
+  echarts.dispose(document.getElementById('chartLine'))
+  const myChart = echarts.init(document.getElementById('chartLine'))
+
+  const option = {
+    grid: {
+      left: '5%',
+      right: '5%',
+      bottom: '5%',
+      containLabel: true
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      },
+      formatter: function (params) {
+        return params[0].name + '<br>' + '用药：' + params[0].value + '次'
+      }
+    },
+    xAxis: {
+      type: 'category',
+      data: data.name,
+      axisTick: {
+        alignWithLabel: true
+      },
+      axisLine: {
+        lineStyle: {
+          width: 1,
+          color: '#999'
+        }
+      }
+    },
+    yAxis: {
+      type: 'value',
+      // min: 1, // 设置 y 轴的最小值为 0
+      // max: 16, // 设置 y 轴的最大值为 100
+      interval: 1, //设置y轴刻度间隔
+      axisTick: {
+        show: true
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          width: 1,
+          color: '#999'
+        }
+      }
+    },
+    series: [
+      {
+        data: data.value1,
+        type: 'line',
+        lineStyle: {
+          color: '#4181c9'
+        },
+        itemStyle: {
+          // 此处可以是一个固定颜色值，也可以是一个回调函数根据数据动态计算颜色
+          color: function (params) {
+            // 这里可以根据需要设置不同的颜色，比如根据数据值
+            if (params.data < 4) {
+              return '#37b328'
+            } else if (params.data >= 4 && params.data < 8) {
+              return '#ff00ff'
+            } else if (params.data >= 8 && params.data < 12) {
+              return '#ff0066'
+            } else if (params.data >= 12 && params.data < 15) {
+              return '#ff0000'
+            } else if (params.data >= 15) {
+              return '#990000' // 数据在50到99之间为蓝色
+            }
+          }
+        },
+        smooth: true,
+        symbol: 'emptyCircle',
+        areaStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: 'rgba(65,129,201, 0.70)'
+              },
+              {
+                offset: 1,
+                color: 'rgba(65,129,201, 0.10)'
+              }
+            ],
+            false
+          ),
+          shadowColor: 'rgba(65,129,201, 0.10)',
+          shadowBlur: 10
+        }
+      }
+    ]
+  }
+
+  myChart.setOption(option)
+}
+
+const currentType = ref('用药次数柱状图')
+const handleRadioChange = (type) => {
+  currentType.value = type
+  switch (type) {
+    case '用药次数柱状图':
+      drawBar(chartData.value)
+      break
+    case '用药次数折线图':
+      drawLine(chartData.value)
+      break
+    default:
+      break
+  }
+}
+getPersonList()
+</script>
diff --git a/src/views/health/medicineBasic/index.vue b/src/views/health/medicineBasic/index.vue
new file mode 100644
index 0000000..6c613fc
--- /dev/null
+++ b/src/views/health/medicineBasic/index.vue
@@ -0,0 +1,445 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="药品名称" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入药品名称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="药品编码" prop="code">
+          <el-input v-model="queryParams.code" placeholder="请输入药品编码" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="治疗类型" prop="treatmentType">
+          <el-select v-model="queryParams.treatmentType" placeholder="请选择治疗类型" clearable>
+            <el-option v-for="dict in mar_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="药品分类" prop="classification">
+          <el-select v-model="queryParams.classification" placeholder="请选择药品分类" clearable>
+            <el-option v-for="dict in medicine_classification" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类别" prop="category">
+          <el-select v-model="queryParams.category" placeholder="请选择类别" clearable>
+            <el-option v-for="dict in medicine_category" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="药品剂型" prop="dosageForm">
+          <el-select v-model="queryParams.dosageForm" placeholder="请选择药品剂型" clearable>
+            <el-option v-for="dict in dosage_form" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="品牌" prop="brand">
+          <el-input v-model="queryParams.brand" placeholder="请输入品牌" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="生产厂家" prop="manufacturers">
+          <el-input v-model="queryParams.manufacturers" placeholder="请输入生产厂家" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['health:medicineBasic:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['health:medicineBasic:remove']">删除</el-button>
+          <!-- <el-button @click="handleExport" icon="Download" v-hasPermi="['health:medicineBasic:export']">导出</el-button> -->
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="medicineBasicList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="药品名称" align="center" prop="name" />
+          <el-table-column label="药品编码" align="center" prop="code" width="110" />
+          <el-table-column label="治疗类型" align="center" prop="treatmentType" width="150">
+            <template #default="scope">
+              <dict-tag :options="mar_type" :value="scope.row.treatmentType" />
+            </template>
+          </el-table-column>
+          <el-table-column label="药品分类" align="center" prop="classification" width="180">
+            <template #default="scope">
+              <dict-tag :options="medicine_classification" :value="scope.row.classification" />
+            </template>
+          </el-table-column>
+          <el-table-column label="类别" align="center" prop="category" width="110">
+            <template #default="scope">
+              <dict-tag :options="medicine_category" :value="scope.row.category" />
+            </template>
+          </el-table-column>
+          <el-table-column label="药品剂型" align="center" prop="dosageForm" width="120">
+            <template #default="scope">
+              <dict-tag :options="dosage_form" :value="scope.row.dosageForm" />
+            </template>
+          </el-table-column>
+          <el-table-column label="包装" align="center" prop="packaging" width="150" />
+          <el-table-column label="品牌" align="center" prop="brand" width="120" />
+          <el-table-column label="生产厂家" align="center" prop="manufacturers" />
+
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template v-slot="scope">
+              <div class="ctrl-btn d-flex">
+                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                  <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 添加或修改药品基础信息对话框 -->
+    <el-dialog :title="title" v-model="open" width="1280px" append-to-body>
+      <el-form ref="medicineBasicRef" :model="form" :inline="true" :rules="rules" label-width="120px">
+        <el-form-item label="药品全称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入药品全称" />
+        </el-form-item>
+        <el-form-item label="药品简称" prop="shortName">
+          <el-input v-model="form.shortName" placeholder="请输入药品简称" />
+        </el-form-item>
+        <el-form-item label="药品编码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入药品编码" />
+        </el-form-item>
+        <el-form-item label="药品剂型" prop="dosageForm">
+          <el-select v-model="form.dosageForm" placeholder="请选择药品剂型">
+            <el-option v-for="dict in dosage_form" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="治疗类型" prop="treatmentType">
+          <el-select v-model="form.treatmentType" placeholder="请选择治疗类型">
+            <el-option v-for="dict in mar_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="药品分类" prop="classification">
+          <el-select v-model="form.classification" placeholder="请选择药品分类">
+            <el-option v-for="dict in medicine_classification" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="类别" prop="category">
+          <el-select v-model="form.category" placeholder="请选择类别">
+            <el-option v-for="dict in medicine_category" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="品牌" prop="brand">
+          <el-input v-model="form.brand" placeholder="请输入品牌" />
+        </el-form-item>
+        <el-form-item label="药品包装" prop="packaging">
+          <el-input v-model="form.packaging" placeholder="请输入药品包装" />
+        </el-form-item>
+        <el-form-item label="包装单位" prop="packageUnit">
+          <el-select v-model="form.packageUnit" placeholder="请选择包装单位">
+            <el-option v-for="dict in package_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="生产厂家" prop="manufacturers">
+          <el-input v-model="form.manufacturers" placeholder="请输入生产厂家" />
+        </el-form-item>
+
+        <el-form-item label="是否进口" prop="isImport">
+          <el-select v-model="form.isImport" placeholder="请选择是否进口">
+            <el-option v-for="dict in is_import" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="规格" prop="specifications">
+          <el-input v-model="form.specifications" placeholder="请输入规格" />
+        </el-form-item>
+        <el-form-item label="规格单位" prop="unit">
+          <el-select v-model="form.unit" placeholder="请选择规格单位">
+            <el-option v-for="dict in medical_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单个含量" prop="content">
+          <el-input v-model="form.content" placeholder="请输入单个含量" />
+        </el-form-item>
+        <el-form-item label="含量单位" prop="contentUnit">
+          <el-select v-model="form.contentUnit" placeholder="请选择含量单位">
+            <el-option v-for="dict in content_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="生产地址" style="width: 788px" prop="address">
+          <el-input v-model="form.address" placeholder="请输入生产地址" />
+        </el-form-item>
+        <el-form-item label="功能主治" style="width: 1200px" prop="indications">
+          <el-input v-model="form.indications" placeholder="请输入功能主治" />
+        </el-form-item>
+        <el-form-item label="贮藏" style="width: 1200px" prop="storage">
+          <el-input v-model="form.storage" placeholder="请输入贮藏" />
+        </el-form-item>
+        <el-form-item label="药品成分" style="width: 1200px" prop="ingredients">
+          <el-input v-model="form.ingredients" placeholder="请输入药品成分" />
+        </el-form-item>
+        <el-form-item label="用法用量" style="width: 1200px" prop="usage">
+          <el-input v-model="form.usage" placeholder="请输入用法用量" />
+        </el-form-item>
+        <el-form-item label="性状" prop="character" style="width: 1200px">
+          <el-input v-model="form.character" placeholder="请输入性状" />
+        </el-form-item>
+        <el-form-item label="不良反应" prop="adverseReaction" style="width: 1200px">
+          <el-input v-model="form.adverseReaction" type="textarea" placeholder="请输入不良反应" />
+        </el-form-item>
+        <el-form-item label="备注" style="width: 1200px" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template v-if="title !== '查看药品基础信息'" #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MedicineBasic">
+import { listMedicineBasic, getMedicineBasic, delMedicineBasic, addMedicineBasic, updateMedicineBasic } from '@/api/health/medicineBasic'
+// eslint-disable-next-line no-unused-vars
+import { require } from '@/utils/require'
+const { proxy } = getCurrentInstance()
+const { medicine_category, mar_type, medicine_classification, dosage_form, is_import, medical_unit, content_unit, package_unit } = proxy.useDict(
+  'medicine_category',
+  'mar_type',
+  'medicine_classification',
+  'dosage_form',
+  'is_import',
+  'medical_unit',
+  'content_unit',
+  'package_unit'
+)
+
+const medicineBasicList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const operateList = ref([
+  { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:medicineBasic:query'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:medicineBasic:edit'] },
+  { id: 'copy', icon: 'Link', title: '复制', hasPermi: ['health:medicineBasic:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:medicineBasic:remove'] }
+])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: null,
+    classification: null,
+    category: null,
+    brand: null,
+    packaging: null,
+    manufacturers: null,
+    treatmentType: null,
+    isImport: null,
+    ingredients: null,
+    usage: null,
+    dosageForm: null,
+    code: null,
+    shortName: null
+  },
+  rules: {
+    name: [{ required: true, message: '药品全称不能为空', trigger: 'blur' }],
+    shortName: [{ required: true, message: '药品简称不能为空', trigger: 'blur' }],
+    // classification: [{ required: true, message: '药品分类不能为空', trigger: 'change' }],
+    // category: [{ required: true, message: '类别不能为空', trigger: 'change' }],
+    brand: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
+    packaging: [{ required: true, message: '药品包装不能为空', trigger: 'blur' }],
+    // manufacturers: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+    // treatmentType: [{ required: true, message: '治疗类型不能为空', trigger: 'change' }],
+    dosageForm: [{ required: true, message: '药品剂型不能为空', trigger: 'change' }]
+    // code: [{ required: true, message: '药品编码不能为空', trigger: 'blur' }]
+  }
+})
+
+const handleOperate = (operate, row) => {
+  switch (operate) {
+    case 'view':
+      handleView(row)
+      break
+    case 'edit':
+      handleUpdate(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    case 'copy':
+      handleCopy(row)
+      break
+    default:
+      break
+  }
+}
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询药品基础信息列表 */
+function getList() {
+  loading.value = true
+  listMedicineBasic(queryParams.value).then((response) => {
+    medicineBasicList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/** 复制按钮操作 */
+function handleCopy(row) {
+  reset()
+  const _id = row.id || ids.value
+  getMedicineBasic(_id).then((response) => {
+    form.value = response.data
+    form.value.id = null
+    open.value = true
+    title.value = '复制药品基础信息'
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    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
+  }
+  proxy.resetForm('medicineBasicRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  title.value = '查看药品基础信息'
+  form.value = row
+  open.value = true
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = '添加药品基础信息'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getMedicineBasic(_id).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改药品基础信息'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.medicineBasicRef.validate((valid) => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateMedicineBasic(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addMedicineBasic(form.value).then((response) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delMedicineBasic(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    'health/medicineBasic/export',
+    {
+      ...queryParams.value
+    },
+    `medicineBasic_${new Date().getTime()}.xlsx`
+  )
+}
+
+getList()
+</script>
diff --git a/src/views/health/medicineStock/index.vue b/src/views/health/medicineStock/index.vue
new file mode 100644
index 0000000..038a050
--- /dev/null
+++ b/src/views/health/medicineStock/index.vue
@@ -0,0 +1,132 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="药品名称" style="width: 480px" prop="medicineId">
+          <el-select v-model="queryParams.medicineId" width="500" placeholder="请选择药品名称" clearable>
+            <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.shortNameBrandPackaging" :value="medicine.id" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="medicineStockInList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column label="药品名称" align="center" prop="medicineName" />
+          <el-table-column label="规格总数" align="center" prop="totalCount" />
+          <el-table-column label="剩余数量" align="center" prop="leftCount" />
+          <el-table-column label="规格单位" align="center" prop="unit">
+            <template #default="scope">
+              <dict-tag :options="medical_unit" :value="scope.row.unit" />
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="MedicineStockIn">
+import { listMedicineRealtimeStock } from '@/api/health/medicineStockIn'
+// eslint-disable-next-line no-unused-vars
+import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
+import { require } from '@/utils/require'
+const { proxy } = getCurrentInstance()
+const { medical_unit } = proxy.useDict('medical_unit')
+
+const medicineStockInList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const medicineList = ref([])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    medicineId: null,
+    quantity: null,
+    productionDate: null,
+    expiringDate: null,
+    purchaseDate: null,
+    purchasePrice: null,
+    code: null,
+    state: null,
+    leftCount: null,
+    usedCount: null,
+    purchaseAddress: null
+  },
+  queryMedicineParams: {
+    pageNum: 1,
+    pageSize: 1000
+  }
+})
+
+const { queryParams, form, queryMedicineParams } = toRefs(data)
+
+/** 查询药品入库清单列表 */
+function getList() {
+  loading.value = true
+  listMedicineRealtimeStock(queryParams.value).then((response) => {
+    medicineStockInList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/** 查询药品管理列表 */
+function getMedicineList() {
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicineList.value = response.rows
+  })
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  title.value = '查看药品入库清单'
+  form.value = row
+  open.value = true
+}
+
+getList()
+getMedicineList()
+</script>
diff --git a/src/views/health/medicineStockIn/index.vue b/src/views/health/medicineStockIn/index.vue
new file mode 100644
index 0000000..136c292
--- /dev/null
+++ b/src/views/health/medicineStockIn/index.vue
@@ -0,0 +1,440 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="药品名称" style="width: 480px" prop="medicineId">
+          <el-select v-model="queryParams.medicineId" placeholder="请选择药品名称" clearable>
+            <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.shortNameBrandPackaging" :value="medicine.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="入库编号" prop="code">
+          <el-input v-model="queryParams.code" placeholder="请输入入库编号" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="使用状态" prop="state">
+          <el-select v-model="queryParams.state" placeholder="请选择使用状态" clearable>
+            <el-option v-for="dict in used_state" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['health:medicineStockIn:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['health:medicineStockIn:remove']">删除</el-button>
+          <!-- <el-button @click="handleExport" icon="Download" v-hasPermi="['health:medicineStockIn:export']">导出</el-button> -->
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="medicineStockInList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="药品名称" align="center" prop="medicineName" />
+          <el-table-column label="购买时间" align="center" prop="purchaseDate" width="155"> </el-table-column>
+          <el-table-column label="入库数量" align="center" width="100" prop="quantity" />
+          <el-table-column label="包装单位" align="center" width="100" prop="packageUnit">
+            <template #default="scope">
+              <dict-tag :options="package_unit" :value="scope.row.packageUnit" />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="单价（元）" align="center" width="100" prop="purchasePrice" />
+          <el-table-column label="总价（元）" align="center" width="100" prop="totalPrice" /> -->
+          <el-table-column label="入库编号" align="center" width="150" prop="code" />
+          <el-table-column label="使用状态" align="center" width="100" prop="state">
+            <template #default="scope">
+              <dict-tag :options="used_state" :value="scope.row.state" />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="生产日期" align="center" prop="productionDate" width="100">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column> -->
+          <el-table-column label="过期日期" align="center" prop="expiringDate" width="120">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.expiringDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="规格总数" align="center" width="100" prop="totalCount" />
+          <!-- <el-table-column label="使用数量" align="center" width="100" prop="usedCount" /> -->
+          <el-table-column label="剩余数量" align="center" width="100" prop="leftCount" />
+          <el-table-column label="规格单位" align="center" width="100" prop="unit">
+            <template #default="scope">
+              <dict-tag :options="medical_unit" :value="scope.row.unit" />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+            <template v-slot="scope">
+              <div class="ctrl-btn d-flex">
+                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                  <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 添加或修改药品入库清单对话框 -->
+    <el-dialog :title="title" v-model="open" width="880px" append-to-body>
+      <el-form ref="medicineStockInRef" :inline="true" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="治疗类型" prop="marType">
+          <el-select v-model="form.marType" placeholder="请选择治疗类型" @change="handleMarTypeChange" clearable>
+            <el-option v-for="dict in mar_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="药品名称" prop="medicineId">
+          <el-select v-model="form.medicineId" placeholder="请选择药品名称" @change="handleMedicineChange" clearable>
+            <el-option v-for="medicine in medicineList" :key="medicine.id" :label="medicine.shortNameBrandPackaging" :value="medicine.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="入库编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入入库编号" />
+        </el-form-item>
+        <el-form-item label="入库数量" prop="quantity">
+          <el-input @change="handleQuantityChange" v-model="form.quantity" type="number" placeholder="请输入入库数量"> </el-input>
+        </el-form-item>
+        <el-form-item label="购买时间" prop="purchaseDate">
+          <el-date-picker clearable v-model="form.purchaseDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择购买时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="使用状态" prop="state">
+          <el-select v-model="form.state" placeholder="请选择使用状态">
+            <el-option v-for="dict in used_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="生产日期" prop="productionDate">
+          <el-date-picker clearable v-model="form.productionDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择生产日期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="过期日期" prop="expiringDate">
+          <el-date-picker clearable v-model="form.expiringDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择过期日期"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="包装单位" prop="packageUnit">
+          <el-select v-model="form.packageUnit" placeholder="请选择包装单位">
+            <el-option v-for="dict in package_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="规格总数" prop="totalCount">
+          <el-input v-model="form.totalCount" type="number" readonly placeholder="请输入规格总数"> </el-input>
+        </el-form-item>
+        <el-form-item label="规格单位" prop="unit">
+          <el-select v-model="form.unit" placeholder="请选择规格单位">
+            <el-option v-for="dict in medical_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="已使用数量" prop="usedCount">
+          <el-input v-model="form.usedCount" type="number" placeholder="请输入已使用数量"> </el-input>
+        </el-form-item>
+        <el-form-item label="剩余数量" prop="leftCount">
+          <el-input v-model="form.leftCount" type="number" placeholder="请输入剩余数量"> </el-input>
+        </el-form-item>
+        <el-form-item label="年龄体重" prop="ageWeight">
+          <el-input v-model="form.ageWeight" placeholder="请输入年龄体重" />
+        </el-form-item>
+        <el-form-item label="药品单价" prop="purchasePrice">
+          <el-input v-model="form.purchasePrice" type="number" placeholder="请输入药品单价">
+            <template #suffix>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="药品总价" prop="totalPrice">
+          <el-input v-model="form.totalPrice" type="number" placeholder="请输入药品总价">
+            <template #suffix>元</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="医嘱" style="width: 792px" prop="usage">
+          <el-input v-model="form.usage" placeholder="请输入医嘱" />
+        </el-form-item>
+        <el-form-item label="购买地址" style="width: 792px" prop="purchaseAddress">
+          <el-input v-model="form.purchaseAddress" placeholder="请输入购买地址" />
+        </el-form-item>
+        <el-form-item label="备注" style="width: 792px" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template v-if="title !== '查看药品入库清单'" #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MedicineStockIn">
+import { listMedicineStockIn, getMedicineStockIn, delMedicineStockIn, addMedicineStockIn, updateMedicineStockIn } from '@/api/health/medicineStockIn'
+// eslint-disable-next-line no-unused-vars
+import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
+import { require } from '@/utils/require'
+const { proxy } = getCurrentInstance()
+const { used_state, package_unit, medical_unit, mar_type } = proxy.useDict('used_state', 'package_unit', 'medical_unit', 'mar_type')
+
+const medicineStockInList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const medicineList = ref([])
+const operateList = ref([
+  { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:medicineStockIn:query'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:medicineStockIn:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:medicineStockIn:remove'] }
+])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    medicineId: null,
+    quantity: null,
+    productionDate: null,
+    expiringDate: null,
+    purchaseDate: null,
+    purchasePrice: null,
+    code: null,
+    state: null,
+    leftCount: null,
+    usedCount: null,
+    purchaseAddress: null
+  },
+  queryMedicineParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  rules: {
+    medicineId: [{ required: true, message: '药品名称不能为空', trigger: 'blur' }],
+    quantity: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+    productionDate: [{ required: true, message: '生产日期不能为空', trigger: 'blur' }],
+    expiringDate: [{ required: true, message: '过期日期不能为空', trigger: 'blur' }],
+    //purchaseDate: [{ required: true, message: '购买日期不能为空', trigger: 'blur' }],
+    code: [{ required: true, message: '入库编号不能为空', trigger: 'blur' }],
+    state: [{ required: true, message: '使用状态不能为空', trigger: 'change' }]
+  }
+})
+
+const handleOperate = (operate, row) => {
+  switch (operate) {
+    case 'view':
+      handleView(row)
+      break
+    case 'edit':
+      handleUpdate(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    default:
+      break
+  }
+}
+
+const { queryParams, form, rules, queryMedicineParams } = toRefs(data)
+
+const handleQuantityChange = (val) => {
+  if (form.value.medicineId != null) {
+    getMedicineBasic(form.value.medicineId).then((response) => {
+      form.value.totalCount = response.data.specifications * val
+    })
+  }
+}
+const handleMarTypeChange = (val) => {
+  queryMedicineParams.value.treatmentType = val
+  form.value.medicineName = ''
+  form.value.name = ''
+  form.value.medicineId = null
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicineList.value = response.rows
+  })
+}
+
+const handleMedicineChange = (medicineId) => {
+  getMedicineBasic(medicineId).then((response) => {
+    form.value.packageUnit = response.data.packageUnit
+    form.value.unit = response.data.unit
+    form.value.totalCount = response.data.specifications
+    if (form.value.quantity != null) {
+      form.value.totalCount = response.data.specifications * form.value.quantity
+    }
+  })
+}
+
+/** 查询药品入库清单列表 */
+function getList() {
+  loading.value = true
+  listMedicineStockIn(queryParams.value).then((response) => {
+    medicineStockInList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/** 查询药品管理列表 */
+function getMedicineList() {
+  listMedicineBasic(queryMedicineParams.value).then((response) => {
+    medicineList.value = response.rows
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    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: null,
+    leftCount: null,
+    usedCount: null,
+    purchaseAddress: null,
+    totalPrice: null,
+    usage: null,
+    ageWeight: null,
+    totalCount: null,
+    unit: null,
+    packageUnit: null
+  }
+  proxy.resetForm('medicineStockInRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  title.value = '查看药品入库清单'
+  form.value = row
+  open.value = true
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  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
+  title.value = '添加药品入库清单'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getMedicineStockIn(_id).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改药品入库清单'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.medicineStockInRef.validate((valid) => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateMedicineStockIn(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addMedicineStockIn(form.value).then((response) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delMedicineStockIn(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    'health/medicineStockIn/export',
+    {
+      ...queryParams.value
+    },
+    `medicineStockIn_${new Date().getTime()}.xlsx`
+  )
+}
+
+getList()
+getMedicineList()
+</script>
diff --git a/src/views/health/person/index.vue b/src/views/health/person/index.vue
new file mode 100644
index 0000000..568493b
--- /dev/null
+++ b/src/views/health/person/index.vue
@@ -0,0 +1,315 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="昵称" prop="nickName">
+          <el-input v-model="queryParams.nickName" placeholder="请输入昵称" clearable @keyup.enter="handleQuery" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="queryParams.type" placeholder="请选择类型" clearable>
+            <el-option v-for="dict in person_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['health:person:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['health:person:remove']">删除</el-button>
+          <!-- <el-button @click="handleExport" icon="Download" v-hasPermi="['health:person:export']">导出</el-button> -->
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="personList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="姓名" align="center" prop="name" />
+          <el-table-column label="昵称" align="center" prop="nickName" />
+          <el-table-column label="类型" align="center" prop="type">
+            <template #default="scope">
+              <dict-tag :options="person_type" :value="scope.row.type" />
+            </template>
+          </el-table-column>
+          <el-table-column label="性别" align="center" prop="sex">
+            <template #default="scope">
+              <dict-tag :options="sys_user_sex" :value="scope.row.sex" />
+            </template>
+          </el-table-column>
+          <el-table-column label="生日" align="center" prop="birthday" width="180">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="年龄" align="center" prop="age" />
+          <el-table-column label="身高（CM）" align="center" prop="height" />
+          <el-table-column label="体重（KG）" align="center" prop="weight" />
+          <el-table-column label="排序" align="center" prop="ranking" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template v-slot="scope">
+              <div class="ctrl-btn d-flex">
+                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                  <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 添加或修改成员管理对话框 -->
+    <el-dialog :title="title" v-model="open" width="860px" append-to-body>
+      <el-form ref="personRef" :model="form" :inline="true" :rules="rules" label-width="100px">
+        <el-form-item label="姓名" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" />
+        </el-form-item>
+        <el-form-item label="昵称" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入昵称" />
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option v-for="dict in person_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="生日" prop="birthday">
+          <el-date-picker clearable v-model="form.birthday" type="date" value-format="YYYY-MM-DD" placeholder="请选择生日"> </el-date-picker>
+        </el-form-item>
+        <el-form-item label="性别" prop="sex">
+          <el-select v-model="form.sex" placeholder="请选择性别">
+            <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="身份证" prop="identityCard">
+          <el-input v-model="form.identityCard" placeholder="请输入身份证" />
+        </el-form-item>
+
+        <el-form-item label="身高" prop="height">
+          <el-input v-model="form.height" type="number" placeholder="请输入身高">
+            <template #suffix>CM</template>
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="体重" prop="weight">
+          <el-input v-model="form.weight" type="number" placeholder="请输入体重">
+            <template #suffix>KG</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="排序" style="width: 360px" prop="ranking">
+          <el-input-number style="width: 360px" v-model="form.ranking" placeholder="排序" />
+        </el-form-item>
+        <el-form-item label="备注" style="width: 752px" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template v-if="title !== '查看成员管理'" #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Person">
+import { listPerson, getPerson, delPerson, addPerson, updatePerson } from '@/api/health/person'
+// eslint-disable-next-line no-unused-vars
+import { require } from '@/utils/require'
+const { proxy } = getCurrentInstance()
+const { person_type, sys_user_sex } = proxy.useDict('person_type', 'sys_user_sex')
+
+const personList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const operateList = ref([
+  { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:person:query'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:person:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:person:remove'] }
+])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    name: null,
+    type: null,
+    nickName: null
+  },
+  rules: {
+    name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
+    sex: [{ required: true, message: '性别不能为空', trigger: 'change' }],
+    birthday: [{ required: true, message: '生日不能为空', trigger: 'blur' }],
+    nickName: [{ required: true, message: '昵称不能为空', trigger: 'blur' }]
+  }
+})
+
+const handleOperate = (operate, row) => {
+  switch (operate) {
+    case 'view':
+      handleView(row)
+      break
+    case 'edit':
+      handleUpdate(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    default:
+      break
+  }
+}
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询成员管理列表 */
+function getList() {
+  loading.value = true
+  listPerson(queryParams.value).then((response) => {
+    personList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    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
+  }
+  proxy.resetForm('personRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  title.value = '查看成员管理'
+  form.value = row
+  open.value = true
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = '添加成员管理'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getPerson(_id).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改成员管理'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.personRef.validate((valid) => {
+    if (valid) {
+      if (form.value.id != null) {
+        updatePerson(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addPerson(form.value).then((response) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delPerson(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    'health/person/export',
+    {
+      ...queryParams.value
+    },
+    `person_${new Date().getTime()}.xlsx`
+  )
+}
+
+getList()
+</script>
diff --git a/src/views/health/processRecord/index.vue b/src/views/health/processRecord/index.vue
new file mode 100644
index 0000000..359b41b
--- /dev/null
+++ b/src/views/health/processRecord/index.vue
@@ -0,0 +1,369 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="queryParams.personId" placeholder="请选择人员姓名" clearable @change="handleQueryPersonChange">
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="healthRecordId">
+          <el-select v-model="queryParams.healthRecordId" placeholder="请选择健康档案" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="记录时间" prop="time">
+          <el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['health:processRecord:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['health:processRecord:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['health:processRecord:export']">导出</el-button>
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="processRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="人员姓名" width="150" align="center" prop="personName" />
+          <el-table-column label="健康档案" width="180" align="center" prop="healthRecordName" />
+          <el-table-column label="记录时间" align="center" prop="recordingTime" width="180"> </el-table-column>
+          <el-table-column label="记录内容" align="center" prop="content"> </el-table-column>
+          <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
+            <template v-slot="scope">
+              <div class="ctrl-btn d-flex">
+                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                  <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 添加或修改档案过程记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="processRecordRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="form.personId" placeholder="请选择人员姓名" @change="handlePersonChange" clearable>
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="healthRecordId">
+          <el-select v-model="form.healthRecordId" placeholder="请选择健康档案" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="记录时间" prop="recordingTime">
+          <el-date-picker clearable v-model="form.recordingTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择记录时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="记录内容" prop="content">
+          <el-input v-model="form.content" type="textarea" placeholder="请输入记录内容" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template v-if="title !== '查看档案过程记录'" #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ProcessRecord">
+import { listProcessRecord, getProcessRecord, delProcessRecord, addProcessRecord, updateProcessRecord } from '@/api/health/processRecord'
+import { listPerson, getPerson } from '@/api/health/person'
+import { listHealthRecord } from '@/api/health/healthRecord'
+import dayjs from 'dayjs'
+// eslint-disable-next-line no-unused-vars
+import { require } from '@/utils/require'
+const { proxy } = getCurrentInstance()
+
+const processRecordList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const personList = ref([])
+const healthRecordList = ref([])
+const operateList = ref([
+  { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:processRecord:query'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:processRecord:edit'] },
+  { id: 'copy', icon: 'Link', title: '复制', hasPermi: ['health:marRecord:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:processRecord:remove'] }
+])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    healthRecordId: null,
+    time: '',
+    content: null,
+    personId: null
+  },
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  queryHealthRecordParams: {
+    pageNum: 1,
+    personId: null,
+    state: '1',
+    pageSize: 1000
+  },
+  rules: {
+    personId: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }],
+    healthRecordId: [{ required: true, message: '健康档案不能为空', trigger: 'change' }],
+    recordingTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+    content: [{ required: true, message: '记录内容不能为空', trigger: 'blur' }]
+  }
+})
+
+const handleOperate = (operate, row) => {
+  switch (operate) {
+    case 'view':
+      handleView(row)
+      break
+    case 'edit':
+      handleUpdate(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    case 'copy':
+      handleCopy(row)
+      break
+    default:
+      break
+  }
+}
+
+const { queryParams, form, rules, queryPersonParams, queryHealthRecordParams } = toRefs(data)
+
+const handlePersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+    if (response.rows.length > 0) {
+      form.value.healthRecordId = healthRecordList.value[0].id
+    }
+  })
+}
+
+const handleQueryPersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  queryParams.value.healthRecordId = null
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+}
+
+/** 查询成员管理列表 */
+function getPersonList() {
+  listPerson(queryPersonParams.value).then((response) => {
+    personList.value = response.rows
+    if (response.rows.length > 0) {
+      listHealthRecord(queryHealthRecordParams).then((res) => {
+        healthRecordList.value = res.rows
+      })
+    }
+  })
+}
+
+/** 复制按钮操作 */
+function handleCopy(row) {
+  reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  const _id = row.id || ids.value
+  getProcessRecord(_id).then((response) => {
+    form.value = response.data
+    form.value.id = null
+    open.value = true
+    title.value = '复制档案过程记录'
+  })
+}
+
+/** 查询档案过程记录列表 */
+function getList() {
+  loading.value = true
+  const timeRange = queryParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length === 2) {
+    st = dayjs(timeRange[0]).format('YYYY-MM-DD')
+    et = dayjs(timeRange[1]).format('YYYY-MM-DD')
+  }
+  queryParams.value.startTime = st
+  queryParams.value.endTime = et
+  listProcessRecord(queryParams.value).then((response) => {
+    processRecordList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    healthRecordId: null,
+    recordingTime: null,
+    content: null,
+    personId: null
+  }
+  proxy.resetForm('processRecordRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  title.value = '查看档案过程记录'
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  form.value = row
+  open.value = true
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  if (personList.value.length > 0) {
+    form.value.personId = personList.value[0].id
+    queryHealthRecordParams.personId = personList.value[0].id
+    listHealthRecord(queryHealthRecordParams).then((response) => {
+      healthRecordList.value = response.rows
+      if (response.rows.length > 0) {
+        form.value.healthRecordId = healthRecordList.value[0].id
+      }
+    })
+  }
+  open.value = true
+  title.value = '添加档案过程记录'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  const _id = row.id || ids.value
+  getProcessRecord(_id).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改档案过程记录'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.processRecordRef.validate((valid) => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateProcessRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addProcessRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delProcessRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    'health/processRecord/export',
+    {
+      ...queryParams.value
+    },
+    `processRecord_${new Date().getTime()}.xlsx`
+  )
+}
+
+getList()
+getPersonList()
+</script>
diff --git a/src/views/health/temperatureRecord/index.vue b/src/views/health/temperatureRecord/index.vue
new file mode 100644
index 0000000..94e86cb
--- /dev/null
+++ b/src/views/health/temperatureRecord/index.vue
@@ -0,0 +1,384 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="queryParams.personId" placeholder="请选择人员姓名" clearable @change="handleQueryPersonChange">
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="healthRecordId">
+          <el-select v-model="queryParams.healthRecordId" placeholder="请选择健康档案" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="测量时间" prop="time">
+          <el-date-picker v-model="queryParams.time" type="daterange" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con">
+      <div class="title-con">
+        <div class="title">基本信息</div>
+        <div class="operate-btn-con">
+          <el-button @click="handleAdd" icon="Plus" v-hasPermi="['health:temperatureRecord:add']">新增</el-button>
+          <el-button :disabled="multiple" icon="Delete" @click="handleDelete" v-hasPermi="['health:temperatureRecord:remove']">删除</el-button>
+          <el-button @click="handleExport" icon="Download" v-hasPermi="['health:temperatureRecord:export']">导出</el-button>
+        </div>
+      </div>
+      <div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
+        <el-table v-loading="loading" :data="temperatureRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="人员姓名" align="center" prop="personName" />
+          <el-table-column label="健康档案" align="center" prop="healthRecordName" />
+          <el-table-column label="测量时间" align="center" prop="measureTime" width="180"> </el-table-column>
+          <el-table-column label="体温（℃）" align="center" prop="temperature">
+            <template #default="scope">
+              <span v-if="scope.row.temperature < 37" style="color: #37b328">{{ scope.row.temperature }}</span>
+              <span v-else-if="scope.row.temperature >= 37 && scope.row.temperature < 37.5" style="color: #ff00ff">{{ scope.row.temperature }}</span>
+              <span v-else-if="scope.row.temperature >= 37.5 && scope.row.temperature < 38.5" style="color: #ff0066">{{ scope.row.temperature }}</span>
+              <span v-else-if="scope.row.temperature >= 38.5 && scope.row.temperature < 39.5" style="color: #ff0000">{{ scope.row.temperature }}</span>
+              <span v-else-if="scope.row.temperature >= 39.5" style="color: #990000">{{ scope.row.temperature }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template v-slot="scope">
+              <div class="ctrl-btn d-flex">
+                <el-tooltip v-for="item in operateList" :key="item.id" class="item" effect="dark" :content="item.title" placement="top">
+                  <el-button :icon="item.icon" v-hasPermi="item.hasPermi" circle @click="handleOperate(item.id, scope.row)"></el-button>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination small background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" />
+      </div>
+    </div>
+    <!-- 添加或修改体温记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="temperatureRecordRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="人员姓名" prop="personId">
+          <el-select v-model="form.personId" placeholder="请选择人员姓名" @change="handlePersonChange" clearable>
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="healthRecordId">
+          <el-select v-model="form.healthRecordId" placeholder="请选择健康档案" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="测量时间" prop="measureTime">
+          <el-date-picker clearable v-model="form.measureTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择测量时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="体温" prop="temperature">
+          <el-input v-model="form.temperature" type="number" placeholder="请输入体温">
+            <template #suffix>℃</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template v-if="title !== '查看体温记录'" #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="TemperatureRecord">
+import {
+  listTemperatureRecord,
+  getTemperatureRecord,
+  delTemperatureRecord,
+  addTemperatureRecord,
+  updateTemperatureRecord
+} from '@/api/health/temperatureRecord'
+import { listPerson, getPerson } from '@/api/health/person'
+import { listHealthRecord } from '@/api/health/healthRecord'
+import dayjs from 'dayjs'
+// eslint-disable-next-line no-unused-vars
+import { require } from '@/utils/require'
+const { proxy } = getCurrentInstance()
+
+const temperatureRecordList = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const title = ref('')
+const personList = ref([])
+const healthRecordList = ref([])
+const operateList = ref([
+  { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:temperatureRecord:query'] },
+  { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:temperatureRecord:edit'] },
+  { id: 'copy', icon: 'Link', title: '复制', hasPermi: ['health:marRecord:edit'] },
+  { id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:temperatureRecord:remove'] }
+])
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    healthRecordId: null,
+    time: '',
+    temperature: null,
+    personId: null
+  },
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  queryHealthRecordParams: {
+    pageNum: 1,
+    personId: null,
+    state: '1',
+    pageSize: 1000
+  },
+  rules: {
+    personId: [{ required: true, message: '人员姓名不能为空', trigger: 'blur' }],
+    measureTime: [{ required: true, message: '测量时间不能为空', trigger: 'blur' }],
+    healthRecordId: [{ required: true, message: '健康档案不能为空', trigger: 'change' }],
+    temperature: [{ required: true, message: '体温不能为空', trigger: 'blur' }]
+  }
+})
+
+const handleOperate = (operate, row) => {
+  switch (operate) {
+    case 'view':
+      handleView(row)
+      break
+    case 'edit':
+      handleUpdate(row)
+      break
+    case 'delete':
+      handleDelete(row)
+      break
+    case 'copy':
+      handleCopy(row)
+      break
+    default:
+      break
+  }
+}
+
+const { queryParams, form, rules, queryPersonParams, queryHealthRecordParams } = toRefs(data)
+
+const handlePersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+    if (response.rows.length > 0) {
+      form.value.healthRecordId = healthRecordList.value[0].id
+    }
+  })
+}
+
+const handleQueryPersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  queryParams.value.healthRecordId = null
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+}
+/** 查询成员管理列表 */
+function getPersonList() {
+  listPerson(queryPersonParams.value).then((response) => {
+    personList.value = response.rows
+    if (response.rows.length > 0) {
+      listHealthRecord(queryHealthRecordParams).then((res) => {
+        healthRecordList.value = res.rows
+      })
+    }
+  })
+}
+
+/** 复制按钮操作 */
+function handleCopy(row) {
+  reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  const _id = row.id || ids.value
+  getTemperatureRecord(_id).then((response) => {
+    form.value = response.data
+    form.value.id = null
+    open.value = true
+    title.value = '复制体温记录'
+  })
+}
+
+/** 查询体温记录列表 */
+function getList() {
+  loading.value = true
+  const timeRange = queryParams.value.time
+  let st = ''
+  let et = ''
+  if (timeRange && timeRange.length === 2) {
+    st = dayjs(timeRange[0]).format('YYYY-MM-DD')
+    et = dayjs(timeRange[1]).format('YYYY-MM-DD')
+  }
+  queryParams.value.startTime = st
+  queryParams.value.endTime = et
+  listTemperatureRecord(queryParams.value).then((response) => {
+    temperatureRecordList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    delFlag: null,
+    remark: null,
+    healthRecordId: null,
+    measureTime: null,
+    temperature: null,
+    personId: null
+  }
+  proxy.resetForm('temperatureRecordRef')
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  handleQuery()
+}
+
+// 分页
+const handleCurrentChange = (val) => {
+  queryParams.value.pageNum = val
+  getList()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map((item) => item.id)
+  single.value = selection.length !== 1
+  multiple.value = !selection.length
+}
+
+// 查看
+const handleView = (row) => {
+  title.value = '查看体温记录'
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  form.value = row
+  open.value = true
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  if (personList.value.length > 0) {
+    form.value.personId = personList.value[0].id
+    queryHealthRecordParams.personId = personList.value[0].id
+    listHealthRecord(queryHealthRecordParams).then((response) => {
+      healthRecordList.value = response.rows
+      if (response.rows.length > 0) {
+        form.value.healthRecordId = healthRecordList.value[0].id
+      }
+    })
+  }
+  open.value = true
+  title.value = '添加体温记录'
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  queryHealthRecordParams.personId = row.personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+  })
+  const _id = row.id || ids.value
+  getTemperatureRecord(_id).then((response) => {
+    form.value = response.data
+    open.value = true
+    title.value = '修改体温记录'
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs.temperatureRecordRef.validate((valid) => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateTemperatureRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('修改成功')
+          open.value = false
+          getList()
+        })
+      } else {
+        addTemperatureRecord(form.value).then((response) => {
+          proxy.$modal.msgSuccess('新增成功')
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal
+    .confirm('是否确认删除选中的数据项？')
+    .then(function () {
+      return delTemperatureRecord(_ids)
+    })
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
+    .catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download(
+    'health/temperatureRecord/export',
+    {
+      ...queryParams.value
+    },
+    `temperatureRecord_${new Date().getTime()}.xlsx`
+  )
+}
+
+getList()
+getPersonList()
+</script>
diff --git a/src/views/health/temperatureStatistic/index.vue b/src/views/health/temperatureStatistic/index.vue
new file mode 100644
index 0000000..7abcfd4
--- /dev/null
+++ b/src/views/health/temperatureStatistic/index.vue
@@ -0,0 +1,634 @@
+<template>
+  <div class="app-container">
+    <div class="search-con">
+      <div class="title">查询条件</div>
+      <el-form :model="queryParams" ref="queryRef" :inline="true" :rules="rules" label-width="100px">
+        <el-form-item label="人员姓名" prop="id">
+          <el-select v-model="queryParams.id" placeholder="请选择人员姓名" @change="handlePersonChange">
+            <el-option v-for="person in personList" :key="person.id" :label="person.name" :value="person.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="健康档案" prop="recordId">
+          <el-select v-model="queryParams.recordId" placeholder="请选择健康档案" @change="handleRecordChange" clearable>
+            <el-option v-for="health in healthRecordList" :key="health.id" :label="health.name" :value="health.id" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="测量日期" prop="time" v-if="queryParams.type === 1">
+          <el-date-picker
+            v-model="queryParams.time"
+            type="daterange"
+            range-separator="~"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            format="YYYY-MM-DD"
+            @calendar-change="calendarChange"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="time" v-if="queryParams.type === 2">
+          <el-date-picker
+            v-model="queryParams.time"
+            type="monthrange"
+            range-separator="~"
+            format="YYYY-MM"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :disabled-date="disabledDateFun"
+            @calendar-change="calendarChange"
+          />
+        </el-form-item>
+        <el-form-item label="" prop="time" v-if="queryParams.type === 3">
+          <yearPicker
+            v-model="queryParams.time"
+            ref="statisticPicker"
+            labelText="选择年份"
+            :initYear="dateValue"
+            :showYear="showYearValue"
+            :maxLength="5"
+            sp="~"
+            @updateTimeRange="updateStatisticYear"
+          />
+        </el-form-item>
+      </el-form>
+      <div class="search-btn-con">
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="info" icon="Refresh" @click="resetQuery">重置</el-button>
+      </div>
+    </div>
+    <div class="main-con" style="height: calc(100% - 1.45rem)">
+      <div class="summary-con" style="height: 115px">
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">发烧天数</div>
+            <div>
+              <span class="num">{{ temp.feverDay }}</span
+              ><span class="unit">天（大于37℃） </span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">测量次数</div>
+            <div>
+              <span class="num">{{ temp.totalCount }}</span
+              ><span class="unit">次 </span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">最高体温</div>
+            <div>
+              <span class="num">{{ temp.maxTemp }}</span
+              ><span class="unit">℃ </span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">最低体温</div>
+            <div>
+              <span class="num">{{ temp.minTemp }}</span
+              ><span class="unit">℃ </span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">平均体温</div>
+            <div>
+              <span class="num">{{ temp.averageTemp }}</span> <span class="unit">℃ </span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="summary-con" style="height: 115px">
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">正常次数</div>
+            <div>
+              <span class="num">{{ temp.normalTempCount }}</span> <span class="unit">次(小于36.9℃)</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">低烧次数</div>
+            <div>
+              <span class="num">{{ temp.lowerTempCount }}</span> <span class="unit">次(36.9~37.5℃)</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">中烧次数</div>
+            <div>
+              <span class="num">{{ temp.middleTempCount }}</span> <span class="unit">次(37.5~38.5℃)</span>
+            </div>
+          </div>
+        </div>
+        <div class="right-con">
+          <div class="img">
+            <img src="@/assets/images/average.png" alt="" />
+          </div>
+          <div class="item-wrap">
+            <div class="title">高烧次数</div>
+            <div>
+              <span class="num">{{ temp.higherTempCount }}</span> <span class="unit">次（大于38.5℃）</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="title-con" style="margin-top: 18px">
+        <div class="title">体温统计</div>
+        <div class="operate-btn-con">
+          <el-radio-group v-model="radioVal" @change="handleRadioChange">
+            <el-radio-button label="体温明细" />
+            <el-radio-button label="柱状图" />
+            <el-radio-button label="折线图" />
+          </el-radio-group>
+        </div>
+      </div>
+      <div class="content-con">
+        <div v-show="radioVal === '柱状图'" class="chart" id="chartBar" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <div v-show="radioVal === '折线图'" class="chart" id="chartLine" style="height: calc(100% - 225px); margin-top: -10px"></div>
+        <el-table v-show="radioVal === '体温明细'" v-loading="loading" :data="temp.tableList" height="calc(100% - 245px)">
+          <el-table-column label="序号" width="50" type="index" align="center">
+            <template #default="scope">
+              <span>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="测量日期" align="center" prop="time" />
+          <el-table-column label="测量次数" align="center" prop="count" />
+          <el-table-column label="最高体温（℃）" align="center" prop="max" />
+          <el-table-column label="最低体温（℃）" align="center" prop="min" />
+          <el-table-column label="平均体温（℃）" align="center" prop="average" />
+          <el-table-column prop="detail" label="测量明细" v-if="queryParams.type === 1">
+            <template #default="scope">
+              <span v-html="formatMultiLineData(scope.row.detail)"></span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="CreditAnalysis">
+import dayjs from 'dayjs'
+import * as echarts from 'echarts'
+import { ElMessage } from 'element-plus'
+import yearPicker from '@/components/YearPicker/index.vue'
+import { getTemperatureAnalysis } from '@/api/health/statisticAnalysis'
+import { listPerson, getPerson } from '@/api/health/person'
+import { listHealthRecord } from '@/api/health/healthRecord'
+const { proxy } = getCurrentInstance()
+const { deal_type, account_type, deal_category } = proxy.useDict('deal_type', 'account_type', 'deal_category')
+const personList = ref([])
+const healthRecordList = ref([])
+
+const dateValue = ref({ startYear: 2000, endYear: new Date().getFullYear() })
+const showYearValue = ref({ startShowYear: '', endShowYear: '' })
+const updateStatisticYear = (startYear, endYear) => {
+  queryParams.value.time = [new Date(startYear, 0, 1), new Date(endYear, 0, 1)]
+  if (endYear - startYear > 5) {
+    ElMessage.warning('时间跨度不能大于5年，默认选择开始日期的5年')
+    queryParams.value.time = [new Date(startYear, 0, 1), new Date(startYear + 5, 0, 1)]
+  }
+}
+
+const dates = [{ value: 1, label: '日' }]
+const accountsList = ref([])
+const loading = ref(true)
+const total = ref(0)
+const radioVal = ref('体温明细')
+const dateValidate = (rules, value, callback) => {
+  const dateType = rules.dateType || 'days'
+  const num = rules.num || 31
+  const dateString = rules.dateString || '天'
+  const message = rules.message || `时间跨度不能超过${num}${dateString}`
+
+  if (value && value.length === 2) {
+    const start = value[0]
+    const end = value[1]
+    if (dayjs(end).diff(dayjs(start), dateType) > num) {
+      queryParams.value.time = [start, dayjs(start).add(23, 'months')]
+      ElMessage.warning(message)
+    }
+  }
+}
+
+const data = reactive({
+  queryParams: {
+    type: 1,
+    time: null,
+    id: null,
+    dataType: '1',
+    dealType: null,
+    dealCategory: null
+  },
+  queryPersonParams: {
+    pageNum: 1,
+    pageSize: 1000
+  },
+  queryHealthRecordParams: {
+    pageNum: 1,
+    personId: null,
+    state: '1',
+    pageSize: 1000
+  },
+  rules: {
+    time: [{ validator: dateValidate, dateType: 'months', num: 23, dateRange: '月', message: '时间跨度不能大于24个月，默认选择开始日期的24个月' }]
+  }
+})
+
+const { queryParams, rules, queryPersonParams, queryHealthRecordParams } = toRefs(data)
+
+const handleRecordChange = (recordId) => {
+  queryParams.value.recordId = recordId
+  getList()
+}
+
+const handlePersonChange = (personId) => {
+  queryHealthRecordParams.personId = personId
+  listHealthRecord(queryHealthRecordParams).then((response) => {
+    healthRecordList.value = response.rows
+    if (response.rows.length > 0) {
+      queryParams.value.recordId = response.rows[0].id
+      getList()
+    }
+  })
+}
+
+/** 查询成员管理列表 */
+function getPersonList() {
+  listPerson(queryPersonParams.value).then((response) => {
+    personList.value = response.rows
+    if (response.rows.length > 0) {
+      queryParams.value.id = response.rows[0].id
+      queryHealthRecordParams.personId = response.rows[0].id
+      listHealthRecord(queryHealthRecordParams).then((res) => {
+        healthRecordList.value = res.rows
+        if (res.rows.length > 0) {
+          queryParams.value.recordId = res.rows[0].id
+          getList()
+        }
+      })
+    }
+  })
+}
+
+// const today = new Date()
+// const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+// const start = dayjs(end).add(-60, 'day')
+// queryParams.value.time = [start, end]
+const handleTimeChange = (type) => {
+  queryParams.value.time = null
+  if (type === 1) {
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+    const start = dayjs(end).add(-60, 'day')
+    queryParams.value.time = [start, end]
+  } else if (type === 2) {
+    const today = new Date()
+    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2)
+    const start = dayjs(end).add(-11, 'months')
+    queryParams.value.time = [start, end]
+  } else if (type === 3) {
+    const today = new Date()
+    const endYear = today.getFullYear()
+    queryParams.value.time = [new Date(endYear - 2, 0, 1), new Date(endYear, 0, 1)]
+    showYearValue.value = { startShowYear: endYear - 2, endShowYear: endYear }
+  }
+  getList()
+}
+function formatMultiLineData(data) {
+  if (data != null) {
+    return data.replace(/<br\/>/g, '<br/>')
+  }
+}
+const disabledDateFun = (time) => {
+  const arr = [0, 30, 365, 365 * 5]
+  const days = arr[queryParams.value.type]
+
+  if (firstChooseDate.value) {
+    const one = days * 24 * 3600 * 1000
+    const minTime = firstChooseDate.value - one
+    const maxTime = firstChooseDate.value + one
+    const startTime = minTime
+    const endTime = maxTime > Date.now() - 8.64e7 ? Date.now() - 8.64e7 : maxTime
+    return time.getTime() > endTime || time.getTime() < startTime
+  } else {
+    return time.getTime() > Date.now() - 8.64e7
+  }
+}
+
+const firstChooseDate = ref('')
+const calendarChange = (val) => {
+  firstChooseDate.value = val[0].getTime()
+  if (val[1]) firstChooseDate.value = ''
+}
+
+const temp = ref({})
+const chartData = ref({
+  name: [],
+  value1: []
+})
+
+function getList() {
+  loading.value = true
+  chartData.value = { name: [], value1: [] }
+  const { type, time, id, recordId } = queryParams.value
+  let formatValue = 'YYYY-MM-DD'
+  if (type === 1) {
+    formatValue = 'YYYY-MM-DD'
+  } else if (type === 2) {
+    formatValue = 'YYYY-MM'
+  } else {
+    formatValue = 'YYYY'
+  }
+  const params = {
+    type,
+    startTime: time && time.length > 0 ? dayjs(time[0]).format(formatValue) : '',
+    endTime: time && time.length > 0 ? dayjs(time[1]).format(formatValue) : '',
+    id,
+    recordId
+  }
+  getTemperatureAnalysis(params).then((response) => {
+    loading.value = false
+    temp.value = { ...response.data }
+    temp.value.temperatureList.map((item) => {
+      return {
+        name: item.time,
+        value: item.value
+      }
+    })
+    response.data.temperatureList.map((item) => {
+      chartData.value.name.push(item.time)
+      chartData.value.value1.push(item.value)
+    })
+    handleRadioChange(currentType.value)
+  })
+}
+
+function handleQuery() {
+  getList()
+}
+
+function resetQuery() {
+  proxy.resetForm('queryRef')
+  queryParams.value.id = null
+  const today = new Date()
+  const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
+  const start = dayjs(end).add(-60, 'day')
+  queryParams.value.time = [start, end]
+  total.value = 0
+  getPersonList()
+}
+
+const drawBar = (data) => {
+  if (document.getElementById('chartBar') === null) {
+    return
+  }
+  echarts.dispose(document.getElementById('chartBar'))
+  const myChart = echarts.init(document.getElementById('chartBar'))
+
+  const option = {
+    legend: {
+      // 图示例样式
+      show: true,
+      top: 50,
+      right: 50,
+      itemGap: 20
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      },
+      formatter: function (params) {
+        return params[0].name + '<br>' + '体温：' + params[0].value + '℃'
+      }
+    },
+    grid: {
+      left: '5%',
+      right: '5%',
+      bottom: '5%',
+      containLabel: true
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: data.name,
+        axisTick: {
+          alignWithLabel: true // 刻度线是否与标签对齐，默认false
+        },
+        // 设置 X 轴线条粗细
+        axisLine: {
+          lineStyle: {
+            width: 1, // 根据需求调整数值大小，单位是像素
+            color: '#999'
+          }
+        }
+      }
+    ],
+    yAxis: [
+      {
+        type: 'value',
+        min: 35.5, // 设置 y 轴的最小值为 0
+        // max: 40.5, // 设置 y 轴的最大值为 100
+        interval: 0.5, //设置y轴刻度间隔
+        axisTick: {
+          show: true // 默认为true，如果要隐藏，则改为 false
+        },
+        axisLine: {
+          show: true,
+          lineStyle: {
+            width: 1,
+            color: '#999'
+          }
+        }
+      }
+    ],
+    series: [
+      {
+        data: data.value1,
+        type: 'bar',
+        barWidth: 10, // 根据需求调整数值大小，单位是像素
+        itemStyle: {
+          // 此处可以是一个固定颜色值，也可以是一个回调函数根据数据动态计算颜色
+          color: function (params) {
+            // 这里可以根据需要设置不同的颜色，比如根据数据值
+            if (params.data < 37) {
+              return '#37b328'
+            } else if (params.data >= 37 && params.data < 37.5) {
+              return '#ff00ff'
+            } else if (params.data >= 37.5 && params.data < 38.5) {
+              return '#ff0066'
+            } else if (params.data >= 38.5 && params.data < 39.5) {
+              return '#ff0000'
+            } else if (params.data >= 39.5) {
+              return '#990000' // 数据在50到99之间为蓝色
+            }
+          }
+        }
+      }
+    ],
+    // 添加点击事件的处理函数
+    emphasis: {
+      // itemStyle: {
+      //   color: '#2283cf',
+      //   barWidth: 20 // 根据需求调整数值大小，单位是像素
+      // },
+      barWidth: 24 // 根据需求调整数值大小，单位是像素
+    }
+  }
+
+  myChart.setOption(option)
+}
+
+const drawLine = (data) => {
+  if (document.getElementById('chartLine') === null) {
+    return
+  }
+  echarts.dispose(document.getElementById('chartLine'))
+  const myChart = echarts.init(document.getElementById('chartLine'))
+
+  const option = {
+    grid: {
+      left: '5%',
+      right: '5%',
+      bottom: '5%',
+      containLabel: true
+    },
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
+      },
+      formatter: function (params) {
+        return params[0].name + '<br>' + '体温：' + params[0].value + '℃'
+      }
+    },
+    xAxis: {
+      type: 'category',
+      data: data.name,
+      axisTick: {
+        alignWithLabel: true
+      },
+      axisLine: {
+        lineStyle: {
+          width: 1,
+          color: '#999'
+        }
+      }
+    },
+    yAxis: {
+      type: 'value',
+      min: 35.5, // 设置 y 轴的最小值为 0
+      // max: 40.5, // 设置 y 轴的最大值为 100
+      interval: 0.5, //设置y轴刻度间隔
+      axisTick: {
+        show: true
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          width: 1,
+          color: '#999'
+        }
+      }
+    },
+    series: [
+      {
+        data: data.value1,
+        type: 'line',
+        lineStyle: {
+          color: '#4181c9'
+        },
+        itemStyle: {
+          // 此处可以是一个固定颜色值，也可以是一个回调函数根据数据动态计算颜色
+          color: function (params) {
+            // 这里可以根据需要设置不同的颜色，比如根据数据值
+            if (params.data < 37) {
+              return '#37b328'
+            } else if (params.data >= 37 && params.data < 37.5) {
+              return '#ff00ff'
+            } else if (params.data >= 37.5 && params.data < 38.5) {
+              return '#ff0066'
+            } else if (params.data >= 38.5 && params.data < 39.5) {
+              return '#ff0000'
+            } else if (params.data >= 39.5) {
+              return '#990000' // 数据在50到99之间为蓝色
+            }
+          }
+        },
+        smooth: true,
+        symbol: 'emptyCircle',
+        areaStyle: {
+          color: new echarts.graphic.LinearGradient(
+            0,
+            0,
+            0,
+            1,
+            [
+              {
+                offset: 0,
+                color: 'rgba(65,129,201, 0.70)'
+              },
+              {
+                offset: 1,
+                color: 'rgba(65,129,201, 0.10)'
+              }
+            ],
+            false
+          ),
+          shadowColor: 'rgba(65,129,201, 0.10)',
+          shadowBlur: 10
+        }
+      }
+    ]
+  }
+
+  myChart.setOption(option)
+}
+
+const currentType = ref('柱状图')
+const handleRadioChange = (type) => {
+  currentType.value = type
+  switch (type) {
+    case '柱状图':
+      drawBar(chartData.value)
+      break
+    case '折线图':
+      drawLine(chartData.value)
+      break
+    default:
+      break
+  }
+}
+getPersonList()
+</script>