diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 108bab7..e991e4d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -405,4 +405,20 @@ public class AntenatalExaminationController extends BaseController { } + /** + * 查询某段返回内的高危孕妇 + * @param antExManagerQueryRequest + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/antex/getRangeRiskAntexlist") + @ResponseBody + @TokenRequired + public BaseResponse getRangeRiskAntexlist(@Valid AntExManagerQueryRequest antExManagerQueryRequest,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antExRecordFacade.getRangeRiskAntexlist(antExManagerQueryRequest, loginState.getId()); + } + + + } \ No newline at end of file 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 a439a4d..c0b75c2 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 @@ -623,4 +623,71 @@ public class AntExRecordFacade { } } + + public BaseResponse getRangeRiskAntexlist(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId) { + + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + + String hospitalId = autoMatchFacade.getHospitalId(userId); + + //产检日期 + if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.getcTime())) { + String nextDateStr = antExManagerQueryRequest.getcTime(); + String[] dates = nextDateStr.split(" - "); + + antExRecordQuery.setCheckTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(dates[1])); + } + } + + Map> map = new HashMap<>(); + + antExRecordQuery.setHospitalId(hospitalId); + List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery); + if (CollectionUtils.isNotEmpty(antExRecordModelList)) + { + for (AntExRecordModel recordModel : antExRecordModelList) + { + List list = map.get(recordModel.getParentId()); + if (!CollectionUtils.isNotEmpty(list)) + { + list = new ArrayList<>(); + } + list.add(recordModel); + map.put(recordModel.getParentId(),list); + } + } + + List riskList = new ArrayList<>(); + + if (map.size() > 0) + { + for (String patientId : map.keySet()) + { + List list = map.get(patientId); + if (CollectionUtils.isNotEmpty(list)) + { + if (list.size() == 1) + { + AntExRecordModel after = list.get(0); + if (!(after.gethRisk() != null && after.gethRisk().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) + || !CollectionUtils.isNotEmpty(after.gethRisk())) + { + riskList.add(after); + } + + } + else if (list.size() == 2) + { + AntExRecordModel after = list.get(0); + AntExRecordModel before = list.get(1); + } + } + } + } + + + return null; + } } \ No newline at end of file