From c25ad6b916c21b16d459c6a4e65ed6ba22517951 Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 2 Apr 2021 14:11:53 +0800 Subject: [PATCH] update --- .../operate/web/facade/MatDeliverFacade.java | 30 +++++++++++++++++++-- .../operate/web/facade/TrackDownFacade.java | 30 +++++++++++++++++++-- .../web/request/ChildbirthManagerRequest.java | 31 +++++++++++++++++++++- .../operate/web/request/TrackDownQueryRequest.java | 30 +++++++++++++++++++++ 4 files changed, 116 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 02a393f..bd7f375 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2626,9 +2626,35 @@ public class MatDeliverFacade { } //初诊医院查询 - if (childbirthManagerRequest.getCzHospitalId() != null) { + List chospitalList = new ArrayList <>(); + if (StringUtils.isNotEmpty(childbirthManagerRequest.getCzHospitalId())) { + chospitalList.add(childbirthManagerRequest.getCzHospitalId()); + } else if (StringUtils.isNotEmpty(childbirthManagerRequest.getCprovinceId())) { + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setProvinceId(childbirthManagerRequest.getCprovinceId()); + if (StringUtils.isNotEmpty(childbirthManagerRequest.getCcityId())) { + organizationQuery.setCityId(childbirthManagerRequest.getCcityId()); + if (StringUtils.isNotEmpty(childbirthManagerRequest.getCareaId())) { + organizationQuery.setAreaId(childbirthManagerRequest.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.setHospitalId(childbirthManagerRequest.getCzHospitalId()); + antExChuQuery1.setHospitalList(chospitalList); antExChuQuery1.setCheckTimeStart(DateUtil.getDayStartTime(DateUtil.parseYMD(childbirthManagerRequest.getCzDateStart()))); antExChuQuery1.setCheckTimeEnd(DateUtil.getDayEndTime(DateUtil.parseYMD(childbirthManagerRequest.getCzDateEnd()))); antExChuQuery1.setYn(YnEnums.YES.getId()); 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 bfd2730..2c5625f 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 @@ -836,9 +836,35 @@ public class TrackDownFacade { return RespBuilder.buildSuccess(pageResult); } //初诊医院查询 - if (downQueryRequest.getCzHospitalId() != null) { + 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.setHospitalId(downQueryRequest.getCzHospitalId()); + antExChuQuery1.setHospitalList(chospitalList); antExChuQuery1.setCheckTimeStart(DateUtil.getDayStartTime(DateUtil.parseYMD(downQueryRequest.getCzDateStart()))); antExChuQuery1.setCheckTimeEnd(DateUtil.getDayEndTime(DateUtil.parseYMD(downQueryRequest.getCzDateEnd()))); antExChuQuery1.setYn(YnEnums.YES.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index be15fec..497638c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -119,7 +119,12 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { * @discription 分娩医院id */ private String hospitalId; - + //省份 + private String cprovinceId; + //城市 + private String ccityId; + //区域 + private String careaId; //初诊医院 private String czHospitalId; //初诊时间 @@ -181,6 +186,30 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { return gcStatus; } + public String getCprovinceId() { + return cprovinceId; + } + + public void setCprovinceId(String cprovinceId) { + this.cprovinceId = cprovinceId; + } + + public String getCcityId() { + return ccityId; + } + + public void setCcityId(String ccityId) { + this.ccityId = ccityId; + } + + public String getCareaId() { + return careaId; + } + + public void setCareaId(String careaId) { + this.careaId = careaId; + } + public void setGcStatus(String gcStatus) { this.gcStatus = gcStatus; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java index 06e09f8..d770d14 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/TrackDownQueryRequest.java @@ -15,6 +15,12 @@ import java.util.Date; * @since BME V100R001C40B104 */ public class TrackDownQueryRequest extends BasePageQueryRequest { + //省份 + private String cprovinceId; + //城市 + private String ccityId; + //区域 + private String careaId; //初诊医院 private String czHospitalId; //初诊时间 @@ -170,6 +176,30 @@ public class TrackDownQueryRequest extends BasePageQueryRequest { return czDateEnd; } + public String getCprovinceId() { + return cprovinceId; + } + + public void setCprovinceId(String cprovinceId) { + this.cprovinceId = cprovinceId; + } + + public String getCcityId() { + return ccityId; + } + + public void setCcityId(String ccityId) { + this.ccityId = ccityId; + } + + public String getCareaId() { + return careaId; + } + + public void setCareaId(String careaId) { + this.careaId = careaId; + } + public void setCzDateEnd(String czDateEnd) { this.czDateEnd = czDateEnd; } -- 1.8.3.1