diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsController.java index b2cb509..4ef0a1b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsController.java @@ -22,17 +22,6 @@ public class BabyStatisticsController { @Autowired private BabyStatisticsFacade babyStatisticsFacade; - /* *//** - 儿童统计 - * @Author: 武涛涛 - * @Date: 2021/3/20 13:55 - *//* - @ResponseBody - @TokenRequired - @RequestMapping(value = "/statistics", method = RequestMethod.POST) - public BaseResponse statistics(@RequestBody BabyStatisticsQueryRequest babyStatisticsQueryRequest) { - return babyStatisticsFacade.statistics(babyStatisticsQueryRequest); - }*/ /** 儿童统计 * @Author: 武涛涛 @@ -45,6 +34,4 @@ public class BabyStatisticsController { return babyStatisticsFacade.statistics2(babyStatisticsQueryRequest); } - - } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsFacade.java index 31fb2bc..4e64001 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsFacade.java @@ -74,49 +74,6 @@ public class BabyStatisticsFacade extends BaseServiceImpl { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(mapList); } /* - 儿童统计: - 1:高危儿管理率、2:儿童建册率、3:低出生体重儿百分比、 - 4:3岁以下儿童系统管理率、5.1:中重度贫血率、5.2:5岁以下儿童肥胖率、6:听力确诊率、7:听力筛查率 - - public BaseResponse statistics(BabyStatisticsQueryRequest queryRequest) { - Map staMaps = new HashMap <>(); - long startTime=System.currentTimeMillis(); //获取开始时间 - - List provinceCityAreaHid = getProvinceCityAreaHid(queryRequest); - //1:高危儿管理率 - Map gwMap = getGwMap(queryRequest, provinceCityAreaHid); - staMaps.put("gwMap", gwMap); - - //2:儿童建册率 - Map babyMap = getBabyMap(queryRequest, provinceCityAreaHid); - staMaps.put("babyMap", babyMap); - - //3:低出生体重儿百分比 - Map dtzMap = getDtzMap(queryRequest, provinceCityAreaHid); - staMaps.put("dtzMap", dtzMap); - - //5.1:中重度贫血率 - Map zdpxMap = getZdpxMap(queryRequest, provinceCityAreaHid); - staMaps.put("zdpxMap", zdpxMap); - - //5.2:5岁以下儿童肥胖率 - Map fplMap = getFplMap(queryRequest, provinceCityAreaHid); - staMaps.put("fplMap", fplMap); - - //6:听力确诊率 - Map tlqzMap = getTlqzMap(queryRequest, provinceCityAreaHid); - staMaps.put("tlqzMap", tlqzMap); - - //7:听力筛查率 - Map tlscMap = getTlscMap(queryRequest, provinceCityAreaHid); - staMaps.put("tlscMap", tlscMap); - - - long endTime=System.currentTimeMillis(); //获取结束时间 - System.out.println("程序运行毫秒: "+(endTime-startTime)+"ms"); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(staMaps); - } - *//* 1 定义 接口 抽象方法 2 实现 接口 抽象方法,不同对象的实现抽象方法, 3 不同对象的实现抽象方法,存储在list集合中。 @@ -134,7 +91,6 @@ public class BabyStatisticsFacade extends BaseServiceImpl { if (end > listMaps.size()) { end = listMaps.size(); } -// listFuture.add(commonThreadPool.submit(new BabyStatisticsWorker(listMaps.subList(i, end), mongoTemplate, commonService, basicConfigService))); listFuture.add(commonThreadPool.submit(new BabyStatisticsWorker(listMaps.subList(i, end), queryRequest, provinceCityAreaHid))); } if(listFuture != null){ @@ -152,11 +108,10 @@ public class BabyStatisticsFacade extends BaseServiceImpl { } - - public interface Statistic { abstract Map statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid); } + //1:高危儿管理率 class GwMap implements Statistic{ @Override diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyStatisticsWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyStatisticsWorker.java index de8a537..631119d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyStatisticsWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyStatisticsWorker.java @@ -54,10 +54,8 @@ public class BabyStatisticsWorker implements Callable> { Map map = statistic.statisticMap(babyStatisticsQueryRequest, provinceCityAreaHid); data.add(map); } - } return data; } - } \ No newline at end of file