diff --git a/src/views/health/activity/index.vue b/src/views/health/activity/index.vue
index d0adb20..2cb585a 100644
--- a/src/views/health/activity/index.vue
+++ b/src/views/health/activity/index.vue
@@ -217,7 +217,7 @@ function reset() {
     updateTime: null,
     delFlag: null,
     remark: null,
-    totalCost: null,
+    totalCost: 0,
     partner: null,
     costDetail: null
   }
diff --git a/src/views/health/healthAnalysis/index.vue b/src/views/health/healthAnalysis/index.vue
index 3f107b7..291276f 100644
--- a/src/views/health/healthAnalysis/index.vue
+++ b/src/views/health/healthAnalysis/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container" style="overflow: auto">
-    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;健康总览</div>
+    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;健康档案数据总览</div>
     <div class="header-con" ref="searchHeightRef">
       <div class="item">
         <img src="./assets/one.png" alt="" />
@@ -26,8 +26,8 @@
       <div class="item">
         <img src="./assets/completionTime.png" alt="" />
         <div class="info-sum">
-          <div class="title">就医次数</div>
-          <div class="num">{{ doctorCount }}<span>次</span></div>
+          <div class="title">活动费用</div>
+          <div class="num">{{ activityCost }}<span>元</span></div>
         </div>
       </div>
     </div>
@@ -35,40 +35,70 @@
       <div class="item">
         <img src="./assets/one.png" alt="" />
         <div class="info-sum">
-          <div class="title">医院数量</div>
+          <div class="title">就医医院</div>
           <div class="num">{{ hospitalCount }}<span>个</span></div>
         </div>
       </div>
       <div class="item">
         <img src="./assets/ticketSum.png" alt="" />
         <div class="info-sum">
-          <div class="title">大夫数量</div>
+          <div class="title">就诊大夫</div>
           <div class="num">{{ doctorTotalCount }}<span>个</span></div>
         </div>
       </div>
       <div class="item">
         <img src="./assets/completionTickets.png" alt="" />
         <div class="info-sum">
-          <div class="title">用药次数</div>
-          <div class="num">{{ marCount }}<span>次</span></div>
+          <div class="title">就医次数</div>
+          <div class="num">{{ doctorCount }}<span>次</span></div>
         </div>
       </div>
       <div class="item">
         <img src="./assets/completionTime.png" alt="" />
         <div class="info-sum">
-          <div class="title">用药种类</div>
-          <div class="num">{{ medicalTypeCount }}<span>种</span></div>
+          <div class="title">就医费用</div>
+          <div class="num">{{ doctorCost }}<span>元</span></div>
         </div>
       </div>
     </div>
     <div class="header-con" ref="searchHeightRef">
       <div class="item">
         <img src="./assets/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">用药天数</div>
+          <div class="num">{{ marDayCount }}<span>天</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">用药次数</div>
+          <div class="num">{{ marCount }}<span>次</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/completionTickets.png" alt="" />
+        <div class="info-sum">
+          <div class="title">用药种类</div>
+          <div class="num">{{ medicalTypeCount }}<span>种</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/completionTime.png" alt="" />
         <div class="info-sum">
           <div class="title">测量体温次数</div>
           <div class="num">{{ temperatureTotalCount }}<span>次</span></div>
         </div>
       </div>
+    </div>
+    <div class="header-con" ref="searchHeightRef">
+      <div class="item">
+        <img src="./assets/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">发烧天数（>=37℃）</div>
+          <div class="num">{{ feverDayCount }}<span>天</span></div>
+        </div>
+      </div>
       <div class="item">
         <img src="./assets/ticketSum.png" alt="" />
         <div class="info-sum">
@@ -91,64 +121,66 @@
         </div>
       </div>
     </div>
