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 02ba4a1..df5d580 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 @@ -979,7 +979,10 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS); MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE); if (c != null) { - c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria()); + //http://jira.healthbaby.com.cn/browse/WEB-2773 + c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); + c.getCriteriaObject().putAll(c1.getCriteria().getCriteriaObject()); +// c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria()); } else { c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria(); } @@ -994,6 +997,8 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } if (c != null) { + System.out.println( c.getCriteriaObject().toString()); + System.out.println( condition.toMongoQuery().convertToMongoQuery().toString()); return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); } return condition.toMongoQuery();