diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index fd3b5ce..f128b8e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -593,12 +593,29 @@ public class AntExRecordFacade { } antExRecordQuery.setHospitalId(hospitalId); + + PatientsQuery patientsQuery = new PatientsQuery(); + if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { + patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo()); + patientsQuery.setHospitalId(hospitalId); + List patientses = patientsService.queryPatient(patientsQuery); + + if (CollectionUtils.isNotEmpty(patientses)) { + List parentIds = new LinkedList<>(); + for (Patients pa : patientses) { + parentIds.add(pa.getId()); + } + antExRecordQuery.setParentIds(parentIds); + } + } + + List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC,"created"); Map> map = handleAntexRecord(antExRecordModelList); AntExRecordQuery pageAntExRecordsQuery = new AntExRecordQuery(); //查询产检新增的高危分页记录 - List pageAntExRecords = getIncrRiskAntexRecard(map,pageAntExRecordsQuery, antExManagerQueryRequest.getPage(),antExManagerQueryRequest.getLimit()); + List pageAntExRecords = getIncrRiskAntexRecard(map,pageAntExRecordsQuery, antExManagerQueryRequest); //查询产检详情 List data = getAntExRecords(pageAntExRecords, hospitalId, false, antExManagerQueryRequest.getShowDetail()); @@ -607,7 +624,7 @@ public class AntExRecordFacade { } - private List getIncrRiskAntexRecard(Map> map,AntExRecordQuery pageAntExRecordsQuery,Integer page,Integer limit) + private List getIncrRiskAntexRecard(Map> map,AntExRecordQuery pageAntExRecordsQuery,AntExManagerQueryRequest request) { List riskListIds = new ArrayList<>(); Map> incriskMap = new HashMap<>(); @@ -706,8 +723,8 @@ public class AntExRecordFacade { } } pageAntExRecordsQuery.setNeed("true"); - pageAntExRecordsQuery.setPage(page); - pageAntExRecordsQuery.setLimit(limit); + pageAntExRecordsQuery.setPage(request.getPage()); + pageAntExRecordsQuery.setLimit(request.getLimit()); pageAntExRecordsQuery.setIds(riskListIds); List pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery); if (CollectionUtils.isNotEmpty(pageAntExRecords)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index 16d72b8..050ebb0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -60,9 +60,6 @@ public class BabyBookbuildingAddRequest { //建档Id private String id; - //母亲名称 - @FormParam - @NotEmpty(message = "母亲名称不能为空") private String mommyName; //证件号号