-    <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;成员1信息</div>
-    <div class="header-con" ref="searchHeightRef">
-      <div class="item">
-        <img src="./assets/one.png" alt="" />
-        <div class="info-sum">
-          <div class="title">档案份数</div>
-          <div class="num">{{ 0 }}<span>份</span></div>
+    <div v-for="(item, index) in personList" :key="index">
+      <div class="header-title" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;{{ item.personName + '-健康档案概览' }}</div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">档案份数</div>
+            <div class="num">{{ item.healthRecordCount }}<span>份</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">就医医院</div>
+            <div class="num">{{ item.hospitalCount }}<span>个</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">就诊大夫</div>
+            <div class="num">{{ item.doctorTotalCount }}<span>个</span></div>
+          </div>
+        </div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">就医次数</div>
+            <div class="num">{{ item.doctorCount }}<span>次</span></div>
+          </div>
         </div>
       </div>
-      <div class="item">
-        <img src="./assets/ticketSum.png" alt="" />
-        <div class="info-sum">
-          <div class="title">就医次数</div>
-          <div class="num">{{ 0 }}<span>次</span></div>
+      <div class="header-con" ref="searchHeightRef">
+        <div class="item">
+          <img src="./assets/one.png" alt="" />
+          <div class="info-sum">
+            <div class="title">就医费用</div>
+            <div class="num">{{ item.doctorCost }}<span>元</span></div>
+          </div>
         </div>
-      </div>
-      <div class="item">
-        <img src="./assets/completionTickets.png" alt="" />
-        <div class="info-sum">
-          <div class="title">总费用</div>
-          <div class="num">{{ 0 }}<span>元</span></div>
+        <div class="item">
+          <img src="./assets/ticketSum.png" alt="" />
+          <div class="info-sum">
+            <div class="title">用药天数</div>
+            <div class="num">{{ item.marDayCount }}<span>天</span></div>
+          </div>
         </div>
-      </div>
-      <div class="item">
-        <img src="./assets/completionTime.png" alt="" />
-        <div class="info-sum">
-          <div class="title">医院数量</div>
-          <div class="num">{{ 0 }}<span>个</span></div>
+        <div class="item">
+          <img src="./assets/completionTickets.png" alt="" />
+          <div class="info-sum">
+            <div class="title">用药次数</div>
+            <div class="num">{{ item.marCount }}<span>次</span></div>
+          </div>
         </div>
-      </div>
-    </div>
-    <div class="header-con" ref="searchHeightRef">
-      <div class="item">
-        <img src="./assets/one.png" alt="" />
-        <div class="info-sum">
-          <div class="title">大夫数量</div>
-          <div class="num">{{ 0 }}<span>次</span></div>
-        </div>
-      </div>
-      <div class="item">
-        <img src="./assets/ticketSum.png" alt="" />
-        <div class="info-sum">
-          <div class="title">用药次数</div>
-          <div class="num">{{ 0 }}<span>次</span></div>
-        </div>
-      </div>
-      <div class="item">
-        <img src="./assets/completionTickets.png" alt="" />
-        <div class="info-sum">
-          <div class="title">用药种类</div>
-          <div class="num">{{ 0 }}<span>元</span></div>
-        </div>
-      </div>
-      <div class="item">
-        <img src="./assets/completionTime.png" alt="" />
-        <div class="info-sum">
-          <div class="title">高烧天数（>=38.5℃）</div>
-          <div class="num">{{ 0 }}<span>天</span></div>
+        <div class="item">
+          <img src="./assets/completionTime.png" alt="" />
+          <div class="info-sum">
+            <div class="title">发烧天数（>=37℃）</div>
+            <div class="num">{{ item.feverDayCount }}<span>天</span></div>
+          </div>
         </div>
       </div>
     </div>
@@ -163,30 +195,40 @@ import { getHealthAnalysis } from '@/api/health/statisticAnalysis.js'
 const personCount = ref(0) //成员总数
 const healthRecordCount = ref(0) //健康档案总数
 const activityCount = ref(0) //活动总数
+const activityCost = ref(0) //活动费用
 const doctorCount = ref(0) //就医总数
+const doctorCost = ref(0) //就医费用
 const hospitalCount = ref(0) //医院总数
 const doctorTotalCount = ref(0) //医生总数
+const marDayCount = ref(0) //用药天数
 const marCount = ref(0) //用药次数
 const medicalTypeCount = ref(0) //用药类别
