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 3d4fe5f..96d6784 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 @@ -96,7 +96,7 @@ public class BabyStatisticsFacade extends BaseServiceImpl { if(listFuture != null){ for (Future f : listFuture) { try { - if(f!=null && f.get(30, TimeUnit.SECONDS)!=null){ + if(f!=null && f.get(85, TimeUnit.SECONDS)!=null){ data.addAll((List ) f.get(300, TimeUnit.SECONDS)); } } catch (Exception e) { @@ -133,7 +133,7 @@ public class BabyStatisticsFacade extends BaseServiceImpl { return getDtzMap(queryRequest, provinceCityAreaHid); } } - //4 :中重度贫血率 + //4 :5岁以下中重度贫血率 class ZdpxMap implements Statistic{ @Override public Map statisticMap(BabyStatisticsQueryRequest queryRequest, List provinceCityAreaHid) { @@ -330,7 +330,7 @@ public class BabyStatisticsFacade extends BaseServiceImpl { e.printStackTrace(); } maps.put("data", map); - maps.put("name", "中重度贫血率"); + maps.put("name", "5岁以下中重度贫血率"); return maps; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index d4b1160..3ade21f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -897,6 +897,7 @@ public class PatientFacade extends BaseServiceImpl { //多线程 patientsQuery.setIds(maternalDeliverParentIds); + patientsQuery.setNeed("true"); List ps = patientsService.queryPatientBySort(patientsQuery, "modified","desc"); if (CollectionUtils.isNotEmpty(ps)) { data = convertToHugeQuanWeight(ps);