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 4180731..d37e7bb 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 @@ -2019,36 +2019,37 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //隆华、滦平定制 Criteria cor3=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 - if(hospitalId.equals("2100001605")||hospitalId.equals("2100001377")){ - //是否结案0:未结案,1:已结案 条件查询 - - if(null != endCase){ - if(endCase==1){ - cor3=Criteria.where("endCase").is(endCase); - }else{ - MongoCondition con = MongoCondition.newInstance(); - MongoCondition con1 = MongoCondition.newInstance("endCase", endCase, MongoOper.IS); - MongoCondition con2 = MongoCondition.newInstance("endCase",false,MongoOper.EXISTS);//只建档没检查的也算没结案 - cor3=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + if(CollectionUtils.isNotEmpty(hospitalIdList)){ + if (hospitalIdList.contains("2100001605")||hospitalIdList.contains("2100001377")){ + //是否结案0:未结案,1:已结案 条件查询 + if(null != endCase){ + if(endCase==1){ + cor3=Criteria.where("endCase").is(endCase); + }else{ + MongoCondition con = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("endCase", endCase, MongoOper.IS); + MongoCondition con2 = MongoCondition.newInstance("endCase",false,MongoOper.EXISTS);//只建档没检查的也算没结案 + cor3=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + } } - } - //隆华、滦平 是否结案 条件查询 健康0/高危1,有没有高危详情来判断 - if(null!=healthHigh){ - if(healthHigh==0){ - condition=condition.and("highRiskInfo", false, MongoOper.EXISTS); - }else { - condition=condition.and("highRiskInfo", true, MongoOper.EXISTS); + //隆华、滦平 是否结案 条件查询 健康0/高危1,有没有高危详情来判断 + if(null!=healthHigh){ + if(healthHigh==0){ + condition=condition.and("highRiskInfo", false, MongoOper.EXISTS); + }else { + condition=condition.and("highRiskInfo", true, MongoOper.EXISTS); + } + } + }else { + // 因用到该字段,原上面代码,移到这里不影响 + if (null != endCase) { + condition = condition.and("endCase", endCase, MongoOper.IS); } - - } - }else { - //因用到该字段,原上面代码,移到这里不影响 - if (null != endCase) { - condition = condition.and("endCase", endCase, MongoOper.IS); } } + /** * 多个orCondition 需要添加Criteria来控制json同级两个and或者or来解决mongodb执行查询问题 */ 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 807a5a4..e790187 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 @@ -2781,7 +2781,7 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(futures)) { for (Future f : futures) { try { - list.addAll((List ) f.get()); + list.addAll((List ) f. get()); } catch (Exception e) { ExceptionUtils.catchException(e, "baby list error."); }