From 9cad00c9ca8c82c768b6b3f0fb84a95c45333bc3 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Tue, 29 Mar 2022 14:05:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96-=E5=84=BF=E7=AB=A5=E5=81=A5?= =?UTF-8?q?=E5=BA=B7=E4=BD=93=E6=A3=80=E7=BB=9F=E8=AE=A1=E8=A1=A8=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=84=BF=E7=AB=A5=E6=88=B7=E7=B1=8D=E5=9C=B0=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabyModel.java | 2 - .../com/lyms/platform/query/BabyModelQuery.java | 63 ++++++++++++++++++++++ .../web/facade/BabyStatisticsManagerFacade.java | 14 +++-- .../operate/web/request/BabyManageRequest.java | 63 ++++++++++++++++++++++ .../platform/operate/web/utils/BabyList3Task.java | 37 +++---------- 5 files changed, 138 insertions(+), 41 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 892c60f..85d6331 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -859,9 +859,7 @@ public class BabyModel extends BaseModel { private List lhEyeHighRisk; /********************************************/ - //隆化-儿童建档户籍地 - /** *省 */ diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 7647be8..7233093 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -383,6 +383,69 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //隆华、滦平 儿保管理全部 加健康/高危 筛查 0：健康，1：高危 private Integer healthHigh; + /********************************************/ + //隆化-儿童建档户籍地 + /** + *省 + */ + private String babyProvinceId; + /** + *市 + */ + private String babyCityId; + /** + *县 + */ + private String babyAreaId; + /** + *乡镇街道 + */ + private String babyStreetId; + /** + *详细地址 + */ + private String babyAddress; + + public String getBabyProvinceId() { + return babyProvinceId; + } + + public void setBabyProvinceId(String babyProvinceId) { + this.babyProvinceId = babyProvinceId; + } + + public String getBabyCityId() { + return babyCityId; + } + + public void setBabyCityId(String babyCityId) { + this.babyCityId = babyCityId; + } + + public String getBabyAreaId() { + return babyAreaId; + } + + public void setBabyAreaId(String babyAreaId) { + this.babyAreaId = babyAreaId; + } + + public String getBabyStreetId() { + return babyStreetId; + } + + public void setBabyStreetId(String babyStreetId) { + this.babyStreetId = babyStreetId; + } + + public String getBabyAddress() { + return babyAddress; + } + + public void setBabyAddress(String babyAddress) { + this.babyAddress = babyAddress; + } + public Integer getHealthHigh() { return healthHigh; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index 5b43484..987c3e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -1329,14 +1329,12 @@ public class BabyStatisticsManagerFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setHospitalId(hospitalId); babyQuery.setYn(YnEnums.YES.getId()); - // 省 - babyQuery.setProvinceId(StringUtils.isEmpty(request.getProvinceId()) ? null : request.getProvinceId()); - // 市 - babyQuery.setCityId(StringUtils.isEmpty(request.getCityId()) ? null : request.getCityId()); - // 区/县 - babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId()) ? null : request.getAreaId()); - //街道 - babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId()); + //儿童建档户籍地 + babyQuery.setBabyProvinceId(request.getBabyProvinceId()); + babyQuery.setBabyCityId(request.getBabyCityId()); + babyQuery.setBabyAreaId(request.getBabyAreaId()); + babyQuery.setBabyStreetId(request.getBabyStreetId()); + babyQuery.setBabyAddress(request.getBabyAddress()); //筛选检查时间 List babyModels=babyBookbuildingService.queryBabyBuildByCond(babyQuery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 208b7cd..96bcd1a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -136,6 +136,69 @@ public class BabyManageRequest extends BaseQuery { //儿保检查时间 private String checkTime; + /********************************************/ + //隆化-儿童建档户籍地 + /** + *省 + */ + private String babyProvinceId; + /** + *市 + */ + private String babyCityId; + /** + *县 + */ + private String babyAreaId; + /** + *乡镇街道 + */ + private String babyStreetId; + /** + *详细地址 + */ + private String babyAddress; + + public String getBabyProvinceId() { + return babyProvinceId; + } + + public void setBabyProvinceId(String babyProvinceId) { + this.babyProvinceId = babyProvinceId; + } + + public String getBabyCityId() { + return babyCityId; + } + + public void setBabyCityId(String babyCityId) { + this.babyCityId = babyCityId; + } + + public String getBabyAreaId() { + return babyAreaId; + } + + public void setBabyAreaId(String babyAreaId) { + this.babyAreaId = babyAreaId; + } + + public String getBabyStreetId() { + return babyStreetId; + } + + public void setBabyStreetId(String babyStreetId) { + this.babyStreetId = babyStreetId; + } + + public String getBabyAddress() { + return babyAddress; + } + + public void setBabyAddress(String babyAddress) { + this.babyAddress = babyAddress; + } + public String getCheckTime() { return checkTime; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyList3Task.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyList3Task.java index f189c7d..687af46 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyList3Task.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyList3Task.java @@ -68,42 +68,17 @@ public class BabyList3Task implements Callable { result.setHospitalName(hospitalName); result.setHospitalName(organizationService.getOrganization(Integer.valueOf(model.getHospitalId())).getName()); - // 开始查询省市区街道 - // 省 - BasicConfig provinceName = basicConfigService.getOneBasicConfigById(model.getProvinceId()); - // 市 - BasicConfig cityName = basicConfigService.getOneBasicConfigById(model.getCityId()); - // 区 - BasicConfig areaName = basicConfigService.getOneBasicConfigById(model.getAreaId()); - // 街道 - BasicConfig streetName = basicConfigService.getOneBasicConfigById(model.getStreetId()); - // 具体 - String address = model.getAddress(); - String habitat = ""; - if (provinceName != null) { - habitat += provinceName.getName(); - } - if (cityName != null) { - habitat += cityName.getName(); - } - if (areaName != null) { - habitat += areaName.getName(); - } - if (streetName != null) { - habitat += streetName.getName(); - } - if (!StringUtils.isEmpty(address)) { - habitat += address; - } - if (habitat.length() == 0) { - habitat = "-"; - } - result.setHabitat(habitat); + + // 组装儿童档案户籍地 + String babyAddress = CommonsHelper.getResidence(model.getBabyProvinceId(), model.getBabyCityId(), + model.getBabyAreaId(), model.getBabyStreetId(), model.getBabyAddress(), basicConfigService); + result.setHabitat(babyAddress); BabyCheckModelQuery query = new BabyCheckModelQuery(); query.setBuildId(model.getId()); query.setYn(YnEnums.YES.getId()); + //组装检查时间 List models = babyCheckService.queryBabyCheckRecord(query); if (CollectionUtils.isNotEmpty(models)) { List listdata=new ArrayList<>(); -- 1.8.3.1