From 9e8b4153ac9cd00ea74753036ab1d314be168435 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 16 Oct 2017 10:54:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E8=8A=82=E7=82=B9=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AreaCountFacade.java | 4 +- .../operate/web/worker/CheckPointCountWorker.java | 10 +++- .../operate/web/worker/CheckWeeksNumWorker.java | 62 +++++++++++++++++++--- 3 files changed, 66 insertions(+), 10 deletions(-) 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 a9da533..9fe550d 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 @@ -206,7 +206,7 @@ public class AreaCountFacade { hospitalIds.subList(i,end), startTime, endTime, - pointType); + pointType,recordService); listFuture.add(commonThreadPool.submit(checkPointCountWorker)); } for (Future f : listFuture) { @@ -686,7 +686,7 @@ public class AreaCountFacade { } } map.put("JD_HOSPITAL",buildHosp); //建档机构 - map.put("TEL_NO",map.get("TEL_NO")); //联系电话 + map.put("TEL_NO", map.get("TEL_NO")); //联系电话 results.add(map); } } 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 be9b18a..24d7551 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 @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.worker; +import com.lyms.platform.biz.service.AntExRecordService; import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.PatientsService; @@ -39,6 +40,8 @@ public class CheckPointCountWorker implements Callable{ private Date endTime; private Integer pointType; + private AntExRecordService recordService; + public CheckPointCountWorker(PatientsService patientsService, AntenatalExaminationService antenatalExaminationService, OrganizationService organizationService, @@ -46,7 +49,9 @@ public class CheckPointCountWorker implements Callable{ List hospitalIds, Date startTime, Date endTime, - Integer pointType) + Integer pointType, + AntExRecordService recordService + ) { this.patientsService = patientsService; this.antenatalExaminationService = antenatalExaminationService; @@ -57,6 +62,7 @@ public class CheckPointCountWorker implements Callable{ this.endTime = endTime; this.endTime = endTime; this.pointType = pointType; + this.recordService = recordService; } @@ -104,7 +110,7 @@ public class CheckPointCountWorker implements Callable{ for (int week : weeks) { CheckWeeksNumWorker callable = new CheckWeeksNumWorker(antenatalExaminationService,hId, - startTime, endTime, week,pointType); + startTime, endTime, week,pointType, recordService); futures.add(pool.submit(callable)); } 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 ebf98ed..5e7de2d 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 @@ -1,6 +1,9 @@ package com.lyms.platform.operate.web.worker; +import com.lyms.platform.biz.service.AntExRecordService; import com.lyms.platform.biz.service.AntenatalExaminationService; +import com.lyms.platform.pojo.AntExRecordModel; +import com.lyms.platform.query.AntExRecordQuery; import java.util.Date; import java.util.HashMap; @@ -20,8 +23,9 @@ public class CheckWeeksNumWorker implements Callable> { private Date endTime; private int week; private Integer pointType; + private AntExRecordService recordService; public CheckWeeksNumWorker(AntenatalExaminationService antenatalExaminationService, String hospitalId, - Date startTime,Date endTime,int week,Integer pointType) + Date startTime,Date endTime,int week,Integer pointType,AntExRecordService recordService) { this.antenatalExaminationService = antenatalExaminationService; this.hospitalId = hospitalId; @@ -29,6 +33,7 @@ public class CheckWeeksNumWorker implements Callable> { this.endTime = endTime; this.week = week; this.pointType = pointType; + this.recordService = recordService; } /** @@ -43,31 +48,76 @@ public class CheckWeeksNumWorker implements Callable> { @Override public Map call() throws Exception { Map map = new HashMap<>(); + + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + antExRecordQuery.setBirthStart(startTime); + antExRecordQuery.setBuildTimeEnd(endTime); + antExRecordQuery.setHospitalId(hospitalId); + antExRecordQuery.setIsFirst(pointType); + if (week == 0) { - int itemnum12 = antenatalExaminationService.queryWeekPointCount(0, 12, hospitalId, startTime, endTime, pointType); + + antExRecordQuery.setcDueWeekStart(0); + antExRecordQuery.setcDueWeekEnd((12 + 1) * 7 - 1); + int itemnum12 = recordService.count(antExRecordQuery); map.put("itemnum12",itemnum12); } else if (week == 16) { - int itemnum20 = antenatalExaminationService.queryWeekPointCount(16, 20, hospitalId, startTime, endTime, pointType); + antExRecordQuery.setcDueWeekStart(16*7); + antExRecordQuery.setcDueWeekEnd((20 + 1) * 7 - 1); + int itemnum20 = recordService.count(antExRecordQuery); map.put("itemnum20",itemnum20); } else if (week == 21) { - int itemnum24 = antenatalExaminationService.queryWeekPointCount(21, 24, hospitalId, startTime, endTime, pointType); + antExRecordQuery.setcDueWeekStart(21*7); + antExRecordQuery.setcDueWeekEnd((24 + 1) * 7 - 1); + int itemnum24 = recordService.count(antExRecordQuery); map.put("itemnum24",itemnum24); } else if (week == 28) { - int itemnum36 = antenatalExaminationService.queryWeekPointCount(28, 36, hospitalId, startTime, endTime, pointType); + antExRecordQuery.setcDueWeekStart(28*7); + antExRecordQuery.setcDueWeekEnd((36 + 1) * 7 - 1); + int itemnum36 = recordService.count(antExRecordQuery); map.put("itemnum36",itemnum36); } else if (week == 37) { - int itemnum40 = antenatalExaminationService.queryWeekPointCount(37, 40, hospitalId, startTime,endTime, pointType); + antExRecordQuery.setcDueWeekStart(37*7); + antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1); + int itemnum40 = recordService.count(antExRecordQuery); map.put("itemnum40",itemnum40); } + + +// if (week == 0) +// { +// int itemnum12 = antenatalExaminationService.queryWeekPointCount(0, 12, hospitalId, startTime, endTime, pointType); +// map.put("itemnum12",itemnum12); +// } +// else if (week == 16) +// { +// int itemnum20 = antenatalExaminationService.queryWeekPointCount(16, 20, hospitalId, startTime, endTime, pointType); +// map.put("itemnum20",itemnum20); +// } +// else if (week == 21) +// { +// int itemnum24 = antenatalExaminationService.queryWeekPointCount(21, 24, hospitalId, startTime, endTime, pointType); +// map.put("itemnum24",itemnum24); +// } +// else if (week == 28) +// { +// int itemnum36 = antenatalExaminationService.queryWeekPointCount(28, 36, hospitalId, startTime, endTime, pointType); +// map.put("itemnum36",itemnum36); +// } +// else if (week == 37) +// { +// int itemnum40 = antenatalExaminationService.queryWeekPointCount(37, 40, hospitalId, startTime,endTime, pointType); +// map.put("itemnum40",itemnum40); +// } return map; } } -- 1.8.3.1