-const temperatureTotalCount = ref(0) //医保余额
-const lowerTempCount = ref(0) //个人养老金余额
-const middleTempCount = ref(0) //其他余额
-const higherTempCount = ref(0) //储蓄卡余额
+const feverDayCount = ref(0) //发烧天数
+const temperatureTotalCount = ref(0) //体温测量次数
+const lowerTempCount = ref(0) //低烧次数
+const middleTempCount = ref(0) //中烧次数
+const higherTempCount = ref(0) //高烧次数
+const personList = ref([]) //人员记录
 
 const getHealthAnalysisData = () => {
   getHealthAnalysis().then((res) => {
     personCount.value = res.data.personCount
     healthRecordCount.value = res.data.healthRecordCount
     activityCount.value = res.data.activityCount
+    activityCost.value = res.data.activityCost
     doctorCount.value = res.data.doctorCount
+    doctorCost.value = res.data.doctorCost
     hospitalCount.value = res.data.hospitalCount
     doctorTotalCount.value = res.data.doctorTotalCount
     marCount.value = res.data.marCount
+    feverDayCount.value = res.data.feverDayCount
+    marDayCount.value = res.data.marDayCount
     medicalTypeCount.value = res.data.medicalTypeCount
     temperatureTotalCount.value = res.data.temperatureTotalCount
     lowerTempCount.value = res.data.lowerTempCount
     middleTempCount.value = res.data.middleTempCount
     higherTempCount.value = res.data.higherTempCount
+    personList.value = res.data.personList
   })
 }
 
diff --git a/src/views/health/marStatistic/index.vue b/src/views/health/marStatistic/index.vue
index 5a6a962..80da4d1 100644
--- a/src/views/health/marStatistic/index.vue
+++ b/src/views/health/marStatistic/index.vue
@@ -56,7 +56,7 @@
     </div>
     <div class="main-con" style="height: calc(100% - 1.45rem)">
       <div class="summary-con" style="height: 115px">
-        <div class="right-con" v-show="mar.marCategoryCount > 0">
+        <div class="right-con">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
@@ -68,7 +68,7 @@
             </div>
           </div>
         </div>
-        <div class="right-con" v-show="mar.marCategoryCount > 0">
+        <div class="right-con">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
@@ -80,7 +80,7 @@
             </div>
           </div>
         </div>
-        <div class="right-con" v-show="mar.marCount > 0">
+        <div class="right-con">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
@@ -93,109 +93,109 @@
           </div>
         </div>
 
-        <div class="right-con" v-show="mar.qingre > 0">
+        <div class="right-con" v-show="mar.top1 > 0">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">清热解毒</div>
+            <div class="title">{{ mar.top1Name }}</div>
             <div>
-              <span class="num">{{ mar.qingre }}</span
+              <span class="num">{{ mar.top1 }}</span
               ><span class="unit">次</span>
             </div>
           </div>
         </div>
-        <div class="right-con" v-show="mar.zhike > 0">
+        <div class="right-con" v-show="mar.top2 > 0">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">止咳化痰平喘</div>
+            <div class="title">{{ mar.top2Name }}</div>
             <div>
-              <span class="num">{{ mar.zhike }}</span
+              <span class="num">{{ mar.top2 }}</span
               ><span class="unit">次</span>
             </div>
           </div>
         </div>
-        <div class="right-con" v-show="mar.kangjun > 0">
+        <div class="right-con" v-show="mar.top3 > 0">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">抗菌消炎</div>
+            <div class="title">{{ mar.top3Name }}</div>
             <div>
-              <span class="num">{{ mar.kangjun }}</span> <span class="unit">次</span>
+              <span class="num">{{ mar.top3 }}</span> <span class="unit">次</span>
             </div>
           </div>
         </div>
       </div>
-      <div class="summary-con" v-show="mar.kangguomin > 0 || mar.kangbingdu > 0 || mar.tuishao > 0 || mar.biyan > 0 || mar.changdao > 0" style="height: 115px">
-        <div class="right-con" v-show="mar.wuhua > 0">
+      <div class="summary-con" v-show="mar.top4 > 0 || mar.top5 > 0 || mar.top6 > 0 || mar.top7 > 0 || mar.top8 > 0 || mar.top9 > 0" style="height: 115px">
+        <div class="right-con" v-show="mar.top4 > 0">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">雾化消炎</div>
+            <div class="title">{{ mar.top4Name }}</div>
             <div>
