diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java index 06c89be..32a9390 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java @@ -609,7 +609,7 @@ public class annualReportFacade { sieveGwQuery.setHospitalIds(entry.getValue()); sieveGwQuery.setStatuses(sieveList); sieveGwQuery.setZtfx(2); - int sieveGw = sieveService.queryListCount(sieveQuery); + int sieveGw = sieveService.queryListCount(sieveGwQuery); map.put("sieveGw", String.valueOf(sieveGw)); map.put("SieveGwPervent", this.division(sieveGw, sieveCount)); @@ -622,7 +622,7 @@ public class annualReportFacade { } diacrisisQuery.setHospitalIds(entry.getValue()); diacrisisQuery.setStatus(4); - int diacrisisCount = sieveService.queryListCount(sieveQuery); + int diacrisisCount = sieveService.queryListCount(diacrisisQuery); map.put("diacrisisCount", String.valueOf(diacrisisCount)); map.put("diacrisisPervent", this.division(diacrisisCount, antexMap.size())); @@ -826,7 +826,7 @@ public class annualReportFacade { } patientsQuery1.setFmHospitalList(entry.getValue()); patientsQuery1.setFmWeekStart(0); - patientsQuery1.setFmWeekEnd(36 * 7); + patientsQuery1.setFmWeekEnd(37 * 7); List patientses = patientsService.queryPatient(patientsQuery1); if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patientses)) { List ids = new ArrayList<>();