Commit 00f64f9ba3e75de0fc067c136b9937f23cfabbb1
1 parent
f3eafe512b
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 9 additions and 5 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
00f64f9
| ... | ... | @@ -1431,9 +1431,6 @@ |
| 1431 | 1431 | // } |
| 1432 | 1432 | // } |
| 1433 | 1433 | |
| 1434 | -// if (null != endCase) { | |
| 1435 | -// condition = condition.and("endCase", endCase, MongoOper.IS); | |
| 1436 | -// } | |
| 1437 | 1434 | |
| 1438 | 1435 | if (null != encoded) { |
| 1439 | 1436 | condition = condition.and("encoded", encoded, MongoOper.IS); |
| 1440 | 1437 | |
| ... | ... | @@ -2018,9 +2015,11 @@ |
| 2018 | 2015 | } |
| 2019 | 2016 | } |
| 2020 | 2017 | |
| 2018 | + | |
| 2019 | + | |
| 2021 | 2020 | //隆华、滦平定制 |
| 2022 | 2021 | Criteria cor3=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 |
| 2023 | - if(StringUtils.isNotEmpty(hospitalId)&&(hospitalId=="2100001605"||hospitalId=="2100001377")){ | |
| 2022 | + if(hospitalId.equals("2100001605")||hospitalId.equals("2100001377")){ | |
| 2024 | 2023 | //是否结案0：未结案，1：已结案 条件查询 |
| 2025 | 2024 | |
| 2026 | 2025 | if(null != endCase){ |
| ... | ... | @@ -2041,6 +2040,11 @@ |
| 2041 | 2040 | condition=condition.and("highRiskInfo", true, MongoOper.EXISTS); |
| 2042 | 2041 | } |
| 2043 | 2042 | |
| 2043 | + } | |
| 2044 | + }else { | |
| 2045 | + //因用到该字段，原上面代码，移到这里不影响 | |
| 2046 | + if (null != endCase) { | |
| 2047 | + condition = condition.and("endCase", endCase, MongoOper.IS); | |
| 2044 | 2048 | } |
| 2045 | 2049 | } |
| 2046 | 2050 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
00f64f9
| ... | ... | @@ -3347,7 +3347,7 @@ |
| 3347 | 3347 | |
| 3348 | 3348 | babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId()); |
| 3349 | 3349 | babyQuery.setQueryNo(request.getQueryNo()); |
| 3350 | - //秦皇岛-儿保管理-全部 加健康/高危筛选 | |
| 3350 | + //滦平、隆化-儿保管理-全部 加健康/高危筛选 | |
| 3351 | 3351 | babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null); |
| 3352 | 3352 | // System.out.println(babyQuery.convertToQuery().convertToMongoQuery().toString()); |
| 3353 | 3353 | List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC); |