Commit 80dc3b55853f5eea1c40acc99d87e06c4118bd9b
1 parent
a44cc29c65
Exists in
master
and in
6 other branches
年报产筛统计bug修改
Showing 2 changed files with 9 additions and 11 deletions
platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
View file @
80dc3b5
| ... | ... | @@ -419,9 +419,9 @@ |
| 419 | 419 | |
| 420 | 420 | if (null != applyTimeStart) { |
| 421 | 421 | if (null != c1) { |
| 422 | - c1 = c1.and("applyTime").gte(applyTimeStart); | |
| 422 | + c1 = c1.and("applyDate").gte(applyTimeStart); | |
| 423 | 423 | } else { |
| 424 | - c1 = Criteria.where("applyTime").gte(applyTimeStart); | |
| 424 | + c1 = Criteria.where("applyDate").gte(applyTimeStart); | |
| 425 | 425 | } |
| 426 | 426 | } |
| 427 | 427 | |
| ... | ... | @@ -429,7 +429,7 @@ |
| 429 | 429 | if (c1 != null) { |
| 430 | 430 | c1 = c1.lte(applyTimeEnd); |
| 431 | 431 | } else { |
| 432 | - c1 = Criteria.where("applyTime").lte(applyTimeEnd); | |
| 432 | + c1 = Criteria.where("applyDate").lte(applyTimeEnd); | |
| 433 | 433 | } |
| 434 | 434 | } |
| 435 | 435 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java
View file @
80dc3b5
| ... | ... | @@ -600,15 +600,14 @@ |
| 600 | 600 | sieveQuery.setHospitalIds(entry.getValue()); |
| 601 | 601 | sieveQuery.setStatuses(sieveList); |
| 602 | 602 | int sieveCount = sieveService.queryListCount(sieveQuery); |
| 603 | - System.out.println("========>" + entry.getKey() + "=======>" + sieveCount); | |
| 604 | 603 | map.put("sieveCount", String.valueOf(sieveCount)); |
| 605 | 604 | map.put("sievePervent", this.division(sieveCount, antexMap.size())); |
| 606 | 605 | //高危人数 |
| 607 | 606 | SieveQuery sieveGwQuery = new SieveQuery(); |
| 608 | 607 | sieveGwQuery.setYn(1); |
| 609 | 608 | if (StringUtils.isNotEmpty(time)) { |
| 610 | - sieveGwQuery.setCreatedStart(DateUtil.getSNDate(time)[0]); | |
| 611 | - sieveGwQuery.setCreatedEnd(DateUtil.getSNDate(time)[1]); | |
| 609 | + sieveGwQuery.setApplyTimeStart(DateUtil.getSNDate(time)[0]); | |
| 610 | + sieveGwQuery.setApplyTimeEnd(DateUtil.getSNDate(time)[1]); | |
| 612 | 611 | } |
| 613 | 612 | sieveGwQuery.setHospitalIds(entry.getValue()); |
| 614 | 613 | sieveGwQuery.setStatuses(sieveGWList); |
| ... | ... | @@ -621,8 +620,8 @@ |
| 621 | 620 | SieveQuery diacrisisQuery = new SieveQuery(); |
| 622 | 621 | diacrisisQuery.setYn(1); |
| 623 | 622 | if (StringUtils.isNotEmpty(time)) { |
| 624 | - diacrisisQuery.setCreatedStart(DateUtil.getSNDate(time)[0]); | |
| 625 | - diacrisisQuery.setCreatedEnd(DateUtil.getSNDate(time)[1]); | |
| 623 | + diacrisisQuery.setApplyTimeStart(DateUtil.getSNDate(time)[0]); | |
| 624 | + diacrisisQuery.setApplyTimeStart(DateUtil.getSNDate(time)[1]); | |
| 626 | 625 | } |
| 627 | 626 | diacrisisQuery.setHospitalIds(entry.getValue()); |
| 628 | 627 | diacrisisQuery.setStatus(4); |
| ... | ... | @@ -634,8 +633,8 @@ |
| 634 | 633 | SieveQuery diacrisis = new SieveQuery(); |
| 635 | 634 | diacrisis.setYn(1); |
| 636 | 635 | if (StringUtils.isNotEmpty(time)) { |
| 637 | - diacrisis.setCreatedStart(DateUtil.getSNDate(time)[0]); | |
| 638 | - diacrisis.setCreatedEnd(DateUtil.getSNDate(time)[1]); | |
| 636 | + diacrisis.setApplyTimeStart(DateUtil.getSNDate(time)[0]); | |
| 637 | + diacrisis.setApplyTimeStart(DateUtil.getSNDate(time)[1]); | |
| 639 | 638 | } |
| 640 | 639 | diacrisis.setHospitalIds(entry.getValue()); |
| 641 | 640 | diacrisis.setStatus(4); |
| ... | ... | @@ -820,7 +819,6 @@ |
| 820 | 819 | //巨大儿数 |
| 821 | 820 | map.put("bigBoyCount", String.valueOf(bigBoyCount)); |
| 822 | 821 | map.put("bigBoyPervent", this.division(bigBoyCount, huoChanCount)); |
| 823 | - | |
| 824 | 822 | int zcBabyCount = 0; |
| 825 | 823 | PatientsQuery patientsQuery1 = new PatientsQuery(); |
| 826 | 824 | patientsQuery1.setYn(YnEnums.YES.getId()); |