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 bbfe329..31fb2bc 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 @@ -155,54 +155,54 @@ public class BabyStatisticsFacade extends BaseServiceImpl { public interface Statistic { - abstract Map > statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid); + abstract Map statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid); } //1:高危儿管理率 class GwMap implements Statistic{ @Override - public Map > statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + public Map statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { return getGwMap(queryRequest, provinceCityAreaHid); } } //2:儿童建册率 class BabyMap implements Statistic{ @Override - public Map > statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + public Map statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { return getBabyMap(queryRequest, provinceCityAreaHid); } } //3:低出生体重儿百分比 class DtzMap implements Statistic{ @Override - public Map > statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + public Map statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { return getDtzMap(queryRequest, provinceCityAreaHid); } } //4 :中重度贫血率 class ZdpxMap implements Statistic{ @Override - public Map > statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + public Map statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { return getZdpxMap(queryRequest, provinceCityAreaHid); } } //5 :5岁以下儿童肥胖率 class FplMap implements Statistic{ @Override - public Map > statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + public Map statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { return getFplMap(queryRequest, provinceCityAreaHid); } } //6:听力确诊率 class TlqzMap implements Statistic{ @Override - public Map > statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + public Map statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { return getTlqzMap(queryRequest, provinceCityAreaHid); } } //7:听力筛查率 class TlscMap implements Statistic{ @Override - public Map > statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + public Map statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { return getTlscMap(queryRequest, provinceCityAreaHid); } } @@ -214,8 +214,8 @@ public class BabyStatisticsFacade extends BaseServiceImpl { * @Author: 武涛涛 * @Date: 2021/3/20 14:09 */ - private Map > getTlscMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { - Map > maps = new HashMap <>(); + private Map getTlscMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + Map maps = new HashMap <>(); Map map = new HashMap <>(); try { @@ -246,6 +246,7 @@ public class BabyStatisticsFacade extends BaseServiceImpl { e.printStackTrace(); } maps.put("tlscMap", map); + maps.put("name", "听力筛查率"); return maps; } /** @@ -253,8 +254,8 @@ public class BabyStatisticsFacade extends BaseServiceImpl { * @Author: 武涛涛 * @Date: 2021/3/20 14:09 */ - private Map > getTlqzMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { - Map > maps = new HashMap <>(); + private Map getTlqzMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + Map maps = new HashMap <>(); Map map = new HashMap <>(); try { @@ -291,6 +292,7 @@ public class BabyStatisticsFacade extends BaseServiceImpl { e.printStackTrace(); } maps.put("tlqzMap", map); + maps.put("name", "听力确诊率"); return maps; } @@ -299,8 +301,8 @@ public class BabyStatisticsFacade extends BaseServiceImpl { * @Author: 武涛涛 * @Date: 2021/3/20 14:09 */ - private Map > getFplMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { - Map > maps = new HashMap <>(); + private Map getFplMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + Map maps = new HashMap <>(); Map map = new HashMap <>(); try { @@ -339,6 +341,7 @@ public class BabyStatisticsFacade extends BaseServiceImpl { e.printStackTrace(); } maps.put("fplMap", map); + maps.put("name", "5岁以下儿童肥胖率"); return maps; } @@ -347,8 +350,8 @@ public class BabyStatisticsFacade extends BaseServiceImpl { * @Author: 武涛涛 * @Date: 2021/3/20 14:09 */ - private Map > getZdpxMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { - Map > maps = new HashMap <>(); + private Map getZdpxMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + Map maps = new HashMap <>(); Map map = new HashMap <>(); try { @@ -372,6 +375,7 @@ public class BabyStatisticsFacade extends BaseServiceImpl { e.printStackTrace(); } maps.put("zdpxMap", map); + maps.put("name", "中重度贫血率"); return maps; } @@ -381,8 +385,8 @@ public class BabyStatisticsFacade extends BaseServiceImpl { * @Author: 武涛涛 * @Date: 2021/3/20 14:09 */ - private Map > getDtzMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { - Map > maps = new HashMap <>(); + private Map getDtzMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + Map maps = new HashMap <>(); Map map = new HashMap <>(); try { @@ -416,6 +420,7 @@ public class BabyStatisticsFacade extends BaseServiceImpl { e.printStackTrace(); } maps.put("dtzMap", map); + maps.put("name", "低出生体重儿百分比"); return maps; } @@ -425,8 +430,8 @@ public class BabyStatisticsFacade extends BaseServiceImpl { * @Author: 武涛涛 * @Date: 2021/3/20 14:09 */ - private Map > getBabyMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { - Map > maps = new HashMap <>(); + private Map getBabyMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + Map maps = new HashMap <>(); Map map = new HashMap <>(); try { // 分子 区域妇幼管理 - 全部儿童管理,建档人数 @@ -466,6 +471,7 @@ public class BabyStatisticsFacade extends BaseServiceImpl { e.printStackTrace(); } maps.put("babyMap", map); + maps.put("name", "儿童建册率"); return maps; } @@ -474,8 +480,8 @@ public class BabyStatisticsFacade extends BaseServiceImpl { * @Author: 武涛涛 * @Date: 2021/3/20 14:09 */ - private Map > getGwMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { - Map > maps = new HashMap <>(); + private Map getGwMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { + Map maps = new HashMap <>(); Map map = new HashMap <>(); try { //分子 @@ -521,6 +527,7 @@ public class BabyStatisticsFacade extends BaseServiceImpl { e.printStackTrace(); } maps.put("gwMap",map); + maps.put("name","高危儿管理率"); return maps; } 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 4d179f8..de8a537 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 @@ -51,7 +51,7 @@ public class BabyStatisticsWorker implements Callable> { if(statistic == null){ continue; } - Map > map = statistic.statisticMap(babyStatisticsQueryRequest, provinceCityAreaHid); + Map map = statistic.statisticMap(babyStatisticsQueryRequest, provinceCityAreaHid); data.add(map); }