Commit 2af9e10e30654659fb0bf88e8591ec3a6528669d
1 parent
5ec00873c2
Exists in
master
and in
6 other branches
儿童母亲姓名非必填
Showing 2 changed files with 21 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
2af9e10
| ... | ... | @@ -593,12 +593,29 @@ |
| 593 | 593 | } |
| 594 | 594 | |
| 595 | 595 | antExRecordQuery.setHospitalId(hospitalId); |
| 596 | + | |
| 597 | + PatientsQuery patientsQuery = new PatientsQuery(); | |
| 598 | + if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { | |
| 599 | + patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); | |
| 600 | + patientsQuery.setHospitalId(hospitalId); | |
| 601 | + List<Patients> patientses = patientsService.queryPatient(patientsQuery); | |
| 602 | + | |
| 603 | + if (CollectionUtils.isNotEmpty(patientses)) { | |
| 604 | + List<String> parentIds = new LinkedList<>(); | |
| 605 | + for (Patients pa : patientses) { | |
| 606 | + parentIds.add(pa.getId()); | |
| 607 | + } | |
| 608 | + antExRecordQuery.setParentIds(parentIds); | |
| 609 | + } | |
| 610 | + } | |
| 611 | + | |
| 612 | + | |
| 596 | 613 | List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC,"created"); |
| 597 | 614 | Map<String,List<AntExRecordModel>> map = handleAntexRecord(antExRecordModelList); |
| 598 | 615 | AntExRecordQuery pageAntExRecordsQuery = new AntExRecordQuery(); |
| 599 | 616 | |
| 600 | 617 | //查询产检新增的高危分页记录 |
| 601 | - List<AntExRecordModel> pageAntExRecords = getIncrRiskAntexRecard(map,pageAntExRecordsQuery, antExManagerQueryRequest.getPage(),antExManagerQueryRequest.getLimit()); | |
| 618 | + List<AntExRecordModel> pageAntExRecords = getIncrRiskAntexRecard(map,pageAntExRecordsQuery, antExManagerQueryRequest); | |
| 602 | 619 | |
| 603 | 620 | //查询产检详情 |
| 604 | 621 | List<AntExManagerResult> data = getAntExRecords(pageAntExRecords, hospitalId, false, antExManagerQueryRequest.getShowDetail()); |
| ... | ... | @@ -607,7 +624,7 @@ |
| 607 | 624 | } |
| 608 | 625 | |
| 609 | 626 | |
| 610 | - private List<AntExRecordModel> getIncrRiskAntexRecard(Map<String,List<AntExRecordModel>> map,AntExRecordQuery pageAntExRecordsQuery,Integer page,Integer limit) | |
| 627 | + private List<AntExRecordModel> getIncrRiskAntexRecard(Map<String,List<AntExRecordModel>> map,AntExRecordQuery pageAntExRecordsQuery,AntExManagerQueryRequest request) | |
| 611 | 628 | { |
| 612 | 629 | List<String> riskListIds = new ArrayList<>(); |
| 613 | 630 | Map<String,List<String>> incriskMap = new HashMap<>(); |
| ... | ... | @@ -706,8 +723,8 @@ |
| 706 | 723 | } |
| 707 | 724 | } |
| 708 | 725 | pageAntExRecordsQuery.setNeed("true"); |
| 709 | - pageAntExRecordsQuery.setPage(page); | |
| 710 | - pageAntExRecordsQuery.setLimit(limit); | |
| 726 | + pageAntExRecordsQuery.setPage(request.getPage()); | |
| 727 | + pageAntExRecordsQuery.setLimit(request.getLimit()); | |
| 711 | 728 | pageAntExRecordsQuery.setIds(riskListIds); |
| 712 | 729 | List<AntExRecordModel> pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery); |
| 713 | 730 | if (CollectionUtils.isNotEmpty(pageAntExRecords)) |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
View file @
2af9e10