diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java
index 457bab2..1fbb2b3 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java
@@ -2,9 +2,7 @@ package com.elink.esua.epdc.modules.screen.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
 import com.elink.esua.epdc.modules.screen.service.EpdcScreenService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -105,9 +103,75 @@ public class EpdcScreenController {
         return  epdcScreenService.frontPageDeptInfoList();
     }
 
+    /**
+     *首页-人口类型统计接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/11 20:01
+     */
     @GetMapping("frontPage/personInfoStatistics")
-    public Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList(){
+    public Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> frontPagePersonInfoStatisticsList(){
         return epdcScreenService.frontPagePersonInfoStatisticsList();
     }
 
+    /**
+     * 首页-房屋类型统计接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/11 20:02
+     */
+    @GetMapping("frontPage/houseTypeStatistics")
+    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> frontPageHouseTypeStatistics(){
+        return epdcScreenService.frontPageHouseTypeStatistics();
+    }
+
+    /**
+     * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/12 10:10
+     */
+    @GetMapping("epidemic/vaccinationStatistics")
+    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics(){
+        return epdcScreenService.epidemicVaccinationStatistics();
+    }
+
+    /**
+     * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/12 10:26
+     */
+    @GetMapping("epidemic/communityVaccinationStatistics")
+    public Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(@RequestBody EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.epidemicCommunityVaccinationStatisticsList(formDto);
+    }
+
+    /**
+     * 疫情防控-接种企业统计
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>>
+     * @author jyyzz
+     * @since 2021/8/12 11:26
+     */
+    @GetMapping("epidemic/companyVaccinationStatistics")
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(){
+        return epdcScreenService.epidemicCompanyVaccinationStatisticsList();
+    }
+
+    /**
+     * 疫情防控-疫苗接种年龄分布
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO>
+     * @author jyyzz
+     * @since 2021/8/12 12:35
+     */
+    @GetMapping("vaccination/ageVaccinationStatistics")
+    public Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.vaccinationAgeVaccinationStatistics(formDto);
+    }
 }
diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java
index cf5c9e3..00d769f 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java
@@ -2,9 +2,7 @@ package com.elink.esua.epdc.modules.screen.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -79,5 +77,49 @@ public interface EpdcScreenDao extends BaseDao<EpdcScreenGridGovernanceItemResul
      * @author zhangfenghe
      * @since 2021/8/11 17:46
      */
-    List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> frontPagePersonInfoStatisticsList();
+    EpdcScreenFrontPagePersonInfoStatisticsResultDTO frontPagePersonInfoStatisticsList();
+
+    /**
+     * 首页-房屋类型统计接口
+     * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO
+     * @author zhangfenghe
+     * @since 2021/8/11 20:07
+     */
+    EpdcScreenFrontPageHouseTypeStatisticsResultDTO frontPageHouseTypeStatistics();
+
+    /**
+     * 疫情防控-疫苗接种情况统计
+     * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicVaccinationStatisticsResultDTO
+     * @author zhangfenghe
+     * @since 2021/8/11 23:41
+     */
+    EpdcScreenEpidemicVaccinationStatisticsResultDTO epidemicVaccinationStatistics();
+
+    /**
+     * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）
+     * @params [formDTO]
+     * @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>
+     * @author jyyzz
+     * @since 2021/8/12 10:41
+     */
+    List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDTO);
+
+    /**
+     * 疫情防控-接种企业统计
+     * @params []
+     * @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>
+     * @author jyyzz
+     * @since 2021/8/12 11:31
+     */
+    List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO> epidemicCompanyVaccinationStatisticsList();
+
+    /**
+     *疫情防控-疫苗接种年龄分布
+     * @params [formDto]
+     * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO
+     * @author jyyzz
+     * @since 2021/8/12 12:41
+     */
+    EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto);
+
 }
diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java
index 30c1e11..32ae2bc 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java
@@ -1,10 +1,9 @@
 package com.elink.esua.epdc.modules.screen.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
+import org.springframework.web.bind.annotation.GetMapping;
 
 import java.util.List;
 
@@ -78,5 +77,47 @@ public interface EpdcScreenService {
      * @author zhangfenghe
      * @since 2021/8/11 17:38
      */
-    Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList();
+    Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> frontPagePersonInfoStatisticsList();
+
+    /**
+     * 首页-房屋类型统计接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/11 20:03
+     */
+    Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> frontPageHouseTypeStatistics();
+    /**
+     * 疫情防控-疫苗接种情况统计
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicVaccinationStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/11 23:39
+     */
+    Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics();
+
+    /**
+     * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>>
+     * @author jyyzz
+     * @since 2021/8/12 10:31
+     */
+    Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto);
+
+    /**
+     * 疫情防控-接种企业统计
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>>
+     * @author jyyzz
+     * @since 2021/8/12 11:27
+     */
+    Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList();
+
+    /**
+     * 疫情防控-疫苗接种年龄分布
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO>
+     * @author jyyzz
+     * @since 2021/8/12 12:36
+     */
+    Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto);
 }
diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java
index ee40b30..c2909ae 100644
--- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java
@@ -3,9 +3,7 @@ package com.elink.esua.epdc.modules.screen.service.impl;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.*;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
 import com.elink.esua.epdc.modules.screen.dao.EpdcScreenDao;
 import com.elink.esua.epdc.modules.screen.service.EpdcScreenService;
@@ -65,8 +63,42 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl<EpdcScreenDao, EpdcSc
     }
 
     @Override