-              <span class="num">{{ mar.wuhua }}</span
+              <span class="num">{{ mar.top4 }}</span
               ><span class="unit">次</span>
             </div>
           </div>
         </div>
-        <div class="right-con" v-show="mar.kangguomin > 0">
+        <div class="right-con" v-show="mar.top5 > 0">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">抗过敏</div>
+            <div class="title">{{ mar.top5Name }}</div>
             <div>
-              <span class="num">{{ mar.kangguomin }}</span> <span class="unit">次</span>
+              <span class="num">{{ mar.top5 }}</span> <span class="unit">次</span>
             </div>
           </div>
         </div>
-        <div class="right-con" v-show="mar.kangbingdu > 0">
+        <div class="right-con" v-show="mar.top6 > 0">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">抗病毒</div>
+            <div class="title">{{ mar.top6Name }}</div>
             <div>
-              <span class="num">{{ mar.kangbingdu }}</span
+              <span class="num">{{ mar.top6 }}</span
               ><span class="unit">次</span>
             </div>
           </div>
         </div>
-        <div class="right-con" v-show="mar.tuishao > 0">
+        <div class="right-con" v-show="mar.top7 > 0">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">退烧用药</div>
+            <div class="title">{{ mar.top7Name }}</div>
             <div>
-              <span class="num">{{ mar.tuishao }}</span
+              <span class="num">{{ mar.top7 }}</span
               ><span class="unit">次</span>
             </div>
           </div>
         </div>
-        <div class="right-con" v-show="mar.biyan > 0">
+        <div class="right-con" v-show="mar.top8 > 0">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">鼻炎腺样体</div>
+            <div class="title">{{ mar.top8Name }}</div>
             <div>
-              <span class="num">{{ mar.biyan }}</span> <span class="unit">次</span>
+              <span class="num">{{ mar.top8 }}</span> <span class="unit">次</span>
             </div>
           </div>
         </div>
-        <div class="right-con" v-show="mar.changdao > 0">
+        <div class="right-con" v-show="mar.top9 > 0">
           <div class="img">
             <img src="@/assets/images/average.png" alt="" />
           </div>
           <div class="item-wrap">
-            <div class="title">肠道消化</div>
+            <div class="title">{{ mar.top9Name }}</div>
             <div>
-              <span class="num">{{ mar.changdao }}</span> <span class="unit">次</span>
+              <span class="num">{{ mar.top9 }}</span> <span class="unit">次</span>
             </div>
           </div>
         </div>
@@ -216,7 +216,7 @@
         <div class="operate-btn-con">
           <el-radio-group v-model="radioVal" @change="handleRadioChange">
             <el-radio-button label="用药分类明细" />
-            <el-radio-button label="按天用药明细" />
+            <!-- <el-radio-button label="按天用药明细" /> -->
             <el-radio-button label="用药次数柱状图" />
             <el-radio-button label="用药次数折线图" />
           </el-radio-group>
@@ -225,7 +225,7 @@
       <div class="content-con">
         <div v-show="radioVal === '用药次数柱状图'" class="chart" id="chartBar" style="height: calc(100% - 225px); margin-top: -10px"></div>
         <div v-show="radioVal === '用药次数折线图'" class="chart" id="chartLine" style="height: calc(100% - 225px); margin-top: -10px"></div>
-        <el-table v-show="radioVal === '按天用药明细'" v-loading="loading" :data="mar.tableMarList" height="calc(100% - 245px)">
+        <!-- <el-table v-show="radioVal === '按天用药明细'" v-loading="loading" :data="mar.tableMarList" height="calc(100% - 245px)">
           <el-table-column label="序号" width="50" type="index" align="center">
             <template #default="scope">
               <span>{{ scope.$index + 1 }}</span>
@@ -237,7 +237,7 @@
               <span v-html="formatMultiLineData(scope.row.detail)"></span>
             </template>
           </el-table-column>
-        </el-table>
+        </el-table> -->
 
         <el-table v-show="radioVal === '用药分类明细'" v-loading="loading" :data="mar.marMapList" height="calc(100% - 245px)">
           <el-table-column label="序号" width="50" type="index" align="center">
