From fc1ffd25d160768099c34a45208dc1ff9f30b0c5 Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 4 Jul 2018 22:05:01 +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 --- .../src/main/java/com/lyms/platform/query/BabyModelQuery.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 6099401..015dd26 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 @@ -639,20 +639,19 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); - }else{ + } else { if (dataStatus != null) { if (dataStatus) {//分娩自动建档 condition = condition.and("dataStatus", 1, MongoOper.NE); } else { mongoCondits.add(new MongoCondition("yn", 1, 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()])); + condition = condition.andCondition(condition.orCondition(mongoCondits.toArray(new MongoCondition[mongoCondits.size()]))); } } } - if (null != buildType) { condition = condition.and("buildType", buildType, MongoOper.IS); } -- 1.8.3.1