Commit 253f02e93141c62cc0d28a508ee5fd883a72ca3c
1 parent
3c577fb876
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 11 additions and 15 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
253f02e
| ... | ... | @@ -1965,15 +1965,18 @@ |
| 1965 | 1965 | c = Criteria.where("created").gte(createdTimeStart).lte(createdTimeEnd); |
| 1966 | 1966 | } |
| 1967 | 1967 | } |
| 1968 | - Criteria cor=null; | |
| 1969 | - if(null != highRiskAndWeakSon){ //隆化县， 1：高危体弱合并 | |
| 1970 | - MongoCondition c1 = MongoCondition.newInstance(); | |
| 1968 | + | |
| 1969 | + //隆化县， 1：高危体弱合并 | |
| 1970 | + Criteria cor=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 | |
| 1971 | + if(null != highRiskAndWeakSon){ | |
| 1972 | + MongoCondition con = MongoCondition.newInstance(); | |
| 1971 | 1973 | MongoCondition con1 = MongoCondition.newInstance("highRisk", 1, MongoOper.IS); |
| 1972 | 1974 | MongoCondition con2 = MongoCondition.newInstance("weakSon", 1, MongoOper.IS); |
| 1973 | - cor=c1.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); | |
| 1975 | + cor=con.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); | |
| 1974 | 1976 | } |
| 1977 | + | |
| 1975 | 1978 | //条件查询：儿童疾病是否开通字段 查询冲突问题解决 |
| 1976 | - Criteria cor2=null; | |
| 1979 | + Criteria cor2=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 | |
| 1977 | 1980 | if (StringUtils.isNotEmpty(openDisease)) { |
| 1978 | 1981 | if ("2".equals(openDisease)) |
| 1979 | 1982 | { |
| 1980 | 1983 | |
| ... | ... | @@ -1991,17 +1994,10 @@ |
| 1991 | 1994 | /** |
| 1992 | 1995 | * 多个orCondition 需要添加Criteria来控制json同级两个and或者or来解决mongodb执行查询问题 |
| 1993 | 1996 | */ |
| 1994 | - if(c!=null&&cor!=null&&cor2!=null){ | |
| 1995 | - return new MongoCondition(c.andOperator(condition.getCriteria(), cor,cor2)).toMongoQuery(); | |
| 1996 | - }else if(c!=null){ | |
| 1997 | - return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); | |
| 1998 | - }else if(cor!=null){ | |
| 1999 | - return new MongoCondition(cor.andOperator(condition.getCriteria())).toMongoQuery(); | |
| 2000 | - }else if(cor2!=null){ | |
| 2001 | - return new MongoCondition(cor2.andOperator(condition.getCriteria())).toMongoQuery(); | |
| 2002 | - }else { | |
| 2003 | - return condition.toMongoQuery(); | |
| 1997 | + if(c!=null){ | |
| 1998 | + return new MongoCondition(c.andOperator(condition.getCriteria(),cor,cor2)).toMongoQuery(); | |
| 2004 | 1999 | } |
| 2000 | + return condition.toMongoQuery(); | |
| 2005 | 2001 | } |
| 2006 | 2002 | |
| 2007 | 2003 | public Boolean getFmDataStatu() { |