Commit 4a16ddddd21aacadf414614da687644ab37525be
1 parent
2e43d54678
Exists in
master
and in
6 other branches
产检节点统计
Showing 1 changed file with 5 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
View file @
4a16ddd
| ... | ... | @@ -613,7 +613,7 @@ |
| 613 | 613 | antExRecordQuery.setcDueWeekEnd((40 + 1) * 7 - 1); |
| 614 | 614 | } |
| 615 | 615 | |
| 616 | - final List<AntExRecordModel> list = recordService.queryAntExRecords(antExRecordQuery); | |
| 616 | + List<AntExRecordModel> list = recordService.queryAntExRecords(antExRecordQuery); | |
| 617 | 617 | List<Future> futures = new ArrayList<>(); |
| 618 | 618 | List<Map> results = new ArrayList<>(); |
| 619 | 619 | if (CollectionUtils.isNotEmpty(list)) |
| 620 | 620 | |
| 621 | 621 | |
| 622 | 622 | |
| ... | ... | @@ -637,15 +637,15 @@ |
| 637 | 637 | map.put("YZ_NAME", StringUtils.dueWeek(model.getcDay())); //产检孕周 |
| 638 | 638 | |
| 639 | 639 | AntExRecordQuery query = new AntExRecordQuery(); |
| 640 | - query.setParentId(model.getParentId()); | |
| 640 | + query.setPid(model.getPid()); | |
| 641 | 641 | |
| 642 | 642 | String times = ""; |
| 643 | - List<AntExRecordModel> antExRecordModels = recordService.queryAntExRecords(query,Sort.Direction.ASC,"checkTime"); | |
| 643 | + List<AntExRecordModel> antExRecordModels = recordService.queryAntExRecords(query,Sort.Direction.DESC,"checkTime"); | |
| 644 | 644 | if (CollectionUtils.isNotEmpty(antExRecordModels)) |
| 645 | 645 | { |
| 646 | - for (int j = 0 ; j < list.size() ; j++) | |
| 646 | + for (int j = 0 ; j < antExRecordModels.size() ; j++) | |
| 647 | 647 | { |
| 648 | - AntExRecordModel antExRecordModel = list.get(j); | |
| 648 | + AntExRecordModel antExRecordModel = antExRecordModels.get(j); | |
| 649 | 649 | |
| 650 | 650 | if (model.getId().equals(antExRecordModel.getId())) |
| 651 | 651 | { |