diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 753dad5..3198c64 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -117,25 +117,9 @@ public class RiskReportFacade { { continue; } - - PatientsQuery query = new PatientsQuery(); - query.setYn(YnEnums.YES.getId()); - query.setBuildTypeList(patientsQuery.getBuildTypeList()); - query.setHospitalId(patientsQuery.getHospitalId()); - query.setDueStatus(patientsQuery.getDueStatus()); - //高危等级 - query.setrLevel(patientsQuery.getrLevel()); - //产检医生 - query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId()); - query.setDueDateStart(patientsQuery.getDueDateStart()); - query.setDueDateEnd(patientsQuery.getDueDateEnd()); - - query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart()); - query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd()); - Callable c = new HiskCountTask( basicConfigService, patientsService, levelConfig, - query, + patientsQuery, allPatientCount); Future f = pool.submit(c); futures.add(f); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java index 955d02b..c43807e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java @@ -74,9 +74,24 @@ public class HiskCountTask implements Callable { List datas = new ArrayList<>(); for (BasicConfig config : configs) { - patientsQuery.setrFactor(config.getId()); + PatientsQuery query = new PatientsQuery(); + query.setYn(YnEnums.YES.getId()); + query.setBuildTypeList(patientsQuery.getBuildTypeList()); + query.setHospitalId(patientsQuery.getHospitalId()); + query.setDueStatus(patientsQuery.getDueStatus()); + //高危等级 + query.setrLevel(patientsQuery.getrLevel()); + //产检医生 + query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId()); + query.setDueDateStart(patientsQuery.getDueDateStart()); + query.setDueDateEnd(patientsQuery.getDueDateEnd()); + + query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart()); + query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd()); + + query.setrFactor(config.getId()); //单个高危因素孕产妇条数 - int riskPatientCount = patientsService.queryPatientCount(patientsQuery); + int riskPatientCount = patientsService.queryPatientCount(query); if (riskPatientCount > 0) { RiskReportResult risk = new RiskReportResult();