diff --git a/src/api/health/statisticAnalysis.js b/src/api/health/statisticAnalysis.js
index 2b39859..2ede0b0 100644
--- a/src/api/health/statisticAnalysis.js
+++ b/src/api/health/statisticAnalysis.js
@@ -15,3 +15,11 @@ export function getTemperatureAnalysis(query) {
     params: query
   })
 }
+
+export function getHealthAnalysis(query) {
+  return request({
+    url: '/health/analysis/healthAnalysis',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/health/healthAnalysis/index.vue b/src/views/health/healthAnalysis/index.vue
index 368c314..3f107b7 100644
--- a/src/views/health/healthAnalysis/index.vue
+++ b/src/views/health/healthAnalysis/index.vue
@@ -6,28 +6,28 @@
         <img src="./assets/one.png" alt="" />
         <div class="info-sum">
           <div class="title">成员总数</div>
-          <div class="num">{{ 0 }}<span>人</span></div>
+          <div class="num">{{ personCount }}<span>人</span></div>
         </div>
       </div>
       <div class="item">
         <img src="./assets/ticketSum.png" alt="" />
         <div class="info-sum">
           <div class="title">档案总数</div>
-          <div class="num">{{ 0 }}<span>份</span></div>
+          <div class="num">{{ healthRecordCount }}<span>份</span></div>
         </div>
       </div>
       <div class="item">
         <img src="./assets/completionTickets.png" alt="" />
         <div class="info-sum">
           <div class="title">活动次数</div>
-          <div class="num">{{ 0 }}<span>次</span></div>
+          <div class="num">{{ activityCount }}<span>次</span></div>
         </div>
       </div>
       <div class="item">
         <img src="./assets/completionTime.png" alt="" />
         <div class="info-sum">
           <div class="title">就医次数</div>
-          <div class="num">{{ investBalance }}<span>次</span></div>
+          <div class="num">{{ doctorCount }}<span>次</span></div>
         </div>
       </div>
     </div>
@@ -36,28 +36,28 @@
         <img src="./assets/one.png" alt="" />
         <div class="info-sum">
           <div class="title">医院数量</div>
-          <div class="num">{{ unClearedOnlineDebt }}<span>个</span></div>
+          <div class="num">{{ hospitalCount }}<span>个</span></div>
         </div>
       </div>
       <div class="item">
         <img src="./assets/ticketSum.png" alt="" />
         <div class="info-sum">
           <div class="title">大夫数量</div>
-          <div class="num">{{ peopleLendHistory }}<span>个</span></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">{{ creditBalance }}<span>次</span></div>
+          <div class="num">{{ marCount }}<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">{{ investBalance }}<span>种</span></div>
+          <div class="num">{{ medicalTypeCount }}<span>种</span></div>
         </div>
       </div>
     </div>
@@ -66,28 +66,28 @@
         <img src="./assets/one.png" alt="" />
         <div class="info-sum">
           <div class="title">测量体温次数</div>
-          <div class="num">{{ unClearedOnlineDebt }}<span>次</span></div>
+          <div class="num">{{ temperatureTotalCount }}<span>次</span></div>
         </div>
       </div>
       <div class="item">
         <img src="./assets/ticketSum.png" alt="" />
         <div class="info-sum">
           <div class="title">低烧次数（36.9~37.5℃）</div>
-          <div class="num">{{ peopleLendHistory }}<span>次</span></div>
+          <div class="num">{{ lowerTempCount }}<span>次</span></div>
         </div>
       </div>
       <div class="item">
         <img src="./assets/completionTickets.png" alt="" />
         <div class="info-sum">
           <div class="title">中烧次数（37.5~38.5℃）</div>
-          <div class="num">{{ creditBalance }}<span>次</span></div>
+          <div class="num">{{ middleTempCount }}<span>次</span></div>
         </div>
       </div>
       <div class="item">
         <img src="./assets/completionTime.png" alt="" />
         <div class="info-sum">
           <div class="title">高烧次数（>=38.5℃）</div>
-          <div class="num">{{ investBalance }}<span>次</span></div>
+          <div class="num">{{ higherTempCount }}<span>次</span></div>
         </div>
       </div>
     </div>
@@ -97,28 +97,28 @@
         <img src="./assets/one.png" alt="" />
         <div class="info-sum">
           <div class="title">档案份数</div>
-          <div class="num">{{ debitICount }}<span>份</span></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">{{ debitIICount }}<span>次</span></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">{{ debitOnlineCount }}<span>元</span></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">医院数量</div>
-          <div class="num">{{ storedValueCardCount }}<span>个</span></div>
+          <div class="num">{{ 0 }}<span>个</span></div>
         </div>
       </div>
     </div>
@@ -127,28 +127,28 @@
         <img src="./assets/one.png" alt="" />
         <div class="info-sum">
           <div class="title">大夫数量</div>
-          <div class="num">{{ otherDebitCount }}<span>次</span></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">{{ debitTotalBalance }}<span>次</span></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">{{ debitBalance }}<span>元</span></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">{{ debitOnlineBalance }}<span>天</span></div>
+          <div class="num">{{ 0 }}<span>天</span></div>
         </div>
       </div>
     </div>
@@ -157,217 +157,41 @@
   </div>
 </template>
 <script setup name="facilityType">
-import {
-  getPosAccountsInfo,
-  getInvestAccountsInfo,
-  getCreditReportInfo,
-  getLendAccountsInfo,
-  getCreditAccountsInfo,
-  getDebitAccountsInfo
-} from '@/api/invest/accountAnalysis.js'
+import { getHealthAnalysis } from '@/api/health/statisticAnalysis.js'
 
-//POS机信息
-const posCount = ref(0) //POS机总数
-const currentMonthAmount = ref(0) //当月刷卡金额
-const currentMonthCommission = ref(0) //当月刷卡手续费
-const currentMonthCount = ref(0) //当月刷卡次数
-const currentYearAmount = ref(0) //当年刷卡金额
-const currentYearCommission = ref(0) //当年刷卡手续费
-const currentYearCount = ref(0) //当年刷卡次数
-const accumulateAmount = ref(0) //累计刷卡金额
-const accumulateCommission = ref(0) //累计刷卡手续费
-const accumulateCount = ref(0) //累计刷卡次数
+//信息
+const personCount = ref(0) //成员总数
+const healthRecordCount = ref(0) //健康档案总数
+const activityCount = ref(0) //活动总数
+const doctorCount = ref(0) //就医总数
+const hospitalCount = ref(0) //医院总数
+const doctorTotalCount = 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 stocksCount = ref(0) //股票账户
-const futuresCount = ref(0) //期货账户
-const currentMonthInvest = ref(0) //当月收益
-const currentMonthIncome = ref(0) //当月盈利
-const currentMonthExpenses = ref(0) //当月亏损
-const futuresIncome = ref(0) //期货收益
-const totalIncome = ref(0) //投资总收益
-const stocksIncome = ref(0) //股票收益
-const investBalance = ref(0) //投资账户余额
-
-//储蓄账户信息
-const debitCount = ref(0) //储蓄卡总数
-const debitICount = ref(0) //I类储蓄卡总数
-const debitIICount = ref(0) //II类储蓄卡总数
-const debitOnlineCount = ref(0) //网络账户总数
-const storedValueCardCount = ref(0) //储值卡总数
-const otherDebitCount = ref(0) //其他账户数
-const storedValueCardBalance = ref(0) //储值卡余额
-const housingFundBalance = ref(0) //公积金余额
-const medicalBalance = ref(0) //医保余额
-const debitOnlineBalance = ref(0) //网络账户余额
-const personalPensionBalance = ref(0) //个人养老金余额
-const otherDebitBalance = ref(0) //其他余额
-const debitBalance = ref(0) //储蓄卡余额
-const debitTotalBalance = ref(0) //储蓄账户余额
-
-//借贷账户信息
-const peopleLendHistory = ref(0) //人情借贷余额
-const peopleLendCount = ref(0) //人情账户
-const onlineLendCount = ref(0) //贷款账户
-const unclearedOnlineDebtCount = ref(0) //未结清贷款账户数
-const unClearedOnlineDebt = ref(0) //未结清贷款本息
-const unClearedOnlineDebtPrinciple = ref(0) //未结清贷款本金
-const unClearedOnlineDebtInterest = ref(0) //未结清贷款利息
-const clearedOnlineDebtCount = ref(0) //已结清贷款账户数
-const clearedOnlineDebt = ref(0) //已结清贷款本息
-const clearedOnlineDebtPrinciple = ref(0) //已结清贷款本金
-const clearedOnlineDebtInterest = ref(0) //已结清贷款利息
-const dueOnlineDebt = ref(0) //本月应还贷款
-const repaidOnlineDebt = ref(0) //本月已还贷款
-const leftOnlineDebt = ref(0) //本月剩余应还贷款
-
-//信用卡信息
-const creditInstallmentHistory = ref(0)
-const creditCount = ref(0) //信用卡数量
-const currentCreditBill = ref(0)
-const creditInstallment = ref(0)
-const creditLimit = ref(0) //信用卡额度
-const lastSixMonthUsedLimit = ref(0) //近6月使用额度
-const lastSixMonthUsedRate = ref(0) //近6月使用率
-const lastMonthUsedLimit = ref(0) //上月已用额度
-const lastMonthUsedRate = ref(0) //上月使用率
-const creditBalance = ref(0) //信用卡余额
-const creditAvailableLimit = ref(0) //信用卡可用额度
-const creditBillRate = ref(0) //信用卡使用率
-const unclearedCreditInstallmentCount = ref(0) //未结清分期数量
-const unclearedCreditInstallment = ref(0) //未结清分期本息
-const unclearedCreditInstallmentPrinciple = ref(0) //未结清分期本金
-const unclearedCreditInstallmentInterest = ref(0) //未结清分期利息
-const clearedCreditInstallmentCount = ref(0) //已结清分期数量
-const clearedCreditInstallmentDebt = ref(0) //已结清分期本息
-const clearedCreditInstallmentPrinciple = ref(0) //已结清分期本金
-const clearedCreditInstallmentInterest = ref(0) //已结清分期利息
-
-//征信报告信息
-const lastOneMonths = ref(0) //近1月硬查询
-const lastTwoMonths = ref(0) //近2月硬查询
-const lastThreeMonths = ref(0) //近3月硬查询
-const lastSixMonths = ref(0) //近6月硬查询
-const lastOneYears = ref(0) //近1年硬查询
-const lastTwoYears = ref(0) //近2年硬查询
-const lastAllYears = ref(0) //所有硬查询
-const lastSixMonthQueryCount = ref(0) //近6月个人查询
-const lastSixMonthsAfterLoan = ref(0) //近6月贷后管理
-const lastTwoYearsAfterLoan = ref(0) //近2年贷后管理
-const totalAfterLoan = ref(0) //总贷后管理
-
-const getInvestAccountsInfoData = () => {
-  getInvestAccountsInfo().then((res) => {
-    stocksCount.value = res.data.stocksCount
-    futuresCount.value = res.data.futuresCount
-    totalIncome.value = res.data.totalIncome
-    futuresIncome.value = res.data.futuresIncome
-    stocksIncome.value = res.data.stocksIncome
-    investBalance.value = res.data.investBalance
-    currentMonthInvest.value = res.data.currentMonthInvest
-    currentMonthIncome.value = res.data.currentMonthIncome
-    currentMonthExpenses.value = res.data.currentMonthExpenses
-  })
-}
-
-const getPosAccountsInfoData = () => {
-  getPosAccountsInfo().then((res) => {
-    posCount.value = res.data.posCount
-    currentMonthAmount.value = res.data.currentMonthAmount
-    currentMonthCommission.value = res.data.currentMonthCommission
-    currentMonthCount.value = res.data.currentMonthCount
-    currentYearAmount.value = res.data.currentYearAmount
-    currentYearCommission.value = res.data.currentYearCommission
-    currentYearCount.value = res.data.currentYearCount
-    accumulateAmount.value = res.data.accumulateAmount
-    accumulateCommission.value = res.data.accumulateCommission
-    accumulateCount.value = res.data.accumulateCount
-  })
-}
-
-const getCreditAccountsInfoData = () => {
-  getCreditAccountsInfo().then((res) => {
-    creditCount.value = res.data.creditCount
-    currentCreditBill.value = res.data.currentCreditBill
-    creditInstallment.value = res.data.creditInstallment
-    creditLimit.value = res.data.creditLimit
-    lastSixMonthUsedLimit.value = res.data.lastSixMonthUsedLimit
-    lastSixMonthUsedRate.value = res.data.lastSixMonthUsedRate
-    lastMonthUsedLimit.value = res.data.lastMonthUsedLimit
-    lastMonthUsedRate.value = res.data.lastMonthUsedRate
-    creditBalance.value = res.data.creditBalance
-    creditAvailableLimit.value = res.data.creditAvailableLimit
-    creditBillRate.value = res.data.creditBillRate
-    unclearedCreditInstallmentCount.value = res.data.unclearedCreditInstallmentCount
-    unclearedCreditInstallment.value = res.data.unclearedCreditInstallment
-    unclearedCreditInstallmentPrinciple.value = res.data.unclearedCreditInstallmentPrinciple
-    unclearedCreditInstallmentInterest.value = res.data.unclearedCreditInstallmentInterest
-    clearedCreditInstallmentCount.value = res.data.clearedCreditInstallmentCount
-    clearedCreditInstallmentDebt.value = res.data.clearedCreditInstallmentDebt
-    clearedCreditInstallmentPrinciple.value = res.data.clearedCreditInstallmentPrinciple
-    clearedCreditInstallmentInterest.value = res.data.clearedCreditInstallmentInterest
-  })
-}
-const getLendAccountsInfoData = () => {
-  getLendAccountsInfo().then((res) => {
-    peopleLendCount.value = res.data.peopleLendCount
-    onlineLendCount.value = res.data.onlineLendCount
-    unClearedOnlineDebt.value = res.data.unClearedOnlineDebt
-    creditInstallmentHistory.value = res.data.creditInstallmentHistory
-    peopleLendHistory.value = res.data.peopleLendHistory
-    unclearedOnlineDebtCount.value = res.data.unclearedOnlineDebtCount
-    clearedOnlineDebtCount.value = res.data.clearedOnlineDebtCount
-    clearedOnlineDebt.value = res.data.clearedOnlineDebt
-    dueOnlineDebt.value = res.data.dueOnlineDebt
-    repaidOnlineDebt.value = res.data.repaidOnlineDebt
-    leftOnlineDebt.value = res.data.leftOnlineDebt
-    unClearedOnlineDebtPrinciple.value = res.data.unClearedOnlineDebtPrinciple
-    unClearedOnlineDebtInterest.value = res.data.unClearedOnlineDebtInterest
-    clearedOnlineDebtPrinciple.value = res.data.clearedOnlineDebtPrinciple
-    clearedOnlineDebtInterest.value = res.data.clearedOnlineDebtInterest
-  })
-}
-const getCreditReportInfoData = () => {
-  getCreditReportInfo().then((res) => {
-    lastOneMonths.value = res.data.lastOneMonths
-    lastTwoMonths.value = res.data.lastTwoMonths
-    lastThreeMonths.value = res.data.lastThreeMonths
-    lastSixMonths.value = res.data.lastSixMonths
-    lastOneYears.value = res.data.lastOneYears
-    lastTwoYears.value = res.data.lastTwoYears
-    lastAllYears.value = res.data.lastAllYears
-    lastSixMonthQueryCount.value = res.data.lastSixMonthQueryCount
-    lastSixMonthsAfterLoan.value = res.data.lastSixMonthsAfterLoan
-    lastTwoYearsAfterLoan.value = res.data.lastTwoYearsAfterLoan
-    totalAfterLoan.value = res.data.totalAfterLoan
-  })
-}
-const getDebitAccountsInfoData = () => {
-  getDebitAccountsInfo().then((res) => {
-    debitCount.value = res.data.debitCount
-    debitICount.value = res.data.debitICount
-    debitIICount.value = res.data.debitIICount
-    debitOnlineCount.value = res.data.debitOnlineCount
-    storedValueCardCount.value = res.data.storedValueCardCount
-    debitBalance.value = res.data.debitBalance
-    debitTotalBalance.value = res.data.debitTotalBalance
-    debitOnlineBalance.value = res.data.debitOnlineBalance
-    storedValueCardBalance.value = res.data.storedValueCardBalance
-    housingFundBalance.value = res.data.housingFundBalance
-    medicalBalance.value = res.data.medicalBalance
-    personalPensionBalance.value = res.data.personalPensionBalance
-    otherDebitBalance.value = res.data.otherDebitBalance
-    otherDebitCount.value = res.data.otherDebitCount
+const getHealthAnalysisData = () => {
+  getHealthAnalysis().then((res) => {
+    personCount.value = res.data.personCount
+    healthRecordCount.value = res.data.healthRecordCount
+    activityCount.value = res.data.activityCount
+    doctorCount.value = res.data.doctorCount
+    hospitalCount.value = res.data.hospitalCount
+    doctorTotalCount.value = res.data.doctorTotalCount
+    marCount.value = res.data.marCount
+    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
   })
 }
 
 onMounted(() => {
-  getInvestAccountsInfoData()
-  getPosAccountsInfoData()
-  getDebitAccountsInfoData()
-  getCreditAccountsInfoData()
-  getLendAccountsInfoData()
-  getCreditReportInfoData()
+  getHealthAnalysisData()
 })
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/health/marRecord/index.vue b/src/views/health/marRecord/index.vue
index a8ad05e..d41416a 100644
--- a/src/views/health/marRecord/index.vue
+++ b/src/views/health/marRecord/index.vue
@@ -52,7 +52,7 @@
           <el-table-column label="人员姓名" align="center" width="120" prop="personName" />
           <el-table-column label="健康档案" align="center" width="180" prop="healthRecordName" />
           <el-table-column label="用药名称" align="center" prop="name" />
-          <el-table-column label="用药类型" align="center" width="120" prop="type">
+          <el-table-column label="用药类型" align="center" width="180" prop="type">
             <template #default="scope">
               <dict-tag :options="mar_type" :value="scope.row.type" />
             </template>