From fb05ec1c04e82d589b0cf118c40e17826ede23a2 Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 4 Jul 2018 19:56:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/query/BabyModelQuery.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 5ac87d8..39c4217 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 @@ -638,16 +638,19 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { List mongoCondits = new ArrayList<>(); if (-1 != yn) { - // MongoCondition mongoCondition1 = condition.and("yn", yn, MongoOper.IS); - mongoCondits.add(new MongoCondition("yn", yn, MongoOper.IS)); - mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS))); + MongoCondition mongoCondition1 = condition.and("yn", yn, MongoOper.IS); } - condition = condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])); - if (dataStatus) {//分娩自动建档 condition = condition.and("dataStatus", 1, MongoOper.NE); + }else{ + mongoCondits.add(new MongoCondition("yn", yn, MongoOper.IS)); + mongoCondits.add(new MongoCondition("dataStatus", 1, MongoOper.IS).andCondition(new MongoCondition("yn", 0, MongoOper.IS))); + condition = condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()])); } + + + if (null != buildType) { condition = condition.and("buildType", buildType, MongoOper.IS); } -- 1.8.3.1