From 841358e413d076f57a3ddf040f40b72a3c42375b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 2 Nov 2022 10:33:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96=E7=BB=9F=E8=AE=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=B9=A1=E9=95=87=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/query/BabyModelQuery.java | 13 +++++ .../operate/web/facade/BabyBookbuildingFacade.java | 68 ++++++++++++++++++++-- .../operate/web/facade/BabyCheckFacade.java | 2 +- .../operate/web/facade/BabyHealthFacade.java | 28 ++++++++- .../web/facade/BabyStatisticsManagerFacade.java | 31 ++++++++++ 5 files changed, 136 insertions(+), 6 deletions(-) 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 ac79d8d..54c4115 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 @@ -401,6 +401,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { *乡镇街道 */ private String babyStreetId; + private List babyStreetIds; /** *详细地址 */ @@ -412,6 +413,14 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { // 1 本县 2 外县 private Integer areaType; + public List getBabyStreetIds() { + return babyStreetIds; + } + + public void setBabyStreetIds(List babyStreetIds) { + this.babyStreetIds = babyStreetIds; + } + public Integer getAreaType() { return areaType; } @@ -2204,6 +2213,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(babyStreetId)) { condition = condition.and("babyStreetId", babyStreetId, MongoOper.IS); } + if (CollectionUtils.isNotEmpty(babyStreetIds)) { + condition = condition.and("babyStreetId", babyStreetIds, MongoOper.IN); + } + if (StringUtils.isNotEmpty(babyAddress)) { condition = condition.and("babyAddress", babyAddress, MongoOper.IN); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 6e51d87..225dbe9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -6386,12 +6386,46 @@ public class BabyBookbuildingFacade { //儿童档案 BabyModelQuery babyModelQuery=new BabyModelQuery(); babyModelQuery.setId(checkModel.getBuildId()); - if(StringUtils.isNotEmpty(babyProvinceId) && StringUtils.isNotEmpty(babyCityId) && - StringUtils.isNotEmpty(babyAreaId) && StringUtils.isNotEmpty(babyStreetId)){ + if(StringUtils.isNotEmpty(babyProvinceId)){ babyModelQuery.setBabyProvinceId(babyProvinceId); + } + if(StringUtils.isNotEmpty(babyCityId)){ babyModelQuery.setBabyCityId(babyCityId); + } + if(StringUtils.isNotEmpty(babyAreaId)){ babyModelQuery.setBabyAreaId(babyAreaId); - babyModelQuery.setBabyStreetId(babyStreetId); + } + if(StringUtils.isNotEmpty(babyStreetId)){ + + if("2112".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2112","5f2a11de9d5c99e71b2724ef")); + } + else if ("2114".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2114","5f1b912c9d5c7e6a533c937d")); + } + else if ("2116".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2116","5f18e8ae9d5c7e6a533c6bf4")); + } + else if ("2117".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2117","5f17ff3a9d5c7e6a533c6286")); + } + else if ("2119".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2119","5f041f0d25dc36c779f7d52a")); + } + else if ("2120".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2120","5f041f3e25dc36c779f7d55c")); + } + else { + babyModelQuery.setBabyStreetId(babyStreetId); + } + + } List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); for (BabyModel babyModel : babyModels) { @@ -6454,7 +6488,33 @@ public class BabyBookbuildingFacade { babyModelQuery.setBabyAreaId(babyAreaId); } if(StringUtils.isNotEmpty(babyStreetId)){ - babyModelQuery.setBabyStreetId(babyStreetId); + if("2112".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2112","5f2a11de9d5c99e71b2724ef")); + } + else if ("2114".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2114","5f1b912c9d5c7e6a533c937d")); + } + else if ("2116".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2116","5f18e8ae9d5c7e6a533c6bf4")); + } + else if ("2117".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2117","5f17ff3a9d5c7e6a533c6286")); + } + else if ("2119".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2119","5f041f0d25dc36c779f7d52a")); + } + else if ("2120".equals(babyStreetId)) + { + babyModelQuery.setBabyStreetIds(Arrays.asList("2120","5f041f3e25dc36c779f7d55c")); + } + else { + babyModelQuery.setBabyStreetId(babyStreetId); + } } List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); for (BabyModel babyModel : babyModels) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index f89105b..3d4f0ca 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1463,7 +1463,7 @@ public class BabyCheckFacade extends BaseServiceImpl { // List hospital = groupsFacade.findGroupHospital(userId, false); String hospitalId = autoMatchFacade.getHospitalId(userId); Criteria criteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); - Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); + Criteria pCriteria = Criteria.where("yn").ne(0);//.and("hospitalId").is(hospitalId); if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) { pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java index 7df3862..fddd49b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java @@ -181,7 +181,33 @@ public class BabyHealthFacade extends BaseServiceImpl { criteria.and("babyAreaId").is(areaId); } if(StringUtils.isNotEmpty(streetId)){ - criteria.and("babyStreetId").is(streetId); + if("2112".equals(streetId)) + { + criteria.and("babyStreetId").in(Arrays.asList("2112","5f2a11de9d5c99e71b2724ef")); + } + else if ("2114".equals(streetId)) + { + criteria.and("babyStreetId").in(Arrays.asList("2114","5f1b912c9d5c7e6a533c937d")); + } + else if ("2116".equals(streetId)) + { + criteria.and("babyStreetId").in(Arrays.asList("2116","5f18e8ae9d5c7e6a533c6bf4")); + } + else if ("2117".equals(streetId)) + { + criteria.and("babyStreetId").in(Arrays.asList("2117","5f17ff3a9d5c7e6a533c6286")); + } + else if ("2119".equals(streetId)) + { + criteria.and("babyStreetId").in(Arrays.asList("2119","5f041f0d25dc36c779f7d52a")); + } + else if ("2120".equals(streetId)) + { + criteria.and("babyStreetId").in(Arrays.asList("2120","5f041f3e25dc36c779f7d55c")); + } + else { + criteria.and("babyStreetId").is(streetId); + } } if(null!=queryStartBirth&&null!=queryEndtBirth){ criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth); 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 987c3e3..47a792c 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 @@ -1334,6 +1334,37 @@ public class BabyStatisticsManagerFacade { babyQuery.setBabyCityId(request.getBabyCityId()); babyQuery.setBabyAreaId(request.getBabyAreaId()); babyQuery.setBabyStreetId(request.getBabyStreetId()); + + if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(request.getBabyStreetId())){ + if("2112".equals(request.getBabyStreetId())) + { + babyQuery.setBabyStreetIds(Arrays.asList("2112","5f2a11de9d5c99e71b2724ef")); + } + else if ("2114".equals(request.getBabyStreetId())) + { + babyQuery.setBabyStreetIds(Arrays.asList("2114","5f1b912c9d5c7e6a533c937d")); + } + else if ("2116".equals(request.getBabyStreetId())) + { + babyQuery.setBabyStreetIds(Arrays.asList("2116","5f18e8ae9d5c7e6a533c6bf4")); + } + else if ("2117".equals(request.getBabyStreetId())) + { + babyQuery.setBabyStreetIds(Arrays.asList("2117","5f17ff3a9d5c7e6a533c6286")); + } + else if ("2119".equals(request.getBabyStreetId())) + { + babyQuery.setBabyStreetIds(Arrays.asList("2119","5f041f0d25dc36c779f7d52a")); + } + else if ("2120".equals(request.getBabyStreetId())) + { + babyQuery.setBabyStreetIds(Arrays.asList("2120","5f041f3e25dc36c779f7d55c")); + } + else { + babyQuery.setBabyStreetId(request.getBabyStreetId()); + } + } + babyQuery.setBabyAddress(request.getBabyAddress()); //筛选检查时间 -- 1.8.3.1