diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index c7ce895..6a18abe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -735,6 +735,51 @@ public class TrackDownFacade { downRecordQuery.setNextCheckTimeEnd(downQueryRequest.getEndNextCheckTime()); } + + //初诊医院查询 + List chospitalList = new ArrayList <>(); + if (StringUtils.isNotEmpty(downQueryRequest.getCzHospitalId())) { + chospitalList.add(downQueryRequest.getCzHospitalId()); + } else if (StringUtils.isNotEmpty(downQueryRequest.getCprovinceId())) { + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setProvinceId(downQueryRequest.getCprovinceId()); + if (StringUtils.isNotEmpty(downQueryRequest.getCcityId())) { + organizationQuery.setCityId(downQueryRequest.getCcityId()); + if (StringUtils.isNotEmpty(downQueryRequest.getCareaId())) { + organizationQuery.setAreaId(downQueryRequest.getCareaId()); + } + } + List orgId = new ArrayList <>(); + List organizations = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isNotEmpty(organizations)) { + for (Organization org : organizations) { + if (null != org.getId()) { + orgId.add(org.getId() + ""); + } + } + } + if (CollectionUtils.isNotEmpty(orgId)) { + chospitalList.addAll(orgId); + } + } + if (CollectionUtils.isNotEmpty(chospitalList)) { + AntExChuQuery antExChuQuery1 = new AntExChuQuery(); + antExChuQuery1.setHospitalList(chospitalList); + antExChuQuery1.setCheckTimeStart(DateUtil.getDayStartTime(DateUtil.parseYMD(downQueryRequest.getCzDateStart()))); + antExChuQuery1.setCheckTimeEnd(DateUtil.getDayEndTime(DateUtil.parseYMD(downQueryRequest.getCzDateEnd()))); + antExChuQuery1.setYn(YnEnums.YES.getId()); + List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); + List ids = (List ) CollectionUtils.collect(data1, new Transformer() { + @Override + public Object transform(Object o) { + AntExChuModel antExChuModel = (AntExChuModel) o; + return antExChuModel.getParentId(); + } + }); + downRecordQuery.setParentIds(ids); + } + return downRecordQuery; } @@ -897,49 +942,7 @@ public class TrackDownFacade { pageResult.setGrid(new ArrayList<>()); return RespBuilder.buildSuccess(pageResult); } - //初诊医院查询 - List chospitalList = new ArrayList <>(); - if (StringUtils.isNotEmpty(downQueryRequest.getCzHospitalId())) { - chospitalList.add(downQueryRequest.getCzHospitalId()); - } else if (StringUtils.isNotEmpty(downQueryRequest.getCprovinceId())) { - OrganizationQuery organizationQuery = new OrganizationQuery(); - organizationQuery.setYn(YnEnums.YES.getId()); - organizationQuery.setProvinceId(downQueryRequest.getCprovinceId()); - if (StringUtils.isNotEmpty(downQueryRequest.getCcityId())) { - organizationQuery.setCityId(downQueryRequest.getCcityId()); - if (StringUtils.isNotEmpty(downQueryRequest.getCareaId())) { - organizationQuery.setAreaId(downQueryRequest.getCareaId()); - } - } - List orgId = new ArrayList <>(); - List organizations = organizationService.queryOrganization(organizationQuery); - if (CollectionUtils.isNotEmpty(organizations)) { - for (Organization org : organizations) { - if (null != org.getId()) { - orgId.add(org.getId() + ""); - } - } - } - if (CollectionUtils.isNotEmpty(orgId)) { - chospitalList.addAll(orgId); - } - } - if (CollectionUtils.isNotEmpty(chospitalList)) { - AntExChuQuery antExChuQuery1 = new AntExChuQuery(); - antExChuQuery1.setHospitalList(chospitalList); - antExChuQuery1.setCheckTimeStart(DateUtil.getDayStartTime(DateUtil.parseYMD(downQueryRequest.getCzDateStart()))); - antExChuQuery1.setCheckTimeEnd(DateUtil.getDayEndTime(DateUtil.parseYMD(downQueryRequest.getCzDateEnd()))); - antExChuQuery1.setYn(YnEnums.YES.getId()); - List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); - List ids = (List ) CollectionUtils.collect(data1, new Transformer() { - @Override - public Object transform(Object o) { - AntExChuModel antExChuModel = (AntExChuModel) o; - return antExChuModel.getParentId(); - } - }); - downRecordQuery.setParentIds(ids); - } + List downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery); List data = new ArrayList<>();