diff --git a/src/views/health/medicineBasic/index.vue b/src/views/health/medicineBasic/index.vue
index f9259b5..6c613fc 100644
--- a/src/views/health/medicineBasic/index.vue
+++ b/src/views/health/medicineBasic/index.vue
@@ -75,6 +75,7 @@
               <dict-tag :options="dosage_form" :value="scope.row.dosageForm" />
             </template>
           </el-table-column>
+          <el-table-column label="包装" align="center" prop="packaging" width="150" />
           <el-table-column label="品牌" align="center" prop="brand" width="120" />
           <el-table-column label="生产厂家" align="center" prop="manufacturers" />
 
@@ -248,14 +249,14 @@ const data = reactive({
   rules: {
     name: [{ required: true, message: '药品全称不能为空', trigger: 'blur' }],
     shortName: [{ required: true, message: '药品简称不能为空', trigger: 'blur' }],
-    classification: [{ required: true, message: '药品分类不能为空', trigger: 'change' }],
-    category: [{ required: true, message: '类别不能为空', trigger: 'change' }],
+    // classification: [{ required: true, message: '药品分类不能为空', trigger: 'change' }],
+    // category: [{ required: true, message: '类别不能为空', trigger: 'change' }],
     brand: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
     packaging: [{ required: true, message: '药品包装不能为空', trigger: 'blur' }],
-    manufacturers: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
-    treatmentType: [{ required: true, message: '治疗类型不能为空', trigger: 'change' }],
-    dosageForm: [{ required: true, message: '药品剂型不能为空', trigger: 'change' }],
-    code: [{ required: true, message: '药品编码不能为空', trigger: 'blur' }]
+    // manufacturers: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }],
+    // treatmentType: [{ required: true, message: '治疗类型不能为空', trigger: 'change' }],
+    dosageForm: [{ required: true, message: '药品剂型不能为空', trigger: 'change' }]
+    // code: [{ required: true, message: '药品编码不能为空', trigger: 'blur' }]
   }
 })
 
diff --git a/src/views/health/person/index.vue b/src/views/health/person/index.vue
index 56f0fa6..d3406aa 100644
--- a/src/views/health/person/index.vue
+++ b/src/views/health/person/index.vue
@@ -39,6 +39,11 @@
               <dict-tag :options="person_type" :value="scope.row.type" />
             </template>
           </el-table-column>
+          <el-table-column label="性别" align="center" prop="sex">
+            <template #default="scope">
+              <dict-tag :options="sys_user_sex" :value="scope.row.sex" />
+            </template>
+          </el-table-column>
           <el-table-column label="生日" align="center" prop="birthday" width="180">
             <template #default="scope">
               <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
@@ -78,6 +83,15 @@
         <el-form-item label="生日" prop="birthday">
           <el-date-picker clearable v-model="form.birthday" type="date" value-format="YYYY-MM-DD" placeholder="请选择生日"> </el-date-picker>
         </el-form-item>
+        <el-form-item label="性别">
+          <el-select v-model="form.sex" placeholder="请选择性别">
+            <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="身份证" prop="identityCard">
+          <el-input v-model="form.identityCard" placeholder="请输入身份证" />
+        </el-form-item>
+
         <el-form-item label="排序" prop="ranking">
           <el-input-number v-model="form.ranking" placeholder="排序" />
         </el-form-item>
@@ -111,7 +125,7 @@ import { listPerson, getPerson, delPerson, addPerson, updatePerson } from '@/api
 // eslint-disable-next-line no-unused-vars
 import { require } from '@/utils/require'
 const { proxy } = getCurrentInstance()
-const { person_type } = proxy.useDict('person_type')
+const { person_type, sys_user_sex } = proxy.useDict('person_type', 'sys_user_sex')
 
 const personList = ref([])
 const open = ref(false)
@@ -139,6 +153,7 @@ const data = reactive({
   rules: {
     name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
     type: [{ required: true, message: '类型不能为空', trigger: 'change' }],
+    sex: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
     birthday: [{ required: true, message: '生日不能为空', trigger: 'blur' }],
     nickName: [{ required: true, message: '昵称不能为空', trigger: 'blur' }]
   }