diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 695bf60..1012d24 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -436,7 +436,7 @@ public class TestController { { AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); antExRecordQuery.setParentIds(ids); - for (int i = 0 ; i < 5 ; i++) + for (int i = 0 ; i < 7 ; i++) { if (i == 0) { @@ -445,20 +445,30 @@ public class TestController { } else if (i == 1) { + antExRecordQuery.setcDueWeekStart(13*7); + antExRecordQuery.setcDueWeekEnd((15 + 1) * 7 - 1); + } + else if (i == 2) + { antExRecordQuery.setcDueWeekStart(16*7); antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1); } - else if (i == 2) + else if (i == 3) { antExRecordQuery.setcDueWeekStart(21*7); antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1); } - else if (i == 3) + else if (i == 4) + { + antExRecordQuery.setcDueWeekStart(25*7); + antExRecordQuery.setcDueWeekEnd((27 + 1) * 7 - 1); + } + else if (i == 5) { antExRecordQuery.setcDueWeekStart(28*7); antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1); } - else if (i == 4) + else if (i == 6) { antExRecordQuery.setcDueWeekStart(37*7); antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index 84d8e37..e7c9651 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -51,9 +51,6 @@ public class AreaCountFacade { private AntExRecordService recordService; @Autowired - private AutoMatchFacade autoMatchFacade; - - @Autowired private DataPermissionService dataPermissionService; @Autowired @@ -186,8 +183,10 @@ public class AreaCountFacade { } List chartData = new ArrayList<>(); List num12 = new ArrayList<>(); + List num15 = new ArrayList<>(); List num20 = new ArrayList<>(); List num24 = new ArrayList<>(); + List num27 = new ArrayList<>(); List num36 = new ArrayList<>(); List num40 = new ArrayList<>(); @@ -224,31 +223,35 @@ public class AreaCountFacade { for (Map map : checkPointtList) { chartData.add(map.get("HOSPITAL_NAME").toString()); num12.add(getInteger(map.get("NUM_12"))); - num20.add(getInteger(map.get("NUM_16"))); + num15.add(getInteger(map.get("NUM_15"))); + num20.add(getInteger(map.get("NUM_20"))); num24.add(getInteger(map.get("NUM_24"))); + num27.add(getInteger(map.get("NUM_27"))); num36.add(getInteger(map.get("NUM_36"))); num40.add(getInteger(map.get("NUM_40"))); } } else if (StringUtils.isNotEmpty(cityId)) { - getData(checkPointtList,num12,num20,num24,num36,num40,chartData,"AREA_COUNTY_ID","AREA_COUNTY"); + getData(checkPointtList,num12,num15,num20,num24,num27,num36,num40,chartData,"AREA_COUNTY_ID","AREA_COUNTY"); } else if (StringUtils.isNotEmpty(provinceId)) { - getData(checkPointtList,num12,num20,num24,num36,num40,chartData,"CITY_ID","CITY"); + getData(checkPointtList,num12,num15,num20,num24,num27,num36,num40,chartData,"CITY_ID","CITY"); } else { - getData(checkPointtList,num12,num20,num24,num36,num40,chartData,"PROVINCE_ID","PROVINCE"); + getData(checkPointtList,num12,num15,num20,num24,num27,num36,num40,chartData,"PROVINCE_ID","PROVINCE"); } Map data = new HashMap<>(); data.put("list", checkPointtList); data.put("chartData", chartData); data.put("num12", num12); + data.put("num15", num15); data.put("num20", num20); data.put("num24", num24); + data.put("num27", num27); data.put("num36", num36); data.put("num40", num40); return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data); @@ -256,8 +259,8 @@ public class AreaCountFacade { private void getData(List> checkPointtList, - List num12,List num20, - List num24,List num36, + List num12, List num15,List num20, + List num24,List num27,List num36, List num40,List chartData, String idKey,String nameKey ) @@ -276,15 +279,26 @@ public class AreaCountFacade { result.put(key, getInteger(map.get("NUM_12"))); } - String key1 = "num16:"+map.get(idKey).toString()+":"+map.get(nameKey).toString(); + String key15 = "num15:"+map.get(idKey).toString()+":"+map.get(nameKey).toString(); + if (result.get(key15) != null) + { + Integer value = result.get(key15); + result.put(key15,value+getInteger(map.get("NUM_15"))); + } + else + { + result.put(key15, getInteger(map.get("NUM_15"))); + } + + String key1 = "num20:"+map.get(idKey).toString()+":"+map.get(nameKey).toString(); if (result.get(key1) != null) { Integer value = result.get(key1); - result.put(key1,value+getInteger(map.get("NUM_16"))); + result.put(key1,value+getInteger(map.get("NUM_20"))); } else { - result.put(key1, getInteger(map.get("NUM_16"))); + result.put(key1, getInteger(map.get("NUM_20"))); } String key2 = "num24:"+map.get(idKey).toString()+":"+map.get(nameKey).toString(); @@ -298,6 +312,18 @@ public class AreaCountFacade { result.put(key2, getInteger(map.get("NUM_24"))); } + + String key27 = "num27:"+map.get(idKey).toString()+":"+map.get(nameKey).toString(); + if (result.get(key27) != null) + { + Integer value = result.get(key27); + result.put(key27,value+getInteger(map.get("NUM_27"))); + } + else + { + result.put(key27, getInteger(map.get("NUM_27"))); + } + String key3 = "num36:"+map.get(idKey).toString()+":"+map.get(nameKey).toString(); if (result.get(key3) != null) { @@ -309,7 +335,6 @@ public class AreaCountFacade { result.put(key3, getInteger(map.get("NUM_36"))); } - String key4 = "num40:"+map.get(idKey).toString()+":"+map.get(nameKey).toString(); if (result.get(key4) != null) { @@ -333,7 +358,11 @@ public class AreaCountFacade { { num12.add(result.get(key)); } - else if (key.contains("num16")) + else if (key.contains("num15")) + { + num20.add(result.get(key)); + } + else if (key.contains("num20")) { num20.add(result.get(key)); } @@ -341,6 +370,10 @@ public class AreaCountFacade { { num24.add(result.get(key)); } + else if (key.contains("num27")) + { + num24.add(result.get(key)); + } else if (key.contains("num36")) { num36.add(result.get(key)); @@ -537,7 +570,7 @@ public class AreaCountFacade { * @param page * @param limit * @param userId - * @param nodeName 0:0～12 孕周 1: 16～20 孕周 2: 21～24 孕周 3:28～36 孕周 4:37～ 分娩 + * @param nodeName 0:0～12 孕周 1:13-15 2: 16～20 孕周 3: 21～24 孕周 4:25-27 5:28～36 孕周 6:37～ 40 * @return */ public BaseResponse getCheckDetail(Integer nodeType, String time, String hospitalId, @@ -589,20 +622,30 @@ public class AreaCountFacade { } else if (nodeName == 1) { + antExRecordQuery.setcDueWeekStart(13*7); + antExRecordQuery.setcDueWeekEnd((15 + 1) * 7 - 1); + } + else if (nodeName == 2) + { antExRecordQuery.setcDueWeekStart(16*7); antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1); } - else if (nodeName == 2) + else if (nodeName == 3) { antExRecordQuery.setcDueWeekStart(21*7); antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1); } - else if (nodeName == 3) + else if (nodeName == 4) + { + antExRecordQuery.setcDueWeekStart(25*7); + antExRecordQuery.setcDueWeekEnd((27 + 1) * 7 - 1); + } + else if (nodeName == 5) { antExRecordQuery.setcDueWeekStart(28*7); antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1); } - else if (nodeName == 4) + else if (nodeName == 6) { antExRecordQuery.setcDueWeekStart(37*7); antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java index f11a868..2dfab1d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckPointCountWorker.java @@ -24,11 +24,13 @@ public class CheckPointCountWorker implements Callable{ private static List weeks = new ArrayList<>(); static { - weeks.add(0); - weeks.add(16); - weeks.add(21); - weeks.add(28); - weeks.add(37); + weeks.add(12); + weeks.add(15); + weeks.add(20); + weeks.add(24); + weeks.add(27); + weeks.add(36); + weeks.add(40); } private static ExecutorService pool = Executors.newFixedThreadPool(5); private PatientsService patientsService; @@ -127,8 +129,10 @@ public class CheckPointCountWorker implements Callable{ int itemnum12 = result.get("itemnum12"); + int itemnum15 = result.get("itemnum15"); int itemnum20 = result.get("itemnum20"); int itemnum24 = result.get("itemnum24"); + int itemnum27 = result.get("itemnum27"); int itemnum36 = result.get("itemnum36"); int itemnum40 = result.get("itemnum40"); int cjNum = itemnum12+itemnum20+itemnum24+itemnum36+itemnum40; @@ -139,8 +143,10 @@ public class CheckPointCountWorker implements Callable{ map.put("JD_NUM", buildCount); map.put("CJ_NUM", cjNum); map.put("NUM_12", itemnum12); + map.put("NUM_15", itemnum15); map.put("NUM_16", itemnum20); map.put("NUM_24", itemnum24); + map.put("NUM_27", itemnum27); map.put("NUM_36", itemnum36); map.put("NUM_40", itemnum40); checkPointtList.add(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java index a9b6033..3539363 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CheckWeeksNumWorker.java @@ -58,36 +58,50 @@ public class CheckWeeksNumWorker implements Callable> { antExRecordQuery.setIsFirst(pointType); } - if (week == 0) + if (week == 12) { - antExRecordQuery.setcDueWeekStart(0); antExRecordQuery.setcDueWeekEnd((12 + 1) * 7 - 1); int itemnum12 = recordService.count(antExRecordQuery); map.put("itemnum12",itemnum12); } - else if (week == 16) + + else if (week == 15) + { + antExRecordQuery.setcDueWeekStart(13*7); + antExRecordQuery.setcDueWeekEnd((15 + 1) * 7 - 1); + int itemnum15 = recordService.count(antExRecordQuery); + map.put("itemnum15",itemnum15); + } + else if (week == 20) { antExRecordQuery.setcDueWeekStart(16*7); antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1); int itemnum20 = recordService.count(antExRecordQuery); map.put("itemnum20",itemnum20); } - else if (week == 21) + else if (week == 24) { antExRecordQuery.setcDueWeekStart(21*7); antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1); int itemnum24 = recordService.count(antExRecordQuery); map.put("itemnum24",itemnum24); } - else if (week == 28) + else if (week == 27) + { + antExRecordQuery.setcDueWeekStart(25*7); + antExRecordQuery.setcDueWeekEnd((27 + 1) * 7 - 1); + int itemnum27 = recordService.count(antExRecordQuery); + map.put("itemnum27",itemnum27); + } + else if (week == 36) { antExRecordQuery.setcDueWeekStart(28*7); antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1); int itemnum36 = recordService.count(antExRecordQuery); map.put("itemnum36",itemnum36); } - else if (week == 37) + else if (week == 40) { antExRecordQuery.setcDueWeekStart(37*7); antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1);