Commit d986745e3df78c711c990a9db871308959f7baba
1 parent
39bdc2fe2c
Exists in
master
and in
6 other branches
修改产后复查bug
Showing 1 changed file with 8 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
d986745
... | ... | @@ -402,6 +402,7 @@ |
402 | 402 | List<String> pids = new ArrayList<>(); |
403 | 403 | for (Patients ps : patientses) { |
404 | 404 | pids.add(ps.getId()); |
405 | + System.out.println(ps.getId()); | |
405 | 406 | } |
406 | 407 | downRecordQuery.setParentIds(pids); |
407 | 408 | } |
408 | 409 | |
... | ... | @@ -621,12 +622,15 @@ |
621 | 622 | public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest, Integer userId) { |
622 | 623 | //转换为本地的查询条件 |
623 | 624 | TrackDownRecordQuery downRecordQuery; |
625 | + PageResult pageResult = new PageResult(); | |
624 | 626 | try { |
625 | 627 | downRecordQuery = convertNaviteQuery(downQueryRequest, userId); |
626 | 628 | } catch (Exception e) { |
627 | - BaseObjectResponse baseObjectResponse = new BaseObjectResponse(); | |
628 | - baseObjectResponse.setData(new ArrayList<>()); | |
629 | - return new BaseObjectResponse(); | |
629 | + pageResult.setCount(0); | |
630 | + pageResult.setPage(downQueryRequest.getPage()); | |
631 | + pageResult.setLimit(downQueryRequest.getLimit()); | |
632 | + pageResult.setGrid(new ArrayList<>()); | |
633 | + return RespBuilder.buildSuccess(pageResult); | |
630 | 634 | } |
631 | 635 | List<TrackDownRecord> downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); |
632 | 636 | List<Map> data = new ArrayList<>(); |
... | ... | @@ -657,7 +661,7 @@ |
657 | 661 | data.add(map); |
658 | 662 | } |
659 | 663 | } |
660 | - PageResult pageResult = new PageResult(); | |
664 | + | |
661 | 665 | pageResult.setCount(downRecordQuery.getPageInfo().getCount()); |
662 | 666 | pageResult.setPage(downRecordQuery.getPageInfo().getPage()); |
663 | 667 | pageResult.setLimit(downRecordQuery.getPageInfo().getLimit()); |