diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java index 15937a9..9891833 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java @@ -249,7 +249,7 @@ public class ApiScreenController { * 疫情防控-疫苗接种年龄分布 * @params [formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author jyyzz + * @author zhangfenghe * @since 2021/8/12 12:21 */ @GetMapping("vaccination/ageVaccinationStatistics") @@ -257,4 +257,16 @@ public class ApiScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.vaccinationAgeVaccinationStatistics(formDto); } + + /** + * 疫情防控-疫苗接种人口类型统计 + * @params [forDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author jyyzz + * @since 2021/8/12 15:14 + */ + public Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO forDto){ + ValidatorUtils.validateEntity(forDto); + return epdcScreenService.vaccinationPersonVaccinationStatistics(forDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index 3cb8662..3746b4e 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -215,4 +215,14 @@ public interface AnalysisFeignClient { */ @GetMapping(value = "analysis/screen/vaccination/ageVaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto); + + /** + * 疫情防控-疫苗接种人口类型统计 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author jyyzz + * @since 2021/8/12 15:20 + */ + @GetMapping(value = "analysis/screen/vaccination/personVaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) + Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 32dab1e..7a2faa8 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -115,4 +115,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"vaccinationAgeVaccinationStatistics",formDto); } + @Override + public Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"vaccinationPersonVaccinationStatistics",formDto); + } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java index b6b152c..0723c5d 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java @@ -175,7 +175,23 @@ public interface EpdcScreenService { */ Result> epidemicCompanyVaccinationStatisticsList(); + /** + * 疫情防控-疫苗接种年龄分布 + * @params [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author jyyzz + * @since 2021/8/12 15:16 + */ Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDTO); + /** + * 疫情防控-疫苗接种人口类型统计 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author jyyzz + * @since 2021/8/12 15:16 + */ + Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto); + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java index faee14e..cd4ad8e 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java @@ -116,4 +116,9 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { return analysisFeignClient.vaccinationAgeVaccinationStatistics(formDTO); } + @Override + public Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto) { + return analysisFeignClient.vaccinationPersonVaccinationStatistics(formDto); + } + } diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 12c59c0..4869a724 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 12c59c0577125d310e1304170496c33bea8e4487 +Subproject commit 4869a724cf816024dfa62749e506a0be09d562fa