Commit fcc074c2fe77dfd4ff99cb6c75ab87ca2c1bb24f
1 parent
00f64f9ba3
Exists in
master
and in
6 other branches
update
Showing 2 changed files with 26 additions and 25 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
fcc074c
| ... | ... | @@ -2019,34 +2019,35 @@ |
| 2019 | 2019 | |
| 2020 | 2020 | //隆华、滦平定制 |
| 2021 | 2021 | Criteria cor3=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 |
| 2022 | - if(hospitalId.equals("2100001605")||hospitalId.equals("2100001377")){ | |
| 2023 | - //是否结案0：未结案，1：已结案 条件查询 | |
| 2024 | - | |
| 2025 | - if(null != endCase){ | |
| 2026 | - if(endCase==1){ | |
| 2027 | - cor3=Criteria.where("endCase").is(endCase); | |
| 2028 | - }else{ | |
| 2029 | - MongoCondition con = MongoCondition.newInstance(); | |
| 2030 | - MongoCondition con1 = MongoCondition.newInstance("endCase", endCase, MongoOper.IS); | |
| 2031 | - MongoCondition con2 = MongoCondition.newInstance("endCase",false,MongoOper.EXISTS);//只建档没检查的也算没结案 | |
| 2032 | - cor3=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); | |
| 2022 | + if(CollectionUtils.isNotEmpty(hospitalIdList)){ | |
| 2023 | + if (hospitalIdList.contains("2100001605")||hospitalIdList.contains("2100001377")){ | |
| 2024 | + //是否结案0：未结案，1：已结案 条件查询 | |
| 2025 | + if(null != endCase){ | |
| 2026 | + if(endCase==1){ | |
| 2027 | + cor3=Criteria.where("endCase").is(endCase); | |
| 2028 | + }else{ | |
| 2029 | + MongoCondition con = MongoCondition.newInstance(); | |
| 2030 | + MongoCondition con1 = MongoCondition.newInstance("endCase", endCase, MongoOper.IS); | |
| 2031 | + MongoCondition con2 = MongoCondition.newInstance("endCase",false,MongoOper.EXISTS);//只建档没检查的也算没结案 | |
| 2032 | + cor3=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); | |
| 2033 | + } | |
| 2033 | 2034 | } |
| 2034 | - } | |
| 2035 | - //隆华、滦平 是否结案 条件查询 健康0/高危1，有没有高危详情来判断 | |
| 2036 | - if(null!=healthHigh){ | |
| 2037 | - if(healthHigh==0){ | |
| 2038 | - condition=condition.and("highRiskInfo", false, MongoOper.EXISTS); | |
| 2039 | - }else { | |
| 2040 | - condition=condition.and("highRiskInfo", true, MongoOper.EXISTS); | |
| 2035 | + //隆华、滦平 是否结案 条件查询 健康0/高危1，有没有高危详情来判断 | |
| 2036 | + if(null!=healthHigh){ | |
| 2037 | + if(healthHigh==0){ | |
| 2038 | + condition=condition.and("highRiskInfo", false, MongoOper.EXISTS); | |
| 2039 | + }else { | |
| 2040 | + condition=condition.and("highRiskInfo", true, MongoOper.EXISTS); | |
| 2041 | + } | |
| 2041 | 2042 | } |
| 2042 | - | |
| 2043 | + }else { | |
| 2044 | + // 因用到该字段，原上面代码，移到这里不影响 | |
| 2045 | + if (null != endCase) { | |
| 2046 | + condition = condition.and("endCase", endCase, MongoOper.IS); | |
| 2047 | + } | |
| 2043 | 2048 | } |
| 2044 | - }else { | |
| 2045 | - //因用到该字段，原上面代码，移到这里不影响 | |
| 2046 | - if (null != endCase) { | |
| 2047 | - condition = condition.and("endCase", endCase, MongoOper.IS); | |
| 2048 | - } | |
| 2049 | 2049 | } |
| 2050 | + | |
| 2050 | 2051 | |
| 2051 | 2052 | |
| 2052 | 2053 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
fcc074c
| ... | ... | @@ -2781,7 +2781,7 @@ |
| 2781 | 2781 | if (CollectionUtils.isNotEmpty(futures)) { |
| 2782 | 2782 | for (Future f : futures) { |
| 2783 | 2783 | try { |
| 2784 | - list.addAll((List <BabyManageListResult>) f.get()); | |
| 2784 | + list.addAll((List <BabyManageListResult>) f. get()); | |
| 2785 | 2785 | } catch (Exception e) { |
| 2786 | 2786 | ExceptionUtils.catchException(e, "baby list error."); |
| 2787 | 2787 | } |