-    public Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList() {
-        List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> data = baseDao.frontPagePersonInfoStatisticsList();
-        return new Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>>().ok(data);
+    public Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> frontPagePersonInfoStatisticsList() {
+        EpdcScreenFrontPagePersonInfoStatisticsResultDTO data = baseDao.frontPagePersonInfoStatisticsList();
+        return new Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>().ok(data);
     }
+
+    @Override
+    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> frontPageHouseTypeStatistics() {
+        EpdcScreenFrontPageHouseTypeStatisticsResultDTO data = baseDao.frontPageHouseTypeStatistics();
+        return new Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO>().ok(data);
+    }
+
+    @Override
+    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics() {
+        EpdcScreenEpidemicVaccinationStatisticsResultDTO data = baseDao.epidemicVaccinationStatistics();
+        return new Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO>().ok(data);
+    }
+
+    @Override
+    public Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE)*formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO> data = baseDao.epidemicCommunityVaccinationStatisticsList(formDto);
+        return  new Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>>().ok(data);
+    }
+
+    @Override
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList() {
+        List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO> data = baseDao.epidemicCompanyVaccinationStatisticsList()
+        return new Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>>().ok(data);
+    }
+
+    @Override
+    public Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto) {
+        EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO data = baseDao.vaccinationAgeVaccinationStatistics(formDto);
+        return new Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO>().ok(data);
+    }
+
+
 }
diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
index f698328..838a00e 100644
--- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
+++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
@@ -155,9 +155,90 @@
     <select id="frontPagePersonInfoStatisticsList"
             resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO">
       SELECT
-        PERSON_NUM,
-        LIVE_TYPE
+        sum(if(LIVE_TYPE='0',PERSON_NUM,0)) as permanentResidenceNum,
+        sum(if(LIVE_TYPE='1',PERSON_NUM,0)) as floatingPopulationNum,
+        sum(if(LIVE_TYPE='2',PERSON_NUM,0)) as overseasPopulationNum
       FROM epdc_screen_person_live_statistics
       WHERE DEL_FLAG = '0'
     </select>
+
+    <select id="frontPageHouseTypeStatistics"
+            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO">
+      SELECT
+        sum(if(HOUSE_TYPE ='0',HOUSE_NUM ,0)) as aloneLiveNum,
+        sum(if(HOUSE_TYPE ='1',HOUSE_NUM ,0)) as rentNum,
+        sum(if(HOUSE_TYPE ='2',HOUSE_NUM ,0)) as dormitoryNum,
+        sum(if(HOUSE_TYPE ='3',HOUSE_NUM ,0)) as vacantNum,
+        sum(if(HOUSE_TYPE ='4',HOUSE_NUM ,0)) as otherNum
+      FROM epdc_screen_house_type_statistics
+      WHERE  DEL_FLAG = '0'
+    </select>
+
+    <select id="epidemicVaccinationStatistics"
+            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicVaccinationStatisticsResultDTO">
+      SELECT
+        SUM (VACCINATION_COMPLETED_NUM) as vaccinationCompletedNum,
+        SUM (ONE_SHOT_NUM) as oneShotNum,
+        SUM (TWO_SHOTS_NUM) as twoShotsNum,
+        SUM (NOT_VACCINATED_NUM) as notVaccinatedNum
+      FROM epdc_screen_vaccination_statistics
+      WHERE  DEL_FLAG = '0'
+      GROUP BY id
+    </select>
+
+    <select id="epidemicCommunityVaccinationStatisticsList"
+            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO">
+        SELECT
+        DEPT_ID,
+        DEPT_NAME,
+        COMMUNITY_TOTAL_NUM,
+        VACCINATION_COMPLETED_NUM,
+        ONE_SHOT_NUM,
+        TWO_SHOTS_NUM,
+        NOT_VACCINATED_NUM,
+        BEING_VACCINATED_NUM,
+        LONGITUDE,
+        LATITUDE
+        FROM epdc_screen_vaccination_statistics
+        WHERE DEL_FLAG = '0'
+        ORDER BY
+        <if test="orderType == 0">
+            VACCINATION_COMPLETED_NUM DESC
+        </if>
+        <if test="orderType == 1">
+            ONE_SHOT_NUM DESC
+        </if>
+        <if test="orderType == 2">
+            TWO_SHOTS_NUM DESC
+        </if>
+        <if test="orderType == 3">
+            NOT_VACCINATED_NUM DESC
+        </if>
+        DEPT_NAME
+        LIMIT #{pageIndex}, #{pageSize}
+    </select>
+
+    <select id="epidemicCompanyVaccinationStatisticsList"
+            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO">
+      SELECT
+        COMPANY,
+        VACCINATION_NUM
+      FROM  epdc_screen_vaccination_company_statistics
+      WHERE DEL_FLAG  = '0'
+    </select>
+
+    <select id="vaccinationAgeVaccinationStatistics"
+            resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO">
+
+      SELECT
+
+      FROM epdc_screen_vaccination_age_statistics
+        SUM (AGE_EIGHTEEN_THIRTY) ,
+        SUM (AGE_THIRTY_ONE_FORTY) ,
+        SUM (AGE_FORTY_ONE_FIFTY) ,
+        SUM (AGE_FIFTY_ONE_SIXTY) ,
+        SUM (AGE_OVER_SIXTY)
+      WHERE DEL_FLAG = '0'
+      AND STATISTIC_TYPE = #{statisticType}
+    </select>
 </mapper>
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 387fab2..e538352 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 387fab21c68235b15c886a70359a22c2ad91caa4
+Subproject commit e5383528fa125ed6da9fdae023c5432bc38ee154