Commit d3a918c9c54833e0b1adb0586a50a0de70467619
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
d3a918c
| ... | ... | @@ -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()); |
| 605 | 622 | |
| ... | ... | @@ -607,9 +624,9 @@ |
| 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 | - List<String> riskListIds = new ArrayList<>(); | |
| 629 | + List<String> ids = new ArrayList<>(); | |
| 613 | 630 | Map<String,List<String>> incriskMap = new HashMap<>(); |
| 614 | 631 | AntExRecordQuery beforeRecordQuery = new AntExRecordQuery(); |
| 615 | 632 | |
| ... | ... | @@ -639,7 +656,7 @@ |
| 639 | 656 | |
| 640 | 657 | if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) |
| 641 | 658 | { |
| 642 | - riskListIds.add(oneRecord.getId()); | |
| 659 | + ids.add(oneRecord.getId()); | |
| 643 | 660 | incriskMap.put(oneRecord.getId(), currentRiskList); |
| 644 | 661 | } |
| 645 | 662 | else if (CollectionUtils.isNotEmpty(beforeRiskList) ) |
| 646 | 663 | |
| ... | ... | @@ -654,14 +671,14 @@ |
| 654 | 671 | } |
| 655 | 672 | if (CollectionUtils.isNotEmpty(incrHrisk)) |
| 656 | 673 | { |
| 657 | - riskListIds.add(oneRecord.getId()); | |
| 674 | + ids.add(oneRecord.getId()); | |
| 658 | 675 | incriskMap.put(oneRecord.getId(), incrHrisk); |
| 659 | 676 | } |
| 660 | 677 | } |
| 661 | 678 | } |
| 662 | 679 | else |
| 663 | 680 | { |
| 664 | - riskListIds.add(oneRecord.getId()); | |
| 681 | + ids.add(oneRecord.getId()); | |
| 665 | 682 | incriskMap.put(oneRecord.getId(), oneRecord.gethRisk()); |
| 666 | 683 | } |
| 667 | 684 | } |
| ... | ... | @@ -682,7 +699,7 @@ |
| 682 | 699 | List beforeRiskList = twoRecord.gethRisk(); |
| 683 | 700 | if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) |
| 684 | 701 | { |
| 685 | - riskListIds.add(oneRecord.getId()); | |
| 702 | + ids.add(oneRecord.getId()); | |
| 686 | 703 | incriskMap.put(oneRecord.getId(), currentRiskList); |
| 687 | 704 | } |
| 688 | 705 | else if (CollectionUtils.isNotEmpty(beforeRiskList) ) |
| ... | ... | @@ -697,7 +714,7 @@ |
| 697 | 714 | } |
| 698 | 715 | if (CollectionUtils.isNotEmpty(incrHrisk)) |
| 699 | 716 | { |
| 700 | - riskListIds.add(oneRecord.getId()); | |
| 717 | + ids.add(oneRecord.getId()); | |
| 701 | 718 | incriskMap.put(oneRecord.getId(), incrHrisk); |
| 702 | 719 | } |
| 703 | 720 | } |
| ... | ... | @@ -706,9 +723,14 @@ |
| 706 | 723 | } |
| 707 | 724 | } |
| 708 | 725 | pageAntExRecordsQuery.setNeed("true"); |
| 709 | - pageAntExRecordsQuery.setPage(page); | |
| 710 | - pageAntExRecordsQuery.setLimit(limit); | |
| 711 | - pageAntExRecordsQuery.setIds(riskListIds); | |
| 726 | + pageAntExRecordsQuery.setPage(request.getPage()); | |
| 727 | + pageAntExRecordsQuery.setLimit(request.getLimit()); | |
| 728 | + pageAntExRecordsQuery.setIds(ids); | |
| 729 | + pageAntExRecordsQuery.setLevelId(request.getLevel()); | |
| 730 | + | |
| 731 | + pageAntExRecordsQuery.setrFactor(request.getRiskFactorId()); | |
| 732 | + pageAntExRecordsQuery.setrFactorList(StringUtils.covertToList(request.getRiskFactorId(), String.class)); | |
| 733 | + | |
| 712 | 734 | List<AntExRecordModel> pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery); |
| 713 | 735 | if (CollectionUtils.isNotEmpty(pageAntExRecords)) |
| 714 | 736 | { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
View file @
d3a918c