Commit 9dbde23fade5f18f834c77f6d1ad70cc07a592de
1 parent
4133227f94
Exists in
master
and in
6 other branches
年报bug修改
Showing 1 changed file with 3 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java
View file @
9dbde23
| ... | ... | @@ -609,7 +609,7 @@ |
| 609 | 609 | sieveGwQuery.setHospitalIds(entry.getValue()); |
| 610 | 610 | sieveGwQuery.setStatuses(sieveList); |
| 611 | 611 | sieveGwQuery.setZtfx(2); |
| 612 | - int sieveGw = sieveService.queryListCount(sieveQuery); | |
| 612 | + int sieveGw = sieveService.queryListCount(sieveGwQuery); | |
| 613 | 613 | map.put("sieveGw", String.valueOf(sieveGw)); |
| 614 | 614 | |
| 615 | 615 | map.put("SieveGwPervent", this.division(sieveGw, sieveCount)); |
| ... | ... | @@ -622,7 +622,7 @@ |
| 622 | 622 | } |
| 623 | 623 | diacrisisQuery.setHospitalIds(entry.getValue()); |
| 624 | 624 | diacrisisQuery.setStatus(4); |
| 625 | - int diacrisisCount = sieveService.queryListCount(sieveQuery); | |
| 625 | + int diacrisisCount = sieveService.queryListCount(diacrisisQuery); | |
| 626 | 626 | map.put("diacrisisCount", String.valueOf(diacrisisCount)); |
| 627 | 627 | map.put("diacrisisPervent", this.division(diacrisisCount, antexMap.size())); |
| 628 | 628 | |
| ... | ... | @@ -826,7 +826,7 @@ |
| 826 | 826 | } |
| 827 | 827 | patientsQuery1.setFmHospitalList(entry.getValue()); |
| 828 | 828 | patientsQuery1.setFmWeekStart(0); |
| 829 | - patientsQuery1.setFmWeekEnd(36 * 7); | |
| 829 | + patientsQuery1.setFmWeekEnd(37 * 7); | |
| 830 | 830 | List<Patients> patientses = patientsService.queryPatient(patientsQuery1); |
| 831 | 831 | if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patientses)) { |
| 832 | 832 | List<String> ids = new ArrayList<>(); |