diff --git a/src/components/suspend/suspend.vue b/src/components/suspend/suspend.vue
index 3ebcd92..e8cca0d 100644
--- a/src/components/suspend/suspend.vue
+++ b/src/components/suspend/suspend.vue
@@ -30,7 +30,7 @@
 	methods: {
 	  // 意见反馈
 	  newProblem() {
-		uni.switchTab({url: `/pages/health/index`})
+		uni.switchTab({url: `/pages/home/index`})
 	  }
 	}
   };
diff --git a/src/components/systemBtn/systemBtn.vue b/src/components/systemBtn/systemBtn.vue
index c90a342..e8cca0d 100644
--- a/src/components/systemBtn/systemBtn.vue
+++ b/src/components/systemBtn/systemBtn.vue
@@ -30,9 +30,7 @@
 	methods: {
 	  // 意见反馈
 	  newProblem() {
-		uni.navigateTo({
-		  url: `/pages_mine/pages/system/index`
-		})
+		uni.switchTab({url: `/pages/home/index`})
 	  }
 	}
   };
diff --git a/src/pages.json b/src/pages.json
index 0eeeb30..64bed61 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -39,224 +39,26 @@
       }
     },
     {
-      "path": "pages/health/homepage/index",
+      "path": "pages/home/homepage/index",
       "style": {
         "navigationBarTitleText": "",
          "navigationStyle": "custom"
       }
     },
     {
-      "path": "pages/health/index",
+      "path": "pages/home/index",
       "style": {
         "navigationBarTitleText": "",
          "navigationStyle": "custom"
       }
     }, 
-    {
-      "path": "pages/health/statistic/index",
-      "style": {
-        "navigationBarTitleText": ""
-      }
-    },
     {
       "path": "pages/mine",
       "style": {
         "navigationBarTitleText": "",
          "navigationStyle": "custom"
       }
-    },
-    {
-      "path": "pages/health/doctorRecord/list",
-      "style": {
-        "navigationBarTitleText": "就医记录"
-      }
     }
-    ,
-    {
-      "path": "pages/health/doctorRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "就医记录"
-      }
-    },
-    {
-      "path": "pages/health/healthRecord/list",
-      "style": {
-        "navigationBarTitleText": "健康档案"
-      }
-    } ,
-    {
-      "path": "pages/health/healthRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "健康档案"
-      }
-    },
-    {
-      "path": "pages/health/marRecord/list",
-      "style": {
-        "navigationBarTitleText": "用药记录"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/marRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "用药记录"
-      }
-    },
-    {
-      "path": "pages/health/medicineBasic/list",
-      "style": {
-        "navigationBarTitleText": "药品基础信息"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/medicineBasic/details",
-      "style": {
-        "navigationBarTitleText": "药品基础信息详情"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/medicineBasic/addEdit",
-      "style": {
-        "navigationBarTitleText": "药品基础信息"
-      }
-    },
-    {
-      "path": "pages/health/medicineStockIn/list",
-      "style": {
-        "navigationBarTitleText": "药品入库清单"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/medicineStockIn/details",
-      "style": {
-        "navigationBarTitleText": "药品入库清单详情"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/medicineStockIn/addEdit",
-      "style": {
-        "navigationBarTitleText": "药品入库清单"
-      }
-    }, {
-      "path": "pages/health/medicineStock/list",
-      "style": {
-        "navigationBarTitleText": "药品实时库存"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/temperatureRecord/list",
-      "style": {
-        "navigationBarTitleText": "体温记录"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/temperatureRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "体温记录"
-      }
-    } ,
-    {
-      "path": "pages/health/processRecord/list",
-      "style": {
-        "navigationBarTitleText": "档案过程记录"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/processRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "过程记录"
-      }
-    },
-     {
-      "path": "pages/health/heightWeightRecord/list",
-      "style": {
-        "navigationBarTitleText": "身高体重记录"
-      }
-    } 
-    ,
-    {
-      "path": "pages/health/milkPowderRecord/addEdit",
-      "style": {
-        "navigationBarTitleText": "吃奶记录"
-      }
-    },
-    {
-     "path": "pages/health/milkPowderRecord/list",
-     "style": {
-       "navigationBarTitleText": "吃奶记录"
-     }
-   } 
-   ,
-   {
-     "path": "pages/health/heightWeightRecord/addEdit",
-     "style": {
-       "navigationBarTitleText": "身高体重记录"
-     }
-   },
-    {
-      "path": "pages/health/person/list",
-      "style": {
-        "navigationBarTitleText": "成员管理"
-      }
-    }
-    ,
-    {
-      "path": "pages/health/person/addEdit",
-      "style": {
-        "navigationBarTitleText": "成员管理"
-      }
-    },
-    {
-      "path": "pages/health/activity/list",
-      "style": {
-        "navigationBarTitleText": "活动记录"
-      }
-    }
-    ,
-    {
-      "path": "pages/health/activity/addEdit",
-      "style": {
-        "navigationBarTitleText": "活动记录"
-      }
-    } ,
-    {
-      "path": "pages/health/statistic/doctorStatistic/index",
-      "style": {
-        "navigationBarTitleText": "就医统计"
-      }
-    }  ,
-    {
-      "path": "pages/health/statistic/healthStatistic/index",
-      "style": {
-        "navigationBarTitleText": "档案统计"
-      }
-    }  ,
-    {
-      "path": "pages/health/statistic/marStatistic/index",
-      "style": {
-        "navigationBarTitleText": "用药统计"
-      }
-    }  ,
-    {
-      "path": "pages/health/statistic/temperatureStatistic/index",
-      "style": {
-        "navigationBarTitleText": "体温统计"
-      }
-    }  ,
-    {
-      "path": "pages/health/statistic/milkPowderStatistic/index",
-      "style": {
-        "navigationBarTitleText": "吃奶量统计"
-      }
-    } 
   ],
   "subPackages": [
    {
@@ -485,23 +287,17 @@
     "backgroundColor": "#ffffff",
     "list": [
       {
-        "pagePath": "pages/health/homepage/index",
+        "pagePath": "pages/home/homepage/index",
         "iconPath": "static/images/tabbar/home.png",
         "selectedIconPath": "static/images/tabbar/home_.png",
         "text": "首页"
       },
       {
-        "pagePath": "pages/health/index",
+        "pagePath": "pages/home/index",
         "iconPath": "static/images/tabbar/work.png",
         "selectedIconPath": "static/images/tabbar/work_.png",
         "text": "工作台"
       },
-      // {
-      //   "pagePath": "pages/health/statistic/index",
-      //   "iconPath": "static/images/tabbar/statistic.png",
-      //   "selectedIconPath": "static/images/tabbar/statistic_.png",
-      //   "text": "统计分析"
-      // },
       {
         "pagePath": "pages/mine",
         "iconPath": "static/images/tabbar/mine.png",
diff --git a/src/pages/health/activity/addEdit.vue b/src/pages/health/activity/addEdit.vue
deleted file mode 100644
index b0df681..0000000
--- a/src/pages/health/activity/addEdit.vue
+++ /dev/null
@@ -1,350 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="活动记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="活动名称" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写活动名称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-          <u-form-item label="类型" prop="typeName" required @click="handleType">
-              <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="活动地点" required prop="place" >
-              <u--input v-model="form.place"  placeholder="请填写活动地点"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="成员" required prop="partner" >
-              <u--input v-model="form.partner" placeholder="请填写成员"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="开始时间" prop="startTime" required @click="selectStartTime()">
-            <u--input v-model="form.startTime" disabled disabledColor="#ffffff" placeholder="请选择开始时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="结束时间" prop="endTime"  @click="selectEndTime()">
-            <u--input v-model="form.endTime" disabled disabledColor="#ffffff" placeholder="请选择结束时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-            <!-- <u-form-item label="活动时长" prop="exerciseTime" >
-              <u--input v-model="form.exerciseTime" placeholder="请填写活动时长"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item> -->
-            <u-form-item label="活动量" prop="activityVolumeName" required @click="handleActivityVolume">
-              <u--input v-model="form.activityVolumeName" disabled disabledColor="#ffffff" placeholder="请选择活动量"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="总费用" prop="totalCost" >
-              <u--input v-model="form.totalCost" type="number"  placeholder="请填写总费用"
-                inputAlign="right" border="none">
-                <template #suffix>
-					<up-text
-						text="元"
-					></up-text>
-				</template></u--input>
-            </u-form-item>
-            <u-form-item label="费用明细" prop="costDetail"  labelPosition="top">
-            <u--textarea v-model="form.costDetail" placeholder="请填写费用明细" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="饮食" prop="foods"  labelPosition="top">
-            <u--textarea v-model="form.foods" placeholder="请填写饮食" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="收获" prop="harvest"  labelPosition="top">
-            <u--textarea v-model="form.harvest" placeholder="请填写收获" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-        <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleTypeCancel"
-        @confirm="handleTypeConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showActivityVolume" :columns="activityVolumeList" keyName="dictLabel" @cancel="handleActivityVolumeCancel"
-        @confirm="handleActivityVolumeConfirm"></u-picker>
-        <u-datetime-picker
-			:show="startTimeShow"
-			mode="datetime"
-      ref="startTimeRef" 
-			@cancel="startTimeShow=false"
-			@confirm="startTimeConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-
-    <u-datetime-picker
-			:show="endTimeShow"
-			mode="datetime"
-      ref="endTimeRef" 
-			@cancel="endTimeShow=false"
-			@confirm="endTimeConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getActivity, addActivity, updateActivity } from '@/api/health/activity'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const birthdayShow = ref(false)
-const title = ref("活动记录")
-const startTimeShow = ref(false)
-const endTimeShow = ref(false)
-
-const typeList = ref([])
-const showType = ref(false)
-const flag = ref('add')
-const activityVolumeList = ref([])
-const showActivityVolume = ref(false)
-
-const data = reactive({
-form: {
-  id: null,
-    name: null,
-    type: null,
-    place: null,
-    activityVolume: null,
-    exerciseTime: null,
-    startTime: null,
-    endTime: null,
-    harvest: null,
-    foods: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    totalCost: 0,
-    partner: null,
-    costDetail: null
-},
-rules: {
-  name: [{ required: true, message: '活动名称不能为空', trigger:['change', 'blur'] }],
-  place: [{ required: true, message: '活动地点不能为空', trigger: ['change', 'blur'] }],
-  partner: [{ required: true, message: '成员不能为空', trigger: ['change', 'blur'] }],
-  startTime: [{ required: true, message: '开始时间不能为空', trigger: ['change', 'blur'] }],
-  // endTime: [{ required: true, message: '结束时间不能为空', trigger: ['change', 'blur'] }],
-  activityVolumeName: [{ required: true, message: '活动量不能为空', trigger: ['change', 'blur'] }],
-  typeName: [{ required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
-}
-})
-const { form, rules} = toRefs(data)
-
-
-onLoad((option) => {
-  form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="活动记录-修改"
-     }else{
-      title.value="活动记录-新增"
-     }
-     }else{
-      title.value="活动记录-复制"
-     }
-    getData()
-})
-onReady(() => {
-  form.value.startTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
- function  selectStartTime() {
-      startTimeShow.value = true
-      proxy.$refs['startTimeRef'].innerValue = new Date().getTime()
-  }
-function startTimeConfirm(e) {
-      form.value.startTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      startTimeShow.value = false
-  }
-
-  function  selectEndTime() {
-    endTimeShow.value = true
-      proxy.$refs['endTimeRef'].innerValue = new Date().getTime()
-  }
-function endTimeConfirm(e) {
-      form.value.endTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      endTimeShow.value = false
-  }
-function  getData() {
-     // 类型
-     getDicts('activity_type').then(res => {
-        typeList.value =[res.data] 
-      })
-           // 类型
-     getDicts('activity_exercise').then(res => {
-      activityVolumeList.value =[res.data] 
-      })
-    if(form.value.id!=null){
-      getActivity(form.value.id).then(res => {
-        form.value = res.data   
-            // 类型
-           getDicts('activity_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-         })
-               // 类型
-               getDicts('activity_exercise').then(result => {
-          form.value.activityVolumeName=dictStr(form.value.activityVolume, result.data)
-         })
-      })
-    }
-}
-
-
-  function handleType() {
-        if (typeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '类型为空  ', type: 'warning'
-          })
-        } else {
-          showType.value = true
-        }
-     }
-  function   handleTypeConfirm(e) {
-        form.value.typeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-        showType.value = false
-  }
- function handleTypeCancel() {
-       showType.value = false
-      }
-
-      function handleActivityVolume() {
-        if (activityVolumeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '活动量为空  ', type: 'warning'
-          })
-        } else {
-          showActivityVolume.value = true
-        }
-     }
-  function   handleActivityVolumeConfirm(e) {
-        form.value.activityVolumeName = e.value[0].dictLabel
-        form.value.activityVolume = e.value[0].dictValue
-        showActivityVolume.value = false
-  }
- function handleActivityVolumeCancel() {
-       showActivityVolume.value = false
-      }
-
-
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-        if(flag.value==null){
-          updateActivity(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/activity/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addActivity(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/activity/list` })
-            }
-          })
-        })
-          }
-        }else {
-          addActivity(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/activity/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/activity/list.vue b/src/pages/health/activity/list.vue
deleted file mode 100644
index 078f86b..0000000
--- a/src/pages/health/activity/list.vue
+++ /dev/null
@@ -1,534 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.name" border="false" placeholder="请输入活动名称" class="search-input"
-          @blur="handleSearch" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-        <view class="add-btn" @click="handleAdd()">
-          <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-          <text>新增</text>
-        </view>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="flag-filled" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="place-info">
-                <text class="place-text">{{ item.place }}</text>
-              </view>
-            </view>
-            <view class="duration-section">
-              <text class="duration-value">{{ item.exerciseTimeStr || '--' }}</text>
-            </view>
-            <view class="name-section">
-              <text class="name-value">{{ item.name }}</text>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item">
-                <text class="info-label">活动类型</text>
-                <text class="info-value">{{ dictStr(item.type,typeList) || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">总费用</text>
-                <text class="info-value cost-value">{{ item.totalCost }} 元</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">成员</text>
-                <text class="info-value">{{ item.partner || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">活动量</text>
-                <text class="info-value">{{ dictStr(item.activityVolume,activityVolumeList) || '--' }}</text>
-              </view>
-              <view class="info-item" style="flex: 0 0 100%;">
-              </view>
-              <view class="info-item">
-                <text class="info-label">开始时间</text>
-                <text class="info-value">{{ item.startTime || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">结束时间</text>
-                <text class="info-value">{{ item.endTime || '--' }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.costDetail">
-                <text class="info-label">费用明细</text>
-                <text class="info-value">{{ item.costDetail }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.foods">
-                <text class="info-label">饮食</text>
-                <text class="info-value">{{ item.foods }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.harvest">
-                <text class="info-label">收获</text>
-                <text class="info-value">{{ item.harvest }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.remark">
-                <text class="info-label">备注</text>
-                <text class="info-value">{{ item.remark }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="operate" @click.stop>
-            <view class="btn-edit" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-copy" @click="handleCopy(item)">
-              <uni-icons type="paperplane" size="16" color="#fa8c16"></uni-icons>
-              <text>复制</text>
-            </view>
-            <view class="btn-delete" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-  </view>
-     <!--返回首页按钮 -->
-     <suspend></suspend>
-</template>
-
-<script setup>
-import { listActivity, delActivity } from '@/api/health/activity'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const typeList = ref([])
-const activityVolumeList = ref([])
-
-
-const  flag= ref(true)
-const data = reactive({
-  filterPanel: false,
-  queryParams: {
-    name: null,
-    type: null,
-    nickName: null
-   } 
-})
-const { filterPanel, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function handleSearch() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-     }
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-       // 类型
-       getDicts('activity_type').then(res => {
-        typeList.value = res.data
-      })
-             // 类型
-             getDicts('activity_exercise').then(res => {
-              activityVolumeList.value = res.data
-      })
-      status.value = 'loading'
-      listActivity({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/activity/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/activity/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/activity/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        title: '确认删除',
-        content: '确定要删除这条记录吗？',
-        confirmText: '删除',
-        cancelText: '取消',
-        confirmColor: '#f5576c',
-        cancelColor: '#909399',
-        success: function (res) {
-          if (res.confirm) {
-            delActivity(item.id).then(() => {
-              uni.showToast({
-                title: '删除成功',
-                icon: 'success'
-              })
-              pageNum.value = 1
-              listData.value = []
-              getList()
-            })
-          }
-        }
-      });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-    display: flex;
-    align-items: center;
-  }
-  
-  .add-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-  
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-
-    .filter-panel-content {
-      background-color: #ffff;
-      padding: 0 30rpx 30rpx;
-
-      .filter-title {
-        color: #000000;
-        font-size: 30rpx;
-        font-weight: 500;
-        padding: 30rpx 0;
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    gap: 12rpx;
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .place-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      align-items: center;
-      
-      .place-text {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 500;
-        line-height: 1.3;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-    
-    .duration-section {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex-shrink: 0;
-      
-      .duration-value {
-        color: #fa8c16;
-        font-size: 30rpx;
-        font-weight: 600;
-        line-height: 1.3;
-        white-space: nowrap;
-      }
-    }
-    
-    .name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-      justify-content: flex-end;
-      
-      .name-value {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        letter-spacing: 0.5rpx;
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-        
-        &.cost-value {
-          color: #fa8c16;
-          font-weight: 600;
-        }
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-copy,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-copy {
-      background: rgba(250, 140, 22, 0.1);
-      color: #fa8c16;
-      border: 1rpx solid rgba(250, 140, 22, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/doctorRecord/addEdit.vue b/src/pages/health/doctorRecord/addEdit.vue
deleted file mode 100644
index 1b6a8aa..0000000
--- a/src/pages/health/doctorRecord/addEdit.vue
+++ /dev/null
@@ -1,400 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="就医记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="健康档案" prop="healthRecordName" required @click="handHealthRecord">
-            <u--input v-model="form.healthRecordName" disabled disabledColor="#ffffff" placeholder="请选择健康档案"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="医院名称" prop="hospitalName" required >
-              <u--input v-model="form.hospitalName"  placeholder="请填写医院名称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="就医类型" prop="typeName" required @click="handleType">
-              <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择就医类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="科室" prop="departments" required >
-              <u--input v-model="form.departments"  placeholder="请填写科室"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="大夫" prop="doctor" required >
-              <u--input v-model="form.doctor"  placeholder="请填写大夫"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="就诊时间" prop="visitingTime" required @click="selectDate()">
-            <u--input v-model="form.visitingTime" disabled disabledColor="#ffffff" placeholder="请选择就诊时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-            <u-form-item label="陪同人" prop="partner" required >
-              <u--input v-model="form.partner"  placeholder="请填写陪同人"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-
-          <u-form-item label="总费用" prop="totalCost" required >
-              <u--input v-model="form.totalCost"  placeholder="请填写总费用"
-                inputAlign="right" border="none">
-                <template #suffix>
-					<up-text
-						text="元"
-					></up-text>
-				</template></u--input>
-            </u-form-item>
-          <u-form-item label="诊断结果" prop="diagnosis"  required labelPosition="top">
-            <u--textarea v-model="form.diagnosis" placeholder="请填写诊断结果" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="处理及医嘱" prop="prescribe"  required labelPosition="top">
-            <u--textarea v-model="form.prescribe" placeholder="请填写处理及医嘱" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-            <u-form-item label="费用明细" prop="costDetail" >
-              <u--textarea v-model="form.costDetail" placeholder="请填写费用明细" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-            </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handHealthRecordCancel"
-      @confirm="handHealthRecordConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleTypeCancel"
-      @confirm="handleTypeConfirm"></u-picker>
-      <u-datetime-picker
-			:show="datePickShow"
-			mode="datetime"
-      ref="visitingTimeRef" 
-			@cancel="datePickShow=false"
-			@confirm="datePickConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getDoctorRecord, addDoctorRecord, updateDoctorRecord } from '@/api/health/doctorRecord'
-import { listPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const showPerson = ref(false)
-const showHealthRecord = ref(false)
-const title = ref("就医记录")
-const healthRecordList = ref([])
-const personList = ref([])
-const typeList = ref([])
-const showType = ref(false)
-const flag = ref('add')
-const data = reactive({
-form: {
-  id: null,
-    hospitalName: null,
-    departments: null,
-    doctor: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    healthRecordId: null,
-    visitingTime: null,
-    prescribe: null,
-    personId: null,
-    totalCost: 0,
-    partner: null,
-    costDetail: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-},
-rules: {
-  healthRecordName: [{ required: true, message: '健康档案不能为空', trigger:['change', 'blur'] }],
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  hospitalName: [{ required: true, message: '医院名称不能为空', trigger: ['change', 'blur'] }],
-  departments: [{ required: true, message: '科室不能为空', trigger: ['change', 'blur'] }],
-  doctor: [{ required: true, message: '大夫不能为空', trigger: ['change', 'blur'] }],
-  totalCost: [{ type: 'number',  required: true, message: '总费用不能为空', trigger: ['change', 'blur'] }],
-  partner: [{ required: true, message: '陪同人不能为空', trigger: ['change', 'blur'] }],
-  prescribe: [{ required: true, message: '处理及医嘱不能为空', trigger: ['change', 'blur'] }],
-  diagnosis: [{ required: true, message: '诊断结果不能为空', trigger: ['change', 'blur'] }],
-  typeName: [{ required: true, message: '就医类型不能为空', trigger: ['change', 'blur'] }],
-  visitingTime: [{ required: true, message: '就诊时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, queryHealthRecordParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-    form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="就医记录-修改"
-     }else{
-      title.value="就医记录-新增"
-     }
-     }else{
-      title.value="就医记录-复制"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.visitingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-function  getData() {
-      
-      // 药品来源
-      
-    if(form.value.id!=null){
-      getDoctorRecord(form.value.id).then(res => {
-        listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-      queryHealthRecordParams.value.personId=res.data.personId
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-      })
-     })
-        form.value = res.data   
-            // 就医类型
-           getDicts('doctor_type').then(result => {
-            typeList.value =[result.data] 
-          form.value.typeName=dictStr(form.value.type, result.data)
-         })
-      })
-      
-    }else{
- // 就医类型
- getDicts('doctor_type').then(res => {
-        typeList.value =[res.data] 
-      })
-    listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-      })
-     }
-     })
-
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-
-function handHealthRecord() {
-      if (healthRecordList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '健康档案为空  ', type: 'warning'
-        })
-      } else {
-        showHealthRecord.value = true
-      }
-   }
-function   handHealthRecordConfirm(e) {
-      form.value.healthRecordName = e.value[0].name
-      form.value.healthRecordId = e.value[0].id
-      showHealthRecord.value = false
-}
-function handHealthRecordCancel() {
-     showHealthRecord.value = false
-}
-
-function handleType() {
-        if (typeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '就医类型为空  ', type: 'warning'
-          })
-        } else {
-          showType.value = true
-        }
-     }
-  function   handleTypeConfirm(e) {
-        form.value.typeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-        showType.value = false
-  }
- function handleTypeCancel() {
-       showType.value = false
-      }
-
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['visitingTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.visitingTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-        if(flag.value==null){
-          updateDoctorRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/doctorRecord/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addDoctorRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/doctorRecord/list` })
-            }
-          })
-        })
-          }
-        }else {
-          addDoctorRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/doctorRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/doctorRecord/list.vue b/src/pages/health/doctorRecord/list.vue
deleted file mode 100644
index 9a7cc67..0000000
--- a/src/pages/health/doctorRecord/list.vue
+++ /dev/null
@@ -1,779 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-container">
-        <view class="search-row">
-          <u--input v-model="queryParams.personName" border="false" type="select" @click="handlePerson" placeholder="请选择人员" class="search-input"
-            suffixIcon="search" suffixIconStyle="color: #909399">
-          </u--input>
-          <view class="add-btn" @click="handleAdd()">
-            <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-            <text>新增</text>
-          </view>
-        </view>
-        <view class="search-row">
-          <u--input v-model="queryParams.healthRecordName" border="false" type="select" @click="handleHealthRecord" placeholder="请选择健康档案" class="search-input"
-            suffixIcon="search" suffixIconStyle="color: #909399">
-          </u--input>
-          <view class="filter-btn" @click="filterPanel = !filterPanel">
-            <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-            <text>筛选</text>
-          </view>
-        </view>
-      </view>
-      
-      <u-transition :show="filterPanel" mode="fade">
-        <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">就诊日期</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <view class="btn-reset" @click="resetQuery()">
-                <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-                <text>重置</text>
-              </view>
-              <view class="btn-confirm" @click="searchSubmit()">
-                <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-                <text>确定</text>
-              </view>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="date"
-              :minDate="-2209017600000"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-        </view>
-      </u-transition>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="170" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="heart-filled" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.healthRecordName }}</text>
-                <text class="card-code">{{ item.hospitalName }}</text>
-              </view>
-            </view>
-          </view>
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item">
-                <text class="info-label">就医类型</text>
-                <text class="info-value">{{ dictStr(item.type, typeList) || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">就诊时间</text>
-                <text class="info-value">{{ item.visitingTime || '--' }}</text>
-              </view>
-              <!-- <view class="info-item">
-                <text class="info-label">人员姓名</text>
-                <text class="info-value">{{ item.personName || '--' }}</text>
-              </view> -->
-              <view class="info-item">
-                <text class="info-label">科室</text>
-                <text class="info-value">{{ item.departments || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">大夫</text>
-                <text class="info-value">{{ item.doctor || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">陪同人</text>
-                <text class="info-value">{{ item.partner || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">总费用</text>
-                <text class="info-value">{{ item.totalCost || '--' }} 元</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.diagnosis">
-                <text class="info-label">诊断结果</text>
-                <text class="info-value">{{ item.diagnosis }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.prescribe">
-                <text class="info-label">处理及医嘱</text>
-                <text class="info-value">{{ item.prescribe }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.costDetail">
-                <text class="info-label">费用明细</text>
-                <text class="info-value">{{ item.costDetail }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.remark">
-                <text class="info-label">备注</text>
-                <text class="info-value">{{ item.remark }}</text>
-              </view>
-            </view>
-          </view>
-          <view class="operate" @click.stop>
-            <view class="btn-edit" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-copy" @click="handleCopy(item)">
-              <uni-icons type="copy" size="16" color="#fa8c16"></uni-icons>
-              <text>复制</text>
-            </view>
-            <view class="btn-delete" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handleHealthRecordCancel"
-        @confirm="handleHealthRecordConfirm"></u-picker>
-  </view>
-       <!--返回首页按钮 -->
-       <suspend></suspend>
-</template>
-
-<script setup>
-import { listDoctorRecord, delDoctorRecord } from '@/api/health/doctorRecord'
-import { listPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-
-const showHealthRecord = ref(false)
-const healthRecordList = ref([])
-
-const typeList = ref([])
-
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    hospitalName: null,
-    departments: null,
-    doctor: null,
-    healthRecordId: null,
-    time: '',
-    personId: null
-   },
-   queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-}
-})
-const { filterPanel, queryPersonParams,queryHealthRecordParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getData()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-    function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-    function getData() {
-      // 类型
-      getDicts('doctor_type').then(res => {
-        typeList.value = res.data
-      })
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows]
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-      })
-      status.value = 'loading'
-      listDoctorRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    })
-    }
-function getList() {
-      status.value = 'loading'
-      listDoctorRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    
-  }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-    queryParams.value.healthRecordName = ''
-    queryParams.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-    showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-})
-  }
- function handlePersonCancel() {
-  queryParams.value.personName = ''
-        queryParams.value.personId = ''
-        queryHealthRecordParams.value.personId=null
-        listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        })
-       showPerson.value = false
-       pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-
-  function handleHealthRecord() {
-        if (healthRecordList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '健康档案为空  ', type: 'warning'
-          })
-        } else {
-          showHealthRecord.value = true
-        }
-     }
-  function   handleHealthRecordConfirm(e) {
-    queryParams.value.healthRecordName = e.value[0].name
-    queryParams.value.healthRecordId =  e.value[0].id
-    showHealthRecord.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleHealthRecordCancel() {
-  queryParams.value.healthRecordName= ''
-         queryParams.value.healthRecordId = ''
-       showHealthRecord.value = false
-       pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-
-    function resetQuery() {
-          queryParams.value.personName = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-         queryParams.value.healthRecordName= ''
-         queryParams.value.healthRecordId = ''
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-        queryHealthRecordParams.value.personId=null
-        listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/doctorRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/doctorRecord/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/doctorRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        title: '确认删除',
-        content: '确定要删除这条记录吗？',
-        confirmText: '删除',
-        cancelText: '取消',
-        confirmColor: '#f5576c',
-        cancelColor: '#909399',
-        success: function (res) {
-          if (res.confirm) {
-            delDoctorRecord(item.id).then(() => {
-              uni.showToast({
-                title: '删除成功',
-                icon: 'success'
-              })
-              pageNum.value = 1
-              listData.value = []
-              getList()
-            })
-          }
-        }
-      });
-    }
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.search-container {
-  background-color: #ffffff;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-  position: relative;
-  z-index: 100;
-
-  .search-row {
-    padding: 12rpx 32rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: 16rpx;
-    
-    &:first-child {
-      padding-bottom: 8rpx;
-    }
-    
-    &:last-child {
-      padding-top: 8rpx;
-    }
-
-    .search-input {
-      background: rgba(102, 126, 234, 0.08);
-      color: #333333;
-      flex: 1;
-      border-radius: 24rpx;
-      border: 2rpx solid rgba(102, 126, 234, 0.3);
-      height: 66rpx !important;
-      display: flex;
-      align-items: center;
-    }
-    
-    .filter-btn,
-    .add-btn {
-      display: flex;
-      align-items: center;
-      gap: 6rpx;
-      padding: 12rpx 24rpx;
-      background: rgba(102, 126, 234, 0.08);
-      border-radius: 24rpx;
-      border: 2rpx solid rgba(102, 126, 234, 0.3);
-      transition: all 0.3s ease;
-      flex-shrink: 0;
-      
-      &:active {
-        transform: scale(0.95);
-        background: rgba(102, 126, 234, 0.12);
-      }
-      
-      text {
-        color: #667eea;
-        font-size: 28rpx;
-        font-weight: 600;
-      }
-      
-      uni-icons {
-        color: #667eea;
-      }
-    }
-  }
-}
-
-.filter-panel {
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 180rpx;
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 999;
-
-  .filter-panel-content {
-    background-color: #ffffff;
-    padding: 0 30rpx 30rpx;
-    border-radius: 16rpx 16rpx 0 0;
-
-    .filter-title {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-
-    .select-header {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-
-    .selcet-content {
-      display: flex;
-      flex-direction: column;
-      gap: 16rpx;
-    }
-  }
-
-  .btn-box {
-    display: flex;
-    gap: 20rpx;
-    padding: 24rpx 30rpx;
-    background-color: #fff;
-    box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    
-    .btn-reset,
-    .btn-confirm {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 8rpx;
-      height: 88rpx;
-      border-radius: 12rpx;
-      font-size: 30rpx;
-      font-weight: 600;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.98);
-        opacity: 0.9;
-      }
-      
-      text {
-        line-height: 1;
-      }
-    }
-    
-    .btn-reset {
-      flex: 1;
-      background: #f5f7fa;
-      border: 2rpx solid #dcdfe6;
-      
-      text {
-        color: #606266;
-      }
-    }
-    
-    .btn-confirm {
-      flex: 1;
-      background: #667eea;
-      box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-      border: none;
-      
-      text {
-        color: #ffffff;
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      gap: 12rpx;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        flex-shrink: 0;
-        letter-spacing: 0.5rpx;
-      }
-      
-      .card-code {
-        color: rgba(255, 255, 255, 0.9);
-        font-size: 24rpx;
-        font-weight: 500;
-        line-height: 1.3;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        flex: 1;
-        min-width: 0;
-        letter-spacing: 0.3rpx;
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-copy,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-copy {
-      background: rgba(250, 140, 22, 0.1);
-      color: #fa8c16;
-      border: 1rpx solid rgba(250, 140, 22, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/healthRecord/addEdit.vue b/src/pages/health/healthRecord/addEdit.vue
deleted file mode 100644
index a69d71d..0000000
--- a/src/pages/health/healthRecord/addEdit.vue
+++ /dev/null
@@ -1,418 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="健康档案"
-  >
-  </u-navbar>
-  <view class="section">
-    <view class="section-title">{{ title}}</view>
-    <view class="form-view">
-      <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-        :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-        <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-          <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-            inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-down"></u-icon>
-        </u-form-item>
-        <u-form-item label="档案名称" prop="name" required >
-            <u--input v-model="form.name"  placeholder="请填写档案名称"
-              inputAlign="right" border="none"></u--input>
-          </u-form-item>
-        <u-form-item label="类型" prop="typeName" required @click="handleType">
-            <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="档案状态" prop="stateName" required @click="handleState">
-            <u--input v-model="form.stateName" disabled disabledColor="#ffffff" placeholder="请选择档案状态"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="发生时间" prop="occurTime" required @click="selectOccurTime()">
-          <u--input v-model="form.occurTime" disabled disabledColor="#ffffff" placeholder="请选择发生时间" inputAlign="right" border="none"></u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-        </u-form-item>
-          <u-form-item label="发生原因"  prop="etiologyName" required @click="handleEtiology">
-            <u--input v-model="form.etiologyName" disabled disabledColor="#ffffff" placeholder="请选择发生原因"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="康复时间" prop="rehabilitationTime"  @click="selectRehabilitationTime()">
-          <u--input v-model="form.rehabilitationTime" disabled disabledColor="#ffffff" placeholder="请选择康复时间" inputAlign="right" border="none"></u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-        </u-form-item>
-          <u-form-item label="初期症状" prop="initialSymptoms" required >
-              <u--textarea v-model="form.initialSymptoms" placeholder="请填写初期症状" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="中期症状" prop="mediumTermSymptoms"  >
-              <u--textarea v-model="form.mediumTermSymptoms" placeholder="请填写中期症状" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="后期症状" prop="laterStageSymptoms"  >
-              <u--textarea v-model="form.laterStageSymptoms" placeholder="请填写后期症状" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-         
-        <!-- <u-form-item label="备注" prop="remark"  labelPosition="top">
-          <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-            maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-        </u-form-item> -->
-      </u--form>
-      <view class="form-btn">
-        <u-button type="primary" text="提交" @click="submit"></u-button>
-      </view>
-    </view>
-  </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showState" :columns="stateList" keyName="dictLabel" @cancel="handleStateCancel"
-        @confirm="handleStateConfirm"></u-picker>
-
-        <u-picker itemHeight="88" :show="showEtiology" :columns="etiologyList" keyName="dictLabel" @cancel="handleEtiologyCancel"
-        @confirm="handleEtiologyConfirm"></u-picker>
-
-        <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleTypeCancel"
-        @confirm="handleTypeConfirm"></u-picker>
-      <u-datetime-picker
-			:show="occurTimeShow"
-			mode="datetime"
-      ref="occurTimeRef" 
-			@cancel="occurTimeShow=false"
-			@confirm="occurTimeConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-
-    <u-datetime-picker
-			:show="rehabilitationTimeShow"
-			mode="datetime"
-      ref="rehabilitationTimeRef" 
-			@cancel="rehabilitationTimeShow=false"
-			@confirm="rehabilitationTimeConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import {getHealthRecord, addHealthRecord, updateHealthRecord } from '@/api/health/healthRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const occurTimeShow = ref(false)
-const showPerson = ref(false)
-const title = ref("健康档案")
-const personList = ref([])
-
-const typeList = ref([])
-const showType = ref(false)
-
-const stateList = ref([])
-const showState = ref(false)
-
-const etiologyList = ref([])
-const showEtiology = ref(false)
-
-const rehabilitationTimeShow = ref(false)
-
-const data = reactive({
-form: {
-  id: null,
-    name: null,
-    type: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    occurTime: null,
-    rehabilitationTime: null,
-    initialSymptoms: null,
-    mediumTermSymptoms: null,
-    laterStageSymptoms: null,
-    etiology: null,
-    personId: null,
-    state: '1',
-    stateName: '建档中'
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-rules: {
-  name: [{ required: true, message: '档案名称不能为空', trigger:['change', 'blur'] }],
-  personName: [{ required: true, message: '人员姓名不能为空', trigger: ['change', 'blur'] }],
-  occurTime: [{ required: true, message: '发生时间不能为空', trigger: ['change', 'blur'] }],
-  typeName: [{ required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
-  etiologyName: [{ required: true, message: '发生原因不能为空', trigger: ['change', 'blur'] }],
-  stateName: [{ required: true, message: '状态不能为空', trigger: ['change', 'blur'] }],
-  initialSymptoms: [{ required: true, message: '初期症状不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     if(form.value.id!=null){
-      title.value="健康档案-修改"
-     }else{
-      title.value="健康档案-新增"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.occurTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-function  getData() {
-    listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-      if( form.value.id==null){
-      getPerson( response.rows[0].id).then((response) => {
-    const date = new Date()
-    const year = date.getFullYear() // 年份
-    let month = date.getMonth() + 1 // 月份，返回值为0-11，所以需要加1
-    let day = date.getDate() // 日期
-
-    // 对月份和日期进行补零
-    month = month < 10 ? '0' + month : month.toString()
-    day = day < 10 ? '0' + day : day.toString()
-
-    const currentDate = year + month + day
-    form.value.name = response.data.name + currentDate + '档案'
-  })}
-     }
-     })
-     // 类型
-     getDicts('record_type').then(res => {
-        typeList.value =[res.data] 
-      })
-       // 状态
-       getDicts('health_record_state').then(res => {
-        stateList.value =[res.data] 
-      })
-       // 发生原因
-       getDicts('etiology').then(res => {
-        etiologyList.value =[res.data] 
-      })
-    if(form.value.id!=null){
-      getHealthRecord(form.value.id).then(res => {
-        form.value = res.data   
-        getDicts('etiology').then(result => {
-          form.value.etiologyName=dictStr(form.value.etiology, result.data)
-         })
-          // 状态
-        getDicts('health_record_state').then(result => {
-          form.value.stateName=dictStr(form.value.state, result.data)
-         })
-                // 类型
-           getDicts('record_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-         })
-      })
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-
-      getPerson( e.value[0].id).then((response) => {
-    const date = new Date()
-    const year = date.getFullYear() // 年份
-    let month = date.getMonth() + 1 // 月份，返回值为0-11，所以需要加1
-    let day = date.getDate() // 日期
-
-    // 对月份和日期进行补零
-    month = month < 10 ? '0' + month : month.toString()
-    day = day < 10 ? '0' + day : day.toString()
-
-    const currentDate = year + month + day
-    form.value.name = response.data.name + currentDate + '档案'
-  })
-      showPerson.value = false         
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-
-function handleState() {
-        if (stateList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '档案状态为空  ', type: 'warning'
-          })
-        } else {
-          showState.value = true
-        }
-     }
-  function   handleStateConfirm(e) {
-        form.value.stateName = e.value[0].dictLabel
-        form.value.state = e.value[0].dictValue
-        showState.value = false
-  }
- function handleStateCancel() {
-      showState.value = false
-      }
-
-
-      function handleEtiology() {
-        if (etiologyList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '发生原因为空  ', type: 'warning'
-          })
-        } else {
-          showEtiology.value = true
-        }
-     }
-  function   handleEtiologyConfirm(e) {
-        form.value.etiologyName = e.value[0].dictLabel
-        form.value.etiology = e.value[0].dictValue
-        showEtiology.value = false
-  }
- function handleEtiologyCancel() {
-  showEtiology.value = false
-      }
-
-  function handleType() {
-        if (typeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '类型为空  ', type: 'warning'
-          })
-        } else {
-          showType.value = true
-        }
-     }
-  function   handleTypeConfirm(e) {
-        form.value.typeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-        showType.value = false
-  }
- function handleTypeCancel() {
-       showType.value = false
-      }
-
-function  selectOccurTime() {
-      occurTimeShow.value = true
-      proxy.$refs['occurTimeRef'].innerValue = new Date().getTime()
-  }
-function occurTimeConfirm(e) {
-      form.value.occurTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      occurTimeShow.value = false
-  }
-
-  function  selectRehabilitationTime() {
-    rehabilitationTimeShow.value = true
-      proxy.$refs['rehabilitationTimeRef'].innerValue = new Date().getTime()
-  }
-function rehabilitationTimeConfirm(e) {
-      form.value.rehabilitationTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      rehabilitationTimeShow.value = false
-  }
-
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          updateHealthRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/healthRecord/list` })
-            }
-          })
-        })
-        }else {
-          addHealthRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/healthRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/healthRecord/list.vue b/src/pages/health/healthRecord/list.vue
deleted file mode 100644
index ba3c738..0000000
--- a/src/pages/health/healthRecord/list.vue
+++ /dev/null
@@ -1,759 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.personName" border="false" placeholder="请选择人员" class="search-input"
-          @click="handlePerson" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-        <view class="add-btn" @click="handleAdd()">
-          <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-          <text>新增</text>
-        </view>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">档案类型</view>
-              <view class="state-list">
-                <view v-for="item in typeList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
-              </view>
-              <view class="filter-title">发生日期</view>
-              <view class="date-inputs">
-                <u-input
-                  :disabled="true"
-                  :disabledColor="'#fff'"
-                  class="dateInput"
-                  border="surround"
-                  v-model="queryParams.startTime"
-                  placeholder="请选择开始时间"
-                >
-                  <template v-slot:suffix>
-                    <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                  </template>
-                </u-input>
-                <u-input
-                  :disabled="true"
-                  :disabledColor="'#fff'"
-                  class="dateInput"
-                  border="surround"
-                  v-model="queryParams.endTime"
-                  placeholder="请选择结束时间"
-                >
-                  <template v-slot:suffix>
-                    <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                  </template>
-                </u-input>
-              </view>
-            </view>
-            <view class="btn-box">
-              <view class="btn-reset" @click="resetQuery()">
-                <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-                <text>重置</text>
-              </view>
-              <view class="btn-confirm" @click="searchSubmit()">
-                <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-                <text>确定</text>
-              </view>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="date"
-              :minDate="-2209017600000"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-
-
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="folder-add-filled" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.name }}</text>
-                <text class="card-code">{{ dictStr(item.type, typeList) }} · {{ dictStr(item.state, stateList) }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item">
-                <text class="info-label">人员名称</text>
-                <text class="info-value">{{ item.personName || '--' }}</text>
-              </view>
-              <view class="info-item" v-if="item.occurTime">
-                <text class="info-label">发生时间</text>
-                <text class="info-value">{{ item.occurTime }}</text>
-              </view>
-              <view class="info-item" v-if="item.rehabilitationTime">
-                <text class="info-label">康复时间</text>
-                <text class="info-value">{{ item.rehabilitationTime }}</text>
-              </view>
-              <view class="info-item" v-if="item.duration">
-                <text class="info-label">康复周期</text>
-                <text class="info-value">{{ item.duration }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.etiology">
-                <text class="info-label">发生原因</text>
-                <text class="info-value">{{ dictStr(item.etiology, etiologyList) }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.initialSymptoms">
-                <text class="info-label">初期症状</text>
-                <text class="info-value">{{ item.initialSymptoms }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.mediumTermSymptoms">
-                <text class="info-label">中期症状</text>
-                <text class="info-value">{{ item.mediumTermSymptoms }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.laterStageSymptoms">
-                <text class="info-label">后期症状</text>
-                <text class="info-value">{{ item.laterStageSymptoms }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.remark">
-                <text class="info-label">备注</text>
-                <text class="info-value">{{ item.remark }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="operate" @click.stop>
-            <view class="btn-edit" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-delete" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-  </view>
-       <!--返回首页按钮 -->
-       <suspend></suspend>
-</template>
-
-<script setup>
-import { listHealthRecord, delHealthRecord } from '@/api/health/healthRecord'
-import { listPerson } from '@/api/health/person'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-const typeList = ref([])
-const etiologyList = ref([])
-const stateList = ref([])
-
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    name: null,
-    type: null,
-    healthRecordId: null,
-    dosingTime: null,
-    dosage: null,
-    personId: null,
-    resource: null,
-    place: null
-   } 
-})
-const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-  function selectType(item) {
-      queryParams.value.type = item.dictValue
-      typeList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-       // 类型
-       getDicts('record_type').then(res => {
-        typeList.value = res.data
-      })
-       // 用药地点
-       getDicts('etiology').then(res => {
-        etiologyList.value = res.data
-      })
-            // 单位
-            getDicts('health_record_state').then(res => {
-              stateList.value = res.data
-      })
-
-      status.value = 'loading'
-      listHealthRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-        showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handlePersonCancel() {
-  queryParams.value.personName = ''
-    queryParams.value.personId= null
-        showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.personName = ''
-       queryParams.value.type = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-        
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/healthRecord/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/healthRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/healthRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        title: '确认删除',
-        content: '确定要删除这条记录吗？',
-        confirmText: '删除',
-        cancelText: '取消',
-        confirmColor: '#f5576c',
-        cancelColor: '#909399',
-        success: function (res) {
-          if (res.confirm) {
-            delHealthRecord(item.id).then(() => {
-              uni.showToast({
-                title: '删除成功',
-                icon: 'success'
-              })
-              pageNum.value = 1
-              listData.value = []
-              getList()
-            })
-          }
-        }
-      });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-    display: flex;
-    align-items: center;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-  
-  .add-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    margin-left: 10rpx;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-  
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-    z-index: 999;
-
-    .filter-panel-content {
-      background-color: #ffffff;
-      padding: 0 30rpx 30rpx;
-      border-radius: 16rpx 16rpx 0 0;
-
-      .filter-title {
-        color: #2c3e50;
-        font-size: 32rpx;
-        font-weight: 600;
-        padding: 32rpx 0 24rpx 20rpx;
-        position: relative;
-        display: flex;
-        align-items: center;
-        
-        &::before {
-          content: '';
-          width: 6rpx;
-          height: 32rpx;
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          border-radius: 3rpx;
-          margin-right: 12rpx;
-          flex-shrink: 0;
-        }
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        gap: 16rpx;
-        margin-bottom: 24rpx;
-
-        .state-item {
-          padding: 0 32rpx;
-          height: 68rpx;
-          border: 2rpx solid #e8edf3;
-          border-radius: 34rpx;
-          text-align: center;
-          line-height: 68rpx;
-          font-size: 28rpx;
-          color: #666666;
-          transition: all 0.3s ease;
-          background: #ffffff;
-          box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-          
-          &:active {
-            transform: scale(0.95);
-          }
-        }
-
-        .active {
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          border: 2rpx solid transparent;
-          color: #ffffff;
-          box-shadow: 0 4rpx 12rpx rgba(102, 126, 234, 0.3);
-          font-weight: 600;
-        }
-      }
-      
-      .date-inputs {
-        display: flex;
-        flex-direction: column;
-        gap: 16rpx;
-        
-        .dateInput {
-          border-radius: 12rpx;
-          border: 2rpx solid #e8edf3;
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      gap: 20rpx;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-      
-      .btn-reset,
-      .btn-confirm {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        gap: 8rpx;
-        height: 88rpx;
-        border-radius: 12rpx;
-        font-size: 30rpx;
-        font-weight: 600;
-        transition: all 0.3s ease;
-        
-        &:active {
-          transform: scale(0.98);
-          opacity: 0.9;
-        }
-        
-        text {
-          line-height: 1;
-        }
-      }
-      
-      .btn-reset {
-        flex: 1;
-        background: #f5f7fa;
-        border: 2rpx solid #dcdfe6;
-        
-        text {
-          color: #606266;
-        }
-      }
-      
-      .btn-confirm {
-        flex: 1;
-        background: #667eea;
-        box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-        border: none;
-        
-        text {
-          color: #ffffff;
-        }
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      gap: 12rpx;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex-shrink: 0;
-        letter-spacing: 0.5rpx;
-      }
-      
-      .card-code {
-        color: rgba(255, 255, 255, 0.9);
-        font-size: 28rpx;
-        font-weight: 500;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex: 1;
-        min-width: 0;
-        letter-spacing: 0.3rpx;
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/heightWeightRecord/addEdit.vue b/src/pages/health/heightWeightRecord/addEdit.vue
deleted file mode 100644
index 72aee1d..0000000
--- a/src/pages/health/heightWeightRecord/addEdit.vue
+++ /dev/null
@@ -1,246 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="身高体重记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="测量时间" prop="measureTime" required @click="selectDate()">
-            <u--input v-model="form.measureTime" disabled disabledColor="#ffffff" placeholder="请选择测量时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="身高" required prop="height" >
-            <u--input v-model="form.height"  type="number" placeholder="请填写身高"
-              inputAlign="right" border="none">
-              <template #suffix>
-        <up-text
-          text="CM"
-        ></up-text>
-      </template>
-            </u--input>
-          </u-form-item>
-          <u-form-item label="体重" required prop="weight" >
-            <u--input v-model="form.weight"  type="number" placeholder="请填写体重过"
-              inputAlign="right" border="none">
-              <template #suffix>
-        <up-text
-          text="KG"
-        ></up-text>
-      </template>
-            </u--input>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-datetime-picker
-    :show="datePickShow"
-    mode="datetime"
-    ref="measureTimeRef" 
-    @cancel="datePickShow=false"
-    @confirm="datePickConfirm"
-    itemHeight="88"
-  ></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import {
-  getHeightWeightRecord,
-  addHeightWeightRecord,
-  updateHeightWeightRecord
-} from '@/api/health/heightWeightRecord'
-import { listPerson, } from '@/api/health/person'
-const { proxy } = getCurrentInstance()
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const showPerson = ref(false)
-const title = ref("身高体重记录")
-const personList = ref([])
-const data = reactive({
-form: {
-  id: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    measureTime: null,
-    weight: null,
-    personId: null,
-    height: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-rules: {
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  measureTime: [{ required: true, message: '测量时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     if(form.value.id!=null){
-      title.value="身高体重记录-修改"
-     }else{
-      title.value="身高体重记录-新增"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.measureTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function  getData() {
-    listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-     }
-     })
-  
-    if(form.value.id!=null){
-      getHeightWeightRecord(form.value.id).then(res => {
-        form.value = res.data   
-      })
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['measureTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.measureTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          updateHeightWeightRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/heightWeightRecord/list` })
-            }
-          })
-        })
-        }else {
-          addHeightWeightRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/heightWeightRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/heightWeightRecord/list.vue b/src/pages/health/heightWeightRecord/list.vue
deleted file mode 100644
index 7cd3fc9..0000000
--- a/src/pages/health/heightWeightRecord/list.vue
+++ /dev/null
@@ -1,643 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.personName" border="false" placeholder="请输入人员姓名" class="search-input"
-          @click="handlePerson" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-        <view class="add-btn" @click="handleAdd()">
-          <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-          <text>新增</text>
-        </view>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="select-header">测量日期</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <u-button text="重置" style="margin-right:20rpx" @click="resetQuery()"></u-button>
-              <u-button type="primary" text="确定" @click="searchSubmit()"></u-button>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="date"
-              
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="staff" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.personName }}</text>
-                <text class="card-time">{{ item.measureTime }}</text>
-              </view>
-            </view>
-            <view class="stats-section">
-              <text class="stats-item">{{ item.height }}<text class="stats-label">CM</text></text>
-              <text class="stats-item"> {{ item.weight }}<text class="stats-label">KG</text></text>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item info-item-full" v-if="item.remark">
-                <text class="info-label">备注</text>
-                <text class="info-value">{{ item.remark }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="operate" @click.stop>
-            <view class="btn-edit" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-delete" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-  </view>
-     <!--返回首页按钮 -->
-     <suspend></suspend>  
-</template>
-
-<script setup>
-import {
-  listHeightWeightRecord,
-  delHeightWeightRecord
-} from '@/api/health/heightWeightRecord'
-import { listPerson } from '@/api/health/person'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    measureTime: null,
-    weight: null,
-    personId: null,
-    height: null
-   } 
-})
-const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-      status.value = 'loading'
-      listHeightWeightRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-        showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handlePersonCancel() {
-  queryParams.value.personName = ''
-        queryParams.value.personId = ''
-       showPerson.value = false
-       pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.personName = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/heightWeightRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/heightWeightRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        title: '确认删除',
-        content: '确定要删除这条记录吗？',
-        confirmText: '删除',
-        cancelText: '取消',
-        confirmColor: '#f5576c',
-        cancelColor: '#909399',
-        success: function (res) {
-          if (res.confirm) {
-            delHeightWeightRecord(item.id).then(() => {
-              uni.showToast({
-                title: '删除成功',
-                icon: 'success'
-              })
-              pageNum.value = 1
-              listData.value = []
-              getList()
-            })
-          }
-        }
-      });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-    display: flex;
-    align-items: center;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-  
-  .add-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    margin-left: 10rpx;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-
-    .filter-panel-content {
-      background-color: #ffffff;
-      padding: 0 30rpx 30rpx;
-      border-radius: 16rpx 16rpx 0 0;
-
-      .select-header {
-        color: #2c3e50;
-        font-size: 32rpx;
-        font-weight: 600;
-        padding: 32rpx 0 24rpx 20rpx;
-        position: relative;
-        display: flex;
-        align-items: center;
-        
-        &::before {
-          content: '';
-          width: 6rpx;
-          height: 32rpx;
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          border-radius: 3rpx;
-          margin-right: 12rpx;
-          flex-shrink: 0;
-        }
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      gap: 20rpx;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-      
-      .u-button {
-        flex: 1;
-        height: 88rpx;
-        border-radius: 12rpx;
-        font-size: 30rpx;
-        font-weight: 600;
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-      margin-right: 16rpx;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      gap: 12rpx;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex-shrink: 0;
-        letter-spacing: 0.5rpx;
-      }
-      
-      .card-time {
-        color: rgba(255, 255, 255, 0.9);
-        font-size: 26rpx;
-        font-weight: 500;
-        line-height: 1.3;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        flex: 1;
-        min-width: 0;
-        letter-spacing: 0.3rpx;
-      }
-    }
-    
-    .stats-section {
-      display: flex;
-      align-items: center;
-      gap: 16rpx;
-      flex-shrink: 0;
-      
-      .stats-item {
-        color: #fa8c16;
-        font-size: 28rpx;
-        font-weight: 700;
-        line-height: 1;
-        white-space: nowrap;
-        
-        .stats-label {
-          color: rgba(255, 255, 255, 0.85);
-          font-size: 20rpx;
-          font-weight: 400;
-          margin-left: 4rpx;
-        }
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/homepage/index.vue b/src/pages/health/homepage/index.vue
deleted file mode 100644
index ea5136c..0000000
--- a/src/pages/health/homepage/index.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<template>
-  <view class="welcome-container">
-    <!-- 背景装饰 -->
-    <view class="bg-decoration">
-      <view class="circle circle-1"></view>
-      <view class="circle circle-2"></view>
-      <view class="circle circle-3"></view>
-    </view>
-
-    <!-- 主要内容区 -->
-    <view class="content-wrapper">
-      <!-- 欢迎区域 -->
-      <view class="welcome-section" :class="{ 'fade-in': showContent }">
-        <view class="avatar-wrapper">
-          <view class="avatar-glow">
-            <view class="avatar-inner">
-              <uni-icons type="person-filled" size="80" color="#ffffff"></uni-icons>
-            </view>
-          </view>
-        </view>
-        
-        <view class="greeting-content">
-          <text class="greeting-text">{{ greetingTime }}</text>
-          <text class="user-name">{{ userName }}</text>
-          <text class="welcome-message">欢迎回来，开启美好的一天</text>
-        </view>
-      </view>
-
-      <!-- 底部日期 -->
-      <view class="date-info" :class="{ 'fade-in': showContent }">
-        <text class="date-text">{{ currentDate }}</text>
-      </view>
-    </view>
-  </view>
-</template>
-<script setup>
-import { ref, computed, onMounted } from 'vue';
-import useUserStore from '@/store/modules/user';
-
-const userStore = useUserStore();
-const showContent = ref(false);
-
-// 获取用户名
-const userName = computed(() => userStore.name || '用户');
-
-// 获取问候语
-const greetingTime = computed(() => {
-  const hour = new Date().getHours();
-  if (hour < 6) return '夜深了';
-  if (hour < 9) return '早上好';
-  if (hour < 12) return '上午好';
-  if (hour < 14) return '中午好';
-  if (hour < 18) return '下午好';
-  if (hour < 22) return '晚上好';
-  return '夜深了';
-});
-
-// 获取当前日期
-const currentDate = computed(() => {
-  const now = new Date();
-  const year = now.getFullYear();
-  const month = String(now.getMonth() + 1).padStart(2, '0');
-  const day = String(now.getDate()).padStart(2, '0');
-  const weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-  const weekDay = weekDays[now.getDay()];
-  return `${year}年${month}月${day}日 ${weekDay}`;
-});
-
-onMounted(() => {
-  // 延迟显示内容以触发动画
-  setTimeout(() => {
-    showContent.value = true;
-  }, 100);
-});
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: hidden;
-  padding: 0;
-  margin: 0;
-}
-
-.welcome-container {
-  min-height: 100vh;
-  background: linear-gradient(180deg, #667eea 0%, #764ba2 100%);
-  position: relative;
-  overflow: hidden;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-// 背景装饰
-.bg-decoration {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  pointer-events: none;
-  z-index: 0;
-  
-  .circle {
-    position: absolute;
-    border-radius: 50%;
-    background: rgba(255, 255, 255, 0.1);
-    animation: float 20s infinite ease-in-out;
-  }
-  
-  .circle-1 {
-    width: 400rpx;
-    height: 400rpx;
-    top: -200rpx;
-    right: -200rpx;
-    animation-delay: 0s;
-  }
-  
-  .circle-2 {
-    width: 300rpx;
-    height: 300rpx;
-    bottom: -150rpx;
-    left: -150rpx;
-    animation-delay: 5s;
-  }
-  
-  .circle-3 {
-    width: 250rpx;
-    height: 250rpx;
-    top: 50%;
-    right: -125rpx;
-    animation-delay: 10s;
-  }
-}
-
-.content-wrapper {
-  position: relative;
-  z-index: 1;
-  width: 100%;
-  padding: 0 60rpx;
-}
-
-// 欢迎区域
-.welcome-section {
-  text-align: center;
-  opacity: 0;
-  
-  &.fade-in {
-    animation: fadeInUp 1s ease forwards;
-  }
-  
-  .avatar-wrapper {
-    margin-bottom: 60rpx;
-    display: flex;
-    justify-content: center;
-    
-    .avatar-glow {
-      position: relative;
-      width: 240rpx;
-      height: 240rpx;
-      
-      .avatar-inner {
-        width: 100%;
-        height: 100%;
-        border-radius: 50%;
-        background: rgba(255, 255, 255, 0.15);
-        backdrop-filter: blur(20rpx);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        box-shadow: 0 30rpx 80rpx rgba(0, 0, 0, 0.3);
-        border: 6rpx solid rgba(255, 255, 255, 0.2);
-        animation: pulse 3s infinite ease-in-out;
-      }
-    }
-  }
-  
-  .greeting-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    gap: 20rpx;
-    
-    .greeting-text {
-      font-size: 36rpx;
-      color: rgba(255, 255, 255, 0.9);
-      font-weight: 300;
-      letter-spacing: 4rpx;
-    }
-    
-    .user-name {
-      font-size: 72rpx;
-      color: #ffffff;
-      font-weight: 700;
-      text-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.3);
-      letter-spacing: 4rpx;
-    }
-    
-    .welcome-message {
-      font-size: 28rpx;
-      color: rgba(255, 255, 255, 0.8);
-      font-weight: 300;
-      margin-top: 10rpx;
-      letter-spacing: 2rpx;
-    }
-  }
-}
-
-// 底部日期
-.date-info {
-  margin-top: 80rpx;
-  text-align: center;
-  opacity: 0;
-  
-  &.fade-in {
-    animation: fadeIn 1.5s ease forwards 0.5s;
-  }
-  
-  .date-text {
-    font-size: 26rpx;
-    color: rgba(255, 255, 255, 0.8);
-    font-weight: 300;
-    letter-spacing: 2rpx;
-  }
-}
-
-// 动画定义
-@keyframes float {
-  0%, 100% {
-    transform: translate(0, 0) rotate(0deg);
-  }
-  33% {
-    transform: translate(30rpx, -30rpx) rotate(120deg);
-  }
-  66% {
-    transform: translate(-20rpx, 20rpx) rotate(240deg);
-  }
-}
-
-@keyframes pulse {
-  0%, 100% {
-    transform: scale(1);
-    box-shadow: 0 30rpx 80rpx rgba(0, 0, 0, 0.3);
-  }
-  50% {
-    transform: scale(1.05);
-    box-shadow: 0 40rpx 100rpx rgba(0, 0, 0, 0.4);
-  }
-}
-
-@keyframes fadeInUp {
-  from {
-    opacity: 0;
-    transform: translateY(60rpx);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/index.vue b/src/pages/health/index.vue
deleted file mode 100644
index ede2f5f..0000000
--- a/src/pages/health/index.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <view class="content">
-    <!-- 系统管理 -->
-    <view class="section-header">
-      <text class="section-title">系统管理</text>
-    </view>
-    <view class="grid-body">
-      <view class="grid-wrapper">
-        <view 
-          v-for="(item, index) in systemGridList" 
-          :key="index" 
-          @click="navigateTo(item.path)"
-          class="grid-item">
-          <view class="item-icon" :style="{ background: item.color }">
-            <uni-icons :type="item.icon" size="22" color="#ffffff"></uni-icons>
-          </view>
-          <text class="item-text">{{ item.text }}</text>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-import { ref } from "vue";
-
-const systemGridList = ref([
-  { path: '/pages_mine/pages/system/user/list', text: '用户管理', icon: 'person', color: 'linear-gradient(135deg, #667eea 0%, #764ba2 100%)' },
-  { path: '/pages_mine/pages/system/role/list', text: '角色管理', icon: 'staff', color: 'linear-gradient(135deg, #fa709a 0%, #fee140 100%)' },
-  { path: '/pages_mine/pages/system/menu/list', text: '菜单管理', icon: 'list', color: 'linear-gradient(135deg, #4facfe 0%, #00f2fe 100%)' },
-  { path: '/pages_mine/pages/system/dept/list', text: '部门管理', icon: 'chat', color: 'linear-gradient(135deg, #43e97b 0%, #38f9d7 100%)' },
-  { path: '/pages_mine/pages/system/post/list', text: '岗位管理', icon: 'contact', color: 'linear-gradient(135deg, #fd79a8 0%, #e84393 100%)' },
-  { path: '/pages_mine/pages/system/dict/list', text: '字典管理', icon: 'bars', color: 'linear-gradient(135deg, #f6d365 0%, #fda085 100%)' },
-  { path: '/pages_mine/pages/system/config/list', text: '参数配置', icon: 'gear', color: 'linear-gradient(135deg, #5f72bd 0%, #9b23ea 100%)' },
-  { path: '/pages_mine/pages/system/notice/list', text: '通知公告', icon: 'notification', color: 'linear-gradient(135deg, #0be881 0%, #0fbcf9 100%)' },
-  { path: '/pages_mine/pages/system/operlog/list', text: '操作日志', icon: 'compose', color: 'linear-gradient(135deg, #ff6b6b 0%, #ee5a6f 100%)' },
-  { path: '/pages_mine/pages/system/logininfor/list', text: '登录日志', icon: 'eye', color: 'linear-gradient(135deg, #00d2ff 0%, #3a7bd5 100%)' }
-])
-
-function navigateTo(path) {
-    uni.navigateTo({
-      url: path
-    });
-  
-}
-</script>
-
-<style lang="scss">
-  .container {
-    min-height: 100vh;
-    background-color: #f5f5f5;
-  }
-
-  /* #ifndef APP-NVUE */
-  /* #endif */
-
-  .content {
-    padding: 12rpx 0;
-  }
-
-  .section-header {
-    padding: 12rpx 24rpx 8rpx;
-  }
-
-  .section-title {
-    font-size: 28rpx;
-    font-weight: 700;
-    color: #333;
-    position: relative;
-    padding-left: 16rpx;
-  }
-
-  .section-title::before {
-    content: '';
-    position: absolute;
-    left: 0;
-    top: 50%;
-    transform: translateY(-50%);
-    width: 6rpx;
-    height: 28rpx;
-    background: linear-gradient(135deg, #667eea, #764ba2);
-    border-radius: 3rpx;
-  }
-
-  .grid-body {
-    padding: 0 16rpx;
-  }
-
-  .grid-wrapper {
-    display: flex;
-    flex-wrap: wrap;
-  }
-
-  .grid-item {
-    width: 25%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 16rpx 8rpx;
-    box-sizing: border-box;
-  }
-
-  .item-icon {
-    width: 80rpx;
-    height: 80rpx;
-    border-radius: 20rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-bottom: 12rpx;
-    box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
-    transition: all 0.3s;
-  }
-
-  .grid-item:active .item-icon {
-    transform: scale(0.95);
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.15);
-  }
-
-  .item-text {
-    text-align: center;
-    font-size: 22rpx;
-    color: #333;
-    font-weight: 500;
-    line-height: 1.3;
-  }
-</style>
diff --git a/src/pages/health/marRecord/addEdit.vue b/src/pages/health/marRecord/addEdit.vue
deleted file mode 100644
index 737311c..0000000
--- a/src/pages/health/marRecord/addEdit.vue
+++ /dev/null
@@ -1,533 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="用药记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="健康档案" prop="healthRecordName" required @click="handHealthRecord">
-            <u--input v-model="form.healthRecordName" disabled disabledColor="#ffffff" placeholder="请选择健康档案"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="用药类型" prop="marTypeName" required @click="handleMarType">
-              <u--input v-model="form.marTypeName" disabled disabledColor="#ffffff" placeholder="请选择用药类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="药品名称" prop="medicalName" required @click="handleMedical">
-            <u--input v-model="form.medicalName" disabled disabledColor="#ffffff" placeholder="请选择药品名称"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-            <u-form-item label="药品来源" prop="resourceName" required @click="handleResource">
-              <u--input v-model="form.resourceName" disabled disabledColor="#ffffff" placeholder="请选择药品来源"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="用药地点"  prop="placeName" required @click="handlePlace">
-              <u--input v-model="form.placeName" disabled disabledColor="#ffffff" placeholder="请选择用药地点"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="用药时间" prop="dosingTime" required @click="selectDate()">
-            <u--input v-model="form.dosingTime" disabled disabledColor="#ffffff" placeholder="请选择用药时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-            <u-form-item label="用药剂量" prop="dosage" required >
-              <u--input v-model="form.dosage"  placeholder="请填写用药剂量"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="用药单位" prop="unitName" required @click="handleUnit">
-              <u--input v-model="form.unitName" disabled disabledColor="#ffffff" placeholder="请选择用药单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showResource" :columns="resourceList" keyName="dictLabel" @cancel="handleResourceCancel"
-        @confirm="handleResourceConfirm"></u-picker>
-
-        <u-picker itemHeight="88" :show="showPlace" :columns="placeList" keyName="dictLabel" @cancel="handlePlaceCancel"
-        @confirm="handlePlaceConfirm"></u-picker>
-
-        <u-picker itemHeight="88" :show="showMarType" :columns="marTypeList" keyName="dictLabel" @cancel="handleMarTypeCancel"
-        @confirm="handleMarTypeConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handHealthRecordCancel"
-      @confirm="handHealthRecordConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
-      @confirm="handleMedicalConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showUnit" :columns="unitList" keyName="dictLabel" @cancel="handleUnitCancel"
-      @confirm="handleUnitConfirm"></u-picker>
-      <u-datetime-picker
-			:show="datePickShow"
-			mode="datetime"
-      ref="dosingTimeRef" 
-			@cancel="datePickShow=false"
-			@confirm="datePickConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getMarRecord, addMarRecord, updateMarRecord  } from '@/api/health/marRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const showPerson = ref(false)
-const flag = ref('add')
-const showHealthRecord = ref(false)
-const title = ref("用药记录")
-const healthRecordList = ref([])
-const personList = ref([])
-
-const medicalList = ref([])
-const showMedical = ref(false)
-
-const marTypeList = ref([])
-const showMarType = ref(false)
-
-const resourceList = ref([])
-const showResource = ref(false)
-
-const placeList = ref([])
-const showPlace = ref(false)
-
-const unitList = ref([])
-const showUnit = ref(false)
-
-const data = reactive({
-form: {
-  id: null,
-    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',
-     resourceName: '医院开药',
-    placeName: '家中'
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-},
-queryMedicineParams: {
-    pageNum: 1,
-    treatmentType: null,
-    pageSize: 1000
-  },
-rules: {
-  healthRecordName: [{ required: true, message: '健康档案不能为空', trigger:['change', 'blur'] }],
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  medicalName: [{ required: true, message: '药品名称不能为空', trigger: ['change', 'blur'] }],
-  marTypeName: [{ required: true, message: '用药类型不能为空', trigger: ['change', 'blur'] }],
-  resource: [{ required: true, message: '药品来源不能为空', trigger: ['change', 'blur'] }],
-  place: [{ required: true, message: '用药地点不能为空', trigger: ['change', 'blur'] }],
-  dosage: [{ type: 'number', required: true, message: '用药剂量不能为空', trigger: ['change', 'blur'] }],
-
-  dosingTime: [{ required: true, message: '用药时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, queryHealthRecordParams,queryMedicineParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="用药记录-修改"
-     }else{
-      title.value="用药记录-新增"
-     }
-     }else{
-      title.value="用药记录-复制"
-     }
-     
-    getData()
-})
-onReady(() => {
-     form.value.dosingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-function  getData() {
-  listMedicineBasic(queryMedicineParams.value).then((response) => {
-    medicalList.value = [response.rows] 
-  })
-      // 药品来源
-    if(form.value.id!=null){
-      getMarRecord(form.value.id).then(res => {
-        listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-
-      queryHealthRecordParams.value.personId=res.data.personId
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-      })
-     })
-        form.value = res.data   
-        if(flag.value!=null){
-        form.value.dosingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-       }
-        form.value.medicalName=form.value.name
-        getDicts('mar_place').then(result => {
-          placeList.value =[result.data] 
-          form.value.placeName=dictStr(form.value.place, result.data)
-         })
-          // 药品来源
-        getDicts('mar_resource').then(result => {
-          resourceList.value =[result.data] 
-          form.value.resourceName=dictStr(form.value.resource, result.data)
-         })
-                   // 药品来源
-        getDicts('medical_unit').then(result => {
-          unitList.value =[result.data] 
-          form.value.unitName=dictStr(form.value.unit, result.data)
-         })
-                // 用药类型
-           getDicts('mar_type').then(result => {
-            marTypeList.value =[result.data] 
-          form.value.marTypeName=dictStr(form.value.type, result.data)
-         })
-      })
-    }else{
-      listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-      })
-     }
-     })
-     // 类型
-     getDicts('mar_type').then(res => {
-        marTypeList.value =[res.data] 
-      })
-           // 类型
-     getDicts('medical_unit').then(res => {
-        unitList.value =[res.data] 
-      })
-       // 类型
-       getDicts('mar_resource').then(res => {
-        resourceList.value =[res.data] 
-      })
-       // 子类型
-       getDicts('mar_place').then(res => {
-        placeList.value =[res.data] 
-      })
-
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-
-  function handleMedical() {
-      if (medicalList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '药品为空  ', type: 'warning'
-        })
-      } else {
-        showMedical.value = true
-      }
-   }
-function   handleMedicalConfirm(e) {
-     form.value.medicalName = e.value[0].shortNameBrandPackaging
-     form.value.name = e.value[0].shortNameBrandPackaging
-      form.value.medicineId = e.value[0].id
-      getMedicineBasic(e.value[0].id).then((response) => {
-    form.value.unit = response.data.unit
-       // 药品来源
-         getDicts('medical_unit').then(result => {
-          form.value.unitName=dictStr( response.data.unit, result.data)
-         })
-    form.value.contentUnit = response.data.contentUnit
-  })
-      showMedical.value = false
-      
-}
-function handleMedicalCancel() {
-     showMedical.value = false
-  }
-function handHealthRecord() {
-      if (healthRecordList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '健康档案为空  ', type: 'warning'
-        })
-      } else {
-        showHealthRecord.value = true
-      }
-   }
-function   handHealthRecordConfirm(e) {
-      form.value.healthRecordName = e.value[0].name
-      form.value.healthRecordId = e.value[0].id
-      showHealthRecord.value = false
-}
-function handHealthRecordCancel() {
-     showHealthRecord.value = false
-}
-
-function handleResource() {
-        if (resourceList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showResource.value = true
-        }
-     }
-  function   handleResourceConfirm(e) {
-        form.value.resourceName = e.value[0].dictLabel
-        form.value.resource = e.value[0].dictValue
-        showResource.value = false
-  }
- function handleResourceCancel() {
-      showResource.value = false
-      }
-
-      function handleUnit() {
-        if (unitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '用药单位为空  ', type: 'warning'
-          })
-        } else {
-          showUnit.value = true
-        }
-     }
-  function   handleUnitConfirm(e) {
-        form.value.unitName = e.value[0].dictLabel
-        form.value.unit = e.value[0].dictValue
-        showUnit.value = false
-  }
- function handleUnitCancel() {
-      showUnit.value = false
-      }
-
-      function handlePlace() {
-        if (placeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '用药地点为空  ', type: 'warning'
-          })
-        } else {
-          showPlace.value = true
-        }
-     }
-  function   handlePlaceConfirm(e) {
-        form.value.placeName = e.value[0].dictLabel
-        form.value.place = e.value[0].dictValue
-        showPlace.value = false
-  }
- function handlePlaceCancel() {
-  showPlace.value = false
-      }
-
-  function handleMarType() {
-        if (marTypeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '用药类型为空  ', type: 'warning'
-          })
-        } else {
-          showMarType.value = true
-        }
-     }
-  function   handleMarTypeConfirm(e) {
-        form.value.marTypeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-
-        queryMedicineParams.value.treatmentType = e.value[0].dictValue
-        form.value.medicalName = ""
-     form.value.name = ""
-      form.value.medicineId = null
-  listMedicineBasic(queryMedicineParams.value).then((response) => {
-    medicalList.value = [response.rows] 
-  })
-
-        showMarType.value = false
-  }
- function handleMarTypeCancel() {
-       showMarType.value = false
-      }
-
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['dosingTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.dosingTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          if(flag.value==null){
-            updateMarRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/marRecord/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addMarRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/marRecord/list` })
-            }
-          })
-        })
-          }
-
-        }else {
-          addMarRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/marRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/marRecord/list.vue b/src/pages/health/marRecord/list.vue
deleted file mode 100644
index 5330d90..0000000
--- a/src/pages/health/marRecord/list.vue
+++ /dev/null
@@ -1,837 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-container">
-        <view class="search-row">
-          <u--input v-model="queryParams.personName" border="false" type="select" @click="handlePerson" placeholder="请选择人员" class="search-input"
-            suffixIcon="search" suffixIconStyle="color: #909399">
-          </u--input>
-          <view class="add-btn" @click="handleAdd()">
-            <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-            <text>新增</text>
-          </view>
-        </view>
-        <view class="search-row">
-          <u--input v-model="queryParams.name" border="false" placeholder="请填写药品名称" class="search-input"
-            @blur="searchSubmit" suffixIcon="search" suffixIconStyle="color: #909399">
-          </u--input>
-          <view class="filter-btn" @click="filterPanel = !filterPanel">
-            <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-            <text>筛选</text>
-          </view>
-        </view>
-      </view>
-      
-      <u-transition :show="filterPanel" mode="fade">
-        <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-          <view class="filter-panel-content">
-            <view class="filter-title">健康档案</view>
-            <view class="health-record-input">
-              <u--input v-model="queryParams.healthRecordName" border="surround" type="select" @click="handleHealthRecord" placeholder="请选择健康档案"
-                suffixIcon="search" suffixIconStyle="color: #909399">
-              </u--input>
-            </view>
-            
-            <view class="filter-title">用药类型</view>
-            <view class="state-list">
-              <view v-for="item in typeList" :key="item.id" class="state-item"
-                :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
-            </view>
-            
-            <view class="filter-title">用药日期</view>
-            <view class="date-inputs">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-          </view>
-          <view class="btn-box">
-            <view class="btn-reset" @click="resetQuery()">
-              <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-              <text>重置</text>
-            </view>
-            <view class="btn-confirm" @click="searchSubmit()">
-              <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-              <text>确定</text>
-            </view>
-          </view>
-          <u-datetime-picker
-            :closeOnClickOverlay="true"
-            :show="timeShow"
-            v-model="time"
-            mode="datetime"
-            @close="openOrCloseDate"
-            @cancel="openOrCloseDate"
-            @confirm="confirm"
-          ></u-datetime-picker>
-        </view>
-      </u-transition>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="color" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.name }}</text>
-              </view>
-            </view>
-            <view class="dosage-section">
-              <text class="dosage-value">{{ item.dosage }} {{ dictStr(item.unit, unitList) }}</text>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item">
-                <text class="info-label">人员名称</text>
-                <text class="info-value">{{ item.personName || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">用药时间</text>
-                <text class="info-value">{{ item.dosingTime || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">用药类型</text>
-                <text class="info-value">{{ dictStr(item.type, typeList) || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">药品来源</text>
-                <text class="info-value">{{ dictStr(item.resource, resourceList) || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">用药地点</text>
-                <text class="info-value">{{ dictStr(item.place, placeList) || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">健康档案</text>
-                <text class="info-value">{{ item.healthRecordName || '--' }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.remark">
-                <text class="info-label">备注</text>
-                <text class="info-value">{{ item.remark }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="operate" @click.stop>
-            <view class="btn-edit" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-copy" @click="handleCopy(item)">
-              <uni-icons type="paperplane" size="16" color="#fa8c16"></uni-icons>
-              <text>复制</text>
-            </view>
-            <view class="btn-delete" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handleHealthRecordCancel"
-        @confirm="handleHealthRecordConfirm"></u-picker>
-  </view>
-     <!--返回首页按钮 -->
-     <suspend></suspend>
-</template>
-
-<script setup>
-import { listMarRecord, delMarRecord } from '@/api/health/marRecord'
-import { listPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-const typeList = ref([])
-const resourceList = ref([])
-const placeList = ref([])
-const unitList = ref([])
-
-const showHealthRecord = ref(false)
-const healthRecordList = ref([])
-
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    name: null,
-    type: null,
-    healthRecordId: null,
-    dosingTime: null,
-    dosage: null,
-    personId: null,
-    resource: null,
-    place: null
-   } ,
-   queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-}
-})
-const { filterPanel, queryPersonParams,queryHealthRecordParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-  getData()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-  function selectType(item) {
-      queryParams.value.type = item.dictValue
-      typeList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-    function getData() {
-        // 用药类型
-        getDicts('mar_type').then(res => {
-        typeList.value = res.data
-      })
-       // 用药地点
-       getDicts('mar_place').then(res => {
-        placeList.value = res.data
-      })
-            // 单位
-            getDicts('medical_unit').then(res => {
-              unitList.value = res.data
-      })
-
-       // 药品类型
-       getDicts('mar_resource').then(res => {
-        resourceList.value = res.data
-      })
-      listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows]
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-      })
-      status.value = 'loading'
-      listMarRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    })
-    }
-    function getList() {
-      status.value = 'loading'
-      listMarRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-    queryParams.value.healthRecordName = ''
-    queryParams.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-    showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-})
-  }
- function handlePersonCancel() {
-  queryParams.value.personName = ''
-        queryParams.value.personId = ''
-        queryHealthRecordParams.value.personId=null
-        listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        })
-       showPerson.value = false
-       pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-
-  function handleHealthRecord() {
-        if (healthRecordList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '健康档案为空  ', type: 'warning'
-          })
-        } else {
-          showHealthRecord.value = true
-        }
-     }
-  function   handleHealthRecordConfirm(e) {
-    queryParams.value.healthRecordName = e.value[0].name
-    queryParams.value.healthRecordId =  e.value[0].id
-    showHealthRecord.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleHealthRecordCancel() {
-  queryParams.value.healthRecordName= ''
-         queryParams.value.healthRecordId = ''
-       showHealthRecord.value = false
-       pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-      queryParams.value.personName = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-         queryParams.value.healthRecordName= ''
-         queryParams.value.healthRecordId = ''
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-        queryHealthRecordParams.value.personId=null
-        listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        })
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/marRecord/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/marRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/marRecord/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/marRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delMarRecord(item.id)
-              uni.navigateTo({ url: `/pages/health/marRecord/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-
-.search-container {
-  background-color: #ffffff;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-  position: relative;
-  z-index: 100;
-
-  .search-row {
-    padding: 12rpx 32rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: 16rpx;
-    
-    &:first-child {
-      padding-bottom: 8rpx;
-    }
-    
-    &:last-child {
-      padding-top: 8rpx;
-    }
-
-    .search-input {
-      background: rgba(102, 126, 234, 0.08);
-      color: #333333;
-      flex: 1;
-      border-radius: 24rpx;
-      border: 2rpx solid rgba(102, 126, 234, 0.3);
-      height: 66rpx !important;
-      display: flex;
-      align-items: center;
-    }
-    
-    .filter-btn,
-    .add-btn {
-      display: flex;
-      align-items: center;
-      gap: 6rpx;
-      padding: 12rpx 24rpx;
-      background: rgba(102, 126, 234, 0.08);
-      border-radius: 24rpx;
-      border: 2rpx solid rgba(102, 126, 234, 0.3);
-      transition: all 0.3s ease;
-      flex-shrink: 0;
-      
-      &:active {
-        transform: scale(0.95);
-        background: rgba(102, 126, 234, 0.12);
-      }
-      
-      text {
-        color: #667eea;
-        font-size: 28rpx;
-        font-weight: 600;
-      }
-      
-      uni-icons {
-        color: #667eea;
-      }
-    }
-  }
-}
-
-.filter-panel {
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 180rpx;
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 999;
-
-  .filter-panel-content {
-    background-color: #ffffff;
-    padding: 0 30rpx 30rpx;
-    border-radius: 16rpx 16rpx 0 0;
-
-    .filter-title {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-    
-    .medicine-input,
-    .health-record-input {
-      margin-bottom: 24rpx;
-    }
-
-    .state-list {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: flex-start;
-      gap: 16rpx;
-      margin-bottom: 24rpx;
-
-      .state-item {
-        padding: 0 32rpx;
-        height: 68rpx;
-        border: 2rpx solid #e8edf3;
-        border-radius: 34rpx;
-        text-align: center;
-        line-height: 68rpx;
-        font-size: 28rpx;
-        color: #666666;
-        transition: all 0.3s ease;
-        background: #ffffff;
-        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-        
-        &:active {
-          transform: scale(0.95);
-        }
-      }
-
-      .active {
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border: 2rpx solid transparent;
-        color: #ffffff;
-        box-shadow: 0 4rpx 12rpx rgba(102, 126, 234, 0.3);
-        font-weight: 600;
-      }
-    }
-    
-    .date-inputs {
-      display: flex;
-      flex-direction: column;
-      gap: 16rpx;
-      
-      .dateInput {
-        border-radius: 12rpx;
-        border: 2rpx solid #e8edf3;
-      }
-    }
-  }
-
-  .btn-box {
-    display: flex;
-    gap: 20rpx;
-    padding: 24rpx 30rpx;
-    background-color: #fff;
-    box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    
-    .btn-reset,
-    .btn-confirm {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 8rpx;
-      height: 88rpx;
-      border-radius: 12rpx;
-      font-size: 30rpx;
-      font-weight: 600;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.98);
-        opacity: 0.9;
-      }
-      
-      text {
-        line-height: 1;
-      }
-    }
-    
-    .btn-reset {
-      flex: 1;
-      background: #f5f7fa;
-      border: 2rpx solid #dcdfe6;
-      
-      text {
-        color: #606266;
-      }
-    }
-    
-    .btn-confirm {
-      flex: 1;
-      background: #667eea;
-      box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-      border: none;
-      
-      text {
-        color: #ffffff;
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      gap: 12rpx;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 26rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex: 1;
-        letter-spacing: 0.5rpx;
-      }
-    }
-    
-    .dosage-section {
-      display: flex;
-      align-items: center;
-      flex-shrink: 0;
-      
-      .dosage-value {
-        color: rgba(255, 255, 255, 0.95);
-        font-size: 26rpx;
-        font-weight: 600;
-        line-height: 1.3;
-        white-space: nowrap;
-        padding: 8rpx 16rpx;
-        background: rgba(255, 255, 255, 0.2);
-        border-radius: 8rpx;
-        letter-spacing: 0.3rpx;
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-copy,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-copy {
-      background: rgba(250, 140, 22, 0.1);
-      color: #fa8c16;
-      border: 1rpx solid rgba(250, 140, 22, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineBasic/addEdit.vue b/src/pages/health/medicineBasic/addEdit.vue
deleted file mode 100644
index e3fe404..0000000
--- a/src/pages/health/medicineBasic/addEdit.vue
+++ /dev/null
@@ -1,555 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="药品基础信息"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="药品全称" prop="name" required >
-              <u--input v-model="form.name"  placeholder="请填写药品全称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="药品简称" prop="shortName" required >
-              <u--input v-model="form.shortName"  placeholder="请填写药品简称"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="品牌" prop="brand" required >
-              <u--input v-model="form.brand"  placeholder="请填写品牌"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="药品包装" prop="packaging" required >
-              <u--input v-model="form.packaging"  placeholder="请填写药品包装"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="生产厂家" prop="manufacturers"  >
-              <u--input v-model="form.manufacturers"  placeholder="请填写生产厂家"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-        
-            <u-form-item label="药品编码" prop="code"  >
-              <u--input v-model="form.code"  placeholder="请填写药品编码"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-
-          <u-form-item label="药品剂型" prop="dosageFormName"  @click="handleDosageForm">
-              <u--input v-model="form.dosageFormName" disabled disabledColor="#ffffff" placeholder="请选择药品剂型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="治疗类型" prop="treatmentTypeName"  @click="handleTreatmentType">
-              <u--input v-model="form.treatmentTypeName" disabled disabledColor="#ffffff" placeholder="请选择治疗类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="药品分类"  prop="classificationName"  @click="handleClassification">
-              <u--input v-model="form.classificationName" disabled disabledColor="#ffffff" placeholder="请选择药品分类"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-
-            <u-form-item label="类别" prop="categoryName"  @click="handleCategory">
-              <u--input v-model="form.categoryName" disabled disabledColor="#ffffff" placeholder="请选择类别"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="包装单位" prop="packageUnitName"  @click="handlePackageUnit">
-              <u--input v-model="form.packageUnitName" disabled disabledColor="#ffffff" placeholder="请选择包装单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-        
-            <u-form-item label="是否进口" prop="isImportName"  @click="handleIsImport">
-              <u--input v-model="form.isImportName" disabled disabledColor="#ffffff" placeholder="请选择是否进口"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="规格" prop="specifications" >
-              <u--input v-model="form.specifications"  placeholder="请填写规格"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="规格单位" prop="unitName"  @click="handleUnit">
-              <u--input v-model="form.unitName" disabled disabledColor="#ffffff" placeholder="请选择规格单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="单个含量" prop="content"  >
-              <u--input v-model="form.content"  placeholder="请填写单个含量"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="含量单位" prop="contentUnitName"  @click="handleContentUnit">
-              <u--input v-model="form.contentUnitName" disabled disabledColor="#ffffff" placeholder="请选择含量单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="生产地址" prop="address"  >
-              <u--input v-model="form.address"  placeholder="请填写生产地址"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="功能主治" prop="indications"  labelPosition="top">
-            <u--textarea v-model="form.indications" placeholder="请填写功能主治" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="贮藏" prop="storage"  labelPosition="top">
-            <u--textarea v-model="form.storage" placeholder="请填写贮藏" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="药品成分" prop="ingredients"  labelPosition="top">
-            <u--textarea v-model="form.ingredients" placeholder="请填写药品成分" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="用法用量" prop="usage"  labelPosition="top">
-            <u--textarea v-model="form.usage" placeholder="请填写用法用量" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="性状" prop="character"  labelPosition="top">
-            <u--textarea v-model="form.character" placeholder="请填写性状" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="不良反应" prop="adverseReaction"  labelPosition="top">
-            <u--textarea v-model="form.adverseReaction" placeholder="请填写不良反应" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showDosageForm" :columns="dosageFormList" keyName="dictLabel" @cancel="handleDosageFormCancel"
-        @confirm="handleDosageFormConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showTreatmentType" :columns="treatmentTypeList" keyName="dictLabel" @cancel="handleTreatmentTypeCancel"
-        @confirm="handleTreatmentTypeConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showClassification" :columns="classificationList" keyName="dictLabel" @cancel="handleClassificationCancel"
-        @confirm="handleClassificationConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showCategory" :columns="categoryList" keyName="dictLabel" @cancel="handleCategoryCancel"
-      @confirm="handleCategoryConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showPackageUnit" :columns="packageUnitList" keyName="dictLabel" @cancel="handlePackageUnitCancel"
-      @confirm="handlePackageUnitConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showIsImport" :columns="isImportList" keyName="dictLabel" @cancel="handleIsImportCancel"
-      @confirm="handleIsImportConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showUnit" :columns="unitList" keyName="dictLabel" @cancel="handleUnitCancel"
-      @confirm="handleUnitConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showContentUnit" :columns="contentUnitList" keyName="dictLabel" @cancel="handleContentUnitCancel"
-      @confirm="handleContentUnitConfirm"></u-picker>
-  </view>
-</template>
-
-<script setup>
-import {getMedicineBasic, addMedicineBasic, updateMedicineBasic } from '@/api/health/medicineBasic'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const title = ref("药品基础信息")
-const flag = ref('add')
-
-const dosageFormList = ref([])
-const showDosageForm = ref(false)
-
-const treatmentTypeList = ref([])
-const showTreatmentType = ref(false)
-
-const classificationList = ref([])
-const showClassification = ref(false)
-
-const categoryList = ref([])
-const showCategory = ref(false)
-
-const packageUnitList = ref([])
-const showPackageUnit = ref(false)
-
-const isImportList = ref([])
-const showIsImport = ref(false)
-
-const unitList = ref([])
-const showUnit = ref(false)
-
-const contentUnitList = ref([])
-const showContentUnit = ref(false)
-
-
-const data = reactive({
-form: {
-  id: null,
-    name: null,
-    classification: null,
-    category: null,
-    brand: null,
-    packaging: null,
-    manufacturers: null,
-    treatmentType: null,
-    isImport: null,
-    ingredients: null,
-    usage: null,
-    dosageForm: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    code: null,
-    specifications: null,
-    unit: null,
-    address: null,
-    adverseReaction: null,
-    content: null,
-    contentUnit: null,
-    character: null,
-    storage: null,
-    indications: null
-},
-rules: {
-  name: [{ required: true, message: '药品全称不能为空', trigger:['change', 'blur'] }],
-  shortName: [{ required: true, message: '药品简称不能为空', trigger: ['change', 'blur'] }],
-  // classificationName: [{ required: true, message: '药品分类不能为空', trigger: ['change', 'blur'] }],
-  // categoryName: [{ required: true, message: '类别不能为空', trigger: ['change', 'blur'] }],
-  brand: [{ required: true, message: '品牌不能为空', trigger: ['change', 'blur'] }],
-  packaging: [{ required: true, message: '药品包装不能为空', trigger: ['change', 'blur'] }],
-  // manufacturers: [{ required: true, message: '生产厂家不能为空', trigger: ['change', 'blur'] }],
-  // code: [{ required: true, message: '药品编码不能为空', trigger: ['change', 'blur'] }],
-  // dosageFormName: [{ required: true, message: '药品剂型不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, rules} = toRefs(data)
-
-
-onLoad((option) => {
-  form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="药品基础信息-修改"
-     }else{
-      title.value="药品基础信息-新增"
-     }
-     }else{
-      title.value="药品基础信息-复制"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.dosingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-function  getData() {
-     // 类型
-     getDicts('dosage_form').then(res => {
-      dosageFormList.value =[res.data] 
-      })
-       // 类型
-     getDicts('mar_type').then(res => {
-      treatmentTypeList.value =[res.data] 
-      })
-       // 类型
-     getDicts('medicine_classification').then(res => {
-      classificationList.value =[res.data] 
-      })
-       // 类型
-     getDicts('medicine_category').then(res => {
-      categoryList.value =[res.data] 
-      })
-       // 类型
-     getDicts('package_unit').then(res => {
-      packageUnitList.value =[res.data] 
-      })
-       // 类型
-     getDicts('is_import').then(res => {
-      isImportList.value =[res.data] 
-      })
-       // 类型
-     getDicts('medical_unit').then(res => {
-      unitList.value =[res.data] 
-      })
-       // 类型
-     getDicts('content_unit').then(res => {
-      contentUnitList.value =[res.data] 
-      })
-
-    if(form.value.id!=null){
-      getMedicineBasic(form.value.id).then(res => {
-        form.value = res.data   
-        getDicts('dosage_form').then(result => {
-          form.value.dosageFormName=dictStr(form.value.dosageForm, result.data)
-         })
-         getDicts('mar_type').then(result => {
-          form.value.treatmentTypeName=dictStr(form.value.treatmentType, result.data)
-         })
-         getDicts('medicine_classification').then(result => {
-          form.value.classificationName=dictStr(form.value.classification, result.data)
-         })
-         getDicts('medicine_category').then(result => {
-          form.value.categoryName=dictStr(form.value.category, result.data)
-         })
-         getDicts('package_unit').then(result => {
-          form.value.packageUnitName=dictStr(form.value.packageUnit, result.data)
-         })
-         getDicts('is_import').then(result => {
-          form.value.isImportName=dictStr(form.value.isImport, result.data)
-         })
-         getDicts('medical_unit').then(result => {
-          form.value.unitName=dictStr(form.value.unit, result.data)
-         })
-         getDicts('content_unit').then(result => {
-          form.value.contentUnitName=dictStr(form.value.contentUnit, result.data)
-         })
-      })
-    }
-}
-
-function handleDosageForm() {
-        if (dosageFormList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品剂型为空  ', type: 'warning'
-          })
-        } else {
-          showDosageForm.value = true
-        }
-     }
-  function   handleDosageFormConfirm(e) {
-        form.value.dosageFormName = e.value[0].dictLabel
-        form.value.dosageForm = e.value[0].dictValue
-        showDosageForm.value = false
-  }
- function handleDosageFormCancel() {
-  showDosageForm.value = false
-      }
-
-      function handleTreatmentType() {
-        if (treatmentTypeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showTreatmentType.value = true
-        }
-     }
-  function   handleTreatmentTypeConfirm(e) {
-        form.value.treatmentTypeName = e.value[0].dictLabel
-        form.value.treatmentType = e.value[0].dictValue
-        showTreatmentType.value = false
-  }
- function handleTreatmentTypeCancel() {
-  showTreatmentType.value = false
-      }
-
-      function handleClassification() {
-        if (classificationList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showClassification.value = true
-        }
-     }
-  function   handleClassificationConfirm(e) {
-        form.value.classificationName = e.value[0].dictLabel
-        form.value.classification = e.value[0].dictValue
-        showClassification.value = false
-  }
- function handleClassificationCancel() {
-  showClassification.value = false
-      }
-
-      function handleCategory() {
-        if (categoryList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showCategory.value = true
-        }
-     }
-  function   handleCategoryConfirm(e) {
-        form.value.categoryName = e.value[0].dictLabel
-        form.value.category = e.value[0].dictValue
-        showCategory.value = false
-  }
- function handleCategoryCancel() {
-  showCategory.value = false
-      }
-
-      function handlePackageUnit() {
-        if (packageUnitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showPackageUnit.value = true
-        }
-     }
-  function   handlePackageUnitConfirm(e) {
-        form.value.packageUnitName = e.value[0].dictLabel
-        form.value.packageUnit = e.value[0].dictValue
-        showPackageUnit.value = false
-  }
- function handlePackageUnitCancel() {
-  showPackageUnit.value = false
-      }
-
-      function handleIsImport() {
-        if (isImportList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showIsImport.value = true
-        }
-     }
-  function   handleIsImportConfirm(e) {
-        form.value.isImportName = e.value[0].dictLabel
-        form.value.isImport = e.value[0].dictValue
-        showIsImport.value = false
-  }
- function handleIsImportCancel() {
-  showIsImport.value = false
-      }
-
-      function handleUnit() {
-        if (unitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showUnit.value = true
-        }
-     }
-  function   handleUnitConfirm(e) {
-        form.value.unitName = e.value[0].dictLabel
-        form.value.unit = e.value[0].dictValue
-        showUnit.value = false
-  }
- function handleUnitCancel() {
-  showUnit.value = false
-      }
-
-      function handleContentUnit() {
-        if (contentUnitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showContentUnit.value = true
-        }
-     }
-  function   handleContentUnitConfirm(e) {
-        form.value.contentUnitName = e.value[0].dictLabel
-        form.value.contentUnit = e.value[0].dictValue
-        showContentUnit.value = false
-  }
- function handleContentUnitCancel() {
-  showContentUnit.value = false
-      }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-        if(flag.value==null){
-          updateMedicineBasic(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addMedicineBasic(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
-            }
-          })
-        })
-          }
-
-        }else {
-          addMedicineBasic(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineBasic/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineBasic/details.vue b/src/pages/health/medicineBasic/details.vue
deleted file mode 100644
index 55b32d4..0000000
--- a/src/pages/health/medicineBasic/details.vue
+++ /dev/null
@@ -1,412 +0,0 @@
-<template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="药品基础信息详情"
-		>
-		</u-navbar>
-      <view class="detail-card">
-        <view class="card-header">
-          <view class="header-icon">
-            <uni-icons type="plusempty" size="24" color="#ffffff"></uni-icons>
-          </view>
-          <view class="header-info">
-            <text class="card-name">{{ detailInfo.name }}-{{ detailInfo.brand }}({{ detailInfo.packaging }})</text>
-          </view>
-        </view>
-        
-        <view class="card-body">
-          <view class="info-section">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>基本信息</text>
-            </view>
-            <view class="info-list">
-              <view class="list-item">
-                <text class="item-label">药品简称</text>
-                <text class="item-value">{{ detailInfo.shortName || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">药品编码</text>
-                <text class="item-value">{{ detailInfo.code || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">药品剂型</text>
-                <text class="item-value">{{ detailInfo.dosageForm || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">治疗类型</text>
-                <text class="item-value">{{ detailInfo.treatmentType || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">药品分类</text>
-                <text class="item-value">{{ detailInfo.classification || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">类别</text>
-                <text class="item-value">{{ detailInfo.category || '-' }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="info-section">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>产品信息</text>
-            </view>
-            <view class="info-list">
-              <view class="list-item">
-                <text class="item-label">品牌</text>
-                <text class="item-value">{{ detailInfo.brand || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">药品包装</text>
-                <text class="item-value">{{ detailInfo.packaging || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">包装单位</text>
-                <text class="item-value">{{ detailInfo.packageUnit || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">生产厂家</text>
-                <text class="item-value">{{ detailInfo.manufacturers || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">是否进口</text>
-                <text class="item-value">{{ detailInfo.isImport || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">生产地址</text>
-                <text class="item-value">{{ detailInfo.address || '-' }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="info-section">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>规格信息</text>
-            </view>
-            <view class="info-list">
-              <view class="list-item">
-                <text class="item-label">规格</text>
-                <text class="item-value">{{ detailInfo.specifications || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">规格单位</text>
-                <text class="item-value">{{ detailInfo.unit || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">单个含量</text>
-                <text class="item-value">{{ detailInfo.content || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">含量单位</text>
-                <text class="item-value">{{ detailInfo.contentUnit || '-' }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="info-section" v-if="detailInfo.indications">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>功能主治</text>
-            </view>
-            <view class="remark-content">
-              <text>{{ detailInfo.indications }}</text>
-            </view>
-          </view>
-          
-          <view class="info-section" v-if="detailInfo.storage">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>贮藏</text>
-            </view>
-            <view class="remark-content">
-              <text>{{ detailInfo.storage }}</text>
-            </view>
-          </view>
-          
-          <view class="info-section" v-if="detailInfo.ingredients">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>药品成分</text>
-            </view>
-            <view class="remark-content">
-              <text>{{ detailInfo.ingredients }}</text>
-            </view>
-          </view>
-          
-          <view class="info-section" v-if="detailInfo.usage">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>用法用量</text>
-            </view>
-            <view class="remark-content">
-              <text>{{ detailInfo.usage }}</text>
-            </view>
-          </view>
-          
-          <view class="info-section" v-if="detailInfo.character">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>性状</text>
-            </view>
-            <view class="remark-content">
-              <text>{{ detailInfo.character }}</text>
-            </view>
-          </view>
-          
-          <view class="info-section" v-if="detailInfo.adverseReaction">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>不良反应</text>
-            </view>
-            <view class="remark-content">
-              <text>{{ detailInfo.adverseReaction }}</text>
-            </view>
-          </view>
-          
-          <view class="info-section" v-if="detailInfo.remark">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>备注</text>
-            </view>
-            <view class="remark-content">
-              <text>{{ detailInfo.remark }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-      <u-toast ref="uToast"></u-toast>
-    </view>
-  </template>
-  
-  <script setup>
-import { getMedicineBasic } from '@/api/health/medicineBasic'
-import { getDicts } from '@/api/system/dict/data.js'
-import { onLoad } from "@dcloudio/uni-app"
-import { ref, getCurrentInstance } from "vue"
-
-const { proxy } = getCurrentInstance()
-const detailInfo = ref({})
-const typeList = ref([])
-const classificationList = ref([])
-const categoryList = ref([])
-const dosageFormList = ref([])
-const packageUnitList = ref([])
-const isImportList = ref([])
-const unitList = ref([])
-const contentUnitList = ref([])
-
-onLoad((option) => {
-  if (option.id) {
-    // 先加载字典，再加载详情
-    getDict().then(() => {
-      getDetail(option.id)
-    })
-  }
-})
-
-function getDict() {
-  // 使用 Promise.all 确保所有字典都加载完成
-  return Promise.all([
-    getDicts('mar_type').then(res => {
-      typeList.value = res.data
-    }),
-    getDicts('medicine_classification').then(res => {
-      classificationList.value = res.data
-    }),
-    getDicts('medicine_category').then(res => {
-      categoryList.value = res.data
-    }),
-    getDicts('dosage_form').then(res => {
-      dosageFormList.value = res.data
-    }),
-    getDicts('package_unit').then(res => {
-      packageUnitList.value = res.data
-    }),
-    getDicts('is_import').then(res => {
-      isImportList.value = res.data
-    }),
-    getDicts('medical_unit').then(res => {
-      unitList.value = res.data
-    }),
-    getDicts('content_unit').then(res => {
-      contentUnitList.value = res.data
-    })
-  ])
-}
-
-function dictStr(val, arr) {
-  if (!val || !arr || arr.length === 0) {
-    return ''
-  }
-  let str = ''
-  arr.forEach(item => {
-    // 支持字符串和数字类型的匹配
-    if (String(item.dictValue) === String(val)) {
-      str = item.dictLabel
-    }
-  })
-  return str
-}
-
-function getDetail(id) {
-  getMedicineBasic(id).then(res => {
-    const data = res.data
-    // 先将原始数据赋值
-    detailInfo.value = { ...data }
-    
-    // 使用已加载的字典数据进行转换，将字典值转换为标签显示
-    if (data.treatmentType) {
-      detailInfo.value.treatmentType = dictStr(data.treatmentType, typeList.value) || data.treatmentType
-    }
-    if (data.classification) {
-      detailInfo.value.classification = dictStr(data.classification, classificationList.value) || data.classification
-    }
-    if (data.category) {
-      detailInfo.value.category = dictStr(data.category, categoryList.value) || data.category
-    }
-    if (data.dosageForm) {
-      detailInfo.value.dosageForm = dictStr(data.dosageForm, dosageFormList.value) || data.dosageForm
-    }
-    if (data.packageUnit) {
-      detailInfo.value.packageUnit = dictStr(data.packageUnit, packageUnitList.value) || data.packageUnit
-    }
-    if (data.isImport !== null && data.isImport !== undefined) {
-      detailInfo.value.isImport = dictStr(String(data.isImport), isImportList.value) || data.isImport
-    }
-    if (data.unit) {
-      detailInfo.value.unit = dictStr(data.unit, unitList.value) || data.unit
-    }
-    if (data.contentUnit) {
-      detailInfo.value.contentUnit = dictStr(data.contentUnit, contentUnitList.value) || data.contentUnit
-    }
-  })
-}
-</script>
-  
-  <style lang="scss" scoped>
-.container {
-  background: #f5f7fa;
-  padding-bottom: 24rpx;
-}
-
-.detail-card {
-  margin: 24rpx;
-  background: #ffffff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-}
-
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 16rpx 20rpx;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  
-  .header-icon {
-    width: 48rpx;
-    height: 48rpx;
-    background: rgba(255, 255, 255, 0.2);
-    border-radius: 16rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-right: 12rpx;
-    backdrop-filter: blur(10rpx);
-  }
-  
-  .header-info {
-    flex: 1;
-    min-width: 0;
-    overflow: hidden;
-    
-    .card-name {
-      color: #ffffff;
-      font-size: 28rpx;
-      font-weight: 600;
-      line-height: 1.2;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-}
-
-.card-body {
-  padding: 24rpx;
-}
-
-.info-section {
-  margin-bottom: 32rpx;
-  
-  &:last-child {
-    margin-bottom: 0;
-  }
-  
-  .section-title {
-    display: flex;
-    align-items: center;
-    margin-bottom: 20rpx;
-    
-    .title-icon {
-      width: 6rpx;
-      height: 28rpx;
-      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-    
-    text {
-      color: #2c3e50;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-  }
-  
-  .info-list {
-    .list-item {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 20rpx;
-      background: #f8f9fa;
-      border-radius: 8rpx;
-      margin-bottom: 12rpx;
-      
-      &:last-child {
-        margin-bottom: 0;
-      }
-      
-      .item-label {
-        color: #7f8c8d;
-        font-size: 26rpx;
-      }
-      
-      .item-value {
-        color: #2c3e50;
-        font-size: 28rpx;
-        font-weight: 500;
-        text-align: right;
-      }
-    }
-  }
-  
-  .remark-content {
-    padding: 20rpx;
-    background: #f8f9fa;
-    border-radius: 8rpx;
-    
-    text {
-      color: #2c3e50;
-      font-size: 26rpx;
-      line-height: 1.6;
-    }
-  }
-}
-  </style>
\ No newline at end of file
diff --git a/src/pages/health/medicineBasic/list.vue b/src/pages/health/medicineBasic/list.vue
deleted file mode 100644
index 2104165..0000000
--- a/src/pages/health/medicineBasic/list.vue
+++ /dev/null
@@ -1,700 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.keys" border="false" @click="searchBlur"
-          placeholder="请输入名称编码厂家" class="search-input" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-        <view class="add-btn" v-show="auth.hasPermi('health:medicineBasic:add')" @click="handleAdd()">
-          <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-          <text>新增</text>
-        </view>
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">治疗类型</view>
-              <view class="state-list">
-                <view v-for="item in typeList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
-              </view>
-              <view class="filter-title">录入日期</view>
-              <view class="selcet-content" style="padding: 0 24rpx">
-                <u-input
-                  :disabled="true"
-                  :disabledColor="'#fff'"
-                  class="dateInput"
-                  border="surround"
-                  v-model="queryParams.startTime"
-                  placeholder="请选择开始时间"
-                >
-                  <template v-slot:suffix>
-                    <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                  </template>
-                </u-input>
-                <u-input
-                  :disabled="true"
-                  :disabledColor="'#fff'"
-                  class="dateInput"
-                  border="surround"
-                  v-model="queryParams.endTime"
-                  placeholder="请选择结束时间"
-                >
-                  <template v-slot:suffix>
-                    <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                  </template>
-                </u-input>
-              </view>
-            </view>
-            <view class="btn-box">
-              <view class="btn-reset" @click="resetQuery()">
-                <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-                <text>重置</text>
-              </view>
-              <view class="btn-confirm" @click="searchSubmit()">
-                <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-                <text>确定</text>
-              </view>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="date"
-              :minDate="-2209017600000"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item" @click="enterDetails(item)">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="locked" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.shortName }}-{{ item.brand }}({{ item.packaging }})</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item" v-if="item.name || true">
-                <text class="info-label">药品全称</text>
-                <text class="info-value">{{ item.name || '--' }}</text>
-              </view>
-              <view class="info-item" v-if="dictStr(item.treatmentType, typeList) || true">
-                <text class="info-label">治疗类型</text>
-                <text class="info-value">{{ dictStr(item.treatmentType, typeList) || '--' }}</text>
-              </view>
-              <view class="info-item" v-if="item.code || true">
-                <text class="info-label">药品编码</text>
-                <text class="info-value">{{ item.code || '--' }}</text>
-              </view>
-              <view class="info-item" v-if="dictStr(item.classification, classificationList) || true">
-                <text class="info-label">药品分类</text>
-                <text class="info-value">{{ dictStr(item.classification, classificationList) || '--' }}</text>
-              </view>
-              <view class="info-item" v-if="dictStr(item.category, categoryList) || true">
-                <text class="info-label">类别</text>
-                <text class="info-value">{{ dictStr(item.category, categoryList) || '--' }}</text>
-              </view>
-              <view class="info-item" v-if="dictStr(item.dosageForm, dosageFormList) || true">
-                <text class="info-label">药品剂型</text>
-                <text class="info-value">{{ dictStr(item.dosageForm, dosageFormList) || '--' }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.manufacturers || true">
-                <text class="info-label">生产厂家</text>
-                <text class="info-value">{{ item.manufacturers || '--' }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.createTime || true">
-                <text class="info-label">录入时间</text>
-                <text class="info-value">{{ item.createTime || '--' }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="operate" @click.stop>
-            <view class="btn-edit" v-show="auth.hasPermi('health:medicineBasic:edit')" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-copy" v-show="auth.hasPermi('health:medicineBasic:edit')" @click="handleCopy(item)">
-              <uni-icons type="copy" size="16" color="#fa8c16"></uni-icons>
-              <text>复制</text>
-            </view>
-            <view class="btn-delete" v-show="auth.hasPermi('health:medicineBasic:remove')" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-  </view>
-        <!--返回首页按钮 -->
-        <suspend></suspend> 
-</template>
-
-<script setup>
-import { listMedicineBasic, delMedicineBasic } from '@/api/health/medicineBasic'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const typeList = ref([])
-const classificationList = ref([])
-const categoryList = ref([])
-const dosageFormList = ref([])
-
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryParams: {
-    name: null,
-    classification: null,
-    keys: null,
-    brand: null,
-    packaging: null,
-    manufacturers: null,
-    treatmentType: null,
-    isImport: null,
-    ingredients: null,
-    usage: null,
-    dosageForm: null,
-    code: null,
-    shortName: null
-   } 
-})
-const { filterPanel, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-  function selectType(item) {
-      queryParams.value.type = item.dictValue
-      typeList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-       // 治疗类型
-       getDicts('mar_type').then(res => {
-        typeList.value = res.data
-      })
-       // 用药地点
-       getDicts('medicine_classification').then(res => {
-        classificationList.value = res.data
-      })
-            // 单位
-            getDicts('medicine_category').then(res => {
-              categoryList.value = res.data
-      })
-
-       // 药品类型
-       getDicts('dosage_form').then(res => {
-        dosageFormList.value = res.data
-      })
-      status.value = 'loading'
-      listMedicineBasic({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.type = ''
-       queryParams.value.keys = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        
-        queryParams.value.endTime = ''
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/medicineBasic/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/medicineBasic/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/medicineBasic/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/medicineBasic/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        title: '确认删除',
-        content: '确定要删除这条记录吗？',
-        confirmText: '删除',
-        cancelText: '取消',
-        confirmColor: '#f5576c',
-        cancelColor: '#909399',
-        success: function (res) {
-          if (res.confirm) {
-            delMedicineBasic(item.id).then(() => {
-              uni.showToast({
-                title: '删除成功',
-                icon: 'success'
-              })
-              pageNum.value = 1
-              listData.value = []
-              getList()
-            })
-          }
-        }
-      });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-  }
-  
-  .add-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    margin-left: 10rpx;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-  }
-  
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-    z-index: 999;
-
-    .filter-panel-content {
-      background-color: #ffffff;
-      padding: 0 30rpx 30rpx;
-      border-radius: 16rpx 16rpx 0 0;
-
-      .filter-title {
-        color: #2c3e50;
-        font-size: 32rpx;
-        font-weight: 600;
-        padding: 32rpx 0 24rpx 20rpx;
-        position: relative;
-        display: flex;
-        align-items: center;
-        
-        &::before {
-          content: '';
-          width: 6rpx;
-          height: 32rpx;
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          border-radius: 3rpx;
-          margin-right: 12rpx;
-          flex-shrink: 0;
-        }
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        gap: 16rpx;
-
-        .state-item {
-          padding: 0 32rpx;
-          height: 68rpx;
-          border: 2rpx solid #e8edf3;
-          border-radius: 34rpx;
-          text-align: center;
-          line-height: 68rpx;
-          font-size: 28rpx;
-          color: #666666;
-          transition: all 0.3s ease;
-          background: #ffffff;
-          box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-          
-          &:active {
-            transform: scale(0.95);
-          }
-        }
-
-        .active {
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          border: 2rpx solid transparent;
-          color: #ffffff;
-          box-shadow: 0 4rpx 12rpx rgba(102, 126, 234, 0.3);
-          font-weight: 600;
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      gap: 20rpx;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-      
-      .btn-reset,
-      .btn-confirm {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        gap: 8rpx;
-        height: 88rpx;
-        border-radius: 12rpx;
-        font-size: 30rpx;
-        font-weight: 600;
-        transition: all 0.3s ease;
-        
-        &:active {
-          transform: scale(0.98);
-          opacity: 0.9;
-        }
-        
-        text {
-          line-height: 1;
-        }
-      }
-      
-      .btn-reset {
-        flex: 1;
-        background: #f5f7fa;
-        border: 2rpx solid #dcdfe6;
-        
-        text {
-          color: #606266;
-        }
-      }
-      
-      .btn-confirm {
-        flex: 1;
-        background: #667eea;
-        box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-        border: none;
-        
-        text {
-          color: #ffffff;
-        }
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-      margin-right: 16rpx;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      align-items: center;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        letter-spacing: 0.5rpx;
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-copy,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-copy {
-      background: rgba(250, 140, 22, 0.1);
-      color: #fa8c16;
-      border: 1rpx solid rgba(250, 140, 22, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStock/list.vue b/src/pages/health/medicineStock/list.vue
deleted file mode 100644
index eed1c07..0000000
--- a/src/pages/health/medicineStock/list.vue
+++ /dev/null
@@ -1,319 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.medicalName" border="false" type="select" @click="handleMedical"
-          placeholder="请选择药品" class="search-input" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header" @click="enterDetails(item)">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="shop" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.medicineName }} - 库存{{ item.leftCount }}{{ dictStr(item.unit, unitList) }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <!-- <view class="card-body">
-            <view class="info-row">
-              <view class="info-item">
-                <text class="info-label">规格总数</text>
-                <text class="info-value">{{ item.totalCount }}{{ dictStr(item.unit, unitList) }}</text>
-              </view>
-            </view>
-          </view> -->
-        </view>
-      </u-list-item>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
-        @confirm="handleMedicalConfirm"></u-picker>
-  </view>
-         <!--返回首页按钮 -->
-         <suspend></suspend>
-</template>
-
-<script setup>
-import { listMedicineRealtimeStock } from '@/api/health/medicineStockIn'
-import { listMedicineBasic } from '@/api/health/medicineBasic'
-import { getDicts } from '@/api/system/dict/data.js'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const stateList = ref([])
-
-const unitList = ref([])
-const medicalList = ref([])
-const showMedical = ref(false)
-const  flag= ref(true)
-const data = reactive({
-  filterPanel: false,
-  queryMedicalParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    name: null,
-    type: null,
-    healthRecordId: null,
-    dosingTime: null,
-    dosage: null,
-    medicineId: null,
-    resource: null,
-    place: null
-   } 
-})
-const { filterPanel, queryMedicalParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-  function selectType(item) {
-      queryParams.value.state = item.dictValue
-      stateList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listMedicineBasic(queryMedicalParams.value).then((response) => {
-        medicalList.value = [response.rows] 
-      })
-       // 用药地点
-       getDicts('medical_unit').then(res => {
-        unitList.value = res.data
-      })
-         
-      status.value = 'loading'
-      listMedicineRealtimeStock({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-
-    function handleMedical() {
-        if (medicalList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品名称为空  ', type: 'warning'
-          })
-        } else {
-          showMedical.value = true
-        }
-     }
-  function   handleMedicalConfirm(e) {
-    queryParams.value.medicalName = e.value[0].shortNameBrandPackaging
-    queryParams.value.medicineId= e.value[0].id
-        showMedical.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleMedicalCancel() {
-  showMedical.value = false
-  queryParams.value.medicalName = null
-  queryParams.value.medicineId = null
-  pageNum.value = 1
-  listData.value = []
-  getList()
-}
-
-
-
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-      margin-right: 16rpx;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      align-items: center;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        letter-spacing: 0.5rpx;
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStockIn/addEdit.vue b/src/pages/health/medicineStockIn/addEdit.vue
deleted file mode 100644
index 10212f9..0000000
--- a/src/pages/health/medicineStockIn/addEdit.vue
+++ /dev/null
@@ -1,565 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="药品入库清单"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="治疗类型" prop="marTypeName"  @click="handleMarType">
-              <u--input v-model="form.marTypeName" disabled disabledColor="#ffffff" placeholder="请选择治疗类型"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="药品名称" prop="medicineName" required @click="handleMedical">
-            <u--input v-model="form.medicineName" disabled disabledColor="#ffffff" placeholder="请选择药品名称"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="入库编号" prop="code" required >
-              <u--input v-model="form.code"  placeholder="请填写入库编号"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="入库数量" prop="quantity" required >
-              <u--input v-model="form.quantity"   @change="handleQuantityChange" placeholder="请填写入库数量"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="规格总数" prop="totalCount" required >
-              <u--input v-model="form.totalCount"  readonly placeholder="请填写规格总数"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="使用状态" prop="stateName" required  @click="handleState">
-              <u--input v-model="form.stateName" disabled disabledColor="#ffffff" placeholder="请选择使用状态"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="购买时间" prop="purchaseDate"  @click="selectDate()">
-            <u--input v-model="form.purchaseDate" disabled disabledColor="#ffffff" placeholder="请选择购买时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-   
-            <u-form-item label="生产日期" prop="productionDate"  @click="selectProductionDate()">
-            <u--input v-model="form.productionDate" disabled disabledColor="#ffffff" placeholder="请选择生产日期" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="过期日期" prop="expiringDate"   @click="selectExpiringDate()">
-            <u--input v-model="form.expiringDate" disabled disabledColor="#ffffff" placeholder="请选择过期日期" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-            <u-form-item label="包装单位" prop="packageUnitName"  @click="handlePackageUnit">
-              <u--input v-model="form.packageUnitName" disabled disabledColor="#ffffff" placeholder="请选择包装单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-  
-            <u-form-item label="规格单位" prop="unitName"  @click="handleUnit">
-              <u--input v-model="form.unitName" disabled disabledColor="#ffffff" placeholder="请选择规格单位"
-                inputAlign="right" border="none"></u--input>
-              <u-icon slot="right" name="arrow-down"></u-icon>
-            </u-form-item>
-            <u-form-item label="已使用数量" prop="usedCount"  >
-              <u--input v-model="form.usedCount"  placeholder="请填写已使用数量"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="剩余数量" prop="leftCount"  >
-              <u--input v-model="form.leftCount"  placeholder="请填写剩余数量"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="年龄体重" prop="ageWeight"  >
-              <u--input v-model="form.ageWeight"  placeholder="请填写年龄体重"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="药品单价" prop="purchasePrice"  >
-              <u--input v-model="form.purchasePrice"  placeholder="请填写药品单价"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="药品总价" prop="totalPrice"  >
-              <u--input v-model="form.totalPrice"  placeholder="请填写药品总价"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-            <u-form-item label="购买地址" prop="purchaseAddress"  labelPosition="top">
-              <u--input v-model="form.purchaseAddress"  placeholder="请填写购买地址"
-              inputAlign="right" border="none"></u--input>
-          </u-form-item>
-            <u-form-item label="医嘱" prop="usage"  labelPosition="top">
-            <u--textarea v-model="form.usage" placeholder="请填写医嘱" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-         
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-
-      <u-picker itemHeight="88" :show="showState" :columns="stateList" keyName="dictLabel" @cancel="handleStateCancel"
-        @confirm="handleStateConfirm"></u-picker>
-
-        <u-picker itemHeight="88" :show="showMarType" :columns="marTypeList" keyName="dictLabel" @cancel="handleMarTypeCancel"
-        @confirm="handleMarTypeConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
-      @confirm="handleMedicalConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showPackageUnit" :columns="packageUnitList" keyName="dictLabel" @cancel="handlePackageUnitCancel"
-      @confirm="handlePackageUnitConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showUnit" :columns="unitList" keyName="dictLabel" @cancel="handleUnitCancel"
-      @confirm="handleUnitConfirm"></u-picker>
-      <u-datetime-picker
-			:show="datePickShow"
-			mode="datetime"
-      ref="purchaseDateRef" 
-			@cancel="datePickShow=false"
-			@confirm="datePickConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-    <u-datetime-picker
-			:show="productionDateShow"
-			mode="date"
-      :minDate="-2209017600000"
-      ref="productionDateRef" 
-			@cancel="productionDateShow=false"
-			@confirm="productionDateConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-
-    <u-datetime-picker
-			:show="expiringDateShow"
-			mode="date"
-      :minDate="-2209017600000"
-      ref="expiringDateRef" 
-			@cancel="expiringDateShow=false"
-			@confirm="expiringDateConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import {  getMedicineStockIn, addMedicineStockIn, updateMedicineStockIn } from '@/api/health/medicineStockIn'
-import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const flag = ref('add')
-const title = ref("药品入库清单")
-
-const productionDateShow = ref(false)
-const expiringDateShow = ref(false)
-const medicalList = ref([])
-const showMedical = ref(false)
-
-const marTypeList = ref([])
-const showMarType = ref(false)
-
-const stateList = ref([])
-const showState = ref(false)
-
-const packageUnitList = ref([])
-const showPackageUnit = ref(false)
-
-const unitList = ref([])
-const showUnit = ref(false)
-
-const data = reactive({
-form: {
-  id: null,
-    medicineId: null,
-    quantity: 1,
-    productionDate: null,
-    expiringDate: null,
-    purchaseDate: null,
-    purchasePrice: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    code: null,
-    state: '0',
-    stateName: '未使用',
-    leftCount: null,
-    usedCount: null,
-    purchaseAddress: null,
-    totalPrice: null,
-    usage: null,
-    ageWeight: null,
-    totalCount: null,
-    unit: null,
-    packageUnit: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-},
-queryMedicineParams: {
-    pageNum: 1,
-    treatmentType: null,
-    pageSize: 1000
-  },
-rules: {
-  medicineName: [{ required: true, message: '药品名称不能为空', trigger: ['change', 'blur'] }],
-  quantity: [{type: 'number',  required: true, message: '数量不能为空', trigger: ['change', 'blur'] }],
-  // productionDate: [{ required: true, message: '生产日期不能为空', trigger: ['change', 'blur'] }],
-  // expiringDate: [{ required: true, message: '过期日期不能为空', trigger: ['change', 'blur'] }],
-  totalCount: [{ type: 'number', required: true, message: '规格总数不能为空', trigger: ['change', 'blur'] }],
-  
-  code: [{ type: 'number', required: true, message: '入库编号不能为空', trigger: ['change', 'blur'] }],
-
-  stateName: [{ required: true, message: '使用状态不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form,queryMedicineParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="药品入库清单-修改"
-     }else{
-      title.value="药品入库清单-新增"
-     }
-     }else{
-      title.value="药品入库清单-复制"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.purchaseDate = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-
- const handleQuantityChange = (val) => {
-  if(form.value.medicineId!=null){
-  getMedicineBasic(form.value.medicineId).then((response) => {
-    form.value.totalCount = response.data.specifications * val
-  })
-}
-}
-
- function  selectProductionDate() {
-      productionDateShow.value = true
-      proxy.$refs['productionDateRef'].innerValue = new Date().getTime()
-  }
-function productionDateConfirm(e) {
-      form.value.productionDate = dayjs(e.value).format("YYYY-MM-DD")
-      productionDateShow.value = false
-  }
-
-  function  selectExpiringDate() {
-    expiringDateShow.value = true
-      proxy.$refs['expiringDateRef'].innerValue = new Date().getTime()
-  }
-function expiringDateConfirm(e) {
-      form.value.expiringDate = dayjs(e.value).format("YYYY-MM-DD")
-      expiringDateShow.value = false
-  }
-function  getData() {
-  listMedicineBasic(queryMedicineParams.value).then((response) => {
-    medicalList.value = [response.rows] 
-  })
-     // 类型
-     getDicts('used_state').then(res => {
-        stateList.value =[res.data] 
-      })
-
-           // 类型
-     getDicts('mar_type').then(res => {
-        marTypeList.value =[res.data] 
-      })
-           // 类型
-     getDicts('medical_unit').then(res => {
-        unitList.value =[res.data] 
-      })
-         // 类型
-     getDicts('package_unit').then(res => {
-      packageUnitList.value =[res.data] 
-      })
-
-    if(form.value.id!=null){
-      getMedicineStockIn(form.value.id).then(res => {
-        form.value = res.data   
-     
-         getDicts('package_unit').then(result => {
-          form.value.packageUnitName=dictStr(form.value.packageUnit, result.data)
-         })
-                   // 药品来源
-        getDicts('medical_unit').then(result => {
-          form.value.unitName=dictStr(form.value.unit, result.data)
-         })
-                     // 药品来源
-        getDicts('used_state').then(result => {
-          form.value.stateName=dictStr(form.value.state, result.data)
-         })
-                // 用药类型
-           getDicts('mar_type').then(result => {
-          form.value.marTypeName=dictStr(form.value.type, result.data)
-         })
-      })
-    }else {
-
-      const date = new Date()
-  const year = date.getFullYear() // 年份
-  let month = date.getMonth() + 1 // 月份，返回值为0-11，所以需要加1
-  let day = date.getDate() // 日期
-  let hour = date.getHours()
-  let minute = date.getMinutes()
-  let second = date.getSeconds()
-  // 对月份和日期进行补零
-  month = month < 10 ? '0' + month : month.toString()
-  day = day < 10 ? '0' + day : day.toString()
-  hour = hour < 10 ? '0' + hour : hour.toString()
-  minute = minute < 10 ? '0' + minute : minute.toString()
-  second = second < 10 ? '0' + second : second.toString()
-  const currentDate = year + month + day + hour + minute + second
-  form.value.code = currentDate
-    }
-}
-
-function handlePackageUnit() {
-        if (packageUnitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品来源为空  ', type: 'warning'
-          })
-        } else {
-          showPackageUnit.value = true
-        }
-     }
-  function   handlePackageUnitConfirm(e) {
-        form.value.packageUnitName = e.value[0].dictLabel
-        form.value.packageUnit = e.value[0].dictValue
-        showPackageUnit.value = false
-  }
- function handlePackageUnitCancel() {
-  showPackageUnit.value = false
-      }
-  function handleMedical() {
-      if (medicalList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '药品为空  ', type: 'warning'
-        })
-      } else {
-        showMedical.value = true
-      }
-   }
-function   handleMedicalConfirm(e) {
-     form.value.medicineName = e.value[0].shortNameBrandPackaging
-     form.value.name = e.value[0].shortNameBrandPackaging
-      form.value.medicineId = e.value[0].id
-      getMedicineBasic(e.value[0].id).then((response) => {
-    form.value.unit = response.data.unit
-       // 药品来源
-         getDicts('medical_unit').then(result => {
-          form.value.unitName=dictStr( response.data.unit, result.data)
-         })
-         form.value.packageUnit = response.data.packageUnit
-         form.value.totalCount = response.data.specifications
-         if (form.value.quantity != null) {
-             form.value.totalCount = response.data.specifications * form.value.quantity
-        }
-       // 药品来源
-         getDicts('package_unit').then(result => {
-          form.value.packageUnitName=dictStr( response.data.packageUnit, result.data)
-         })
-
-
-  })
-      showMedical.value = false
-      
-}
-function handleMedicalCancel() {
-     showMedical.value = false
-  }
-
-
-function handleState() {
-        if (stateList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '使用状态为空  ', type: 'warning'
-          })
-        } else {
-          showState.value = true
-        }
-     }
-  function   handleStateConfirm(e) {
-        form.value.stateName = e.value[0].dictLabel
-        form.value.state = e.value[0].dictValue
-        showState.value = false
-  }
- function handleStateCancel() {
-      showState.value = false
-      }
-
-      function handleUnit() {
-        if (unitList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '规格单位为空  ', type: 'warning'
-          })
-        } else {
-          showUnit.value = true
-        }
-     }
-  function   handleUnitConfirm(e) {
-        form.value.unitName = e.value[0].dictLabel
-        form.value.unit = e.value[0].dictValue
-        showUnit.value = false
-  }
- function handleUnitCancel() {
-      showUnit.value = false
-      }
-
-     
-
-  function handleMarType() {
-        if (marTypeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '治疗类型为空  ', type: 'warning'
-          })
-        } else {
-          showMarType.value = true
-        }
-     }
-  function   handleMarTypeConfirm(e) {
-        form.value.marTypeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-
-        queryMedicineParams.value.treatmentType = e.value[0].dictValue
-        form.value.medicineName = ""
-     form.value.name = ""
-      form.value.medicineId = null
-  listMedicineBasic(queryMedicineParams.value).then((response) => {
-    medicalList.value = [response.rows] 
-  })
-
-        showMarType.value = false
-  }
- function handleMarTypeCancel() {
-       showMarType.value = false
-      }
-
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['purchaseDateRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.purchaseDate = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-        if(flag.value==null){
-          updateMedicineStockIn(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addMedicineStockIn(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
-            }
-          })
-        })
-          }
-        }else {
-          addMedicineStockIn(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/medicineStockIn/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStockIn/details.vue b/src/pages/health/medicineStockIn/details.vue
deleted file mode 100644
index 4c7156b..0000000
--- a/src/pages/health/medicineStockIn/details.vue
+++ /dev/null
@@ -1,298 +0,0 @@
-<template>
-    <view class="container" style="paddingBottom:1rpx;">
-      <u-navbar
-			leftIconSize="40rpx"
-			leftIconColor="#333333"
-			title="药品入库清单详情"
-		>
-		</u-navbar>
-      <view class="detail-card">
-        <view class="card-header">
-          <view class="header-icon">
-            <uni-icons type="plusempty" size="24" color="#ffffff"></uni-icons>
-          </view>
-          <view class="header-info">
-            <text class="card-name">{{ detailInfo.medicineName }}</text>
-          </view>
-        </view>
-        
-        <view class="card-body">
-          <view class="info-section">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>入库信息</text>
-            </view>
-            <view class="info-list">
-              <view class="list-item">
-                <text class="item-label">入库编号</text>
-                <text class="item-value">{{ detailInfo.code || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">入库数量</text>
-                <text class="item-value">{{ detailInfo.quantity || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">购买时间</text>
-                <text class="item-value">{{ detailInfo.purchaseDate || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">使用状态</text>
-                <text class="item-value">{{ detailInfo.state || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">生产日期</text>
-                <text class="item-value">{{ detailInfo.productionDate || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">过期日期</text>
-                <text class="item-value">{{ detailInfo.expiringDate || '-' }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="info-section">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>规格信息</text>
-            </view>
-            <view class="info-list">
-              <view class="list-item">
-                <text class="item-label">包装单位</text>
-                <text class="item-value">{{ detailInfo.packageUnit || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">规格总数</text>
-                <text class="item-value">{{ detailInfo.totalCount || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">规格单位</text>
-                <text class="item-value">{{ detailInfo.unit || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">已使用数量</text>
-                <text class="item-value">{{ detailInfo.usedCount || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">剩余数量</text>
-                <text class="item-value">{{ detailInfo.leftCount || '-' }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="info-section">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>价格信息</text>
-            </view>
-            <view class="info-list">
-              <view class="list-item">
-                <text class="item-label">药品单价</text>
-                <text class="item-value">{{ detailInfo.purchasePrice || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">药品总价</text>
-                <text class="item-value">{{ detailInfo.totalPrice || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">年龄体重</text>
-                <text class="item-value">{{ detailInfo.ageWeight || '-' }}</text>
-              </view>
-              <view class="list-item">
-                <text class="item-label">购买地址</text>
-                <text class="item-value">{{ detailInfo.purchaseAddress || '-' }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="info-section" v-if="detailInfo.usage">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>医嘱</text>
-            </view>
-            <view class="remark-content">
-              <text>{{ detailInfo.usage }}</text>
-            </view>
-          </view>
-          
-          <view class="info-section" v-if="detailInfo.remark">
-            <view class="section-title">
-              <view class="title-icon"></view>
-              <text>备注</text>
-            </view>
-            <view class="remark-content">
-              <text>{{ detailInfo.remark }}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-      <u-toast ref="uToast"></u-toast>
-    </view>
-  </template>
-  
-<script setup>
-import { getMedicineStockIn } from '@/api/health/medicineStockIn'
-import { getDicts } from '@/api/system/dict/data.js'
-import {onLoad} from "@dcloudio/uni-app";
-import {reactive ,toRefs,ref,computed }from "vue";
-const id = ref('')
-const data = reactive({
-  detailInfo: {} 
-})
-const {detailInfo} = toRefs(data)
-onLoad((option) => {
-    id.value = option.id
-    getInfo()
-  })
-  function getInfo() {
-    getMedicineStockIn(id.value).then(res => {
-          detailInfo.value = res.data
-
-       // 类型
-       getDicts('used_state').then(result => {
-         detailInfo.value.state=dictStr(detailInfo.value.state, result.data)
-      })
-       // 类型
-       getDicts('package_unit').then(result => {
-         detailInfo.value.packageUnit=dictStr(detailInfo.value.packageUnit, result.data)
-      })
-    
-       // 类型
-       getDicts('medical_unit').then(result => {
-         detailInfo.value.unit=dictStr(detailInfo.value.unit, result.data)
-      })
-       
-        })
-  }
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-  </script>
-  
-  <style lang="scss" scoped>
-.container {
-  background: #f5f7fa;
-  padding-bottom: 24rpx;
-}
-
-.detail-card {
-  margin: 24rpx;
-  background: #ffffff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-}
-
-.card-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 16rpx 20rpx;
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-  
-  .header-icon {
-    width: 48rpx;
-    height: 48rpx;
-    background: rgba(255, 255, 255, 0.2);
-    border-radius: 16rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-right: 12rpx;
-    backdrop-filter: blur(10rpx);
-  }
-  
-  .header-info {
-    flex: 1;
-    min-width: 0;
-    overflow: hidden;
-    
-    .card-name {
-      color: #ffffff;
-      font-size: 28rpx;
-      font-weight: 600;
-      line-height: 1.2;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-  }
-}
-
-.card-body {
-  padding: 24rpx;
-}
-
-.info-section {
-  margin-bottom: 32rpx;
-  
-  &:last-child {
-    margin-bottom: 0;
-  }
-  
-  .section-title {
-    display: flex;
-    align-items: center;
-    margin-bottom: 20rpx;
-    
-    .title-icon {
-      width: 6rpx;
-      height: 28rpx;
-      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-    
-    text {
-      color: #2c3e50;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-  }
-  
-  .info-list {
-    .list-item {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding: 20rpx;
-      background: #f8f9fa;
-      border-radius: 8rpx;
-      margin-bottom: 12rpx;
-      
-      &:last-child {
-        margin-bottom: 0;
-      }
-      
-      .item-label {
-        color: #7f8c8d;
-        font-size: 26rpx;
-      }
-      
-      .item-value {
-        color: #2c3e50;
-        font-size: 28rpx;
-        font-weight: 500;
-        text-align: right;
-      }
-    }
-  }
-  
-  .remark-content {
-    padding: 20rpx;
-    background: #f8f9fa;
-    border-radius: 8rpx;
-    
-    text {
-      color: #2c3e50;
-      font-size: 26rpx;
-      line-height: 1.6;
-    }
-  }
-}
-  </style>
\ No newline at end of file
diff --git a/src/pages/health/medicineStockIn/list.vue b/src/pages/health/medicineStockIn/list.vue
deleted file mode 100644
index a38ce1e..0000000
--- a/src/pages/health/medicineStockIn/list.vue
+++ /dev/null
@@ -1,713 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.medicalName" border="false" type="select" @click="handleMedical"
-          placeholder="请选择药品" class="search-input" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-        <view class="add-btn" @click="handleAdd()">
-          <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-          <text>新增</text>
-        </view>
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">使用状态</view>
-              <view class="state-list">
-                <view v-for="item in stateList" :key="item.id" class="state-item"
-                  :class="item.selected ? 'active' : ''" @click="selectType(item)">{{ item.dictLabel }}</view>
-              </view>
-              <view class="filter-title">购买时间</view>
-              <view class="selcet-content" style="padding: 0 24rpx">
-                <u-input
-                  :disabled="true"
-                  :disabledColor="'#fff'"
-                  class="dateInput"
-                  border="surround"
-                  v-model="queryParams.startTime"
-                  placeholder="请选择开始时间"
-                >
-                  <template v-slot:suffix>
-                    <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                  </template>
-                </u-input>
-                <u-input
-                  :disabled="true"
-                  :disabledColor="'#fff'"
-                  class="dateInput"
-                  border="surround"
-                  v-model="queryParams.endTime"
-                  placeholder="请选择结束时间"
-                >
-                  <template v-slot:suffix>
-                    <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                  </template>
-                </u-input>
-              </view>
-            </view>
-            <view class="btn-box">
-              <view class="btn-reset" @click="resetQuery()">
-                <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-                <text>重置</text>
-              </view>
-              <view class="btn-confirm" @click="searchSubmit()">
-                <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-                <text>确定</text>
-              </view>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="date"
-              :minDate="-2209017600000"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item" @click="enterDetails(item)">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="download-filled" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.medicineName }} - 入库{{ item.quantity }}{{ dictStr(item.packageUnit, packageUnitList) }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item">
-                <text class="info-label">购买时间</text>
-                <text class="info-value">{{ item.purchaseDate || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">使用状态</text>
-                <text class="info-value">{{ dictStr(item.state, stateList) || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">入库编号</text>
-                <text class="info-value">{{ item.code || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">过期日期</text>
-                <text class="info-value">{{ item.expiringDate || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">规格总数</text>
-                <text class="info-value">{{ item.totalCount }}{{ dictStr(item.unit, unitList) }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">剩余数量</text>
-                <text class="info-value">{{ item.leftCount }}{{ dictStr(item.unit, unitList) }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.remark">
-                <text class="info-label">备注</text>
-                <text class="info-value">{{ item.remark }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="operate" @click.stop>
-            <view class="btn-edit" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-copy" @click="handleCopy(item)">
-              <uni-icons type="copy" size="16" color="#fa8c16"></uni-icons>
-              <text>复制</text>
-            </view>
-            <view class="btn-delete" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showMedical" :columns="medicalList" keyName="shortNameBrandPackaging" @cancel="handleMedicalCancel"
-        @confirm="handleMedicalConfirm"></u-picker>
-  </view>
-         <!--返回首页按钮 -->
-         <suspend></suspend>
-</template>
-
-<script setup>
-import { listMedicineStockIn,  delMedicineStockIn,  } from '@/api/health/medicineStockIn'
-import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const stateList = ref([])
-
-const unitList = ref([])
-const packageUnitList = ref([])
-const medicalList = ref([])
-const showMedical = ref(false)
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryMedicalParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    name: null,
-    type: null,
-    healthRecordId: null,
-    dosingTime: null,
-    dosage: null,
-    medicalId: null,
-    resource: null,
-    place: null
-   } 
-})
-const { filterPanel, queryMedicalParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-  function selectType(item) {
-      queryParams.value.state = item.dictValue
-      stateList.value.map(ele => {
-        if (ele.dictValue == item.dictValue) {
-          ele.selected = true
-          Reflect.set(ele, 'selected', true)
-        } else {
-          Reflect.set(ele, 'selected', false)
-        }
-      })
-    }
-
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listMedicineBasic(queryMedicalParams.value).then((response) => {
-        medicalList.value = [response.rows] 
-      })
-       // 使用状态
-       getDicts('used_state').then(res => {
-        stateList.value = res.data
-      })
-       // 用药地点
-       getDicts('medical_unit').then(res => {
-        unitList.value = res.data
-      })
-            // 单位
-            getDicts('package_unit').then(res => {
-              packageUnitList.value = res.data
-      })
-
-      status.value = 'loading'
-      listMedicineStockIn({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handleMedical() {
-        if (medicalList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '药品名称为空  ', type: 'warning'
-          })
-        } else {
-          showMedical.value = true
-        }
-     }
-  function   handleMedicalConfirm(e) {
-    queryParams.value.medicalName = e.value[0].shortNameBrandPackaging
-    queryParams.value.medicineId= e.value[0].id
-        showMedical.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleMedicalCancel() {
-       showMedical.value = false
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.medicalName = ''
-       queryParams.value.state = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        
-        queryParams.value.endTime = ''
-        queryParams.value.medicineId = ''
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/medicineStockIn/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/medicineStockIn/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/medicineStockIn/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/medicineStockIn/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        title: '确认删除',
-        content: '确定要删除这条记录吗？',
-        confirmText: '删除',
-        cancelText: '取消',
-        confirmColor: '#f5576c',
-        cancelColor: '#909399',
-        success: function (res) {
-          if (res.confirm) {
-            delMedicineStockIn(item.id).then(() => {
-              uni.showToast({
-                title: '删除成功',
-                icon: 'success'
-              })
-              pageNum.value = 1
-              listData.value = []
-              getList()
-            })
-          }
-        }
-      });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-  }
-  
-  .add-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    margin-left: 10rpx;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-  }
-  
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-    z-index: 999;
-
-    .filter-panel-content {
-      background-color: #ffffff;
-      padding: 0 30rpx 30rpx;
-      border-radius: 16rpx 16rpx 0 0;
-
-      .filter-title {
-        color: #2c3e50;
-        font-size: 32rpx;
-        font-weight: 600;
-        padding: 32rpx 0 24rpx 20rpx;
-        position: relative;
-        display: flex;
-        align-items: center;
-        
-        &::before {
-          content: '';
-          width: 6rpx;
-          height: 32rpx;
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          border-radius: 3rpx;
-          margin-right: 12rpx;
-          flex-shrink: 0;
-        }
-      }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        gap: 16rpx;
-
-        .state-item {
-          padding: 0 32rpx;
-          height: 68rpx;
-          border: 2rpx solid #e8edf3;
-          border-radius: 34rpx;
-          text-align: center;
-          line-height: 68rpx;
-          font-size: 28rpx;
-          color: #666666;
-          transition: all 0.3s ease;
-          background: #ffffff;
-          box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-          
-          &:active {
-            transform: scale(0.95);
-          }
-        }
-
-        .active {
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          border: 2rpx solid transparent;
-          color: #ffffff;
-          box-shadow: 0 4rpx 12rpx rgba(102, 126, 234, 0.3);
-          font-weight: 600;
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      gap: 20rpx;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-      
-      .btn-reset,
-      .btn-confirm {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        gap: 8rpx;
-        height: 88rpx;
-        border-radius: 12rpx;
-        font-size: 30rpx;
-        font-weight: 600;
-        transition: all 0.3s ease;
-        
-        &:active {
-          transform: scale(0.98);
-          opacity: 0.9;
-        }
-        
-        text {
-          line-height: 1;
-        }
-      }
-      
-      .btn-reset {
-        flex: 1;
-        background: #f5f7fa;
-        border: 2rpx solid #dcdfe6;
-        
-        text {
-          color: #606266;
-        }
-      }
-      
-      .btn-confirm {
-        flex: 1;
-        background: #667eea;
-        box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-        border: none;
-        
-        text {
-          color: #ffffff;
-        }
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-      margin-right: 16rpx;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      align-items: center;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        letter-spacing: 0.5rpx;
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-copy,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-copy {
-      background: rgba(250, 140, 22, 0.1);
-      color: #fa8c16;
-      border: 1rpx solid rgba(250, 140, 22, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/milkPowderRecord/addEdit.vue b/src/pages/health/milkPowderRecord/addEdit.vue
deleted file mode 100644
index a2d1634..0000000
--- a/src/pages/health/milkPowderRecord/addEdit.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="吃奶记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="吃奶时间" prop="sucklesTime" required @click="selectDate()">
-            <u--input v-model="form.sucklesTime" disabled disabledColor="#ffffff" placeholder="请选择吃奶时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="吃奶量" required prop="consumption" >
-            <u--input v-model="form.consumption"  type="number" placeholder="请填写吃奶量"
-              inputAlign="right" border="none">
-              <template #suffix>
-        <up-text
-          text="毫升"
-        ></up-text>
-      </template>
-            </u--input>
-          </u-form-item>
-          <u-form-item label="奶粉品牌" prop="milkPowderBrand"  >
-              <u--input v-model="form.milkPowderBrand"  placeholder="请填写奶粉品牌"
-                inputAlign="right" border="none"></u--input>
-            </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-datetime-picker
-    :show="datePickShow"
-    mode="datetime"
-    ref="sucklesTimeRef" 
-    @cancel="datePickShow=false"
-    @confirm="datePickConfirm"
-    itemHeight="88"
-  ></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { listMilkPowderRecord, getMilkPowderRecord, delMilkPowderRecord, addMilkPowderRecord, updateMilkPowderRecord } from '@/api/health/milkPowderRecord'
-import { listPerson, } from '@/api/health/person'
-const { proxy } = getCurrentInstance()
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const showPerson = ref(false)
-const title = ref("吃奶记录")
-const personList = ref([])
-const data = reactive({
-form: {
-  id: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    sucklesTime: null,
-    consumption: null,
-    personId: null,
-    milkPowderBrand: null,
-    spoonful: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-rules: {
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  sucklesTime: [{ required: true, message: '吃奶时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     if(form.value.id!=null){
-      title.value="吃奶记录-修改"
-     }else{
-      title.value="吃奶记录-新增"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.sucklesTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function  getData() {
-    listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-     }
-     })
-  
-    if(form.value.id!=null){
-      getMilkPowderRecord(form.value.id).then(res => {
-        form.value = res.data   
-      })
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['sucklesTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.sucklesTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          updateMilkPowderRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/milkPowderRecord/list` })
-            }
-          })
-        })
-        }else {
-          addMilkPowderRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/milkPowderRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/milkPowderRecord/list.vue b/src/pages/health/milkPowderRecord/list.vue
deleted file mode 100644
index 1b9ed4c..0000000
--- a/src/pages/health/milkPowderRecord/list.vue
+++ /dev/null
@@ -1,620 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.personName" border="false" type="select" @click="handlePerson"
-          placeholder="请选择人员" class="search-input" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-        <view class="add-btn" @click="handleAdd()">
-          <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-          <text>新增</text>
-        </view>
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">吃奶日期</view>
-              <view class="selcet-content" style="padding: 0 24rpx">
-                <u-input
-                  :disabled="true"
-                  :disabledColor="'#fff'"
-                  class="dateInput"
-                  border="surround"
-                  v-model="queryParams.startTime"
-                  placeholder="请选择开始时间"
-                >
-                  <template v-slot:suffix>
-                    <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                  </template>
-                </u-input>
-                <u-input
-                  :disabled="true"
-                  :disabledColor="'#fff'"
-                  class="dateInput"
-                  border="surround"
-                  v-model="queryParams.endTime"
-                  placeholder="请选择结束时间"
-                >
-                  <template v-slot:suffix>
-                    <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                  </template>
-                </u-input>
-              </view>
-            </view>
-            <view class="btn-box">
-              <view class="btn-reset" @click="resetQuery()">
-                <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-                <text>重置</text>
-              </view>
-              <view class="btn-confirm" @click="searchSubmit()">
-                <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-                <text>确定</text>
-              </view>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="date"
-              
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="gift-filled" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.personName }} - {{ item.sucklesTime }}</text>
-              </view>
-            </view>
-            <view class="balance-section">
-              <text class="balance-value">{{ item.consumption }}<text class="balance-label">毫升</text></text>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item">
-                <text class="info-label">奶粉品牌</text>
-                <text class="info-value">{{ item.milkPowderBrand || '--' }}</text>
-              </view>
-              <view class="info-item" v-if="item.remark">
-                <text class="info-label">备注</text>
-                <text class="info-value">{{ item.remark }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="operate" @click.stop>
-            <view class="btn-edit" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-delete" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-  </view>
-     <!--返回首页按钮 -->
-     <suspend></suspend>  
-</template>
-
-<script setup>
-import { listMilkPowderRecord, getMilkPowderRecord, delMilkPowderRecord, addMilkPowderRecord, updateMilkPowderRecord } from '@/api/health/milkPowderRecord'
-import { listPerson } from '@/api/health/person'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    measureTime: null,
-    weight: null,
-    personId: null,
-    height: null
-   } 
-})
-const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-      status.value = 'loading'
-      listMilkPowderRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-        showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handlePersonCancel() {
-  queryParams.value.personName = ''
-        queryParams.value.personId = ''
-       showPerson.value = false
-       pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-          queryParams.value.personName = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/milkPowderRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/milkPowderRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        title: '确认删除',
-        content: '确定要删除这条记录吗？',
-        confirmText: '删除',
-        cancelText: '取消',
-        confirmColor: '#f5576c',
-        cancelColor: '#909399',
-        success: function (res) {
-          if (res.confirm) {
-            delMilkPowderRecord(item.id).then(() => {
-              uni.showToast({
-                title: '删除成功',
-                icon: 'success'
-              })
-              pageNum.value = 1
-              listData.value = []
-              getList()
-            })
-          }
-        }
-      });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-  }
-  
-  .add-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    margin-left: 10rpx;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-  }
-  
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-    z-index: 999;
-
-    .filter-panel-content {
-      background-color: #ffffff;
-      padding: 0 30rpx 30rpx;
-      border-radius: 16rpx 16rpx 0 0;
-
-      .filter-title {
-        color: #2c3e50;
-        font-size: 32rpx;
-        font-weight: 600;
-        padding: 32rpx 0 24rpx 20rpx;
-        position: relative;
-        display: flex;
-        align-items: center;
-        
-        &::before {
-          content: '';
-          width: 6rpx;
-          height: 32rpx;
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          border-radius: 3rpx;
-          margin-right: 12rpx;
-          flex-shrink: 0;
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      gap: 20rpx;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-      
-      .btn-reset,
-      .btn-confirm {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        gap: 8rpx;
-        height: 88rpx;
-        border-radius: 12rpx;
-        font-size: 30rpx;
-        font-weight: 600;
-        transition: all 0.3s ease;
-        
-        &:active {
-          transform: scale(0.98);
-          opacity: 0.9;
-        }
-        
-        text {
-          line-height: 1;
-        }
-      }
-      
-      .btn-reset {
-        flex: 1;
-        background: #f5f7fa;
-        border: 2rpx solid #dcdfe6;
-        
-        text {
-          color: #606266;
-        }
-      }
-      
-      .btn-confirm {
-        flex: 1;
-        background: #667eea;
-        box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-        border: none;
-        
-        text {
-          color: #ffffff;
-        }
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-      margin-right: 16rpx;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      align-items: center;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        letter-spacing: 0.5rpx;
-      }
-    }
-    
-    .balance-section {
-      display: flex;
-      align-items: center;
-      flex-shrink: 0;
-      white-space: nowrap;
-      
-      .balance-value {
-        color: #fa8c16;
-        font-size: 32rpx;
-        font-weight: 700;
-        line-height: 1;
-        white-space: nowrap;
-        
-        .balance-label {
-          color: rgba(255, 255, 255, 0.85);
-          font-size: 22rpx;
-          font-weight: 400;
-          margin-left: 4rpx;
-        }
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/person/addEdit.vue b/src/pages/health/person/addEdit.vue
deleted file mode 100644
index 60b7d54..0000000
--- a/src/pages/health/person/addEdit.vue
+++ /dev/null
@@ -1,303 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="成员管理"
-  >
-  </u-navbar>
-  <view class="section">
-    <view class="section-title">{{ title}}</view>
-    <view class="form-view">
-      <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-        :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-        <u-form-item label="姓名" prop="name" required >
-            <u--input v-model="form.name"  placeholder="请填写姓名"
-              inputAlign="right" border="none"></u--input>
-          </u-form-item>
-          <u-form-item label="昵称" prop="nickName" required >
-            <u--input v-model="form.nickName"  placeholder="请填写昵称"
-              inputAlign="right" border="none"></u--input>
-          </u-form-item>
-        <u-form-item label="类型" prop="typeName" required @click="handleType">
-            <u--input v-model="form.typeName" disabled disabledColor="#ffffff" placeholder="请选择类型"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-        
-          <u-form-item label="生日" prop="birthday" required @click="selectBirthday()">
-          <u--input v-model="form.birthday" disabled disabledColor="#ffffff" placeholder="请选择生日" inputAlign="right" border="none"></u--input>
-        <u-icon slot="right" name="arrow-right"></u-icon>
-        </u-form-item>
-        <u-form-item label="性别" prop="sexName" required @click="handleSex">
-            <u--input v-model="form.sexName" disabled disabledColor="#ffffff" placeholder="请选择性别"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="身份证" prop="identityCard" >
-            <u--input v-model="form.identityCard"  placeholder="请填写身份证"
-              inputAlign="right" border="none"></u--input>
-          </u-form-item>
-        <u-form-item label="身高" prop="height" >
-            <u--input v-model="form.height"  placeholder="请填写身高"
-              inputAlign="right" border="none">
-              <template #suffix>
-					<up-text
-						text="CM"
-					></up-text>
-				</template></u--input>
-          </u-form-item>
-          <u-form-item label="体重" prop="weight" >
-            <u--input v-model="form.weight"  placeholder="请填写体重"
-              inputAlign="right" border="none">
-              <template #suffix>
-					<up-text
-						text="KG"
-					></up-text>
-				</template></u--input>
-          </u-form-item>
-         
-        <u-form-item label="备注" prop="remark"  labelPosition="top">
-          <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-            maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-        </u-form-item>
-      </u--form>
-      <view class="form-btn">
-        <u-button type="primary" text="提交" @click="submit"></u-button>
-      </view>
-    </view>
-  </view>
-    <u-toast ref="uToast"></u-toast>
-        <u-picker itemHeight="88" :show="showType" :columns="typeList" keyName="dictLabel" @cancel="handleTypeCancel"
-        @confirm="handleTypeConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showSex" :columns="sexList" keyName="dictLabel" @cancel="handleSexCancel"
-        @confirm="handleSexConfirm"></u-picker>
-      <u-datetime-picker
-			:show="birthdayShow"
-			mode="date"
-      :minDate="-2209017600000"
-      ref="birthdayRef" 
-			@cancel="birthdayShow=false"
-			@confirm="birthdayConfirm"
-			itemHeight="88"
-		></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getPerson,addPerson, updatePerson } from '@/api/health/person'
-const { proxy } = getCurrentInstance()
-  import { getDicts } from '@/api/system/dict/data.js'
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const birthdayShow = ref(false)
-const title = ref("成员管理")
-
-const typeList = ref([])
-const showType = ref(false)
-
-const sexList = ref([])
-const showSex = ref(false)
-
-const data = reactive({
-form: {
-  id: null,
-  id: null,
-    name: null,
-    type: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    birthday: null,
-    nickName: null,
-    height: null,
-    weight: null,
-    sex: null,
-    identityCard: null,
-    ranking: 0
-},
-rules: {
-  name: [{ required: true, message: '姓名不能为空', trigger:['change', 'blur'] }],
-  nickName: [{ required: true, message: '昵称不能为空', trigger: ['change', 'blur'] }],
-  birthday: [{ required: true, message: '生日不能为空', trigger: ['change', 'blur'] }],
-  typeName: [{ required: true, message: '类型不能为空', trigger: ['change', 'blur'] }],
-  sexName: [{ required: true, message: '性别不能为空', trigger: ['change', 'blur'] }],
-}
-})
-const { form, rules} = toRefs(data)
-
-
-onLoad((option) => {
-     form.value.id = option.id
-     if(form.value.id!=null){
-      title.value="成员管理-修改"
-     }else{
-      title.value="成员管理-新增"
-     }
-    getData()
-})
-onReady(() => {
-    //  form.value.birthday = dayjs(new Date().getTime()).format("YYYY-MM-DD")
-})
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
- }
-function  getData() {
-     // 类型
-     getDicts('person_type').then(res => {
-        typeList.value =[res.data] 
-      })
-           // 类型
-     getDicts('sys_user_sex').then(res => {
-        sexList.value =[res.data] 
-      })
-    if(form.value.id!=null){
-      getPerson(form.value.id).then(res => {
-        form.value = res.data   
-            // 类型
-           getDicts('person_type').then(result => {
-          form.value.typeName=dictStr(form.value.type, result.data)
-         })
-                  // 类型
-                  getDicts('sys_user_sex').then(result => {
-          form.value.sexName=dictStr(form.value.sex, result.data)
-         })
-      })
-    }
-}
-
-
-  function handleType() {
-        if (typeList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '类型为空  ', type: 'warning'
-          })
-        } else {
-          showType.value = true
-        }
-     }
-  function   handleTypeConfirm(e) {
-        form.value.typeName = e.value[0].dictLabel
-        form.value.type = e.value[0].dictValue
-        showType.value = false
-  }
- function handleTypeCancel() {
-       showType.value = false
-      }
-
-      function handleSex() {
-        if (sexList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '性别为空  ', type: 'warning'
-          })
-        } else {
-          showSex.value = true
-        }
-     }
-  function   handleSexConfirm(e) {
-        form.value.sexName = e.value[0].dictLabel
-        form.value.sex = e.value[0].dictValue
-        showSex.value = false
-  }
- function handleSexCancel() {
-       showSex.value = false
-      }
-
-function  selectBirthday() {
-      birthdayShow.value = true
-      proxy.$refs['birthdayRef'].innerValue = new Date().getTime()
-  }
-function birthdayConfirm(e) {
-      form.value.birthday = dayjs(e.value).format("YYYY-MM-DD")
-      birthdayShow.value = false
-  }
-
-
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-          updatePerson(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/person/list` })
-            }
-          })
-        })
-        }else {
-          addPerson(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/person/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/person/list.vue b/src/pages/health/person/list.vue
deleted file mode 100644
index 3090d46..0000000
--- a/src/pages/health/person/list.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.name" border="false" placeholder="请输入名称或昵称" class="search-input"
-          @blur="handleSearch" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-        <view class="add-btn" @click="handleAdd()">
-          <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-          <text>新增</text>
-        </view>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="person-filled" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.name }}（{{ item.nickName }}）</text>
-                <text class="card-code">{{ dictStr(item.sex, sexList) }} · {{ dictStr(item.type, typeList) }} · {{ item.age }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item" v-if="item.birthday">
-                <text class="info-label">生日</text>
-                <text class="info-value">{{ item.birthday }}</text>
-              </view>
-              <view class="info-item" v-if="item.identityCard">
-                <text class="info-label">身份证</text>
-                <text class="info-value">{{ item.identityCard }}</text>
-              </view>
-              <view class="info-item" v-if="item.height">
-                <text class="info-label">身高（CM）</text>
-                <text class="info-value">{{ item.height }}</text>
-              </view>
-              <view class="info-item" v-if="item.weight">
-                <text class="info-label">体重（KG）</text>
-                <text class="info-value">{{ item.weight }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.remark">
-                <text class="info-label">备注</text>
-                <text class="info-value">{{ item.remark }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="operate" @click.stop>
-            <view class="btn-edit" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-delete" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-  </view>
-         <!--返回首页按钮 -->
-         <suspend></suspend>
-</template>
-
-<script setup>
-import { listPerson, delPerson } from '@/api/health/person'
-import { getDicts } from '@/api/system/dict/data.js'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const typeList = ref([])
-const sexList = ref([])
-const  flag= ref(true)
-const data = reactive({
-  filterPanel: false,
-  queryParams: {
-    name: null,
-    type: null,
-    nickName: null
-   } 
-})
-const { filterPanel, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function handleSearch() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-     }
-
-  function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-       // 类型
-       getDicts('person_type').then(res => {
-        typeList.value = res.data
-      })
-      // 类型
-        getDicts('sys_user_sex').then(res => {
-        sexList.value = res.data
-      })
-      status.value = 'loading'
-      listPerson({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/person/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/person/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        title: '确认删除',
-        content: '确定要删除这条记录吗？',
-        confirmText: '删除',
-        cancelText: '取消',
-        confirmColor: '#f5576c',
-        cancelColor: '#909399',
-        success: function (res) {
-          if (res.confirm) {
-            delPerson(item.id).then(() => {
-              uni.showToast({
-                title: '删除成功',
-                icon: 'success'
-              })
-              pageNum.value = 1
-              listData.value = []
-              getList()
-            })
-          }
-        }
-      });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-    display: flex;
-    align-items: center;
-  }
-  
-  .add-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      gap: 12rpx;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex-shrink: 0;
-        letter-spacing: 0.5rpx;
-      }
-      
-      .card-code {
-        color: rgba(255, 255, 255, 0.9);
-        font-size: 28rpx;
-        font-weight: 500;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex: 1;
-        min-width: 0;
-        letter-spacing: 0.3rpx;
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/processRecord/addEdit.vue b/src/pages/health/processRecord/addEdit.vue
deleted file mode 100644
index 60ad5c6..0000000
--- a/src/pages/health/processRecord/addEdit.vue
+++ /dev/null
@@ -1,306 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="档案过程记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="健康档案" prop="healthRecordName" required @click="handHealthRecord">
-            <u--input v-model="form.healthRecordName" disabled disabledColor="#ffffff" placeholder="请选择健康档案"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="记录时间" prop="recordingTime" required @click="selectDate()">
-            <u--input v-model="form.recordingTime" disabled disabledColor="#ffffff" placeholder="请选择记录时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="记录内容" required prop="content" >
-            <u--textarea v-model="form.content" placeholder="请填写记录内容" border="none" autoHeight inputAlign="right" count
-            maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handHealthRecordCancel"
-      @confirm="handHealthRecordConfirm"></u-picker>
-      <u-datetime-picker
-    :show="datePickShow"
-    mode="datetime"
-    ref="recordingTimeRef" 
-    @cancel="datePickShow=false"
-    @confirm="datePickConfirm"
-    itemHeight="88"
-  ></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getProcessRecord, addProcessRecord, updateProcessRecord } from '@/api/health/processRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-const { proxy } = getCurrentInstance()
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const flag = ref('add')
-const showPerson = ref(false)
-const showHealthRecord = ref(false)
-const title = ref("记录内容记录")
-const healthRecordList = ref([])
-const personList = ref([])
-const data = reactive({
-form: {
-    id: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    healthRecordId: null,
-    recordingTime: null,
-    content: null,
-    personId: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-},
-rules: {
-  healthRecordName: [{ required: true, message: '健康档案不能为空', trigger:['change', 'blur'] }],
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  content: [{ required: true, message: '记录内容不能为空', trigger: ['change', 'blur'] }],
-  recordingTime: [{ required: true, message: '记录时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, queryHealthRecordParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-  form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="过程档案记录-修改"
-     }else{
-      title.value="过程档案记录-新增"
-     }
-     }else{
-      title.value="过程档案记录-复制"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.recordingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function  getData() {
-  
-    if(form.value.id!=null){
-      getProcessRecord(form.value.id).then(res => {
-        listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      queryHealthRecordParams.value.personId=res.data.personId
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-      })
-     }
-     })
-        form.value = res.data 
-        if(flag.value!=null){
-        form.value.recordingTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-       }  
-      })
-    }else{
-      listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-      })
-     }
-     })
-    }
-
-
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-function handHealthRecord() {
-      if (healthRecordList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '健康档案为空  ', type: 'warning'
-        })
-      } else {
-        showHealthRecord.value = true
-      }
-   }
-function   handHealthRecordConfirm(e) {
-      form.value.healthRecordName = e.value[0].name
-      form.value.healthRecordId = e.value[0].id
-      showHealthRecord.value = false
-}
-function handHealthRecordCancel() {
-     showHealthRecord.value = false
-}
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['recordingTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.recordingTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-        if(flag.value==null){
-          updateProcessRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/processRecord/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addProcessRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/processRecord/list` })
-            }
-          })
-        })
-          }
-
-
-        }else {
-          addProcessRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/processRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/processRecord/list.vue b/src/pages/health/processRecord/list.vue
deleted file mode 100644
index 3b027b9..0000000
--- a/src/pages/health/processRecord/list.vue
+++ /dev/null
@@ -1,720 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u--input v-model="queryParams.personName" border="false" placeholder="请选择人员" class="search-input"
-          @click="handlePerson" suffixIcon="search" suffixIconStyle="color: #909399">
-        </u--input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-        <view class="add-btn" @click="handleAdd()">
-          <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-          <text>新增</text>
-        </view>
-
-        <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">健康档案</view>
-              <view class="health-record-input">
-                <u--input v-model="queryParams.healthRecordName" border="surround" placeholder="请选择健康档案" 
-                  @click="handleHealthRecord" suffixIcon="search" suffixIconStyle="color: #909399">
-                </u--input>
-              </view>
-              
-              <view class="filter-title">记录日期</view>
-              <view class="date-inputs">
-                <u-input
-                  :disabled="true"
-                  :disabledColor="'#fff'"
-                  class="dateInput"
-                  border="surround"
-                  v-model="queryParams.startTime"
-                  placeholder="请选择开始时间"
-                >
-                  <template v-slot:suffix>
-                    <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                  </template>
-                </u-input>
-                <u-input
-                  :disabled="true"
-                  :disabledColor="'#fff'"
-                  class="dateInput"
-                  border="surround"
-                  v-model="queryParams.endTime"
-                  placeholder="请选择结束时间"
-                >
-                  <template v-slot:suffix>
-                    <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                  </template>
-                </u-input>
-              </view>
-            </view>
-            <view class="btn-box">
-              <view class="btn-reset" @click="resetQuery()">
-                <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-                <text>重置</text>
-              </view>
-              <view class="btn-confirm" @click="searchSubmit()">
-                <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-                <text>确定</text>
-              </view>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="date"
-              :minDate="-2209017600000"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-        </u-transition>
-      </view>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="compose" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.healthRecordName }}</text>
-                <text class="card-code">{{ item.recordingTime }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <!-- <view class="info-item info-item-full">
-                <text class="info-label">健康档案</text>
-                <text class="info-value">{{ item.healthRecordName || '--' }}</text>
-              </view> -->
-              <view class="info-item info-item-full" v-if="item.content">
-                <text class="info-label">记录内容</text>
-                <text class="info-value">{{ item.content }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.remark">
-                <text class="info-label">备注</text>
-                <text class="info-value">{{ item.remark }}</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="operate" @click.stop>
-            <view class="btn-edit" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-copy" @click="handleCopy(item)">
-              <uni-icons type="paperplane" size="16" color="#fa8c16"></uni-icons>
-              <text>复制</text>
-            </view>
-            <view class="btn-delete" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handleHealthRecordCancel"
-        @confirm="handleHealthRecordConfirm"></u-picker>
-  </view>
-         <!--返回首页按钮 -->
-         <suspend></suspend>
-</template>
-
-<script setup>
-import { listProcessRecord, delProcessRecord } from '@/api/health/processRecord'
-import { listPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-
-const showHealthRecord = ref(false)
-const healthRecordList = ref([])
-
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    healthRecordId: null,
-    recordingTime: null,
-    temperature: null,
-    personId: null
-   } ,
-   queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-}
-})
-const { filterPanel, queryPersonParams,queryHealthRecordParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-      })
-      status.value = 'loading'
-      listProcessRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-    queryParams.value.healthRecordName = ''
-    queryParams.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-    showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-})
-  }
- function handlePersonCancel() {
-        queryParams.value.personName = ''
-        queryParams.value.personId = ''
-        queryHealthRecordParams.value.personId=null
-        listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        })
-       showPerson.value = false
-       pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-  function handleHealthRecord() {
-        if (healthRecordList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '健康档案为空  ', type: 'warning'
-          })
-        } else {
-          showHealthRecord.value = true
-        }
-     }
-  function   handleHealthRecordConfirm(e) {
-    queryParams.value.healthRecordName = e.value[0].name
-    queryParams.value.healthRecordId =  e.value[0].id
-    showHealthRecord.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleHealthRecordCancel() {
-       queryParams.value.healthRecordName= ''
-         queryParams.value.healthRecordId = ''
-       showHealthRecord.value = false
-       pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-     
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-         queryParams.value.healthRecordName= ''
-         queryParams.value.healthRecordId = ''
-        queryParams.value.endTime = ''
-         queryParams.value.personName = ''
-        queryParams.value.personId = ''
-        queryHealthRecordParams.value.personId=null
-        listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        })
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/processRecord/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/processRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/processRecord/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/processRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        	title: '提示',
-        	content: '你确定要删除吗',
-        	success: function (res) {
-        		if (res.confirm) {
-        		  delProcessRecord(item.id)
-              uni.navigateTo({ url: `/pages/health/processRecord/list` })
-        		} else if (res.cancel) {
-        			console.log('取消');
-        		}
-        	}
-        });
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-    display: flex;
-    align-items: center;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-  
-  .add-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    margin-left: 10rpx;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-  
-  .filter-panel {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: 96rpx;
-    background-color: rgba(0, 0, 0, 0.5);
-    z-index: 999;
-
-    .filter-panel-content {
-      background-color: #ffffff;
-      padding: 0 30rpx 30rpx;
-      border-radius: 16rpx 16rpx 0 0;
-
-      .filter-title {
-        color: #2c3e50;
-        font-size: 32rpx;
-        font-weight: 600;
-        padding: 32rpx 0 24rpx 20rpx;
-        position: relative;
-        display: flex;
-        align-items: center;
-        
-        &::before {
-          content: '';
-          width: 6rpx;
-          height: 32rpx;
-          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-          border-radius: 3rpx;
-          margin-right: 12rpx;
-          flex-shrink: 0;
-        }
-      }
-      
-      .health-record-input {
-        margin-bottom: 24rpx;
-      }
-      
-      .date-inputs {
-        display: flex;
-        flex-direction: column;
-        gap: 16rpx;
-        
-        .dateInput {
-          border-radius: 12rpx;
-          border: 2rpx solid #e8edf3;
-        }
-      }
-    }
-
-    .btn-box {
-      display: flex;
-      gap: 20rpx;
-      padding: 24rpx 30rpx;
-      background-color: #fff;
-      box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-      
-      .btn-reset,
-      .btn-confirm {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        gap: 8rpx;
-        height: 88rpx;
-        border-radius: 12rpx;
-        font-size: 30rpx;
-        font-weight: 600;
-        transition: all 0.3s ease;
-        
-        &:active {
-          transform: scale(0.98);
-          opacity: 0.9;
-        }
-        
-        text {
-          line-height: 1;
-        }
-      }
-      
-      .btn-reset {
-        flex: 1;
-        background: #f5f7fa;
-        border: 2rpx solid #dcdfe6;
-        
-        text {
-          color: #606266;
-        }
-      }
-      
-      .btn-confirm {
-        flex: 1;
-        background: #667eea;
-        box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-        border: none;
-        
-        text {
-          color: #ffffff;
-        }
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      gap: 12rpx;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex-shrink: 0;
-        letter-spacing: 0.5rpx;
-      }
-      
-      .card-code {
-        color: rgba(255, 255, 255, 0.9);
-        font-size: 26rpx;
-        font-weight: 500;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        flex: 1;
-        min-width: 0;
-        letter-spacing: 0.3rpx;
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-copy,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-copy {
-      background: rgba(250, 140, 22, 0.1);
-      color: #fa8c16;
-      border: 1rpx solid rgba(250, 140, 22, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/statistic/doctorStatistic/index.vue b/src/pages/health/statistic/doctorStatistic/index.vue
deleted file mode 100644
index b018eec..0000000
--- a/src/pages/health/statistic/doctorStatistic/index.vue
+++ /dev/null
@@ -1,1417 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>  
-      </view>
-      <view class="search-view">
-        <u-input v-model="queryParams.healthRecordName" border="false" type="select"  @click="handleHealthRecord" placeholder="请选择健康档案" suffixIcon="search"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-      </view>
-      <view class="search-view">
-        <u-input v-model="queryParams.time" placeholder="请选择就医日期" border="false" type="select" readonly suffixIcon="calendar"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-      </view>
-      
-      <view class="app-container">
-        <view class="header-con" ref="searchHeightRef">
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #5b51d8 0%, #6b21a8 100%);">
-        <uni-icons type="home-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">就医次数</view>
-        <view class="num">{{ doctor.doctorCount }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #c026d3 0%, #dc2626 100%);">
-        <uni-icons type="wallet-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">就医费用</view>
-        <view class="num">{{ doctor.doctorCost }}<span>元</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef">
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #0284c7 0%, #0891b2 100%);">
-        <uni-icons type="home-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">常去医院</view>
-        <view class="num">{{ doctor.commonHospital }}<span></span></view>
-      </view>
-    </view>
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #059669 0%, #0d9488 100%);">
-        <uni-icons type="home-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">常去科室</view>
-        <view class="num">{{ doctor.commonDepartments }}<span></span></view>
-      </view>
-    </view>
-  </view>
-      </view>
-      
-<!-- 视图切换 -->
-  <view class="section-title" v-show="listData.length>0">
-    <view class="title-decorator"></view>
-    <text class="title-text">就医统计</text>
-    <view class="view-switch">
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'list' }]" 
-        @click="viewMode = 'list'; btFirstClick()"
-      >
-        <uni-icons type="list" size="16" :color="viewMode === 'list' ? '#667eea' : '#999'"></uni-icons>
-        <text>列表</text>
-      </view>
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'line' }]" 
-        @click="viewMode = 'line'"
-      >
-        <uni-icons type="loop" size="16" :color="viewMode === 'line' ? '#667eea' : '#999'"></uni-icons>
-        <text>曲线图</text>
-      </view>
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'column' }]" 
-        @click="viewMode = 'column'"
-      >
-        <uni-icons type="bars" size="16" :color="viewMode === 'column' ? '#667eea' : '#999'"></uni-icons>
-        <text>柱状图</text>
-      </view>
-    </view>
-  </view>
-    </u-sticky>
-    
-  <!-- 筛选面板 -->
-  <u-transition :show="filterPanel" mode="fade">
-    <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-      <view class="filter-panel-content">
-        <view class="filter-title">就医日期</view>
-        <view class="selcet-content" style="padding: 0 24rpx">
-          <u-input
-            :disabled="true"
-            :disabledColor="'#fff'"
-            class="dateInput"
-            border="surround"
-            v-model="queryParams.startTime"
-            placeholder="请选择开始时间"
-          >
-            <template v-slot:suffix>
-              <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-            </template>
-          </u-input>
-          <u-input
-            :disabled="true"
-            :disabledColor="'#fff'"
-            class="dateInput"
-            border="surround"
-            v-model="queryParams.endTime"
-            placeholder="请选择结束时间"
-          >
-            <template v-slot:suffix>
-              <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-            </template>
-          </u-input>
-        </view>
-      </view>
-      <view class="btn-box">
-        <view class="btn-reset" @click="resetQuery()">
-          <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-          <text>重置</text>
-        </view>
-        <view class="btn-confirm" @click="searchSubmit()">
-          <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-          <text>确定</text>
-        </view>
-      </view>
-    </view>
-  </u-transition>
-  
-  <!-- 日期选择器 -->
-  <u-datetime-picker
-    :closeOnClickOverlay="true"
-    :show="timeShow"
-    v-model="time"
-    mode="date"
-    :minDate="-2209017600000"
-    @close="openOrCloseDate"
-    @cancel="openOrCloseDate"
-    @confirm="confirm"
-  ></u-datetime-picker>
-    
-    <!-- <div class="header-con" ref="searchHeightRef">
-    <div class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #db2777 0%, #ea580c 100%);">
-        <uni-icons type="person-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <div class="info-sum">
-        <div class="title">常看大夫</div>
-        <div class="num">{{ doctor.commonDoctor }}<span></span></div>
-      </div>
-    </div>
-    <div class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #0891b2 0%, #ec4899 100%);">
-        <uni-icons type="calendar-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <div class="info-sum">
-        <div class="title">门诊次数</div>
-        <div class="num">{{ doctor.clinicCount }}<span>次</span></div>
-      </div>
-    </div>
-  </div>
-  <div class="header-con" ref="searchHeightRef">
-    <div class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);">
-        <uni-icons type="fire-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <div class="info-sum">
-        <div class="title">急诊次数</div>
-        <div class="num">{{ doctor.emergencyCount }}<span>次</span></div>
-      </div>
-    </div>
-    <div class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);">
-        <uni-icons type="plusempty" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <div class="info-sum">
-        <div class="title">输液次数</div>
-        <div class="num">{{ doctor.infusionCount }}<span>次</span></div>
-      </div>
-    </div>
-  </div>
-  <div class="header-con" ref="searchHeightRef">
-    <div class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #10b981 0%, #059669 100%);">
-        <uni-icons type="home" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <div class="info-sum">
-        <div class="title">住院次数</div>
-        <div class="num">{{ doctor.hospitalizedCount }}<span>次</span></div>
-      </div>
-    </div>
-    <div class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #06b6d4 0%, #0284c7 100%);">
-        <uni-icons type="chat-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <div class="info-sum">
-        <div class="title">线上问诊次数</div>
-        <div class="num">{{ doctor.onlineCount }}<span>次</span></div>
-      </div>
-    </div>
-  </div> -->
-  
-  <!-- 曲线图展示 -->
-  <view class="chart-container" v-if="listData.length>0 && viewMode === 'line'">
-    <qiun-data-charts 
-      type="line"
-      canvasId="doctorLineChart"
-      :chartData="chartData"
-      :opts="lineChartOpts"
-      :loadingType="1"
-    />
-  </view>
-  
-  <!-- 柱状图展示 -->
-  <view class="chart-container" v-if="listData.length>0 && viewMode === 'column'">
-    <qiun-data-charts 
-      type="column"
-      canvasId="doctorColumnChart"
-      :chartData="chartData"
-      :opts="columnChartOpts"
-      :loadingType="1"
-    />
-  </view>
-  
-  <!-- 列表展示 -->
-  <!-- 列表展示 -->
-  <view class="tab-switch" v-show="listData.length>0 && viewMode === 'list'">
-    <view 
-      :class="['tab-item', { 'active': firstTabShow }]" 
-      @click="btFirstClick"
-    >
-      <uni-icons type="list" size="14" :color="firstTabShow ? '#667eea' : '#999'"></uni-icons>
-      <text>明细</text>
-    </view>
-    <view 
-      :class="['tab-item', { 'active': secondTabShow }]" 
-      @click="btSecondClick"
-    >
-      <uni-icons type="home" size="14" :color="secondTabShow ? '#667eea' : '#999'"></uni-icons>
-      <text>医院</text>
-    </view>
-    <view 
-      :class="['tab-item', { 'active': thirdTabShow }]" 
-      @click="btThirdClick"
-    >
-      <uni-icons type="flag" size="14" :color="thirdTabShow ? '#667eea' : '#999'"></uni-icons>
-      <text>科室</text>
-    </view>
-    <view 
-      :class="['tab-item', { 'active': fourTabShow }]" 
-      @click="btFourClick"
-    >
-      <uni-icons type="person" size="14" :color="fourTabShow ? '#667eea' : '#999'"></uni-icons>
-      <text>大夫</text>
-    </view>
-    <view 
-      :class="['tab-item', { 'active': fiveTabShow }]" 
-      @click="btFiveClick"
-    >
-      <uni-icons type="wallet" size="14" :color="fiveTabShow ? '#667eea' : '#999'"></uni-icons>
-      <text>费用</text>
-    </view>
-  </view>
-    <u-list   v-show="firstTabShow && viewMode === 'list'"  :spaceHeight="720" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="record-name-section">
-              <view class="record-icon">
-                <uni-icons type="list" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="record-info">
-                <text class="record-name">{{ item.hospitalName }}</text>
-                <text class="record-code">{{ dictStr(item.type, typeList) }}</text>
-              </view>
-            </view>
-            <view class="cost-section">
-              <text class="cost-value"><text class="cost-label">费用</text>{{ item.totalCost }}元</text>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item">
-                <text class="info-label">就诊人</text>
-                <text class="info-value">{{ item.personName || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">大夫</text>
-                <text class="info-value">{{ item.doctor || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">就诊时间</text>
-                <text class="info-value">{{ item.visitingTime || '--' }}</text>
-              </view>
-              <view class="info-item info-item-full">
-                <text class="info-label">诊断结果</text>
-                <text class="info-value">{{ item.diagnosis || '--' }}</text>
-              </view>
-              <view class="info-item info-item-full">
-                <text class="info-label">处理及医嘱</text>
-                <text class="info-value">{{ item.prescribe || '--' }}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-    </u-list>
-    <u-list v-show="secondTabShow && viewMode === 'list'"  :spaceHeight="720" lowerThreshold="100">
-        <u-list-item v-for="(item, index) in secondListData" :key="index">
-          <view class="list-item">
-            <view class="item-header">
-              <view class="record-name-section">
-                <view class="record-icon">
-                  <uni-icons type="home" size="20" color="#ffffff"></uni-icons>
-                </view>
-                <view class="record-info">
-                  <text class="record-name">{{ item.hospitalName }}</text>
-                </view>
-              </view>
-              <view class="cost-section">
-                <text class="cost-value"><text class="cost-label">次数</text>{{ item.count }}次</text>
-              </view>
-            </view>
-          </view>
-        </u-list-item>
-        <view>
-        </view>
-      </u-list>
-      <u-list v-show="thirdTabShow && viewMode === 'list'"  :spaceHeight="720" lowerThreshold="100">
-        <u-list-item v-for="(item, index) in thirdListData" :key="index">
-          <view class="list-item">
-            <view class="item-header">
-              <view class="record-name-section">
-                <view class="record-icon">
-                  <uni-icons type="flag" size="20" color="#ffffff"></uni-icons>
-                </view>
-                <view class="record-info">
-                  <text class="record-name">{{ item.departments }}</text>
-                </view>
-              </view>
-              <view class="cost-section">
-                <text class="cost-value"><text class="cost-label">次数</text>{{ item.count }}次</text>
-              </view>
-            </view>
-          </view>
-        </u-list-item>
-        <view>
-        </view>
-      </u-list>
-      <u-list v-show="fourTabShow && viewMode === 'list'"  :spaceHeight="720" lowerThreshold="100">
-        <u-list-item v-for="(item, index) in fourListData" :key="index">
-          <view class="list-item">
-            <view class="item-header">
-              <view class="record-name-section">
-                <view class="record-icon">
-                  <uni-icons type="person-filled" size="20" color="#ffffff"></uni-icons>
-                </view>
-                <view class="record-info">
-                  <text class="record-name">{{ item.doctor }} - {{ item.hospitalName }}</text>
-                </view>
-              </view>
-              <view class="cost-section">
-                <text class="cost-value"><text class="cost-label">次数</text>{{ item.count }}次</text>
-              </view>
-            </view>
-          </view>
-        </u-list-item>
-        <view>
-        </view>
-      </u-list>
-      <u-list v-show="fiveTabShow && viewMode === 'list'"  :spaceHeight="720" lowerThreshold="100">
-        <u-list-item v-for="(item, index) in fiveListData" :key="index">
-          <view class="list-item">
-            <view class="item-header">
-              <view class="record-name-section">
-                <view class="record-icon">
-                  <uni-icons type="wallet-filled" size="20" color="#ffffff"></uni-icons>
-                </view>
-                <view class="record-info">
-                  <text class="record-name">{{ item.time }}</text>
-                </view>
-              </view>
-              <view class="cost-section">
-                <text class="cost-value"><text class="cost-label">费用</text>{{ item.value }}元</text>
-              </view>
-            </view>
-          </view>
-        </u-list-item>
-        <view>
-        </view>
-      </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handleHealthRecordCancel"
-        @confirm="handleHealthRecordConfirm"></u-picker>
-  </view>
-  <!-- 悬停按钮返回工作台-->
-  <suspend></suspend>
-</template>
-
-<script setup>
-import { getDoctorAnalysis } from '@/api/health/statisticAnalysis'
-import { listPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-import { getDicts } from '@/api/system/dict/data.js'
-  import dayjs from 'dayjs'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const personList = ref([])
-
-const showHealthRecord = ref(false)
-const healthRecordList = ref([])
-
-const typeList = ref([])
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const showPerson = ref(false)
-const timeShow= ref(false)
-const time =ref( Number(new Date()))
-const  flag= ref(true)
-const doctor = ref({})
-
-const firstTabShow = ref(true)
-const secondTabShow = ref(false)
-const thirdTabShow = ref(false)
-const fourTabShow = ref(false)
-const fiveTabShow = ref(false)
-
-const firstType = ref("primary")
-const secondType = ref("default")
-const thirdType = ref("default")
-const fourType = ref("default")
-const fiveType = ref("default")
-
-const secondListData = ref([])
-const thirdListData = ref([])
-const fourListData = ref([])
-const fiveListData = ref([])
-
-const viewMode = ref('list') // 'list', 'line', 'column'
-
-// 曲线图配置
-const lineChartOpts = computed(() => {
-  const dataCount = fiveListData.value ? fiveListData.value.length : 0
-  const showXAxisLabel = dataCount <= 10
-  
-  return {
-    color: ['#667eea'],
-    padding: [15, 15, 30, 5],
-    enableScroll: false,
-    enableMarkLine: true,
-    dataLabel: false,
-    dataPointShape: true,
-    legend: {
-      show: false
-    },
-    xAxis: {
-      disableGrid: true,
-      boundaryGap: 'justify',
-      axisLine: false,
-      scrollShow: true,
-      itemCount: 5,
-      fontSize: showXAxisLabel ? 10 : 0,
-      fontColor: showXAxisLabel ? '#999999' : 'transparent',
-      rotateLabel: true,
-      rotateAngle: 30,
-      disabled: !showXAxisLabel
-    },
-    yAxis: {
-      gridType: 'dash',
-      dashLength: 4,
-      gridColor: '#EEEEEE',
-      splitNumber: 5,
-      fontSize: 10,
-      fontColor: '#999999',
-      format: (val) => {
-        if (val >= 10000) {
-          return (val / 10000).toFixed(1) + 'w'
-        }
-        return val.toFixed(0)
-      },
-      data: [
-        {
-          min: 0
-        }
-      ]
-    },
-    extra: {
-      line: {
-        type: 'curve',
-        width: 3,
-        activeType: 'hollow',
-        linearType: 'custom',
-        linearOpacity: 0.2,
-        onShadow: true,
-        animation: true
-      }
-    }
-  }
-})
-
-// 柱状图配置
-const columnChartOpts = computed(() => {
-  const dataCount = fiveListData.value ? fiveListData.value.length : 0
-  const showXAxisLabel = dataCount <= 10
-  
-  return {
-    color: ['#667eea'],
-    padding: [15, 15, 30, 5],
-    enableScroll: false,
-    dataLabel: false,
-    legend: {
-      show: false
-    },
-    xAxis: {
-      disableGrid: true,
-      boundaryGap: 'center',
-      axisLine: false,
-      scrollShow: true,
-      itemCount: 5,
-      fontSize: showXAxisLabel ? 10 : 0,
-      fontColor: showXAxisLabel ? '#999999' : 'transparent',
-      rotateLabel: true,
-      rotateAngle: 30,
-      disabled: !showXAxisLabel
-    },
-    yAxis: {
-      gridType: 'dash',
-      dashLength: 4,
-      gridColor: '#EEEEEE',
-      splitNumber: 5,
-      fontSize: 10,
-      fontColor: '#999999',
-      showTitle: false,
-      disabled: false,
-      format: (val) => {
-        if (val >= 10000) {
-          return (val / 10000).toFixed(1) + 'w'
-        }
-        return val.toFixed(0)
-      }
-    },
-    extra: {
-      column: {
-        type: 'group',
-        width: 20,
-        activeBgColor: '#764ba2',
-        activeBgOpacity: 0.08,
-        linearType: 'none',
-        barBorderCircle: true,
-        seriesGap: 2
-      }
-    }
-  }
-})
-
-// 图表数据
-const chartData = computed(() => {
-  if (!fiveListData.value || fiveListData.value.length === 0) {
-    return {
-      categories: [],
-      series: []
-    }
-  }
-  
-  const reversedData = [...fiveListData.value].reverse()
-  return {
-    categories: reversedData.map(item => item.time || ''),
-    series: [
-      {
-        name: '费用',
-        data: reversedData.map(item => {
-          const value = parseFloat(item.value)
-          return isNaN(value) ? 0 : value
-        })
-      }
-    ]
-  }
-})
-
-function   btFirstClick() {
-        firstType.value="primary"
-        secondType.value="default"
-        thirdType.value="default"
-        fourType.value="default"
-        fiveType.value="default"
-
-         firstTabShow.value=true
-         secondTabShow.value=false
-         thirdTabShow.value=false
-         fourTabShow.value=false
-         fiveTabShow.value=false
-
-      }
-      function  btSecondClick() {
-        
-        firstType.value="default"
-        secondType.value="primary"
-        thirdType.value="default"
-        fourType.value="default"
-        fiveType.value="default"
-
-         firstTabShow.value=false
-         secondTabShow.value=true
-         thirdTabShow.value=false
-         fourTabShow.value=false
-         fiveTabShow.value=false
-    }
-    function  btThirdClick() {
-      firstType.value="default"
-        secondType.value="default"
-        thirdType.value="primary"
-        fourType.value="default"
-        fiveType.value="default"
-
-         firstTabShow.value=false
-         secondTabShow.value=false
-         thirdTabShow.value=true
-         fourTabShow.value=false
-         fiveTabShow.value=false
-        
-    }
-    function  btFourClick() {
-      firstType.value="default"
-        secondType.value="default"
-        thirdType.value="default"
-        fourType.value="primary"
-        fiveType.value="default"
-
-         firstTabShow.value=false
-         secondTabShow.value=false
-         thirdTabShow.value=false
-         fourTabShow.value=true
-         fiveTabShow.value=false
-        
-    }
-    function  btFiveClick() {
-      firstType.value="default"
-        secondType.value="default"
-        thirdType.value="default"
-        fourType.value="default"
-        fiveType.value="primary"
-
-         firstTabShow.value=false
-         secondTabShow.value=false
-         thirdTabShow.value=false
-         fourTabShow.value=false
-         fiveTabShow.value=true
-        
-    }
-
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-  pageNum: 1,
-  pageSize: 100
-},
-  queryParams: {
-  type: 1,
-  time: null,
-  dataType: null,
-  recordId: null,
-  id: null
-   } ,
-   queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-}
-})
-
-const { filterPanel, queryPersonParams, queryHealthRecordParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-            uni.getSystemInfoSync().windowHeight - 50
-        })	
-onLoad(() => {
-    getDict()
-    // getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-    listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function formatMultiLineData(data) {
-if (data != null) {
-  return data.replace(/<br\/>/g, '\n')
-}
-}
-function dictStr(val, arr) {
-      let str = ''
-      arr.map(item => {
-        if (item.dictValue === val) {
-          str = item.dictLabel
-        }
-      })
-      return str
-    }
-function  openOrCloseDate(data) {
-    timeShow.value = !timeShow.value
-    flag.value = data
-  }
-  function confirm(e) {
-    const date = timeHandler(new Date(e.value), '-', ':')
-          let formatValue = 'YYYY-MM-DD'
-          dayjs(date).format(formatValue)
-    if (flag.value) {
-      queryParams.value.startTime =  dayjs(date).format(formatValue)
-    } else {
-      queryParams.value.endTime =  dayjs(date).format(formatValue)
-    }
-    timeShow.value = false
-  }
-function searchSubmit() {
-  if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-    pageNum.value = 1
-    listData.value = []
-    getList()
-    filterPanel.value = false
-  }
-  function resetQuery() {
-      queryParams.value.type = '1'
-     queryParams.value.startTime =  ''
-    queryParams.value.endTime =  ''
-    queryParams.value.time = ''
-    
-
-  }
-  function resetListData() {
-    secondListData.value = []
-    thirdListData.value =  []
-    listData.value =  []
-    fourListData.value =[]
-    fiveListData.value = []
-    
-
-  }
-function getList() {
-   // 使用状态
-   getDicts('doctor_type').then(res => {
-        typeList.value = res.data
-      })
-  getDoctorAnalysis({...queryParams.value }).then(res => {
-          doctor.value = { ...res.data }
-          resetListData() 
-        listData.value = listData.value.concat(res.data.doctorTableList)
-        secondListData.value = secondListData.value.concat(res.data.hospitalStaticList)
-        thirdListData.value = thirdListData.value.concat(res.data.departStaticList)
-        fourListData.value = fourListData.value.concat(res.data.doctorStaticList)
-        fiveListData.value = fiveListData.value.concat(res.data.doctorCostList)
-      }).catch(() => {
-      })
-    }
-function   getDict() {
-  listPerson(queryPersonParams.value).then((response) => {
-      personList.value = [response.rows]
-      if(response.rows.length>0){
-        queryParams.value.personName= response.rows[0].name
-      queryParams.value.id = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-          queryParams.value.healthRecordName= response.rows[0].name
-          queryParams.value.recordId = response.rows[0].id
-       }
-       getDoctorAnalysis({...queryParams.value }).then(res => {
-        doctor.value = { ...res.data }
-        listData.value = listData.value.concat(res.data.doctorTableList)
-        secondListData.value = secondListData.value.concat(res.data.hospitalStaticList)
-        thirdListData.value = thirdListData.value.concat(res.data.departStaticList)
-        fourListData.value = fourListData.value.concat(res.data.doctorStaticList)
-        fiveListData.value = fiveListData.value.concat(res.data.doctorCostList)
-      }).catch(() => {
-      })
-
-
-      })
-     } 
-    })
-        
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.id= e.value[0].id
-    queryParams.value.healthRecordName = ''
-    queryParams.value.recordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-          queryParams.value.healthRecordName= response.rows[0].name
-          queryParams.value.recordId = response.rows[0].id
-    }
-    showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-})
-  }
- function handlePersonCancel() {
-       showPerson.value = false
-       listData.value = []
-      getList()
-      filterPanel.value = false
-  }
-  
-  function handleHealthRecord() {
-        if (healthRecordList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '健康档案为空  ', type: 'warning'
-          })
-        } else {
-          showHealthRecord.value = true
-        }
-     }
-  function   handleHealthRecordConfirm(e) {
-    queryParams.value.healthRecordName = e.value[0].name
-    queryParams.value.recordId =  e.value[0].id
-    showHealthRecord.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleHealthRecordCancel() {
-  queryParams.value.healthRecordName= ""
-  queryParams.value.recordId = null
-       showHealthRecord.value = false
-       listData.value = []
-      getList()
-      filterPanel.value = false
-  }
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.app-container {
-  background-color: #f5f7fa;
-  padding: 0;
-  overflow: visible;
-
-  .header-con {
-    width: calc(100% - 32rpx);
-    margin: 0 16rpx 8rpx 16rpx;
-    background-color: transparent;
-    display: flex;
-    justify-content: space-between;
-    align-items: stretch;
-    padding: 0;
-    gap: 12rpx;
-    
-    .item {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      padding: 20rpx 16rpx;
-      transition: all 0.3s ease;
-      border: 2rpx solid #e8edf3;
-      border-radius: 16rpx;
-      background: linear-gradient(135deg, #ffffff 0%, #f8f9fb 100%);
-      box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-      
-      &:active {
-        transform: scale(0.98);
-        opacity: 0.9;
-      }
-      
-      .item-icon {
-        width: 72rpx;
-        height: 72rpx;
-        border-radius: 16rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 16rpx;
-        box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
-        flex-shrink: 0;
-      }
-      
-      .info-sum {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        
-        .title {
-          color: #7f8c8d;
-          margin-bottom: 8rpx;
-          font-size: 24rpx;
-        }
-        
-        .num {
-          color: #2c3e50;
-          font-size: 32rpx;
-          font-weight: 600;
-          
-          span {
-            font-size: 20rpx;
-            color: #95a5a6;
-            margin-left: 4rpx;
-          }
-        }
-      }
-    }
-  }
-.header-title {
-  width: 100%;
-  height: 30px;
-  background-color: #ffffff;
-  margin-bottom: 3px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  font-size: 16px;
-}
-}
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-    display: flex;
-    align-items: center;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-}
-
-.filter-panel {
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 270rpx;
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 999;
-
-  .filter-panel-content {
-    background-color: #ffffff;
-    padding: 0 30rpx 30rpx;
-    border-radius: 16rpx 16rpx 0 0;
-
-    .select-header {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-
-    .filter-title {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-
-    .state-list {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: flex-start;
-
-      .state-item {
-        width: 210rpx;
-        height: 72rpx;
-        border: 1rpx solid rgba(0, 0, 0, 0.25);
-        border-radius: 72rpx;
-        text-align: center;
-        line-height: 72rpx;
-        margin: 0 20rpx 20rpx 0;
-        font-size: 28rpx;
-        color: #000000;
-      }
-
-      .active {
-        background-color: rgba(222, 241, 255, 1);
-        border: 1rpx solid rgba(22, 119, 255, 1);
-      }
-    }
-  }
-
-  .btn-box {
-    display: flex;
-    gap: 20rpx;
-    padding: 24rpx 30rpx;
-    background-color: #fff;
-    box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    
-    .btn-reset,
-    .btn-confirm {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 8rpx;
-      height: 88rpx;
-      border-radius: 12rpx;
-      font-size: 30rpx;
-      font-weight: 600;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.98);
-        opacity: 0.9;
-      }
-      
-      text {
-        line-height: 1;
-      }
-    }
-    
-    .btn-reset {
-      flex: 1;
-      background: #f5f7fa;
-      border: 2rpx solid #dcdfe6;
-      
-      text {
-        color: #606266;
-      }
-    }
-    
-    .btn-confirm {
-      flex: 1;
-      background: #667eea;
-      box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-      border: none;
-      
-      text {
-        color: #ffffff;
-      }
-    }
-  }
-}
-
-.section-title {
-  display: flex;
-  margin-top: -10rpx;
-  align-items: center;
-  padding: 24rpx 32rpx 16rpx;
-  background-color: #f5f7fa;
-  
-  .title-decorator {
-    width: 6rpx;
-    height: 32rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 3rpx;
-    margin-right: 12rpx;
-  }
-  
-  .title-text {
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #2c3e50;
-    line-height: 1;
-    flex: 1;
-  }
-  
-  .view-switch {
-    display: flex;
-    align-items: center;
-    gap: 4rpx;
-    background: #ffffff;
-    border-radius: 12rpx;
-    padding: 4rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-    
-    .switch-item {
-      display: flex;
-      align-items: center;
-      gap: 4rpx;
-      padding: 6rpx 12rpx;
-      border-radius: 8rpx;
-      transition: all 0.3s ease;
-      cursor: pointer;
-      
-      text {
-        font-size: 22rpx;
-        color: #999999;
-        line-height: 1;
-      }
-      
-      &.active {
-        background: linear-gradient(135deg, rgba(102, 126, 234, 0.1) 0%, rgba(118, 75, 162, 0.1) 100%);
-        
-        text {
-          color: #667eea;
-          font-weight: 600;
-        }
-      }
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-  }
-}
-
-.chart-container {
-  margin: 16rpx 24rpx 60rpx;
-  padding: 16rpx;
-  background: linear-gradient(135deg, #ffffff 0%, #f8f9fb 100%);
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  width: calc(100% - 48rpx);
-  height: 650rpx;
-  overflow: visible;
-  position: relative;
-}
-
-.tab-switch {
-  display: flex;
-  align-items: center;
-  gap: 8rpx;
-  padding: 12rpx 16rpx;
-  background-color: #f5f7fa;
-  overflow-x: auto;
-  
-  &::-webkit-scrollbar {
-    display: none;
-  }
-  
-  .tab-item {
-    flex-shrink: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 6rpx;
-    padding: 12rpx 20rpx;
-    background: #ffffff;
-    border-radius: 20rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-    transition: all 0.3s ease;
-    cursor: pointer;
-    min-width: fit-content;
-    
-    text {
-      font-size: 24rpx;
-      color: #999999;
-      font-weight: 500;
-      line-height: 1;
-      white-space: nowrap;
-    }
-    
-    &.active {
-      background: linear-gradient(135deg, rgba(102, 126, 234, 0.1) 0%, rgba(118, 75, 162, 0.1) 100%);
-      border: 2rpx solid rgba(102, 126, 234, 0.3);
-      box-shadow: 0 2rpx 12rpx rgba(102, 126, 234, 0.2);
-      
-      text {
-        color: #667eea;
-        font-weight: 600;
-      }
-    }
-    
-    &:active {
-      transform: scale(0.96);
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .record-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-      margin-right: 16rpx;
-    }
-    
-    .record-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .record-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      
-      .record-name {
-        color: #ffffff;
-        font-size: 28rpx;
-        font-weight: 600;
-        line-height: 1.2;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-      
-      .record-code {
-        color: rgba(255, 255, 255, 0.85);
-        font-size: 22rpx;
-        font-weight: 400;
-        line-height: 1;
-      }
-    }
-    
-    .cost-section {
-      display: flex;
-      align-items: center;
-      flex-shrink: 0;
-      white-space: nowrap;
-      
-      .cost-value {
-        color: #fa8c16;
-        font-size: 32rpx;
-        font-weight: 700;
-        line-height: 1;
-        white-space: nowrap;
-        
-        .cost-label {
-          color: rgba(255, 255, 255, 0.85);
-          font-size: 22rpx;
-          font-weight: 400;
-          margin-right: 8rpx;
-        }
-      }
-    }
-  }
-  
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/statistic/healthStatistic/index.vue b/src/pages/health/statistic/healthStatistic/index.vue
deleted file mode 100644
index 129ccb0..0000000
--- a/src/pages/health/statistic/healthStatistic/index.vue
+++ /dev/null
@@ -1,1269 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>  
-      </view>
-      <view class="search-view">
-        <u-input v-model="queryParams.healthRecordName" border="false" type="select"  @click="handleHealthRecord" placeholder="请选择健康档案" suffixIcon="search"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-      </view>
-      <view class="search-view">
-        <u-input v-model="queryParams.time" placeholder="请选择建档日期" border="false" type="select" readonly suffixIcon="calendar"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-      </view>
-      
-      <view class="app-container">
-        <view class="header-con" ref="searchHeightRef">
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #5b51d8 0%, #6b21a8 100%);">
-        <uni-icons type="folder-add-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">档案数量</view>
-        <view class="num">{{ record.healthRecordCount }}<span>份</span></view>
-      </view>
-    </view>
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #c026d3 0%, #dc2626 100%);">
-        <uni-icons type="calendar-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">平均康复周期</view>
-        <view class="num">
-          {{ record.perDuration ? record.perDuration.split(',')[0] : '0' }}
-          <span>天</span>
-          {{ record.perDuration ? record.perDuration.split(',')[1] : '0' }}
-          <span>小时</span>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef">
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #0284c7 0%, #0891b2 100%);">
-        <uni-icons type="home-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">就医医院</view>
-        <view class="num">{{ record.hospitalCount }}<span>个</span></view>
-      </view>
-    </view>
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #059669 0%, #0d9488 100%);">
-        <uni-icons type="person-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">就诊大夫</view>
-        <view class="num">{{ record.doctorTotalCount }}<span>个</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef">
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #db2777 0%, #ea580c 100%);">
-        <uni-icons type="heart-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">就医次数</view>
-        <view class="num">{{ record.doctorCount }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #0891b2 0%, #ec4899 100%);">
-        <uni-icons type="wallet-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">就医费用</view>
-        <view class="num">{{ record.doctorCost }}<span>元</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef">
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);">
-        <uni-icons type="color" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">用药天数</view>
-        <view class="num">{{ record.marDayCount }}<span>天</span></view>
-      </view>
-    </view>
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);">
-        <uni-icons type="cart-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">用药次数</view>
-        <view class="num">{{ record.marCount }}<span>次</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef">
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #10b981 0%, #059669 100%);">
-        <uni-icons type="fire-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">发烧天数</view>
-        <view class="num">{{ record.feverDayCount }}<span>天</span></view>
-      </view>
-    </view>
-  </view>
-      </view>
-      
-<!-- 视图切换 -->
-  <view class="section-title" v-show="listData.length>0 || secondListData.length>0">
-    <view class="title-decorator"></view>
-    <text class="title-text">档案统计</text>
-    <view class="view-switch">
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'list' }]" 
-        @click="viewMode = 'list'; btFirstClick()"
-      >
-        <uni-icons type="list" size="16" :color="viewMode === 'list' ? '#667eea' : '#999'"></uni-icons>
-        <text>列表</text>
-      </view>
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'line' }]" 
-        @click="viewMode = 'line'"
-        v-if="secondListData.length>0"
-      >
-        <uni-icons type="loop" size="16" :color="viewMode === 'line' ? '#667eea' : '#999'"></uni-icons>
-        <text>曲线图</text>
-      </view>
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'column' }]" 
-        @click="viewMode = 'column'"
-        v-if="secondListData.length>0"
-      >
-        <uni-icons type="bars" size="16" :color="viewMode === 'column' ? '#667eea' : '#999'"></uni-icons>
-        <text>柱状图</text>
-      </view>
-    </view>
-  </view>
-    </u-sticky>
-    
-  <!-- 筛选面板 -->
-  <u-transition :show="filterPanel" mode="fade">
-    <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-      <view class="filter-panel-content">
-        <view class="filter-title">建档日期</view>
-        <view class="selcet-content" style="padding: 0 24rpx">
-          <u-input
-            :disabled="true"
-            :disabledColor="'#fff'"
-            class="dateInput"
-            border="surround"
-            v-model="queryParams.startTime"
-            placeholder="请选择开始时间"
-          >
-            <template v-slot:suffix>
-              <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-            </template>
-          </u-input>
-          <u-input
-            :disabled="true"
-            :disabledColor="'#fff'"
-            class="dateInput"
-            border="surround"
-            v-model="queryParams.endTime"
-            placeholder="请选择结束时间"
-          >
-            <template v-slot:suffix>
-              <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-            </template>
-          </u-input>
-        </view>
-      </view>
-      <view class="btn-box">
-        <view class="btn-reset" @click="resetQuery()">
-          <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-          <text>重置</text>
-        </view>
-        <view class="btn-confirm" @click="searchSubmit()">
-          <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-          <text>确定</text>
-        </view>
-      </view>
-    </view>
-  </u-transition>
-  
-  <!-- 日期选择器 -->
-  <u-datetime-picker
-    :closeOnClickOverlay="true"
-    :show="timeShow"
-    v-model="time"
-    mode="date"
-    :minDate="-2209017600000"
-    @close="openOrCloseDate"
-    @cancel="openOrCloseDate"
-    @confirm="confirm"
-  ></u-datetime-picker>
-  
-  <!-- 曲线图展示 -->
-  <view class="chart-container" v-if="secondListData.length>0 && viewMode === 'line'">
-    <qiun-data-charts 
-      type="line"
-      canvasId="healthLineChart"
-      :chartData="chartData"
-      :opts="lineChartOpts"
-      :loadingType="1"
-    />
-  </view>
-  
-  <!-- 柱状图展示 -->
-  <view class="chart-container" v-if="secondListData.length>0 && viewMode === 'column'">
-    <qiun-data-charts 
-      type="column"
-      canvasId="healthColumnChart"
-      :chartData="chartData"
-      :opts="columnChartOpts"
-      :loadingType="1"
-    />
-  </view>
-  
-  <!-- 列表展示 -->
-  <view class="tab-switch" v-show="listData.length>0 && viewMode === 'list'">
-    <view 
-      :class="['tab-item', { 'active': !tabShow }]" 
-      @click="btFirstClick"
-    >
-      <uni-icons type="folder-add" size="16" :color="!tabShow ? '#667eea' : '#999'"></uni-icons>
-      <text>档案明细</text>
-    </view>
-    <view 
-      :class="['tab-item', { 'active': tabShow }]" 
-      @click="btSecondClick"
-    >
-      <uni-icons type="wallet" size="16" :color="tabShow ? '#667eea' : '#999'"></uni-icons>
-      <text>费用明细</text>
-    </view>
-  </view>
-    <u-list   v-show="!tabShow && viewMode === 'list'" :spaceHeight="720" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="record-name-section">
-              <view class="record-icon">
-                <uni-icons type="paperplane-filled" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="record-info">
-                <text class="record-name">{{ item.name }}</text>
-              </view>
-            </view>
-            <view class="cost-section">
-              <text class="cost-value"><text class="cost-label">费用</text>{{ item.doctorCost }}元</text>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item">
-                <text class="info-label">发生时间</text>
-                <text class="info-value">{{ item.occurTime || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">持续时间</text>
-                <text class="info-value">{{ item.duration || '--' }}</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">过程记录</text>
-                <text class="info-value">{{ item.processCount || 0 }}次</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">就医次数</text>
-                <text class="info-value">{{ item.doctorCount || 0 }}次</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">用药天数</text>
-                <text class="info-value">{{ item.marDayCount || 0 }}天</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">用药次数</text>
-                <text class="info-value">{{ item.marCount || 0 }}次</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">发烧天数</text>
-                <text class="info-value">{{ item.feverDayCount || 0 }}天</text>
-              </view>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-    </u-list>
-    <u-list v-show="tabShow && viewMode === 'list'"  :spaceHeight="720" lowerThreshold="100">
-        <u-list-item v-for="(item, index) in secondListData" :key="index">
-          <view class="list-item">
-            <view class="item-header">
-              <view class="record-name-section">
-                <view class="record-icon">
-                  <uni-icons type="paperplane-filled" size="20" color="#ffffff"></uni-icons>
-                </view>
-                <view class="record-info">
-                  <text class="record-name">{{ item.time }}</text>
-                </view>
-              </view>
-              <view class="cost-section">
-                <text class="cost-value"><text class="cost-label">费用</text>{{ item.value }}元</text>
-              </view>
-            </view>
-          </view>
-        </u-list-item>
-        <view>
-        </view>
-      </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handleHealthRecordCancel"
-        @confirm="handleHealthRecordConfirm"></u-picker>
-  </view>
-  <!-- 悬停按钮返回工作台-->
-  <suspend></suspend>
-</template>
-
-<script setup>
-import { getRecordAnalysis } from '@/api/health/statisticAnalysis'
-import { listPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-import { getDicts } from '@/api/system/dict/data.js'
-  import dayjs from 'dayjs'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const personList = ref([])
-
-const showHealthRecord = ref(false)
-const healthRecordList = ref([])
-
-const personTypeList = ref([])
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const showPerson = ref(false)
-const timeShow= ref(false)
-const time =ref( Number(new Date()))
-const  flag= ref(true)
-const record = ref({})
-
-const tabShow = ref(false)
-const firstType = ref("primary")
-const secondType = ref("default")
-const secondListData = ref([])
-const viewMode = ref('list') // 'list', 'line', 'column'
-
-// 曲线图配置
-const lineChartOpts = computed(() => {
-  const showXAxisLabel = filteredDataCount.value <= 10
-  
-  return {
-    color: ['#667eea'],
-    padding: [15, 15, 30, 5],
-    enableScroll: false,
-    enableMarkLine: true,
-    dataLabel: false,
-    dataPointShape: true,
-    legend: {
-      show: false
-    },
-    xAxis: {
-      disableGrid: true,
-      boundaryGap: 'justify',
-      axisLine: false,
-      scrollShow: false,
-      fontSize: showXAxisLabel ? 10 : 0,
-      fontColor: showXAxisLabel ? '#999999' : 'transparent',
-      lineHeight: 12,
-      marginTop: 5,
-      disabled: !showXAxisLabel
-    },
-    yAxis: {
-      gridType: 'dash',
-      dashLength: 2,
-      gridColor: '#eeeeee',
-      padding: 10,
-      showTitle: false,
-      data: [
-        {
-          min: 0,
-          axisLabel: true,
-          fontSize: 10,
-          fontColor: '#999999',
-          format: (val) => val.toFixed(0)
-        }
-      ]
-    },
-    extra: {
-      line: {
-        type: 'curve',
-        width: 2,
-        activeType: 'hollow',
-        linearType: 'custom',
-        onShadow: false,
-        animation: 'vertical'
-      },
-      markLine: {
-        type: 'dash',
-        dashLength: 5,
-        data: [
-          {
-            value: 'average',
-            lineColor: '#f04864',
-            showLabel: false,
-            labelOffsetX: 5,
-            labelOffsetY: -5
-          }
-        ]
-      }
-    }
-  }
-})
-
-// 柱状图配置
-const columnChartOpts = computed(() => {
-  const showXAxisLabel = filteredDataCount.value <= 10
-  
-  return {
-    color: ['#667eea'],
-    padding: [15, 15, 30, 5],
-    enableScroll: false,
-    dataLabel: false,
-    legend: {
-      show: false
-    },
-    xAxis: {
-      disableGrid: true,
-      boundaryGap: 'center',
-      axisLine: false,
-      scrollShow: false,
-      fontSize: showXAxisLabel ? 10 : 0,
-      fontColor: showXAxisLabel ? '#999999' : 'transparent',
-      lineHeight: 12,
-      marginTop: 5,
-      disabled: !showXAxisLabel
-    },
-    yAxis: {
-      gridType: 'dash',
-      dashLength: 2,
-      gridColor: '#eeeeee',
-      padding: 10,
-      showTitle: false,
-      data: [
-        {
-          min: 0,
-          axisLabel: true,
-          fontSize: 10,
-          fontColor: '#999999',
-          format: (val) => val.toFixed(0)
-        }
-      ]
-    },
-    extra: {
-      column: {
-        type: 'group',
-        width: 30,
-        activeBgColor: '#000000',
-        activeBgOpacity: 0.08,
-        linearType: 'custom',
-        barBorderCircle: true,
-        seriesGap: 2,
-        categoryGap: 2
-      }
-    }
-  }
-})
-
-// 图表数据
-const chartData = computed(() => {
-  if (!secondListData.value || secondListData.value.length === 0) {
-    return {
-      categories: [],
-      series: []
-    }
-  }
-  
-  // 使用实际的字段名：time 和 value，过滤掉空值和undefined
-  const filteredData = secondListData.value.filter(item => {
-    return item && 
-           item.time && 
-           item.time !== 'undefined' && 
-           item.time !== undefined && 
-           item.value !== undefined && 
-           item.value !== null && 
-           item.value !== 'undefined'
-  })
-  
-  return {
-    categories: filteredData.map(item => String(item.time)),
-    series: [
-      {
-        name: '费用',
-        data: filteredData.map(item => parseFloat(item.value || 0)),
-        color: '#667eea',
-        linearColor: [
-          [0, '#667eea'],
-          [1, '#764ba2']
-        ]
-      }
-    ]
-  }
-})
-
-// 过滤后的实际数据量
-const filteredDataCount = computed(() => {
-  if (!secondListData.value || secondListData.value.length === 0) {
-    return 0
-  }
-  return secondListData.value.filter(item => {
-    return item && 
-           item.time && 
-           item.time !== 'undefined' && 
-           item.time !== undefined && 
-           item.value !== undefined && 
-           item.value !== null && 
-           item.value !== 'undefined'
-  }).length
-})
-
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-  pageNum: 1,
-  pageSize: 100
-},
-  queryParams: {
-  type: 1,
-  time: null,
-  dataType: null,
-  recordId: null,
-  id: null
-   } ,
-   queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-}
-})
-
-const { filterPanel, queryPersonParams,queryHealthRecordParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-            uni.getSystemInfoSync().windowHeight - 50
-        })	
-onLoad(() => {
-    getDict()
-    // getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-    listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-  function   btFirstClick() {
-    tabShow.value=false
-    firstType.value="primary"
-    secondType.value="default"
-
-      }
-      function  btSecondClick() {
-        secondType.value="primary"
-         firstType.value="default"
-        tabShow.value=true
-        
-    }
-
-  function formatMultiLineData(data) {
-if (data != null) {
-  return data.replace(/<br\/>/g, '\n')
-}
-}
-function  openOrCloseDate(data) {
-    timeShow.value = !timeShow.value
-    flag.value = data
-  }
-  function confirm(e) {
-    const date = timeHandler(new Date(e.value), '-', ':')
-          let formatValue = 'YYYY-MM-DD'
-          dayjs(date).format(formatValue)
-    if (flag.value) {
-      queryParams.value.startTime =  dayjs(date).format(formatValue)
-    } else {
-      queryParams.value.endTime =  dayjs(date).format(formatValue)
-    }
-    timeShow.value = false
-  }
-function searchSubmit() {
-  if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-    pageNum.value = 1
-    listData.value = []
-    getList()
-    filterPanel.value = false
-  }
-  function resetQuery() {
-      queryParams.value.type = '1'
-     queryParams.value.startTime =  ''
-    queryParams.value.endTime =  ''
-    queryParams.value.time = ''
-  }
-function getList() {
-  
-  getRecordAnalysis({...queryParams.value }).then(res => {
-          record.value = { ...res.data }
-          listData.value=[]
-          secondListData.value=[]
-        listData.value = listData.value.concat(res.data.recordList)
-        secondListData.value = secondListData.value.concat(res.data.recordCostList)
-        
-        // 调试信息：查看完整返回数据和费用数据结构
-        console.log('完整返回数据 res.data:', res.data)
-        console.log('recordList:', res.data.recordList)
-        console.log('recordCostList:', res.data.recordCostList)
-        if (secondListData.value.length > 0) {
-          console.log('第一条费用数据示例:', secondListData.value[0])
-          console.log('费用数据所有字段:', Object.keys(secondListData.value[0]))
-        }
-      }).catch(() => {
-      })
-    }
-function   getDict() {
-  listPerson(queryPersonParams.value).then((response) => {
-      personList.value = [response.rows]
-      if(response.rows.length>0){
-        queryParams.value.personName= response.rows[0].name
-      queryParams.value.id = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-          // queryParams.value.healthRecordName= response.rows[0].name
-          // queryParams.value.recordId = response.rows[0].id
-       }
-       getRecordAnalysis({...queryParams.value }).then(res => {
-        record.value = { ...res.data }
-        listData.value = listData.value.concat(res.data.recordList)
-        secondListData.value = secondListData.value.concat(res.data.recordCostList)
-      }).catch(() => {
-      })
-
-      })
-     } 
-    })
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.id= e.value[0].id
-    queryParams.value.healthRecordName = ''
-    queryParams.value.recordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-    showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-})
-  }
- function handlePersonCancel() {
-       showPerson.value = false
-       listData.value = []
-      getList()
-      filterPanel.value = false
-  }
-  
-  
-  function handleHealthRecord() {
-        if (healthRecordList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '健康档案为空  ', type: 'warning'
-          })
-        } else {
-          showHealthRecord.value = true
-        }
-     }
-  function   handleHealthRecordConfirm(e) {
-    queryParams.value.healthRecordName = e.value[0].name
-    queryParams.value.recordId =  e.value[0].id
-    showHealthRecord.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleHealthRecordCancel() {
-  queryParams.value.healthRecordName = ''
-    queryParams.value.recordId = ''
-       showHealthRecord.value = false
-       listData.value = []
-      getList()
-      filterPanel.value = false
-  }
-
-
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.app-container {
-  background-color: #f5f7fa;
-  padding: 0;
-  
-  .header-con {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 8rpx 24rpx;
-    margin-bottom: 8rpx;
-    background-color: transparent;
-    
-    .item {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      padding: 16rpx;
-      background: #ffffff;
-      border-radius: 16rpx;
-      box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-      margin: 0 4rpx;
-      transition: all 0.3s ease;
-      
-      &:first-child {
-        margin-left: 0;
-      }
-      
-      &:last-child {
-        margin-right: 0;
-      }
-      
-      &:active {
-        transform: translateY(-2rpx);
-        box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.12);
-      }
-      
-      .item-icon {
-        width: 64rpx;
-        height: 64rpx;
-        border-radius: 12rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 12rpx;
-        box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
-        flex-shrink: 0;
-      }
-      
-      .info-sum {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        
-        .title {
-          color: #7f8c8d;
-          margin-bottom: 4rpx;
-          font-size: 22rpx;
-        }
-        
-        .num {
-          color: #2c3e50;
-          font-size: 28rpx;
-          font-weight: 600;
-          
-          span {
-            font-size: 18rpx;
-            color: #95a5a6;
-            margin-left: 2rpx;
-          }
-        }
-      }
-    }
-  }
-  
-  .header-title {
-    width: 100%;
-    height: 30px;
-    background-color: #ffffff;
-    margin-bottom: 3px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-size: 16px;
-  }
-}
-
-.btnAdd {
-  width: 146rpx;
-  height: 56rpx;
-  line-height: 56rpx;
-  border-radius: 8rpx;
-  display:float;
-  text-align: center;
-}
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-    display: flex;
-    align-items: center;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-}
-
-.filter-panel {
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 270rpx;
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 999;
-
-  .filter-panel-content {
-    background-color: #ffffff;
-    padding: 0 30rpx 30rpx;
-    border-radius: 16rpx 16rpx 0 0;
-
-    .select-header {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-
-    .filter-title {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-
-    .state-list {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: flex-start;
-
-      .state-item {
-        width: 210rpx;
-        height: 72rpx;
-        border: 1rpx solid rgba(0, 0, 0, 0.25);
-        border-radius: 72rpx;
-        text-align: center;
-        line-height: 72rpx;
-        margin: 0 20rpx 20rpx 0;
-        font-size: 28rpx;
-        color: #000000;
-      }
-
-      .active {
-        background-color: rgba(222, 241, 255, 1);
-        border: 1rpx solid rgba(22, 119, 255, 1);
-      }
-    }
-  }
-
-  .btn-box {
-    display: flex;
-    gap: 20rpx;
-    padding: 24rpx 30rpx;
-    background-color: #fff;
-    box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    
-    .btn-reset,
-    .btn-confirm {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 8rpx;
-      height: 88rpx;
-      border-radius: 12rpx;
-      font-size: 30rpx;
-      font-weight: 600;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.98);
-        opacity: 0.9;
-      }
-      
-      text {
-        line-height: 1;
-      }
-    }
-    
-    .btn-reset {
-      flex: 1;
-      background: #f5f7fa;
-      border: 2rpx solid #dcdfe6;
-      
-      text {
-        color: #606266;
-      }
-    }
-    
-    .btn-confirm {
-      flex: 1;
-      background: #667eea;
-      box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-      border: none;
-      
-      text {
-        color: #ffffff;
-      }
-    }
-  }
-}
-
-.section-title {
-  display: flex;
-  margin-top: -10rpx;
-  align-items: center;
-  padding: 20rpx 32rpx 12rpx;
-  background-color: #f5f7fa;
-  
-  .title-decorator {
-    width: 6rpx;
-    height: 32rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 3rpx;
-    margin-right: 12rpx;
-  }
-  
-  .title-text {
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #2c3e50;
-    line-height: 1;
-    flex: 1;
-  }
-  
-  .view-switch {
-    display: flex;
-    align-items: center;
-    gap: 4rpx;
-    background: #ffffff;
-    border-radius: 12rpx;
-    padding: 4rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-    
-    .switch-item {
-      display: flex;
-      align-items: center;
-      gap: 4rpx;
-      padding: 6rpx 12rpx;
-      border-radius: 8rpx;
-      transition: all 0.3s ease;
-      cursor: pointer;
-      
-      text {
-        font-size: 22rpx;
-        color: #999999;
-        line-height: 1;
-      }
-      
-      &.active {
-        background: linear-gradient(135deg, rgba(102, 126, 234, 0.1) 0%, rgba(118, 75, 162, 0.1) 100%);
-        
-        text {
-          color: #667eea;
-          font-weight: 600;
-        }
-      }
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-  }
-}
-
-.chart-container {
-  margin: 16rpx 24rpx 60rpx;
-  padding: 16rpx;
-  background: linear-gradient(135deg, #ffffff 0%, #f8f9fb 100%);
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  width: calc(100% - 48rpx);
-  height: 480rpx;
-  overflow: visible;
-  position: relative;
-}
-
-.tab-switch {
-  display: flex;
-  align-items: center;
-  gap: 12rpx;
-  padding: 16rpx 24rpx;
-  background-color: #f5f7fa;
-  
-  .tab-item {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 8rpx;
-    padding: 16rpx 24rpx;
-    background: #ffffff;
-    border-radius: 12rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-    transition: all 0.3s ease;
-    cursor: pointer;
-    
-    text {
-      font-size: 26rpx;
-      color: #999999;
-      font-weight: 500;
-      line-height: 1;
-    }
-    
-    &.active {
-      background: linear-gradient(135deg, rgba(102, 126, 234, 0.1) 0%, rgba(118, 75, 162, 0.1) 100%);
-      border: 2rpx solid rgba(102, 126, 234, 0.3);
-      box-shadow: 0 2rpx 12rpx rgba(102, 126, 234, 0.2);
-      
-      text {
-        color: #667eea;
-        font-weight: 600;
-      }
-    }
-    
-    &:active {
-      transform: scale(0.98);
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .record-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-      margin-right: 16rpx;
-    }
-    
-    .record-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .record-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      
-      .record-name {
-        color: #ffffff;
-        font-size: 28rpx;
-        font-weight: 600;
-        line-height: 1.2;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-    }
-    
-    .cost-section {
-      display: flex;
-      align-items: center;
-      flex-shrink: 0;
-      white-space: nowrap;
-      
-      .cost-value {
-        color: #fa8c16;
-        font-size: 32rpx;
-        font-weight: 700;
-        line-height: 1;
-        white-space: nowrap;
-        
-        .cost-label {
-          color: rgba(255, 255, 255, 0.85);
-          font-size: 22rpx;
-          font-weight: 400;
-          margin-right: 8rpx;
-        }
-      }
-    }
-  }
-  
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/statistic/index.vue b/src/pages/health/statistic/index.vue
deleted file mode 100644
index 47fa66b..0000000
--- a/src/pages/health/statistic/index.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-<template>
-  <view class="work-container">
-    <!-- 统计分析标题 -->
-    <view class="page-header">
-      <view class="header-decorator"></view>
-      <text class="header-title">统计分析</text>
-    </view>
-    
-    <!-- 宫格组件 -->
-    <view class="grid-body" v-show="auth.hasPermi('health:person:list')">
-      <view class="grid-container">
-        <view 
-          v-for="(item, index) in healthGridList" 
-          :key="index" 
-          v-show="auth.hasPermi(item.permission)" 
-          class="grid-item"
-          @click="navigateTo(item.path)"
-        >
-          <view class="grid-item-content">
-            <view class="icon-wrapper" :style="{ background: item.gradient }">
-              <uni-icons :type="item.icon" size="32" color="#ffffff"></uni-icons>
-            </view>
-            <text class="grid-text">{{ item.text }}</text>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-
-<script setup>
-import auth from "@/plugins/auth";
-import { ref } from "vue";
-
-const healthGridList = ref([
-  { 
-    path: '/pages/health/statistic/healthStatistic/index', 
-    text: '档案统计', 
-    icon: 'folder-add-filled', 
-    permission: 'health:healthRecord:list',
-    gradient: 'linear-gradient(135deg, #667eea 0%, #764ba2 100%)'
-  },
-  { 
-    path: '/pages/health/statistic/doctorStatistic/index', 
-    text: '就医统计', 
-    icon: 'stethoscope', 
-    permission: 'health:doctorRecord:list',
-    gradient: 'linear-gradient(135deg, #f093fb 0%, #f5576c 100%)'
-  },
-  { 
-    path: '/pages/health/statistic/marStatistic/index', 
-    text: '用药统计', 
-    icon: 'color', 
-    permission: 'health:marRecord:list',
-    gradient: 'linear-gradient(135deg, #4facfe 0%, #00f2fe 100%)'
-  },
-  { 
-    path: '/pages/health/statistic/temperatureStatistic/index', 
-    text: '体温统计', 
-    icon: 'fire-filled', 
-    permission: 'health:temperatureRecord:list',
-    gradient: 'linear-gradient(135deg, #fa709a 0%, #fee140 100%)'
-  }
-]);
-
-function navigateTo(path) {
-  uni.navigateTo({
-    url: path
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-page {
-  background-color: #f5f7fa;
-  min-height: 100%;
-}
-
-.work-container {
-  min-height: 100vh;
-  background-color: #f5f7fa;
-  padding: 24rpx;
-}
-
-.page-header {
-  display: flex;
-  align-items: center;
-  padding: 32rpx 24rpx 24rpx;
-  background-color: #ffffff;
-  border-radius: 16rpx;
-  margin-bottom: 24rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  
-  .header-decorator {
-    width: 6rpx;
-    height: 32rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 3rpx;
-    margin-right: 12rpx;
-  }
-  
-  .header-title {
-    font-size: 32rpx;
-    font-weight: 600;
-    color: #2c3e50;
-  }
-}
-
-.grid-body {
-  .grid-container {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-  }
-  
-  .grid-item {
-    width: calc(50% - 12rpx);
-    background: #ffffff;
-    border-radius: 16rpx;
-    overflow: hidden;
-    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-    transition: all 0.3s ease;
-    
-    &:active {
-      transform: translateY(-4rpx);
-      box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.12);
-    }
-  }
-  
-  .grid-item-content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    padding: 40rpx 20rpx;
-    position: relative;
-  }
-  
-  .icon-wrapper {
-    width: 96rpx;
-    height: 96rpx;
-    border-radius: 24rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-bottom: 20rpx;
-    box-shadow: 0 8rpx 16rpx rgba(0, 0, 0, 0.15);
-  }
-  
-  .grid-text {
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #2c3e50;
-    text-align: center;
-  }
-}
-</style>
diff --git a/src/pages/health/statistic/marStatistic/index.vue b/src/pages/health/statistic/marStatistic/index.vue
deleted file mode 100644
index 82ad36b..0000000
--- a/src/pages/health/statistic/marStatistic/index.vue
+++ /dev/null
@@ -1,1219 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.personName" border="false" type="select" @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-      </view>
-      <view class="search-view">
-        <u-input v-model="queryParams.healthRecordName" border="false" type="select" @click="handleHealthRecord" placeholder="请选择健康档案" suffixIcon="search"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-      </view>
-      <view class="search-view">
-        <u-input v-model="queryParams.time" placeholder="请选择用药日期" border="false" type="select" readonly suffixIcon="calendar"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-      </view>
-      
-      <view class="app-container">
-  <view class="header-con" ref="searchHeightRef">
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);">
-        <uni-icons type="color" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">用药天数</view>
-        <view class="num">{{ mar.marDays }}<span>天</span></view>
-      </view>
-    </view>
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);">
-        <uni-icons type="cart-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">用药种类</view>
-        <view class="num">{{ mar.marCategoryCount }}<span>种</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef">
-    <view class="item">
-      <view class="item-icon" style="background: linear-gradient(135deg, #10b981 0%, #059669 100%);">
-        <uni-icons type="loop" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">用药次数</view>
-        <view class="num">{{ mar.marCount }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item" v-show="mar.top1Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #db2777 0%, #ea580c 100%);">
-        <uni-icons type="star-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top1Name }}</view>
-        <view class="num">{{ mar.top1 }}<span>次</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef" v-show="mar.top2Name != null">
-    <view class="item" v-show="mar.top2Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #0891b2 0%, #0284c7 100%);">
-        <uni-icons type="checkbox-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top2Name }}</view>
-        <view class="num">{{ mar.top2 }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item" v-show="mar.top3Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #c026d3 0%, #dc2626 100%);">
-        <uni-icons type="gear-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top3Name }}</view>
-        <view class="num">{{ mar.top3 }}<span>次</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef" v-show="mar.top4Name != null">
-    <view class="item" v-show="mar.top4Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #5b51d8 0%, #6b21a8 100%);">
-        <uni-icons type="flag-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top4Name }}</view>
-        <view class="num">{{ mar.top4 }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item" v-show="mar.top5Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #059669 0%, #0d9488 100%);">
-        <uni-icons type="heart-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top5Name }}</view>
-        <view class="num">{{ mar.top5 }}<span>次</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef" v-show="mar.top6Name != null">
-    <view class="item" v-show="mar.top6Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);">
-        <uni-icons type="location-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top6Name }}</view>
-        <view class="num">{{ mar.top6 }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item" v-show="mar.top7Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);">
-        <uni-icons type="paperplane-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top7Name }}</view>
-        <view class="num">{{ mar.top7 }}<span>次</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef" v-show="mar.top8Name != null">
-    <view class="item" v-show="mar.top8Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #db2777 0%, #ea580c 100%);">
-        <uni-icons type="star" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top8Name }}</view>
-        <view class="num">{{ mar.top8 }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item" v-show="mar.top9Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #0891b2 0%, #ec4899 100%);">
-        <uni-icons type="settings-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top9Name }}</view>
-        <view class="num">{{ mar.top9 }}<span>次</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef" v-show="mar.top10Name != null">
-    <view class="item" v-show="mar.top10Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #10b981 0%, #059669 100%);">
-        <uni-icons type="compose" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top10Name }}</view>
-        <view class="num">{{ mar.top10 }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item" v-show="mar.top11Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #c026d3 0%, #dc2626 100%);">
-        <uni-icons type="contact-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top11Name }}</view>
-        <view class="num">{{ mar.top11 }}<span>次</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef" v-show="mar.top12Name != null">
-    <view class="item" v-show="mar.top12Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #5b51d8 0%, #6b21a8 100%);">
-        <uni-icons type="calendar-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top12Name }}</view>
-        <view class="num">{{ mar.top12 }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item" v-show="mar.top13Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #0284c7 0%, #0891b2 100%);">
-        <uni-icons type="email-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top13Name }}</view>
-        <view class="num">{{ mar.top13 }}<span>次</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef" v-show="mar.top14Name != null">
-    <view class="item" v-show="mar.top14Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);">
-        <uni-icons type="chatbubble-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top14Name }}</view>
-        <view class="num">{{ mar.top14 }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item" v-show="mar.top15Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #059669 0%, #0d9488 100%);">
-        <uni-icons type="eye-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top15Name }}</view>
-        <view class="num">{{ mar.top15 }}<span>次</span></view>
-      </view>
-    </view>
-  </view>
-  <view class="header-con" ref="searchHeightRef" v-show="mar.top16Name != null">
-    <view class="item" v-show="mar.top16Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #db2777 0%, #ea580c 100%);">
-        <uni-icons type="hand-up-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top16Name }}</view>
-        <view class="num">{{ mar.top16 }}<span>次</span></view>
-      </view>
-    </view>
-    <view class="item" v-show="mar.top17Name != null">
-      <view class="item-icon" style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);">
-        <uni-icons type="locked-filled" size="20" color="#ffffff"></uni-icons>
-      </view>
-      <view class="info-sum">
-        <view class="title">{{ mar.top17Name }}</view>
-        <view class="num">{{ mar.top17 }}<span>次</span></view>
-      </view>
-    </view>
-  </view>
-</view>
-      
-<!-- 视图切换 -->
-  <view class="section-title" v-show="listData.length>0">
-    <view class="title-decorator"></view>
-    <text class="title-text">用药统计</text>
-    <view class="view-switch">
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'list' }]" 
-        @click="viewMode = 'list'; tabShow = false"
-      >
-        <uni-icons type="list" size="16" :color="viewMode === 'list' ? '#667eea' : '#999'"></uni-icons>
-        <text>列表</text>
-      </view>
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'line' }]" 
-        @click="viewMode = 'line'; tabShow = false"
-      >
-        <uni-icons type="loop" size="16" :color="viewMode === 'line' ? '#667eea' : '#999'"></uni-icons>
-        <text>曲线图</text>
-      </view>
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'column' }]" 
-        @click="viewMode = 'column'; tabShow = false"
-      >
-        <uni-icons type="bars" size="16" :color="viewMode === 'column' ? '#667eea' : '#999'"></uni-icons>
-        <text>柱状图</text>
-      </view>
-    </view>
-  </view>
-    </u-sticky>
-    
-    <!-- 筛选面板 -->
-    <u-transition :show="filterPanel" mode="fade">
-      <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-        <view class="filter-panel-content">
-          <view class="filter-title">用药日期</view>
-          <view class="selcet-content" style="padding: 0 24rpx">
-            <u-input
-              :disabled="true"
-              :disabledColor="'#fff'"
-              class="dateInput"
-              border="surround"
-              v-model="queryParams.startTime"
-              placeholder="请选择开始时间"
-            >
-              <template v-slot:suffix>
-                <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-              </template>
-            </u-input>
-            <u-input
-              :disabled="true"
-              :disabledColor="'#fff'"
-              class="dateInput"
-              border="surround"
-              v-model="queryParams.endTime"
-              placeholder="请选择结束时间"
-            >
-              <template v-slot:suffix>
-                <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-              </template>
-            </u-input>
-          </view>
-        </view>
-        <view class="btn-box">
-          <view class="btn-reset" @click="resetQuery()">
-            <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-            <text>重置</text>
-          </view>
-          <view class="btn-confirm" @click="searchSubmit()">
-            <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-            <text>确定</text>
-          </view>
-        </view>
-      </view>
-    </u-transition>
-    
-    <u-datetime-picker
-      :closeOnClickOverlay="true"
-      :show="timeShow"
-      v-model="time"
-      mode="date"
-      :minDate="-2209017600000"
-      @close="openOrCloseDate"
-      @cancel="openOrCloseDate"
-      @confirm="confirm"
-    ></u-datetime-picker>
-    
-  <!-- 曲线图展示 -->
-  <view class="chart-container" v-if="listData.length>0 && viewMode === 'line'">
-    <qiun-data-charts 
-      type="line"
-      canvasId="marLineChart"
-      :chartData="chartData"
-      :opts="lineChartOpts"
-      :loadingType="1"
-    />
-  </view>
-  
-  <!-- 柱状图展示 -->
-  <view class="chart-container" v-if="listData.length>0 && viewMode === 'column'">
-    <qiun-data-charts 
-      type="column"
-      canvasId="marColumnChart"
-      :chartData="chartData"
-      :opts="columnChartOpts"
-      :loadingType="1"
-    />
-  </view>
-  
-  <!-- 列表展示 -->
-    <u-list v-show="viewMode === 'list' && !tabShow" :spaceHeight="720" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="record-name-section">
-              <view class="record-icon">
-                <uni-icons type="wallet-filled" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="record-info">
-                <text class="record-name">{{ item.medicalName }} - {{ item.useDays || 0 }}天</text>
-              </view>
-            </view>
-          </view>
-          
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item">
-                <text class="info-label">用药次数</text>
-                <text class="info-value">{{ item.count || 0 }}次</text>
-              </view>
-              <view class="info-item">
-                <text class="info-label">用药总量</text>
-                <text class="info-value">{{ item.dosage }}{{ item.unit }}</text>
-              </view>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-    </u-list>
-    <u-list v-show="viewMode === 'list' && tabShow"  :spaceHeight="720" lowerThreshold="100">
-        <u-list-item v-for="(item, index) in secondListData" :key="index">
-          <view class="list-item">
-            <view class="item-header">
-              <view class="record-name-section">
-                <view class="record-icon">
-                  <uni-icons type="wallet-filled" size="20" color="#ffffff"></uni-icons>
-                </view>
-                <view class="record-info">
-                  <text class="record-name">{{ item.time }}</text>
-                </view>
-              </view>
-              <view class="cost-section">
-                <text class="cost-value"><text class="cost-label">次数</text>{{ item.value }}次</text>
-              </view>
-            </view>
-          </view>
-        </u-list-item>
-        <view>
-        </view>
-      </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handleHealthRecordCancel"
-        @confirm="handleHealthRecordConfirm"></u-picker>
-  </view>
-  <!-- 悬停按钮返回工作台-->
-  <suspend></suspend>
-</template>
-
-<script setup>
-import { getMarAnalysis } from '@/api/health/statisticAnalysis'
-import { listPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-import { getDicts } from '@/api/system/dict/data.js'
-  import dayjs from 'dayjs'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const personList = ref([])
-
-const showHealthRecord = ref(false)
-const healthRecordList = ref([])
-
-const personTypeList = ref([])
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const showPerson = ref(false)
-const timeShow= ref(false)
-const time =ref( Number(new Date()))
-const  flag= ref(true)
-const mar = ref({})
-
-const tabShow = ref(false)
-const viewMode = ref('list') // 'list', 'line', 'column'
-const firstType = ref("primary")
-const secondType = ref("default")
-const secondListData = ref([])
-
-// 曲线图配置
-const lineChartOpts = computed(() => {
-  const dataCount = secondListData.value ? secondListData.value.length : 0
-  const showXAxisLabel = dataCount <= 10
-  
-  return {
-    color: ['#667eea'],
-    padding: [15, 15, 30, 5],
-    enableScroll: false,
-    enableMarkLine: true,
-    dataLabel: false,
-    dataPointShape: true,
-    legend: {
-      show: false
-    },
-    xAxis: {
-      disableGrid: true,
-      boundaryGap: 'justify',
-      axisLine: false,
-      scrollShow: true,
-      itemCount: 5,
-      fontSize: showXAxisLabel ? 10 : 0,
-      fontColor: showXAxisLabel ? '#999999' : 'transparent',
-      rotateLabel: true,
-      rotateAngle: 30,
-      disabled: !showXAxisLabel
-    },
-    yAxis: {
-      gridType: 'dash',
-      dashLength: 4,
-      gridColor: '#EEEEEE',
-      splitNumber: 5,
-      fontSize: 10,
-      fontColor: '#999999',
-      format: (val) => {
-        return val.toFixed(0) + '次'
-      },
-      data: [
-        {
-          min: 0
-        }
-      ]
-    },
-    extra: {
-      line: {
-        type: 'curve',
-        width: 3,
-        activeType: 'hollow',
-        linearType: 'custom',
-        linearOpacity: 0.2,
-        onShadow: true,
-        animation: true
-      }
-    }
-  }
-})
-
-// 柱状图配置
-const columnChartOpts = computed(() => {
-  const dataCount = secondListData.value ? secondListData.value.length : 0
-  const showXAxisLabel = dataCount <= 10
-  
-  return {
-    color: ['#667eea'],
-    padding: [15, 15, 30, 5],
-    enableScroll: false,
-    dataLabel: false,
-    legend: {
-      show: false
-    },
-    xAxis: {
-      disableGrid: true,
-      boundaryGap: 'center',
-      axisLine: false,
-      scrollShow: true,
-      itemCount: 5,
-      fontSize: showXAxisLabel ? 10 : 0,
-      fontColor: showXAxisLabel ? '#999999' : 'transparent',
-      rotateLabel: true,
-      rotateAngle: 30,
-      disabled: !showXAxisLabel
-    },
-    yAxis: {
-      gridType: 'dash',
-      dashLength: 4,
-      gridColor: '#EEEEEE',
-      splitNumber: 5,
-      fontSize: 10,
-      fontColor: '#999999',
-      showTitle: false,
-      disabled: false,
-      format: (val) => {
-        return val.toFixed(0) + '次'
-      }
-    },
-    extra: {
-      column: {
-        type: 'group',
-        width: 20,
-        activeBgColor: '#764ba2',
-        activeBgOpacity: 0.08,
-        linearType: 'none',
-        barBorderCircle: true,
-        seriesGap: 2
-      }
-    }
-  }
-})
-
-// 图表数据
-const chartData = computed(() => {
-  if (!secondListData.value || secondListData.value.length === 0) {
-    return {
-      categories: [],
-      series: []
-    }
-  }
-  
-  return {
-    categories: secondListData.value.map(item => item.time || ''),
-    series: [
-      {
-        name: '用药次数',
-        data: secondListData.value.map(item => {
-          const value = parseFloat(item.value)
-          return isNaN(value) ? 0 : value
-        })
-      }
-    ]
-  }
-})
-
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-  pageNum: 1,
-  pageSize: 100
-},
-  queryParams: {
-  type: 1,
-  time: null,
-  recordId: null,
-  dataType: null,
-  id: null
-   } ,
-   queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-}
-})
-
-const { filterPanel, queryPersonParams,queryHealthRecordParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-            uni.getSystemInfoSync().windowHeight - 50
-        })	
-onLoad(() => {
-    getDict()
-    // getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-    listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-  function   btFirstClick() {
-    tabShow.value=false
-    firstType.value="primary"
-    secondType.value="default"
-
-      }
-      function  btSecondClick() {
-        secondType.value="primary"
-         firstType.value="default"
-        tabShow.value=true
-        
-    }
-
-  function formatMultiLineData(data) {
-if (data != null) {
-  return data.replace(/<br\/>/g, '\n')
-}
-}
-function  openOrCloseDate(data) {
-    timeShow.value = !timeShow.value
-    flag.value = data
-  }
-  function confirm(e) {
-    const date = timeHandler(new Date(e.value), '-', ':')
-          let formatValue = 'YYYY-MM-DD'
-          dayjs(date).format(formatValue)
-    if (flag.value) {
-      queryParams.value.startTime =  dayjs(date).format(formatValue)
-    } else {
-      queryParams.value.endTime =  dayjs(date).format(formatValue)
-    }
-    timeShow.value = false
-  }
-function searchSubmit() {
-  if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-    pageNum.value = 1
-    listData.value = []
-    getList()
-    filterPanel.value = false
-  }
-  function resetQuery() {
-      queryParams.value.type = '1'
-     queryParams.value.startTime =  ''
-    queryParams.value.endTime =  ''
-    queryParams.value.time = ''
-  }
-function getList() {
-  
-  getMarAnalysis({...queryParams.value }).then(res => {
-          mar.value = { ...res.data }
-          listData.value=[]
-          secondListData.value=[]
-        listData.value = listData.value.concat(res.data.marMapList)
-        secondListData.value = secondListData.value.concat(res.data.marList.slice().reverse())
-      }).catch(() => {
-      })
-    }
-function   getDict() {
-  listPerson(queryPersonParams.value).then((response) => {
-      personList.value = [response.rows]
-      if(response.rows.length>0){
-        queryParams.value.personName= response.rows[0].name
-      queryParams.value.id = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-          queryParams.value.healthRecordName= response.rows[0].name
-          queryParams.value.recordId = response.rows[0].id
-       }
-       getMarAnalysis({...queryParams.value }).then(res => {
-        mar.value = { ...res.data }
-        listData.value=[]
-        secondListData.value=[]
-        listData.value = listData.value.concat(res.data.marMapList)
-        secondListData.value = secondListData.value.concat(res.data.marList.slice().reverse())
-      }).catch(() => {
-      })
-
-
-      })
-     } 
-    })
-      
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.id= e.value[0].id
-    queryParams.value.healthRecordName = ''
-    queryParams.value.recordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-    showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-})
-  }
- function handlePersonCancel() {
-
-       showPerson.value = false
-       listData.value = []
-      getList()
-      filterPanel.value = false
-  }
-  
-  function handleHealthRecord() {
-        if (healthRecordList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '健康档案为空  ', type: 'warning'
-          })
-        } else {
-          showHealthRecord.value = true
-        }
-     }
-  function   handleHealthRecordConfirm(e) {
-    queryParams.value.healthRecordName = e.value[0].name
-    queryParams.value.recordId =  e.value[0].id
-    showHealthRecord.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleHealthRecordCancel() {
-  queryParams.value.healthRecordName= ""
-  queryParams.value.recordId = null
-       showHealthRecord.value = false
-       listData.value = []
-      getList()
-      filterPanel.value = false
-  }
-
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.app-container {
-  background-color: #f5f7fa;
-  padding: 0;
-  
-  .header-con {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 8rpx 24rpx;
-    margin-bottom: 8rpx;
-    background-color: transparent;
-    
-    .item {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      padding: 16rpx;
-      background: #ffffff;
-      border-radius: 16rpx;
-      box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-      margin: 0 4rpx;
-      transition: all 0.3s ease;
-      
-      &:first-child {
-        margin-left: 0;
-      }
-      
-      &:last-child {
-        margin-right: 0;
-      }
-      
-      &:active {
-        transform: translateY(-2rpx);
-        box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.12);
-      }
-      
-      .item-icon {
-        width: 64rpx;
-        height: 64rpx;
-        border-radius: 12rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 12rpx;
-        box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
-        flex-shrink: 0;
-      }
-      
-      .info-sum {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        
-        .title {
-          color: #7f8c8d;
-          margin-bottom: 4rpx;
-          font-size: 22rpx;
-        }
-        
-        .num {
-          color: #2c3e50;
-          font-size: 28rpx;
-          font-weight: 600;
-          
-          span {
-            font-size: 18rpx;
-            color: #95a5a6;
-            margin-left: 2rpx;
-          }
-        }
-      }
-    }
-  }
-  
-  .header-title {
-    width: 100%;
-    height: 30px;
-    background-color: #ffffff;
-    margin-bottom: 3px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-size: 16px;
-  }
-}
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-    display: flex;
-    align-items: center;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-}
-
-.filter-panel {
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 270rpx;
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 999;
-
-  .filter-panel-content {
-    background-color: #ffffff;
-    padding: 0 30rpx 30rpx;
-    border-radius: 16rpx 16rpx 0 0;
-
-    .filter-title {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-
-      .state-list {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: flex-start;
-
-        .state-item {
-          width: 210rpx;
-          height: 72rpx;
-          border: 1rpx solid rgba(0, 0, 0, 0.25);
-          border-radius: 72rpx;
-          text-align: center;
-          line-height: 72rpx;
-          margin: 0 20rpx 20rpx 0;
-          font-size: 28rpx;
-          color: #000000;
-        }
-
-        .active {
-          background-color: rgba(222, 241, 255, 1);
-          border: 1rpx solid rgba(22, 119, 255, 1);
-        }
-      }
-    }
-
-  .btn-box {
-    display: flex;
-    gap: 20rpx;
-    padding: 24rpx 30rpx;
-    background-color: #fff;
-    box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    
-    .btn-reset,
-    .btn-confirm {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 8rpx;
-      height: 88rpx;
-      border-radius: 12rpx;
-      font-size: 30rpx;
-      font-weight: 600;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.98);
-        opacity: 0.9;
-      }
-      
-      text {
-        line-height: 1;
-      }
-    }
-    
-    .btn-reset {
-      flex: 1;
-      background: #f5f7fa;
-      border: 2rpx solid #dcdfe6;
-      
-      text {
-        color: #606266;
-      }
-    }
-    
-    .btn-confirm {
-      flex: 1;
-      background: #667eea;
-      box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-      border: none;
-      
-      text {
-        color: #ffffff;
-      }
-    }
-  }
-}
-
-.section-title {
-  display: flex;
-  margin-top: -10rpx;
-  align-items: center;
-  padding: 20rpx 32rpx 12rpx;
-  background-color: #f5f7fa;
-  
-  .title-decorator {
-    width: 6rpx;
-    height: 32rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 3rpx;
-    margin-right: 12rpx;
-  }
-  
-  .title-text {
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #2c3e50;
-    line-height: 1;
-    flex: 1;
-  }
-  
-  .view-switch {
-    display: flex;
-    align-items: center;
-    gap: 4rpx;
-    background: #ffffff;
-    border-radius: 12rpx;
-    padding: 4rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-    
-    .switch-item {
-      display: flex;
-      align-items: center;
-      gap: 4rpx;
-      padding: 6rpx 12rpx;
-      border-radius: 8rpx;
-      transition: all 0.3s ease;
-      cursor: pointer;
-      
-      text {
-        font-size: 22rpx;
-        color: #999999;
-        line-height: 1;
-      }
-      
-      &.active {
-        background: linear-gradient(135deg, rgba(102, 126, 234, 0.1) 0%, rgba(118, 75, 162, 0.1) 100%);
-        
-        text {
-          color: #667eea;
-          font-weight: 600;
-        }
-      }
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-  }
-}
-
-.chart-container {
-  margin: 16rpx 24rpx 60rpx;
-  padding: 16rpx;
-  background: linear-gradient(135deg, #ffffff 0%, #f8f9fb 100%);
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  width: calc(100% - 48rpx);
-  height: 480rpx;
-  overflow: visible;
-  position: relative;
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .record-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-      margin-right: 16rpx;
-    }
-    
-    .record-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .record-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      
-      .record-name {
-        color: #ffffff;
-        font-size: 28rpx;
-        font-weight: 600;
-        line-height: 1.2;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-    }
-    
-    .cost-section {
-      display: flex;
-      align-items: center;
-      flex-shrink: 0;
-      white-space: nowrap;
-      
-      .cost-value {
-        color: #fa8c16;
-        font-size: 32rpx;
-        font-weight: 700;
-        line-height: 1;
-        white-space: nowrap;
-        
-        .cost-label {
-          color: rgba(255, 255, 255, 0.85);
-          font-size: 22rpx;
-          font-weight: 400;
-          margin-right: 8rpx;
-        }
-      }
-    }
-  }
-  
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-    margin-bottom: 0;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/statistic/milkPowderStatistic/index.vue b/src/pages/health/statistic/milkPowderStatistic/index.vue
deleted file mode 100644
index c7a730a..0000000
--- a/src/pages/health/statistic/milkPowderStatistic/index.vue
+++ /dev/null
@@ -1,1000 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.personName" border="false" type="select"  @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>  
-      </view>
-      <view class="search-view">
-        <u-input v-model="queryParams.time" placeholder="请选择吃奶日期" border="false" type="select" readonly suffixIcon="calendar"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-      </view>
-      
-      <view class="app-container">
-        <view class="header-con" ref="searchHeightRef">
-          <view class="item">
-            <view class="item-icon" style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);">
-              <uni-icons type="calendar-filled" size="20" color="#ffffff"></uni-icons>
-            </view>
-            <view class="info-sum">
-              <view class="title">今日吃奶次数</view>
-              <view class="num">{{ milkPowder.todayCount }}<span>次</span></view>
-            </view>
-          </view>
-          <view class="item">
-            <view class="item-icon" style="background: linear-gradient(135deg, #0891b2 0%, #0284c7 100%);">
-              <uni-icons type="color" size="20" color="#ffffff"></uni-icons>
-            </view>
-            <view class="info-sum">
-              <view class="title">今日吃奶量</view>
-              <view class="num">{{ milkPowder.todayConsumption }}<span>毫升</span></view>
-            </view>
-          </view>
-        </view>
-        <view class="header-con" ref="searchHeightRef">
-          <view class="item">
-            <view class="item-icon" style="background: linear-gradient(135deg, #10b981 0%, #059669 100%);">
-              <uni-icons type="star-filled" size="20" color="#ffffff"></uni-icons>
-            </view>
-            <view class="info-sum">
-              <view class="title">今日单次平均吃奶量</view>
-              <view class="num">{{ milkPowder.todayPerConsumption }}<span>毫升</span></view>
-            </view>
-          </view>
-          <view class="item">
-            <view class="item-icon" style="background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);">
-              <uni-icons type="calendar" size="20" color="#ffffff"></uni-icons>
-            </view>
-            <view class="info-sum">
-              <view class="title">近7日吃奶量</view>
-              <view class="num">{{ milkPowder.sevenDayConsumption }}<span>毫升</span></view>
-            </view>
-          </view>
-        </view>
-        <view class="header-con" ref="searchHeightRef">
-          <view class="item">
-            <view class="item-icon" style="background: linear-gradient(135deg, #db2777 0%, #ea580c 100%);">
-              <uni-icons type="heart-filled" size="20" color="#ffffff"></uni-icons>
-            </view>
-            <view class="info-sum">
-              <view class="title">近7日日平均吃奶量</view>
-              <view class="num">{{ milkPowder.sevenDayPerConsumption }}<span>毫升</span></view>
-            </view>
-          </view>
-          <view class="item">
-            <view class="item-icon" style="background: linear-gradient(135deg, #c026d3 0%, #dc2626 100%);">
-              <uni-icons type="flag-filled" size="20" color="#ffffff"></uni-icons>
-            </view>
-            <view class="info-sum">
-              <view class="title">近1月吃奶量</view>
-              <view class="num">{{ milkPowder.oneMonthConsumption }}<span>毫升</span></view>
-            </view>
-          </view>
-        </view>
-        <view class="header-con" ref="searchHeightRef">
-          <view class="item">
-            <view class="item-icon" style="background: linear-gradient(135deg, #0284c7 0%, #0891b2 100%);">
-              <uni-icons type="gift-filled" size="20" color="#ffffff"></uni-icons>
-            </view>
-            <view class="info-sum">
-              <view class="title">近3月吃奶量</view>
-              <view class="num">{{ milkPowder.threeMonthConsumption }}<span>毫升</span></view>
-            </view>
-          </view>
-          <view class="item">
-            <view class="item-icon" style="background: linear-gradient(135deg, #059669 0%, #0d9488 100%);">
-              <uni-icons type="star" size="20" color="#ffffff"></uni-icons>
-            </view>
-            <view class="info-sum">
-              <view class="title">近6月吃奶量</view>
-              <view class="num">{{ milkPowder.sixMonthConsumption }}<span>毫升</span></view>
-            </view>
-          </view>
-        </view>
-        <view class="header-con" ref="searchHeightRef">
-          <view class="item">
-            <view class="item-icon" style="background: linear-gradient(135deg, #5b51d8 0%, #6b21a8 100%);">
-              <uni-icons type="fire-filled" size="20" color="#ffffff"></uni-icons>
-            </view>
-            <view class="info-sum">
-              <view class="title">近1年吃奶量</view>
-              <view class="num">{{ milkPowder.oneYearConsumption }}<span>毫升</span></view>
-            </view>
-          </view>
-          <view class="item">
-            <view class="item-icon" style="background: linear-gradient(135deg, #0891b2 0%, #ec4899 100%);">
-              <uni-icons type="wallet-filled" size="20" color="#ffffff"></uni-icons>
-            </view>
-            <view class="info-sum">
-              <view class="title">总吃奶量</view>
-              <view class="num">{{ milkPowder.totalConsumption }}<span>毫升</span></view>
-            </view>
-          </view>
-        </view>
-      </view>
-      
-<!-- 视图切换 -->
-  <view class="section-title" v-show="listData.length>0">
-    <view class="title-decorator"></view>
-    <text class="title-text">吃奶量统计</text>
-    <view class="view-switch">
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'list' }]" 
-        @click="viewMode = 'list'"
-      >
-        <uni-icons type="list" size="16" :color="viewMode === 'list' ? '#667eea' : '#999'"></uni-icons>
-        <text>列表</text>
-      </view>
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'line' }]" 
-        @click="viewMode = 'line'"
-      >
-        <uni-icons type="loop" size="16" :color="viewMode === 'line' ? '#667eea' : '#999'"></uni-icons>
-        <text>曲线图</text>
-      </view>
-      <view 
-        :class="['switch-item', { 'active': viewMode === 'column' }]" 
-        @click="viewMode = 'column'"
-      >
-        <uni-icons type="bars" size="16" :color="viewMode === 'column' ? '#667eea' : '#999'"></uni-icons>
-        <text>柱状图</text>
-      </view>
-    </view>
-  </view>
-    </u-sticky>
-    
-  <!-- 筛选面板 -->
-  <u-transition :show="filterPanel" mode="fade">
-    <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-      <view class="filter-panel-content">
-        <view class="filter-title">吃奶日期</view>
-        <view class="selcet-content" style="padding: 0 24rpx">
-          <u-input
-            :disabled="true"
-            :disabledColor="'#fff'"
-            class="dateInput"
-            border="surround"
-            v-model="queryParams.startTime"
-            placeholder="请选择开始时间"
-          >
-            <template v-slot:suffix>
-              <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-            </template>
-          </u-input>
-          <u-input
-            :disabled="true"
-            :disabledColor="'#fff'"
-            class="dateInput"
-            border="surround"
-            v-model="queryParams.endTime"
-            placeholder="请选择结束时间"
-          >
-            <template v-slot:suffix>
-              <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-            </template>
-          </u-input>
-        </view>
-      </view>
-      <view class="btn-box">
-        <view class="btn-reset" @click="resetQuery()">
-          <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-          <text>重置</text>
-        </view>
-        <view class="btn-confirm" @click="searchSubmit()">
-          <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-          <text>确定</text>
-        </view>
-      </view>
-    </view>
-  </u-transition>
-  
-  <!-- 日期选择器 -->
-  <u-datetime-picker
-    :closeOnClickOverlay="true"
-    :show="timeShow"
-    v-model="time"
-    mode="date"
-    :minDate="-2209017600000"
-    @close="openOrCloseDate"
-    @cancel="openOrCloseDate"
-    @confirm="confirm"
-  ></u-datetime-picker>
-  
-  <!-- 曲线图展示 -->
-  <view class="chart-container" v-if="listData.length>0 && viewMode === 'line'">
-    <qiun-data-charts 
-      type="line"
-      canvasId="milkLineChart"
-      :chartData="chartData"
-      :opts="lineChartOpts"
-      :loadingType="1"
-    />
-  </view>
-  
-  <!-- 柱状图展示 -->
-  <view class="chart-container" v-if="listData.length>0 && viewMode === 'column'">
-    <qiun-data-charts 
-      type="column"
-      canvasId="milkColumnChart"
-      :chartData="chartData"
-      :opts="columnChartOpts"
-      :loadingType="1"
-    />
-  </view>
-  
-  <!-- 列表展示 -->
-  <view style="margin:0 24rpx 24rpx" v-show="listData.length>0 && viewMode === 'list'">
-    <u-list :spaceHeight="720" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="record-name-section">
-              <view class="record-icon">
-                <uni-icons type="bars" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="record-info">
-                <text class="record-name">{{ item.time }}</text>
-              </view>
-            </view>
-            <view class="cost-section">
-              <text class="cost-value">{{ item.value }}<text class="cost-label">ml</text></text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-    </u-list>
-  </view>
-  
-  <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-    @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-  <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-    @confirm="handlePersonConfirm"></u-picker>
-  </view>
-  <!-- 悬停按钮返回工作台-->
-  <suspend></suspend>
-</template>
-
-<script setup>
-import { getMilkPowderAnalysis } from '@/api/health/statisticAnalysis'
-import { listPerson } from '@/api/health/person'
-import { getDicts } from '@/api/system/dict/data.js'
-  import dayjs from 'dayjs'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const personList = ref([])
-
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const showPerson = ref(false)
-const timeShow= ref(false)
-const time =ref( Number(new Date()))
-const  flag= ref(true)
-const milkPowder = ref({})
-const viewMode = ref('list') // 'list', 'line', 'column'
-
-// 曲线图配置
-const lineChartOpts = computed(() => {
-  const dataCount = listData.value ? listData.value.length : 0
-  const showXAxisLabel = dataCount <= 10
-  
-  return {
-    color: ['#667eea'],
-    padding: [15, 15, 30, 5],
-    enableScroll: false,
-    enableMarkLine: true,
-    dataLabel: false,
-    dataPointShape: true,
-    legend: {
-      show: false
-    },
-    xAxis: {
-      disableGrid: true,
-      boundaryGap: 'justify',
-      axisLine: false,
-      scrollShow: true,
-      itemCount: 5,
-      fontSize: showXAxisLabel ? 10 : 0,
-      fontColor: showXAxisLabel ? '#999999' : 'transparent',
-      rotateLabel: true,
-      rotateAngle: 30,
-      disabled: !showXAxisLabel
-    },
-    yAxis: {
-      gridType: 'dash',
-      dashLength: 4,
-      gridColor: '#EEEEEE',
-      splitNumber: 5,
-      fontSize: 10,
-      fontColor: '#999999',
-      format: (val) => {
-        return val.toFixed(0) + 'ml'
-      },
-      data: [
-        {
-          min: 0
-        }
-      ]
-    },
-    extra: {
-      line: {
-        type: 'curve',
-        width: 3,
-        activeType: 'hollow',
-        linearType: 'custom',
-        linearOpacity: 0.2,
-        onShadow: true,
-        animation: true
-      }
-    }
-  }
-})
-
-// 柱状图配置
-const columnChartOpts = computed(() => {
-  const dataCount = listData.value ? listData.value.length : 0
-  const showXAxisLabel = dataCount <= 10
-  
-  return {
-    color: ['#667eea'],
-    padding: [15, 15, 30, 5],
-    enableScroll: false,
-    dataLabel: false,
-    legend: {
-      show: false
-    },
-    xAxis: {
-      disableGrid: true,
-      boundaryGap: 'center',
-      axisLine: false,
-      scrollShow: true,
-      itemCount: 5,
-      fontSize: showXAxisLabel ? 10 : 0,
-      fontColor: showXAxisLabel ? '#999999' : 'transparent',
-      rotateLabel: true,
-      rotateAngle: 30,
-      disabled: !showXAxisLabel
-    },
-    yAxis: {
-      gridType: 'dash',
-      dashLength: 4,
-      gridColor: '#EEEEEE',
-      splitNumber: 5,
-      fontSize: 10,
-      fontColor: '#999999',
-      showTitle: false,
-      disabled: false,
-      format: (val) => {
-        return val.toFixed(0) + 'ml'
-      }
-    },
-    extra: {
-      column: {
-        type: 'group',
-        width: 20,
-        activeBgColor: '#764ba2',
-        activeBgOpacity: 0.08,
-        linearType: 'none',
-        barBorderCircle: true,
-        seriesGap: 2
-      }
-    }
-  }
-})
-
-// 图表数据
-const chartData = computed(() => {
-  if (!listData.value || listData.value.length === 0) {
-    return {
-      categories: [],
-      series: []
-    }
-  }
-  
-  const reversedData = [...listData.value].reverse()
-  return {
-    categories: reversedData.map(item => item.time || ''),
-    series: [
-      {
-        name: '吃奶量',
-        data: reversedData.map(item => {
-          const value = parseFloat(item.value)
-          return isNaN(value) ? 0 : value
-        })
-      }
-    ]
-  }
-})
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-  pageNum: 1,
-  pageSize: 100
-},
-  queryParams: {
-  type: 1,
-  time: null,
-  dataType: null,
-  recordId: null,
-  id: null
-   }
-})
-
-const { filterPanel, queryPersonParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-            uni.getSystemInfoSync().windowHeight - 50
-        })	
-onLoad(() => {
-    getDict()
-    // getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-    listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function formatMultiLineData(data) {
-if (data != null) {
-  return data.replace(/<br\/>/g, '\n')
-}
-}
-function  openOrCloseDate(data) {
-    timeShow.value = !timeShow.value
-    flag.value = data
-  }
-  function confirm(e) {
-    const date = timeHandler(new Date(e.value), '-', ':')
-          let formatValue = 'YYYY-MM-DD'
-          dayjs(date).format(formatValue)
-    if (flag.value) {
-      queryParams.value.startTime =  dayjs(date).format(formatValue)
-    } else {
-      queryParams.value.endTime =  dayjs(date).format(formatValue)
-    }
-    timeShow.value = false
-  }
-function searchSubmit() {
-  if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-    pageNum.value = 1
-    listData.value = []
-    getList()
-    filterPanel.value = false
-  }
-  function resetQuery() {
-      queryParams.value.type = '1'
-      let formatValue = 'YYYY-MM-DD'
-    const today = new Date()
-    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
-   const start = dayjs(end).add(-30, 'day')
-   queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
-       queryParams.value.startTime =  dayjs(start).format(formatValue)
-      queryParams.value.endTime =  dayjs(end).format(formatValue)
-    queryParams.value.time = ''
-  }
-function getList() {
-  
-  getMilkPowderAnalysis({...queryParams.value }).then(res => {
-          console.log('吃奶统计返回数据:', res.data)
-          console.log('milkPowderTableList:', res.data.milkPowderTableList)
-          milkPowder.value = { ...res.data.milkPowderStatistic }
-        listData.value = listData.value.concat(res.data.milkPowderTableList)
-        console.log('listData.value:', listData.value)
-      }).catch(() => {
-      })
-    }
-function   getDict() {
-  let formatValue = 'YYYY-MM-DD'
-    const today = new Date()
-    const end = today.getFullYear() + '-' + ('0' + (today.getMonth() + 1)).slice(-2) + '-' + ('0' + today.getDate()).slice(-2)
-   const start = dayjs(end).add(-30, 'day')
-       queryParams.value.startTime =  dayjs(start).format(formatValue)
-      queryParams.value.endTime =  dayjs(end).format(formatValue)
-      queryParams.value.time = dayjs(start).format(formatValue)+'-'+dayjs(end).format(formatValue)
-  listPerson(queryPersonParams.value).then((response) => {
-      personList.value = [response.rows]
-      if(response.rows.length>0){
-        queryParams.value.personName= response.rows[0].name
-      queryParams.value.id = response.rows[0].id
-       getMilkPowderAnalysis({...queryParams.value }).then(res => {
-          milkPowder.value = { ...res.data.milkPowderStatistic }
-        listData.value = listData.value.concat(res.data.milkPowderTableList)
-      }).catch(() => {
-      })
-
-
-     } 
-    })
-      
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.id= e.value[0].id
-    showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-
-  }
- function handlePersonCancel() {
-  // queryParams.value.personName = ''
-  //   queryParams.value.id=''
-
-       showPerson.value = false
-       listData.value = []
-      getList()
-      filterPanel.value = false
-  }
-  
-
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.app-container {
-  background-color: #f5f7fa;
-  padding: 0;
-  
-  .header-con {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 8rpx 24rpx;
-    margin-bottom: 8rpx;
-    background-color: transparent;
-    
-    .item {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      padding: 16rpx;
-      background: #ffffff;
-      border-radius: 16rpx;
-      box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-      margin: 0 4rpx;
-      transition: all 0.3s ease;
-      
-      &:first-child {
-        margin-left: 0;
-      }
-      
-      &:last-child {
-        margin-right: 0;
-      }
-      
-      &:active {
-        transform: translateY(-2rpx);
-        box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.12);
-      }
-      
-      .item-icon {
-        width: 64rpx;
-        height: 64rpx;
-        border-radius: 12rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 12rpx;
-        box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
-        flex-shrink: 0;
-      }
-      
-      .info-sum {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        
-        .title {
-          color: #7f8c8d;
-          margin-bottom: 4rpx;
-          font-size: 22rpx;
-        }
-        
-        .num {
-          color: #2c3e50;
-          font-size: 28rpx;
-          font-weight: 600;
-          
-          span {
-            font-size: 18rpx;
-            color: #95a5a6;
-            margin-left: 2rpx;
-          }
-        }
-      }
-    }
-  }
-  
-  .header-title {
-    width: 100%;
-    height: 30px;
-    background-color: #ffffff;
-    margin-bottom: 3px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-size: 16px;
-  }
-}
-
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-    display: flex;
-    align-items: center;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-}
-
-.section-title {
-  display: flex;
-  margin-top: -10rpx;
-  align-items: center;
-  padding: 24rpx 32rpx 16rpx;
-  background-color: #f5f7fa;
-  
-  .title-decorator {
-    width: 6rpx;
-    height: 32rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 3rpx;
-    margin-right: 12rpx;
-  }
-  
-  .title-text {
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #2c3e50;
-    line-height: 1;
-    flex: 1;
-  }
-  
-  .view-switch {
-    display: flex;
-    align-items: center;
-    gap: 4rpx;
-    background: #ffffff;
-    border-radius: 12rpx;
-    padding: 4rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-    
-    .switch-item {
-      display: flex;
-      align-items: center;
-      gap: 4rpx;
-      padding: 6rpx 12rpx;
-      border-radius: 8rpx;
-      transition: all 0.3s ease;
-      cursor: pointer;
-      
-      text {
-        font-size: 22rpx;
-        color: #999999;
-        line-height: 1;
-      }
-      
-      &.active {
-        background: linear-gradient(135deg, rgba(102, 126, 234, 0.1) 0%, rgba(118, 75, 162, 0.1) 100%);
-        
-        text {
-          color: #667eea;
-          font-weight: 600;
-        }
-      }
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-  }
-}
-
-.chart-container {
-  margin: 16rpx 24rpx 60rpx;
-  padding: 16rpx;
-  background: linear-gradient(135deg, #ffffff 0%, #f8f9fb 100%);
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  width: calc(100% - 48rpx);
-  height: 550rpx;
-  overflow: visible;
-  position: relative;
-}
-
-.filter-panel {
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 184rpx;
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 999;
-
-  .filter-panel-content {
-    background-color: #ffffff;
-    padding: 0 30rpx 30rpx;
-    border-radius: 16rpx 16rpx 0 0;
-
-    .select-header {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-
-    .filter-title {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-
-    .state-list {
-      display: flex;
-      flex-wrap: wrap;
-      justify-content: flex-start;
-
-      .state-item {
-        width: 210rpx;
-        height: 72rpx;
-        border: 1rpx solid rgba(0, 0, 0, 0.25);
-        border-radius: 72rpx;
-        text-align: center;
-        line-height: 72rpx;
-        margin: 0 20rpx 20rpx 0;
-        font-size: 28rpx;
-        color: #000000;
-      }
-
-      .active {
-        background-color: rgba(222, 241, 255, 1);
-        border: 1rpx solid rgba(22, 119, 255, 1);
-      }
-    }
-  }
-
-  .btn-box {
-    display: flex;
-    gap: 20rpx;
-    padding: 24rpx 30rpx;
-    background-color: #fff;
-    box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    
-    .btn-reset,
-    .btn-confirm {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 8rpx;
-      height: 88rpx;
-      border-radius: 12rpx;
-      font-size: 30rpx;
-      font-weight: 600;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.98);
-        opacity: 0.9;
-      }
-      
-      text {
-        line-height: 1;
-      }
-    }
-    
-    .btn-reset {
-      flex: 1;
-      background: #f5f7fa;
-      border: 2rpx solid #dcdfe6;
-      
-      text {
-        color: #606266;
-      }
-    }
-    
-    .btn-confirm {
-      flex: 1;
-      background: #667eea;
-      box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-      border: none;
-      
-      text {
-        color: #ffffff;
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 0 0 16rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.3s ease;
-  
-  &:active {
-    transform: translateY(-2rpx);
-    box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.12);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 20rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .record-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-      margin-right: 16rpx;
-    }
-    
-    .record-icon {
-      width: 48rpx;
-      height: 48rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 16rpx;
-      flex-shrink: 0;
-    }
-    
-    .record-info {
-      flex: 1;
-      min-width: 0;
-      
-      .record-name {
-        color: #ffffff;
-        font-size: 28rpx;
-        font-weight: 600;
-        line-height: 1.3;
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-    }
-    
-    .cost-section {
-      display: flex;
-      align-items: center;
-      flex-shrink: 0;
-      white-space: nowrap;
-      
-      .cost-value {
-        color: #ffffff;
-        font-size: 36rpx;
-        font-weight: 700;
-        line-height: 1;
-        white-space: nowrap;
-        text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1);
-        
-        .cost-label {
-          color: rgba(255, 255, 255, 0.85);
-          font-size: 24rpx;
-          font-weight: 500;
-          margin-left: 4rpx;
-        }
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/statistic/temperatureStatistic/index.vue b/src/pages/health/statistic/temperatureStatistic/index.vue
deleted file mode 100644
index 407915a..0000000
--- a/src/pages/health/statistic/temperatureStatistic/index.vue
+++ /dev/null
@@ -1,1082 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-view">
-        <u-input v-model="queryParams.personName" border="false" type="select" @click="handlePerson" placeholder="请选择人员" suffixIcon="search"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-      </view>
-      <view class="search-view">
-        <u-input v-model="queryParams.healthRecordName" border="false" type="select" @click="handleHealthRecord" placeholder="请选择健康档案" suffixIcon="search"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-      </view>
-      <view class="search-view">
-        <u-input v-model="queryParams.time" placeholder="请选择测量日期" border="false" type="select" readonly suffixIcon="calendar"
-        suffixIconStyle="color: #909399" class="search-input">
-        </u-input>
-        <view class="filter-btn" @click="filterPanel = !filterPanel">
-          <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-          <text>筛选</text>
-        </view>
-      </view>
-      
-      <!-- 统计卡片 -->
-    <view class="app-container">
-      <view class="header-con">
-        <view class="item">
-          <view class="item-icon" style="background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);">
-            <uni-icons type="fire-filled" size="20" color="#ffffff"></uni-icons>
-          </view>
-          <view class="info-sum">
-            <view class="title">发烧天数</view>
-            <view class="num">{{ temp.feverDay }}<span>天</span></view>
-          </view>
-        </view>
-        <view class="item">
-          <view class="item-icon" style="background: linear-gradient(135deg, #ef4444 0%, #dc2626 100%);">
-            <uni-icons type="fire-filled" size="20" color="#ffffff"></uni-icons>
-          </view>
-          <view class="info-sum">
-            <view class="title">最高体温</view>
-            <view class="num">{{ temp.maxTemp }}<span>℃</span></view>
-          </view>
-        </view>
-      </view>
-      <view class="header-con">
-        <view class="item">
-          <view class="item-icon" style="background: linear-gradient(135deg, #0891b2 0%, #0e7490 100%);">
-            <uni-icons type="snow" size="20" color="#ffffff"></uni-icons>
-          </view>
-          <view class="info-sum">
-            <view class="title">最低体温</view>
-            <view class="num">{{ temp.minTemp }}<span>℃</span></view>
-          </view>
-        </view>
-        <view class="item">
-          <view class="item-icon" style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);">
-            <uni-icons type="star-filled" size="20" color="#ffffff"></uni-icons>
-          </view>
-          <view class="info-sum">
-            <view class="title">平均体温</view>
-            <view class="num">{{ temp.averageTemp }}<span>℃</span></view>
-          </view>
-        </view>
-      </view>
-      <view class="header-con">
-        <view class="item">
-          <view class="item-icon" style="background: linear-gradient(135deg, #059669 0%, #047857 100%);">
-            <uni-icons type="checkmarkempty" size="20" color="#ffffff"></uni-icons>
-          </view>
-          <view class="info-sum">
-            <view class="title">正常( &lt;36.9℃)</view>
-            <view class="num">{{ temp.normalTempCount }}<span>次</span></view>
-          </view>
-        </view>
-        <view class="item">
-          <view class="item-icon" style="background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%);">
-            <uni-icons type="compose" size="20" color="#ffffff"></uni-icons>
-          </view>
-          <view class="info-sum">
-            <view class="title">低烧(36.9~37.5℃)</view>
-            <view class="num">{{ temp.lowerTempCount }}<span>次</span></view>
-          </view>
-        </view>
-      </view>
-      <view class="header-con">
-        <view class="item">
-          <view class="item-icon" style="background: linear-gradient(135deg, #f97316 0%, #ea580c 100%);">
-            <uni-icons type="fire" size="20" color="#ffffff"></uni-icons>
-          </view>
-          <view class="info-sum">
-            <view class="title">中烧(37.5~38.5℃)</view>
-            <view class="num">{{ temp.middleTempCount }}<span>次</span></view>
-          </view>
-        </view>
-        <view class="item">
-          <view class="item-icon" style="background: linear-gradient(135deg, #dc2626 0%, #b91c1c 100%);">
-            <uni-icons type="fire-filled" size="20" color="#ffffff"></uni-icons>
-          </view>
-          <view class="info-sum">
-            <view class="title">高烧（>38.5℃）</view>
-            <view class="num">{{ temp.higherTempCount }}<span>次</span></view>
-          </view>
-        </view>
-      </view>
-    </view>
-    
-    <!-- 视图切换 -->
-    <view class="section-title" v-show="secondListData.length>0">
-      <view class="title-decorator"></view>
-      <text class="title-text">体温统计</text>
-      <view class="view-switch">
-        <view 
-          :class="['switch-item', { 'active': !tabShow }]" 
-          @click="btFirstClick"
-        >
-          <uni-icons type="list" size="16" :color="!tabShow ? '#667eea' : '#999'"></uni-icons>
-          <text>列表</text>
-        </view>
-        <view 
-          :class="['switch-item', { 'active': viewMode === 'line' }]" 
-          @click="viewMode = 'line'"
-        >
-          <uni-icons type="loop" size="16" :color="viewMode === 'line' ? '#667eea' : '#999'"></uni-icons>
-          <text>曲线图</text>
-        </view>
-        <view 
-          :class="['switch-item', { 'active': viewMode === 'column' }]" 
-          @click="viewMode = 'column'"
-        >
-          <uni-icons type="bars" size="16" :color="viewMode === 'column' ? '#667eea' : '#999'"></uni-icons>
-          <text>柱状图</text>
-        </view>
-      </view>
-    </view>
-    </u-sticky>
-    
-    <!-- 筛选面板 -->
-    <u-transition :show="filterPanel" mode="fade">
-      <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-        <view class="filter-panel-content">
-          <view class="filter-title">测量日期</view>
-          <view class="selcet-content" style="padding: 0 24rpx">
-            <u-input
-              :disabled="true"
-              :disabledColor="'#fff'"
-              class="dateInput"
-              border="surround"
-              v-model="queryParams.startTime"
-              placeholder="请选择开始时间"
-            >
-              <template v-slot:suffix>
-                <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-              </template>
-            </u-input>
-            <u-input
-              :disabled="true"
-              :disabledColor="'#fff'"
-              class="dateInput"
-              border="surround"
-              v-model="queryParams.endTime"
-              placeholder="请选择结束时间"
-            >
-              <template v-slot:suffix>
-                <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-              </template>
-            </u-input>
-          </view>
-        </view>
-        <view class="btn-box">
-          <view class="btn-reset" @click="resetQuery()">
-            <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-            <text>重置</text>
-          </view>
-          <view class="btn-confirm" @click="searchSubmit()">
-            <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-            <text>确定</text>
-          </view>
-        </view>
-      </view>
-    </u-transition>
-    
-    <!-- 日期选择器 -->
-    <u-datetime-picker
-      :closeOnClickOverlay="true"
-      :show="timeShow"
-      v-model="time"
-      mode="date"
-      :minDate="-2209017600000"
-      @close="openOrCloseDate"
-      @cancel="openOrCloseDate"
-      @confirm="confirm"
-    ></u-datetime-picker>
-    
-    <!-- 曲线图展示 -->
-    <view class="chart-container" v-if="secondListData.length>0 && viewMode === 'line'">
-      <qiun-data-charts 
-        type="line"
-        canvasId="tempLineChart"
-        :chartData="chartData"
-        :opts="lineChartOpts"
-        :loadingType="1"
-      />
-    </view>
-    
-    <!-- 柱状图展示 -->
-    <view class="chart-container" v-if="secondListData.length>0 && viewMode === 'column'">
-      <qiun-data-charts 
-        type="column"
-        canvasId="tempColumnChart"
-        :chartData="chartData"
-        :opts="columnChartOpts"
-        :loadingType="1"
-      />
-    </view>
-    <!-- 列表展示 -->
-    <u-list v-show="!tabShow && viewMode === 'list'" :spaceHeight="720" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="header-left">
-              <view class="time-badge">
-                <uni-icons type="loop" size="16" color="#ffffff"></uni-icons>
-                <text>{{ item.time }}</text>
-              </view>
-            </view>
-            <view class="header-right">
-              <text class="amount-label">测量次数：</text>
-              <text class="amount-value">{{ item.count }}次</text>
-            </view>
-          </view>
-          <view class="item-body">
-            <view class="detail-row">
-              <text class="row-label">最高体温：</text>
-              <text class="row-value">{{ item.max }} ℃</text>
-            </view>
-            <view class="detail-row">
-              <text class="row-label">最低体温：</text>
-              <text class="row-value">{{ item.min }} ℃</text>
-            </view>
-            <view class="detail-row">
-              <text class="row-label">平均体温：</text>
-              <text class="row-value">{{ item.average }} ℃</text>
-            </view>
-            <view class="detail-label">
-              <uni-icons type="list" size="14" color="#667eea"></uni-icons>
-              <text>测量明细</text>
-            </view>
-            <view class="detail-content">
-              <text>{{ formatMultiLineData(item.detail) || '-' }}</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-    </u-list>
-
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handleHealthRecordCancel"
-        @confirm="handleHealthRecordConfirm"></u-picker>
-  </view>
-  <!-- 悬停按钮返回工作台-->
-  <suspend></suspend>
-</template>
-
-<script setup>
-import { getTemperatureAnalysis } from '@/api/health/statisticAnalysis'
-import { listPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-import { getDicts } from '@/api/system/dict/data.js'
-  import dayjs from 'dayjs'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const personList = ref([])
-
-const showHealthRecord = ref(false)
-const healthRecordList = ref([])
-
-const personTypeList = ref([])
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const showPerson = ref(false)
-const timeShow= ref(false)
-const time =ref( Number(new Date()))
-const  flag= ref(true)
-const temp = ref({})
-
-const tabShow = ref(false)
-const viewMode = ref('list') // 'list', 'line', 'column'
-const firstType = ref("primary")
-const secondType = ref("default")
-const secondListData = ref([])
-
-// 曲线图配置
-const lineChartOpts = computed(() => {
-  const dataCount = secondListData.value ? secondListData.value.length : 0
-  const showXAxisLabel = dataCount <= 10
-  
-  return {
-    color: ['#667eea'],
-    padding: [15, 15, 60, 5],
-    enableScroll: false,
-    enableMarkLine: true,
-    dataLabel: false,
-    dataPointShape: true,
-    legend: {
-      show: false
-    },
-    xAxis: {
-      disableGrid: true,
-      boundaryGap: 'justify',
-      axisLine: false,
-      scrollShow: true,
-      itemCount: 5,
-      fontSize: showXAxisLabel ? 10 : 0,
-      fontColor: showXAxisLabel ? '#999999' : 'transparent',
-      rotateLabel: true,
-      rotateAngle: 30,
-      disabled: !showXAxisLabel
-    },
-    yAxis: {
-      gridType: 'dash',
-      dashLength: 4,
-      gridColor: '#EEEEEE',
-      splitNumber: 5,
-      fontSize: 10,
-      fontColor: '#999999',
-      format: (val) => {
-        return val.toFixed(1) + '℃'
-      },
-      data: [
-        {
-          min: 35
-        }
-      ]
-    },
-    extra: {
-      line: {
-        type: 'curve',
-        width: 3,
-        activeType: 'hollow',
-        linearType: 'custom',
-        linearOpacity: 0.2,
-        onShadow: true,
-        animation: true
-      },
-      markLine: {
-        type: 'dash',
-        dashLength: 5,
-        data: [
-          {
-            value: 37,
-            lineColor: '#f59e0b',
-            showLabel: true,
-            labelText: '37',
-            labelFontSize: 10,
-            labelFontColor: '#f59e0b',
-            labelOffsetX: 5,
-            labelOffsetY: -5
-          },
-          {
-            value: 38.5,
-            lineColor: '#dc2626',
-            showLabel: true,
-            labelText: '38.5',
-            labelFontSize: 10,
-            labelFontColor: '#dc2626',
-            labelOffsetX: 5,
-            labelOffsetY: -5
-          }
-        ]
-      }
-    }
-  }
-})
-
-// 柱状图配置
-const columnChartOpts = computed(() => {
-  const dataCount = secondListData.value ? secondListData.value.length : 0
-  const showXAxisLabel = dataCount <= 10
-  
-  return {
-    color: ['#667eea'],
-    padding: [15, 15, 30, 5],
-    enableScroll: false,
-    dataLabel: false,
-    legend: {
-      show: false
-    },
-    xAxis: {
-      disableGrid: true,
-      boundaryGap: 'center',
-      axisLine: false,
-      scrollShow: true,
-      itemCount: 5,
-      fontSize: showXAxisLabel ? 10 : 0,
-      fontColor: showXAxisLabel ? '#999999' : 'transparent',
-      rotateLabel: true,
-      rotateAngle: 30,
-      disabled: !showXAxisLabel
-    },
-    yAxis: {
-      gridType: 'dash',
-      dashLength: 4,
-      gridColor: '#EEEEEE',
-      splitNumber: 5,
-      fontSize: 10,
-      fontColor: '#999999',
-      showTitle: false,
-      disabled: false,
-      format: (val) => {
-        return val.toFixed(1) + '℃'
-      },
-      data: [
-        {
-          min: 35
-        }
-      ]
-    },
-    extra: {
-      column: {
-        type: 'group',
-        width: 20,
-        activeBgColor: '#764ba2',
-        activeBgOpacity: 0.08,
-        linearType: 'none',
-        barBorderCircle: true,
-        seriesGap: 2
-      },
-      markLine: {
-        type: 'dash',
-        dashLength: 5,
-        data: [
-          {
-            value: 37,
-            lineColor: '#f59e0b',
-            showLabel: true,
-            labelText: '37',
-            labelFontSize: 10,
-            labelFontColor: '#f59e0b',
-            labelOffsetX: 5,
-            labelOffsetY: -5
-          },
-          {
-            value: 38.5,
-            lineColor: '#dc2626',
-            showLabel: true,
-            labelText: '38.5',
-            labelFontSize: 10,
-            labelFontColor: '#dc2626',
-            labelOffsetX: 5,
-            labelOffsetY: -5
-          }
-        ]
-      }
-    }
-  }
-})
-
-// 图表数据
-const chartData = computed(() => {
-  if (!secondListData.value || secondListData.value.length === 0) {
-    return {
-      categories: [],
-      series: []
-    }
-  }
-  
-  return {
-    categories: secondListData.value.map(item => item.time || ''),
-    series: [
-      {
-        name: '体温',
-        data: secondListData.value.map(item => {
-          const value = parseFloat(item.value)
-          return isNaN(value) ? 0 : value
-        })
-      }
-    ]
-  }
-})
-
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-  pageNum: 1,
-  pageSize: 100
-},
-  queryParams: {
-  type: 1,
-  time: null,
-  dataType: null,
-  recordId: null,
-  id: null
-   } ,
-   queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-}
-})
-
-const { filterPanel, queryPersonParams,queryHealthRecordParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-            uni.getSystemInfoSync().windowHeight - 50
-        })	
-onLoad(() => {
-    getDict()
-    // getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-    listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-
-  function btFirstClick() {
-    tabShow.value = false
-    viewMode.value = 'list'
-    firstType.value = "primary"
-    secondType.value = "default"
-  }
-  
-  function btSecondClick() {
-    secondType.value = "primary"
-    firstType.value = "default"
-    tabShow.value = true
-  }
-
-  function formatMultiLineData(data) {
-if (data != null) {
-  return data.replace(/<br\/>/g, '\n')
-}
-}
-function  openOrCloseDate(data) {
-    timeShow.value = !timeShow.value
-    flag.value = data
-  }
-  function confirm(e) {
-    const date = timeHandler(new Date(e.value), '-', ':')
-          let formatValue = 'YYYY-MM-DD'
-          dayjs(date).format(formatValue)
-    if (flag.value) {
-      queryParams.value.startTime =  dayjs(date).format(formatValue)
-    } else {
-      queryParams.value.endTime =  dayjs(date).format(formatValue)
-    }
-    timeShow.value = false
-  }
-function searchSubmit() {
-  if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-    pageNum.value = 1
-    listData.value = []
-    getList()
-    filterPanel.value = false
-  }
-  function resetQuery() {
-      queryParams.value.type = '1'
-     queryParams.value.startTime =  ''
-    queryParams.value.endTime =  ''
-    queryParams.value.time = ''
-  }
-function getList() {
-  
-  getTemperatureAnalysis({...queryParams.value }).then(res => {
-          temp.value = { ...res.data }
-        listData.value=[]
-        secondListData.value=[]
-        listData.value = listData.value.concat(res.data.tableList)
-        secondListData.value = secondListData.value.concat(res.data.temperatureList.slice().reverse())
-      }).catch(() => {
-      })
-    }
-function   getDict() {
-  listPerson(queryPersonParams.value).then((response) => {
-      personList.value = [response.rows]
-      if(response.rows.length>0){
-        queryParams.value.personName= response.rows[0].name
-      queryParams.value.id = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-          queryParams.value.healthRecordName= response.rows[0].name
-          queryParams.value.recordId = response.rows[0].id
-       }
-       getTemperatureAnalysis({...queryParams.value }).then(res => {
-          temp.value = { ...res.data }
-        listData.value=[]
-        secondListData.value=[]
-        listData.value = listData.value.concat(res.data.tableList)
-        secondListData.value = secondListData.value.concat(res.data.temperatureList.slice().reverse())
-      }).catch(() => {
-      })
-
-
-      })
-     } 
-    })
-      
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.id= e.value[0].id
-    queryParams.value.healthRecordName = ''
-    queryParams.value.recordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-    showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-})
-  }
- function handlePersonCancel() {
-  // queryParams.value.personName = ''
-  //   queryParams.value.id=''
-
-       showPerson.value = false
-       listData.value = []
-      getList()
-      filterPanel.value = false
-  }
-  function handleHealthRecord() {
-        if (healthRecordList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '健康档案为空  ', type: 'warning'
-          })
-        } else {
-          showHealthRecord.value = true
-        }
-     }
-  function   handleHealthRecordConfirm(e) {
-    queryParams.value.healthRecordName = e.value[0].name
-    queryParams.value.recordId =  e.value[0].id
-    showHealthRecord.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleHealthRecordCancel() {
-  queryParams.value.healthRecordName = ''
-    queryParams.value.recordId = ''
-       showHealthRecord.value = false
-       listData.value = []
-      getList()
-      filterPanel.value = false
-  }
-  
-
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-
-.app-container {
-  background-color: #f5f7fa;
-  padding: 0;
-  overflow: visible;
-
-  .header-con {
-    width: calc(100% - 32rpx);
-    margin: 0 16rpx 8rpx 16rpx;
-    background-color: transparent;
-    display: flex;
-    justify-content: space-between;
-    align-items: stretch;
-    padding: 0;
-    gap: 12rpx;
-    
-    .item {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      padding: 20rpx 16rpx;
-      transition: all 0.3s ease;
-      border: 2rpx solid #e8edf3;
-      border-radius: 16rpx;
-      background: linear-gradient(135deg, #ffffff 0%, #f8f9fb 100%);
-      box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
-      
-      &:active {
-        transform: scale(0.98);
-        opacity: 0.9;
-      }
-      
-      .item-icon {
-        width: 72rpx;
-        height: 72rpx;
-        border-radius: 16rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 16rpx;
-        box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
-        flex-shrink: 0;
-      }
-      
-      .info-sum {
-        flex: 1;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        
-        .title {
-          color: #7f8c8d;
-          margin-bottom: 8rpx;
-          font-size: 24rpx;
-        }
-        
-        .num {
-          color: #2c3e50;
-          font-size: 32rpx;
-          font-weight: 600;
-          
-          span {
-            font-size: 20rpx;
-            color: #95a5a6;
-            margin-left: 4rpx;
-          }
-        }
-      }
-    }
-  }
-}
-
-.section-title {
-  display: flex;
-  margin-top: -10rpx;
-  align-items: center;
-  padding: 24rpx 32rpx 16rpx;
-  background-color: #f5f7fa;
-  
-  .title-decorator {
-    width: 6rpx;
-    height: 32rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    border-radius: 3rpx;
-    margin-right: 12rpx;
-  }
-  
-  .title-text {
-    font-size: 28rpx;
-    font-weight: 600;
-    color: #2c3e50;
-    line-height: 1;
-    flex: 1;
-  }
-  
-  .view-switch {
-    display: flex;
-    align-items: center;
-    gap: 4rpx;
-    background: #ffffff;
-    border-radius: 12rpx;
-    padding: 4rpx;
-    box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08);
-    
-    .switch-item {
-      display: flex;
-      align-items: center;
-      gap: 4rpx;
-      padding: 6rpx 12rpx;
-      border-radius: 8rpx;
-      transition: all 0.3s ease;
-      cursor: pointer;
-      
-      text {
-        font-size: 22rpx;
-        color: #999999;
-        line-height: 1;
-      }
-      
-      &.active {
-        background: linear-gradient(135deg, rgba(102, 126, 234, 0.1) 0%, rgba(118, 75, 162, 0.1) 100%);
-        
-        text {
-          color: #667eea;
-          font-weight: 600;
-        }
-      }
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-  }
-}
-
-.chart-container {
-  margin: 16rpx 24rpx 60rpx;
-  padding: 16rpx;
-  background: linear-gradient(135deg, #ffffff 0%, #f8f9fb 100%);
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  width: calc(100% - 48rpx);
-  height: 550rpx;
-  overflow: visible;
-  position: relative;
-}
-
-.search-view {
-  padding: 12rpx 32rpx;
-  background-color: #ffffff;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  position: relative;
-  z-index: 100;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-  .search-input {
-    background: rgba(102, 126, 234, 0.08);
-    color: #333333;
-    flex: 1;
-    margin-right: 16rpx;
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    height: 66rpx !important;
-    display: flex;
-    align-items: center;
-  }
-  
-  .filter-btn {
-    display: flex;
-    align-items: center;
-    gap: 6rpx;
-    padding: 12rpx 24rpx;
-    background: rgba(102, 126, 234, 0.08);
-    border-radius: 24rpx;
-    border: 2rpx solid rgba(102, 126, 234, 0.3);
-    transition: all 0.3s ease;
-    flex-shrink: 0;
-    
-    &:active {
-      transform: scale(0.95);
-      background: rgba(102, 126, 234, 0.12);
-    }
-    
-    text {
-      color: #667eea;
-      font-size: 28rpx;
-      font-weight: 600;
-    }
-    
-    uni-icons {
-      color: #667eea;
-    }
-  }
-}
-
-.filter-panel {
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 270rpx;
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 999;
-
-  .filter-panel-content {
-    background-color: #ffffff;
-    padding: 0 30rpx 30rpx;
-    border-radius: 16rpx 16rpx 0 0;
-
-    .filter-title {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-        flex-shrink: 0;
-      }
-    }
-  }
-
-  .btn-box {
-    display: flex;
-    gap: 20rpx;
-    padding: 24rpx 30rpx;
-    background-color: #fff;
-    box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    
-    .btn-reset,
-    .btn-confirm {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 8rpx;
-      height: 88rpx;
-      border-radius: 12rpx;
-      font-size: 30rpx;
-      font-weight: 600;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.98);
-        opacity: 0.9;
-      }
-      
-      text {
-        line-height: 1;
-      }
-    }
-    
-    .btn-reset {
-      flex: 1;
-      background: #f5f7fa;
-      border: 2rpx solid #dcdfe6;
-      
-      text {
-        color: #606266;
-      }
-    }
-    
-    .btn-confirm {
-      flex: 1;
-      background: #667eea;
-      box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-      border: none;
-      
-      text {
-        color: #ffffff;
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 0 24rpx 16rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 20rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .header-left {
-      flex: 1;
-      
-      .time-badge {
-        display: inline-flex;
-        align-items: center;
-        gap: 8rpx;
-        padding: 8rpx 16rpx;
-        background: rgba(255, 255, 255, 0.2);
-        border-radius: 12rpx;
-        
-        text {
-          font-size: 28rpx;
-          color: #ffffff;
-          font-weight: 600;
-          line-height: 1;
-        }
-      }
-    }
-    
-    .header-right {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      gap: 8rpx;
-      
-      .amount-label {
-        font-size: 24rpx;
-        color: rgba(255, 255, 255, 0.85);
-        line-height: 1;
-      }
-      
-      .amount-value {
-        font-size: 30rpx;
-        font-weight: 700;
-        color: #ffffff;
-        line-height: 1;
-      }
-    }
-  }
-  
-  .item-body {
-    padding: 24rpx;
-    
-    .detail-row {
-      display: flex;
-      justify-content: space-between;
-      padding: 12rpx 0;
-      border-bottom: 1rpx solid #f0f0f0;
-      
-      &:last-of-type {
-        border-bottom: none;
-      }
-      
-      .row-label {
-        font-size: 26rpx;
-        color: #7f8c8d;
-      }
-      
-      .row-value {
-        font-size: 26rpx;
-        color: #2c3e50;
-        font-weight: 600;
-      }
-    }
-    
-    .detail-label {
-      display: flex;
-      align-items: center;
-      gap: 6rpx;
-      margin: 16rpx 0 12rpx;
-      
-      text {
-        font-size: 26rpx;
-        color: #667eea;
-        font-weight: 600;
-      }
-    }
-    
-    .detail-content {
-      padding: 16rpx;
-      background: #f8f9fb;
-      border-radius: 12rpx;
-      border-left: 4rpx solid #667eea;
-      
-      text {
-        font-size: 26rpx;
-        color: #333333;
-        line-height: 1.8;
-        white-space: pre-wrap;
-        word-break: break-all;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/temperatureRecord/addEdit.vue b/src/pages/health/temperatureRecord/addEdit.vue
deleted file mode 100644
index bdafd51..0000000
--- a/src/pages/health/temperatureRecord/addEdit.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<template>
-  <view class="container" style="paddingBottom:1rpx;">
-    <u-navbar
-    leftIconSize="40rpx"
-    leftIconColor="#333333"
-    title="体温记录"
-  >
-  </u-navbar>
-    <view class="section">
-      <view class="section-title">{{ title}}</view>
-      <view class="form-view">
-        <u--form labelPosition="left" :model="form" :rules="rules" ref="uForm" label-width="auto"
-          :labelStyle="{ color: '#333333', fontSize: '30rpx' }">
-          <u-form-item label="人员姓名" prop="personName" required @click="handlePerson">
-            <u--input v-model="form.personName" disabled disabledColor="#ffffff" placeholder="请选择人员"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="健康档案" prop="healthRecordName" required @click="handHealthRecord">
-            <u--input v-model="form.healthRecordName" disabled disabledColor="#ffffff" placeholder="请选择健康档案"
-              inputAlign="right" border="none"></u--input>
-            <u-icon slot="right" name="arrow-down"></u-icon>
-          </u-form-item>
-          <u-form-item label="测量时间" prop="measureTime" required @click="selectDate()">
-            <u--input v-model="form.measureTime" disabled disabledColor="#ffffff" placeholder="请选择测量时间" inputAlign="right" border="none"></u--input>
-          <u-icon slot="right" name="arrow-right"></u-icon>
-          </u-form-item>
-          <u-form-item label="体温" required prop="temperature" >
-            <u--input v-model="form.temperature"  type="number" placeholder="请填写体温"
-              inputAlign="right" border="none">
-              <template #suffix>
-        <up-text
-          text="℃"
-        ></up-text>
-      </template>
-            </u--input>
-          </u-form-item>
-          <u-form-item label="备注" prop="remark"  labelPosition="top">
-            <u--textarea v-model="form.remark" placeholder="请填写备注" border="none" autoHeight inputAlign="right" count
-              maxlength="2000" style="padding:18rpx 0;"></u--textarea>
-          </u-form-item>
-        </u--form>
-        <view class="form-btn">
-          <u-button type="primary" text="提交" @click="submit"></u-button>
-        </view>
-      </view>
-    </view>
-    <u-toast ref="uToast"></u-toast>
-    <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-      @confirm="handlePersonConfirm"></u-picker>
-      <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handHealthRecordCancel"
-      @confirm="handHealthRecordConfirm"></u-picker>
-      <u-datetime-picker
-    :show="datePickShow"
-    mode="datetime"
-    ref="measureTimeRef" 
-    @cancel="datePickShow=false"
-    @confirm="datePickConfirm"
-    itemHeight="88"
-  ></u-datetime-picker>
-  </view>
-</template>
-
-<script setup>
-import { getTemperatureRecord, addTemperatureRecord, updateTemperatureRecord } from '@/api/health/temperatureRecord'
-import { listPerson, getPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-const { proxy } = getCurrentInstance()
-import dayjs from 'dayjs'
-import {onLoad,onReady} from "@dcloudio/uni-app";
-  // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed ,getCurrentInstance }from "vue";
-const datePickShow = ref(false)
-const flag = ref('add')
-const showPerson = ref(false)
-const showHealthRecord = ref(false)
-const title = ref("体温记录")
-const healthRecordList = ref([])
-const personList = ref([])
-const data = reactive({
-form: {
-    id: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    delFlag: null,
-    remark: null,
-    healthRecordId: null,
-    measureTime: null,
-    temperature: null,
-    personId: null
-},
-queryPersonParams: {
-  pageNum: 1,
-  status: '1',
-  pageSize: 1000
-},
-queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-},
-rules: {
-  healthRecordName: [{ required: true, message: '健康档案不能为空', trigger:['change', 'blur'] }],
-  personName: [{ required: true, message: '人员不能为空', trigger: ['change', 'blur'] }],
-  temperature: [{ type: 'number',required: true, message: '体温不能为空', trigger: ['change', 'blur'] }],
-  measureTime: [{ required: true, message: '测量时间不能为空', trigger: ['change', 'blur'] }]
-}
-})
-const { form, queryPersonParams, queryHealthRecordParams, rules} = toRefs(data)
-
-
-onLoad((option) => {
-  form.value.id = option.id
-     flag.value = option.flag
-     if(flag.value==null){
-      if(form.value.id!=null){
-      title.value="体温记录-修改"
-     }else{
-      title.value="体温记录-新增"
-     }
-     }else{
-      title.value="体温记录-复制"
-     }
-    getData()
-})
-onReady(() => {
-     form.value.measureTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-})
-function  getData() {
-    if(form.value.id!=null){
-      getTemperatureRecord(form.value.id).then(res => {
-        listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      queryHealthRecordParams.value.personId=res.data.personId
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-      })
-     }
-     })
-        form.value = res.data   
-        if(flag.value!=null){
-        form.value.measureTime = dayjs(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
-       }  
-      })
-    }else{
-      listPerson(queryPersonParams.value).then((response) => {
-     personList.value = [response.rows] 
-     if(response.rows.length>0){
-      form.value.personName= response.rows[0].name
-      form.value.personId = response.rows[0].id
-      queryHealthRecordParams.value.personId=response.rows[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-      })
-     }
-     })
-    }
-}
-
-function handlePerson() {
-      if (personList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '人员为空  ', type: 'warning'
-        })
-      } else {
-        showPerson.value = true
-      }
-   }
-function   handlePersonConfirm(e) {
-     form.value.personName = e.value[0].name
-      form.value.personId = e.value[0].id
-      form.value.healthRecordName = ''
-      form.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        if(response.rows.length>0){
-      form.value.healthRecordName= response.rows[0].name
-      form.value.healthRecordId = response.rows[0].id
-    }
-  showPerson.value = false
-})
-      
-}
-function handlePersonCancel() {
-     showPerson.value = false
-  }
-function handHealthRecord() {
-      if (healthRecordList.value[0].length === 0) {
-        proxy.$refs['uToast'].show({
-          message: '健康档案为空  ', type: 'warning'
-        })
-      } else {
-        showHealthRecord.value = true
-      }
-   }
-function   handHealthRecordConfirm(e) {
-      form.value.healthRecordName = e.value[0].name
-      form.value.healthRecordId = e.value[0].id
-      showHealthRecord.value = false
-}
-function handHealthRecordCancel() {
-     showHealthRecord.value = false
-}
-function  selectDate() {
-      datePickShow.value = true
-      proxy.$refs['measureTimeRef'].innerValue = new Date().getTime()
-  }
-function datePickConfirm(e) {
-      form.value.measureTime = dayjs(e.value).format("YYYY-MM-DD HH:mm:ss")
-      datePickShow.value = false
-  }
-function submit() {
-      proxy.$refs['uForm'].validate().then(() => {
-        if (form.value.id != null) {
-        if(flag.value==null){
-          updateTemperatureRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '修改成功', complete() {
-              uni.navigateTo({ url: `/pages/health/temperatureRecord/list` })
-            }
-          })
-        })
-          }else {
-            form.value.id == null
-            addTemperatureRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/temperatureRecord/list` })
-            }
-          })
-        })
-          }
-
-
-        }else {
-          addTemperatureRecord(form.value).then(res => {
-            proxy.$refs['uToast'].show({
-            message: '新增成功', complete() {
-              uni.navigateTo({ url: `/pages/health/temperatureRecord/list` })
-            }
-          })
-        })
-        }
-      })
-    }
-</script>
-
-<style lang="scss" scoped>
-.section {
-  margin: 24rpx;
-  padding: 0;
-  background-color: #fff;
-  border-radius: 16rpx;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  overflow: hidden;
-
-  .section-title {
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: #ffffff;
-    line-height: 1.2;
-    font-size: 28rpx;
-    font-weight: 600;
-    display: flex;
-    align-items: center;
-    
-    &::before {
-      content: '';
-      width: 6rpx;
-      height: 28rpx;
-      background: #ffffff;
-      border-radius: 3rpx;
-      margin-right: 12rpx;
-    }
-  }
-
-  .form-view {
-    padding: 24rpx;
-
-    .form-btn {
-      padding-top: 16rpx;
-    }
-  }
-}
-</style>
-
-<style lang="scss">
-.form-btn .u-button {
-  background: linear-gradient(135deg, #667eea 0%, #764ba2 100%) !important;
-  border: none !important;
-  border-radius: 24rpx !important;
-  height: 80rpx !important;
-  box-shadow: 0 4rpx 16rpx rgba(102, 126, 234, 0.4) !important;
-}
-
-.form-btn .u-button__text {
-  font-size: 30rpx !important;
-  font-weight: 500 !important;
-  letter-spacing: 2rpx !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/health/temperatureRecord/list.vue b/src/pages/health/temperatureRecord/list.vue
deleted file mode 100644
index ef6fbc2..0000000
--- a/src/pages/health/temperatureRecord/list.vue
+++ /dev/null
@@ -1,738 +0,0 @@
-<template>
-  <view class="container">
-    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
-      <view class="search-container">
-        <view class="search-row">
-          <u--input v-model="queryParams.personName" border="false" type="select" @click="handlePerson" placeholder="请选择人员" class="search-input"
-            suffixIcon="search" suffixIconStyle="color: #909399">
-          </u--input>
-          <view class="add-btn" @click="handleAdd()">
-            <uni-icons type="plusempty" size="18" color="#667eea"></uni-icons>
-            <text>新增</text>
-          </view>
-        </view>
-        <view class="search-row">
-          <u--input v-model="queryParams.healthRecordName" border="false" type="select" @click="handleHealthRecord" placeholder="请选择健康档案" class="search-input"
-            suffixIcon="search" suffixIconStyle="color: #909399">
-          </u--input>
-          <view class="filter-btn" @click="filterPanel = !filterPanel">
-            <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-            <text>筛选</text>
-          </view>
-        </view>
-      </view>
-      
-      <u-transition :show="filterPanel" mode="fade">
-          <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
-            <view class="filter-panel-content">
-              <view class="filter-title">测量日期</view>
-            <view class="selcet-content" style="padding: 0 24rpx">
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.startTime"
-                placeholder="请选择开始时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(true)"></u-icon>
-                </template>
-              </u-input>
-              <u-input
-                :disabled="true"
-                :disabledColor="'#fff'"
-                class="dateInput"
-                border="surround"
-                v-model="queryParams.endTime"
-                placeholder="请选择结束时间"
-              >
-                <template v-slot:suffix>
-                  <u-icon name="calendar" @click="openOrCloseDate(false)"></u-icon>
-                </template>
-              </u-input>
-            </view>
-            </view>
-            <view class="btn-box">
-              <view class="btn-reset" @click="resetQuery()">
-                <uni-icons type="reload" size="16" color="#909399"></uni-icons>
-                <text>重置</text>
-              </view>
-              <view class="btn-confirm" @click="searchSubmit()">
-                <uni-icons type="checkmarkempty" size="16" color="#ffffff"></uni-icons>
-                <text>确定</text>
-              </view>
-            </view>
-            <u-datetime-picker
-              :closeOnClickOverlay="true"
-              :show="timeShow"
-              v-model="time"
-              mode="date"
-              :minDate="-2209017600000"
-              @close="openOrCloseDate"
-              @cancel="openOrCloseDate"
-              @confirm="confirm"
-            ></u-datetime-picker>
-          </view>
-      </u-transition>
-    </u-sticky>
-    <u-list @scrolltolower="loadmore" :spaceHeight="116" lowerThreshold="100">
-      <u-list-item v-for="(item, index) in listData" :key="index">
-        <view class="list-item">
-          <view class="item-header">
-            <view class="card-name-section">
-              <view class="card-icon">
-                <uni-icons type="fire" size="20" color="#ffffff"></uni-icons>
-              </view>
-              <view class="card-info">
-                <text class="card-name">{{ item.personName }}</text>
-                <text class="card-time">{{ item.measureTime }}</text>
-              </view>
-            </view>
-            <view class="temperature-section">
-              <text :class="['temperature-value', getTemperatureClass(item.temperature)]">{{ item.temperature }}℃</text>
-            </view>
-          </view>
-          <view class="card-body">
-            <view class="info-row">
-              <view class="info-item info-item-full">
-                <text class="info-label">健康档案</text>
-                <text class="info-value">{{ item.healthRecordName || '--' }}</text>
-              </view>
-              <view class="info-item info-item-full" v-if="item.remark">
-                <text class="info-label">备注</text>
-                <text class="info-value">{{ item.remark }}</text>
-              </view>
-            </view>
-          </view>
-          <view class="operate" @click.stop>
-            <view class="btn-edit" @click="handleEdit(item)">
-              <uni-icons type="compose" size="16" color="#667eea"></uni-icons>
-              <text>修改</text>
-            </view>
-            <view class="btn-copy" @click="handleCopy(item)">
-              <uni-icons type="copy" size="16" color="#fa8c16"></uni-icons>
-              <text>复制</text>
-            </view>
-            <view class="btn-delete" @click="handleDelete(item)">
-              <uni-icons type="trash" size="16" color="#f5576c"></uni-icons>
-              <text>删除</text>
-            </view>
-          </view>
-        </view>
-      </u-list-item>
-      <view>
-      </view>
-      <u-loadmore :status="status" loadingIcon="semicircle" height="88" fontSize="32rpx" @loadmore="loadmore" />
-    </u-list>
-    <u-picker itemHeight="88" :show="settingPickShow" :columns="settingColumns" keyName="settingName"
-      @confirm="settingConfirm" @cancel="settingCancel"></u-picker>
-      <u-picker itemHeight="88" :show="showPerson" :columns="personList" keyName="name" @cancel="handlePersonCancel"
-        @confirm="handlePersonConfirm"></u-picker>
-        <u-picker itemHeight="88" :show="showHealthRecord" :columns="healthRecordList" keyName="name" @cancel="handleHealthRecordCancel"
-        @confirm="handleHealthRecordConfirm"></u-picker>
-  </view>
-         <!--返回首页按钮 -->
-         <suspend></suspend>
-</template>
-
-<script setup>
-import { listTemperatureRecord, delTemperatureRecord } from '@/api/health/temperatureRecord'
-import { listPerson } from '@/api/health/person'
-import { listHealthRecord } from '@/api/health/healthRecord'
-import { timeHandler } from '@/utils/common.ts'
-import {onLoad,onShow} from "@dcloudio/uni-app";
-import dayjs from 'dayjs'
-    // 计算属性与监听属性是在vue中而非uniap中 需要注意！！！
-import {reactive ,toRefs,ref,computed }from "vue";
-const pageNum = ref(1)
-const listData = ref([])
-const isShow = ref(false)
-const status = ref('loadmore')
-const settingPickShow = ref(false)
-const settingColumns = ref([])
-const timeShow= ref(false)
-const showPerson = ref(false)
-const personList = ref([])
-
-const showHealthRecord = ref(false)
-const healthRecordList = ref([])
-
-
-const  flag= ref(true)
-const time =ref( Number(new Date()))
-const data = reactive({
-  filterPanel: false,
-  queryPersonParams: {
-    pageNum: 1,
-    pageSize: 100
-  },
-  queryParams: {
-    healthRecordId: null,
-    measureTime: null,
-    temperature: null,
-    personId: null
-   } ,
-   queryHealthRecordParams: {
-  pageNum: 1,
-  personId:null,
-  pageSize: 1000
-}
-})
-const { filterPanel, queryPersonParams,queryHealthRecordParams, queryParams} = toRefs(data)
-const windowHeight = computed(() => {
-			uni.getSystemInfoSync().windowHeight - 50
-		})	
-onLoad(() => {
-    getList()
-  });
-
- onShow(() => {
-    if (isShow.value) {
-      listData.value=[]
-      getList()
-      isShow.value = false
-    }
-  });
-  function  openOrCloseDate(data) {
-      timeShow.value = !timeShow.value
-      flag.value = data
-    }
-function loadmore() {
-      pageNum.value += 1
-      if (status.value == 'loadmore') {
-        getList()
-      }
-    }
-function getList() {
-  listPerson(queryPersonParams.value).then((response) => {
-        personList.value = [response.rows] 
-      })
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-      })
-      status.value = 'loading'
-      listTemperatureRecord({ pageSize: 10, pageNum: pageNum.value, ...queryParams.value }).then(res => {
-        listData.value = listData.value.concat(res.rows)
-        if (listData.value.length < res.total) {
-          status.value = 'loadmore'
-        } else {
-          status.value = 'nomore'
-        }
-      }).catch(() => {
-        status.value = 'nomore'
-      })
-    }
-    function confirm(e) {
-      const date = timeHandler(new Date(e.value), '-', ':')
-            let formatValue = 'YYYY-MM-DD'
-            dayjs(date).format(formatValue)
-      if (flag.value) {
-        queryParams.value.startTime =  dayjs(date).format(formatValue)
-      } else {
-        queryParams.value.endTime =  dayjs(date).format(formatValue)
-      }
-      timeShow.value = false
-    }
-function settingConfirm(e) {
-      queryParams.value.settingId = e.value[0].settingId
-      queryParams.value.settingName = e.value[0].settingName
-      settingPickShow.value = false
-    }
-function settingCancel() {
-      settingPickShow.value = false
-    }
-    function searchSubmit() {
-      if(queryParams.value.startTime!=''&&queryParams.value.startTime!=undefined&&queryParams.value.endTime!=''&&queryParams.value.endTime!=undefined){
-        queryParams.value.time = queryParams.value.startTime+'-'+queryParams.value.endTime 
-      } 
-      pageNum.value = 1
-      listData.value = []
-      getList()
-      filterPanel.value = false
-    }
-    function handlePerson() {
-        if (personList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '人员为空  ', type: 'warning'
-          })
-        } else {
-          showPerson.value = true
-        }
-     }
-  function   handlePersonConfirm(e) {
-    queryParams.value.personName = e.value[0].name
-    queryParams.value.personId= e.value[0].id
-    queryParams.value.healthRecordName = ''
-    queryParams.value.healthRecordId = ''
-      queryHealthRecordParams.value.personId=e.value[0].id
-      listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-    showPerson.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-})
-  }
- function handlePersonCancel() {
-  queryParams.value.personName = ''
-        queryParams.value.personId = ''
-        queryHealthRecordParams.value.personId=null
-        listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        })
-       showPerson.value = false
-       pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-
-  function handleHealthRecord() {
-        if (healthRecordList.value[0].length === 0) {
-          proxy.$refs['uToast'].show({
-            message: '健康档案为空  ', type: 'warning'
-          })
-        } else {
-          showHealthRecord.value = true
-        }
-     }
-  function   handleHealthRecordConfirm(e) {
-    queryParams.value.healthRecordName = e.value[0].name
-    queryParams.value.healthRecordId =  e.value[0].id
-    showHealthRecord.value = false
-        pageNum.value = 1
-      listData.value = []
-      getList()
-  }
- function handleHealthRecordCancel() {
-  queryParams.value.healthRecordName= ''
-         queryParams.value.healthRecordId = ''
-       showHealthRecord.value = false
-       pageNum.value = 1
-      listData.value = []
-      getList()
-  }
-    function searchBlur() {
-      pageNum.value = 1
-      listData.value = []
-      getList()
-    }
-    function resetQuery() {
-      queryParams.value.personName = ''
-        queryParams.value.startTime = ''
-         queryParams.value.time = ''
-         queryParams.value.healthRecordName= ''
-         queryParams.value.healthRecordId = ''
-        queryParams.value.endTime = ''
-        queryParams.value.personId = ''
-        queryHealthRecordParams.value.personId=null
-        listHealthRecord(queryHealthRecordParams.value).then((response) => {  
-        healthRecordList.value = [response.rows] 
-        })
-    }
-    function enterDetails(item) {
-      uni.navigateTo({ url: `/pages/health/temperatureRecord/details?id=${item.id}` })
-    }
-    function handleEdit(item) {
-      uni.navigateTo({ url: `/pages/health/temperatureRecord/addEdit?id=${item.id}` })
-      isShow.value = true
-    }
-    function handleCopy(item) {
-      uni.navigateTo({ url: `/pages/health/temperatureRecord/addEdit?flag=copy&id=${item.id}` })
-      isShow.value = true
-    }
-    function handleAdd() {
-      uni.navigateTo({ url: `/pages/health/temperatureRecord/addEdit` })
-      isShow.value = true
-    }
-    function handleDelete(item) {
-      uni.showModal({
-        title: '确认删除',
-        content: '确定要删除这条记录吗？',
-        confirmText: '删除',
-        cancelText: '取消',
-        confirmColor: '#f5576c',
-        cancelColor: '#909399',
-        success: function (res) {
-          if (res.confirm) {
-            delTemperatureRecord(item.id).then(() => {
-              uni.showToast({
-                title: '删除成功',
-                icon: 'success'
-              })
-              pageNum.value = 1
-              listData.value = []
-              getList()
-            })
-          }
-        }
-      });
-    }
-    
-    function getTemperatureClass(temperature) {
-      const temp = parseFloat(temperature)
-      if (temp < 37) {
-        return 'temp-normal'
-      } else if (temp >= 37 && temp < 38.5) {
-        return 'temp-warning'
-      } else {
-        return 'temp-danger'
-      }
-    }
-	
-</script>
-
-<style lang="scss" scoped>
-page {
-  height: 100%;
-  overflow: auto;
-}
-.search-container {
-  background-color: #ffffff;
-  box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-  position: relative;
-  z-index: 100;
-
-  .search-row {
-    padding: 12rpx 32rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    gap: 16rpx;
-    
-    &:first-child {
-      padding-bottom: 8rpx;
-    }
-    
-    &:last-child {
-      padding-top: 8rpx;
-    }
-
-    .search-input {
-      background: rgba(102, 126, 234, 0.08);
-      color: #333333;
-      flex: 1;
-      border-radius: 24rpx;
-      border: 2rpx solid rgba(102, 126, 234, 0.3);
-      height: 66rpx !important;
-      display: flex;
-      align-items: center;
-    }
-    
-    .filter-btn,
-    .add-btn {
-      display: flex;
-      align-items: center;
-      gap: 6rpx;
-      padding: 12rpx 24rpx;
-      background: rgba(102, 126, 234, 0.08);
-      border-radius: 24rpx;
-      border: 2rpx solid rgba(102, 126, 234, 0.3);
-      transition: all 0.3s ease;
-      flex-shrink: 0;
-      
-      &:active {
-        transform: scale(0.95);
-        background: rgba(102, 126, 234, 0.12);
-      }
-      
-      text {
-        color: #667eea;
-        font-size: 28rpx;
-        font-weight: 600;
-      }
-      
-      uni-icons {
-        color: #667eea;
-      }
-    }
-  }
-}
-
-.filter-panel {
-  width: 100%;
-  position: absolute;
-  left: 0;
-  top: 180rpx;
-  background-color: rgba(0, 0, 0, 0.5);
-  z-index: 999;
-
-  .filter-panel-content {
-    background-color: #ffffff;
-    padding: 0 30rpx 30rpx;
-    border-radius: 16rpx 16rpx 0 0;
-
-    .filter-title {
-      color: #2c3e50;
-      font-size: 32rpx;
-      font-weight: 600;
-      padding: 32rpx 0 24rpx 20rpx;
-      position: relative;
-      display: flex;
-      align-items: center;
-      
-      &::before {
-        content: '';
-        width: 6rpx;
-        height: 32rpx;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-        border-radius: 3rpx;
-        margin-right: 12rpx;
-      }
-    }
-
-    .selcet-content {
-      display: flex;
-      flex-direction: column;
-      gap: 16rpx;
-    }
-  }
-
-  .btn-box {
-    display: flex;
-    gap: 20rpx;
-    padding: 24rpx 30rpx;
-    background-color: #fff;
-    box-shadow: 0rpx -10rpx 20rpx #EEEEEE;
-    
-    .btn-reset,
-    .btn-confirm {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 8rpx;
-      height: 88rpx;
-      border-radius: 12rpx;
-      font-size: 30rpx;
-      font-weight: 600;
-      transition: all 0.3s ease;
-      flex: 1;
-      
-      &:active {
-        transform: scale(0.98);
-        opacity: 0.9;
-      }
-      
-      text {
-        line-height: 1;
-      }
-    }
-    
-    .btn-reset {
-      background: #f5f7fa;
-      border: 2rpx solid #dcdfe6;
-      
-      text {
-        color: #606266;
-      }
-    }
-    
-    .btn-confirm {
-      background: #667eea;
-      box-shadow: 0 2rpx 8rpx rgba(102, 126, 234, 0.2);
-      border: none;
-      
-      text {
-        color: #ffffff;
-      }
-    }
-  }
-}
-
-.list-item {
-  margin: 10rpx 24rpx;
-  background-color: #fff;
-  border-radius: 16rpx;
-  overflow: hidden;
-  box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-  transition: all 0.2s ease;
-  
-  &:active {
-    transform: scale(0.98);
-    box-shadow: 0 1rpx 6rpx rgba(0, 0, 0, 0.06);
-  }
-
-  .item-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 16rpx 24rpx;
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    
-    .card-name-section {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      min-width: 0;
-    }
-    
-    .card-icon {
-      width: 40rpx;
-      height: 40rpx;
-      background: rgba(255, 255, 255, 0.25);
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-right: 12rpx;
-      flex-shrink: 0;
-    }
-    
-    .card-info {
-      flex: 1;
-      min-width: 0;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      gap: 12rpx;
-      
-      .card-name {
-        color: #ffffff;
-        font-size: 30rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        flex-shrink: 0;
-        letter-spacing: 0.5rpx;
-      }
-      
-      .card-time {
-        color: rgba(255, 255, 255, 0.9);
-        font-size: 28rpx;
-        font-weight: 500;
-        line-height: 1.3;
-        white-space: nowrap;
-        flex-shrink: 0;
-      }
-    }
-    
-    .temperature-section {
-      display: flex;
-      align-items: center;
-      flex-shrink: 0;
-      
-      .temperature-value {
-        font-size: 32rpx;
-        font-weight: 700;
-        line-height: 1.3;
-        white-space: nowrap;
-        padding: 10rpx 20rpx;
-        background: rgba(255, 255, 255, 0.2);
-        border-radius: 10rpx;
-        letter-spacing: 0.5rpx;
-        
-        &.temp-normal {
-          color: rgba(255, 255, 255, 0.95);
-        }
-        
-        &.temp-warning {
-          color: #ff7875;
-          background: rgba(255, 120, 117, 0.15);
-          font-weight: 800;
-        }
-        
-        &.temp-danger {
-          color: #ff4d4f;
-          background: rgba(255, 77, 79, 0.15);
-          font-weight: 800;
-        }
-      }
-    }
-  }
-
-  .card-body {
-    padding: 24rpx;
-    background: #fff;
-  }
-
-  .info-row {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 24rpx;
-
-    .info-item {
-      flex: 0 0 calc(50% - 12rpx);
-      display: flex;
-      flex-direction: column;
-      gap: 4rpx;
-      min-width: 0;
-      margin-bottom: -5rpx;
-      
-      &.info-item-full {
-        flex: 0 0 100%;
-      }
-
-      .info-label {
-        font-size: 24rpx;
-        color: #667eea;
-        font-weight: 500;
-        background: rgba(102, 126, 234, 0.08);
-        padding: 6rpx 12rpx;
-        border-radius: 8rpx;
-        align-self: flex-start;
-      }
-
-      .info-value {
-        font-size: 26rpx;
-        color: #333;
-        font-weight: 500;
-        flex: 1;
-        line-height: 1.5;
-        word-break: break-all;
-      }
-      
-      &:not(.info-item-full) .info-value {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-    }
-  }
-
-  .operate {
-    display: flex;
-    justify-content: flex-end;
-    padding: 16rpx 24rpx 24rpx;
-    gap: 16rpx;
-
-    .btn-edit,
-    .btn-copy,
-    .btn-delete {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6rpx;
-      padding: 0 24rpx;
-      height: 64rpx;
-      border-radius: 12rpx;
-      font-size: 26rpx;
-      font-weight: 500;
-      transition: all 0.3s ease;
-      
-      &:active {
-        transform: scale(0.95);
-      }
-    }
-    
-    .btn-edit {
-      background: rgba(102, 126, 234, 0.1);
-      color: #667eea;
-      border: 1rpx solid rgba(102, 126, 234, 0.3);
-    }
-    
-    .btn-copy {
-      background: rgba(250, 140, 22, 0.1);
-      color: #fa8c16;
-      border: 1rpx solid rgba(250, 140, 22, 0.3);
-    }
-    
-    .btn-delete {
-      background: rgba(245, 87, 108, 0.1);
-      color: #f5576c;
-      border: 1rpx solid rgba(245, 87, 108, 0.3);
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/login.vue b/src/pages/login.vue
index c5262cb..57ab7b0 100644
--- a/src/pages/login.vue
+++ b/src/pages/login.vue
@@ -168,7 +168,7 @@ function loginSuccess(result) {
     // 设置用户信息
     userStore.getInfo().then(res => {
       uni.switchTab({
-        url: '/pages/health/homepage/index'
+        url: '/pages/home/homepage/index'
       });
     }).catch(err => {
       modal.msgError('获取用户信息失败，请重新登录');
diff --git a/src/pages/statistic/bill/creditBillAnalysis/index.vue b/src/pages/statistic/bill/creditBillAnalysis/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/statistic/bill/creditInstallmentAnalysis/index.vue b/src/pages/statistic/bill/creditInstallmentAnalysis/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/statistic/bill/creditInstallmentSettledAnalysis/index.vue b/src/pages/statistic/bill/creditInstallmentSettledAnalysis/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/statistic/bill/creditRecordAnalysis/index.vue b/src/pages/statistic/bill/creditRecordAnalysis/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/statistic/bill/futuresAnalysis/index.vue b/src/pages/statistic/bill/futuresAnalysis/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/statistic/bill/investAnalysis/index.vue b/src/pages/statistic/bill/investAnalysis/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/statistic/bill/onlineLendAnalysis/index.vue b/src/pages/statistic/bill/onlineLendAnalysis/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue b/src/pages/statistic/bill/onlineLendSettledAnalysis/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages/statistic/bill/stocksAnalysis/index.vue b/src/pages/statistic/bill/stocksAnalysis/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pages_mine/pages/system/notice/addEdit.vue b/src/pages_mine/pages/system/notice/addEdit.vue
index 60b8544..2cfa616 100644
--- a/src/pages_mine/pages/system/notice/addEdit.vue
+++ b/src/pages_mine/pages/system/notice/addEdit.vue
@@ -69,8 +69,6 @@
         </u--form>
         <view class="form-btn">
           <u-button type="primary" text="保存" @click="submitForm"></u-button>
-          <!-- 调试用的测试按钮 -->
-          <u-button type="warning" text="测试保存" @click="testSave" style="margin-top: 20rpx;"></u-button>
         </view>
       </view>
     </view>
@@ -391,52 +389,6 @@ function doSubmit() {
     })
   }
 }
-
-// 测试函数 - 用于验证基本功能
-function testSave() {
-  console.log('=== 开始测试保存功能 ===')
-  console.log('当前表单状态:', form)
-  console.log('编辑器上下文:', editorCtx.value)
-  console.log('内容长度:', form.noticeContent?.length || 0)
-  
-  // 强制获取编辑器内容进行测试
-  if (editorCtx.value) {
-    editorCtx.value.getContents({
-      success: (res) => {
-        console.log('测试获取的内容:', res)
-        console.log('HTML内容:', res.html)
-        console.log('纯文本内容:', res.text)
-        console.log('字符数:', res.text?.length || 0)
-        
-        // 尝试直接保存测试数据
-        const testData = {
-          noticeTitle: form.noticeTitle || '测试标题',
-          noticeType: form.noticeType || '1',
-          noticeContent: res.html || '<p>测试内容</p>',
-          status: form.status || '0'
-        }
-        
-        console.log('测试数据:', testData)
-        
-        // 直接调用API测试
-        addNotice(testData).then(response => {
-          console.log('测试保存成功:', response)
-          modal.msgSuccess('测试保存成功!')
-        }).catch(error => {
-          console.error('测试保存失败:', error)
-          modal.msgError('测试保存失败: ' + error.message)
-        })
-      },
-      fail: (error) => {
-        console.error('测试获取内容失败:', error)
-        modal.msgError('无法获取编辑器内容')
-      }
-    })
-  } else {
-    console.log('编辑器未初始化')
-    modal.msgError('编辑器未初始化')
-  }
-}
 </script>
 
 <style lang="scss" scoped>