From a7112efb5a974dd55c6302472a2b74ce4fd3dd56 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Thu, 5 May 2016 10:53:49 +0800 Subject: [PATCH] =?UTF-8?q?platform=20permission=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=E5=8F=82=E8=80=83=E5=80=BC=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/param/ReferConfigQuery.java | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java index 70f828b..fe22212 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/param/ReferConfigQuery.java @@ -40,19 +40,35 @@ public class ReferConfigQuery extends BaseQuery { } if (null != referVal) { if(1 == referVal) { - condition.and("charRefer", null, MongoOper.NE); + condition.andCondition(new MongoCondition("charRefer", null, MongoOper.NE).orCondition(new MongoCondition("charRefer", "", MongoOper.NE))); } else if(2 == referVal) { - condition.and("charRefer", null, MongoOper.IS); + condition.orCondition(new MongoCondition[] {new MongoCondition("charRefer", null, MongoOper.IS), new MongoCondition("charRefer", "", MongoOper.IS)}); } } if (null != emergencyVal) { if(1 == emergencyVal) { - condition.and("emergencyChar", null, MongoOper.NE); + condition.andCondition(new MongoCondition("emergencyChar", null, MongoOper.NE).orCondition(new MongoCondition("emergencyChar", "", MongoOper.NE))); + } else if(2 == emergencyVal) { - condition.and("emergencyChar", null, MongoOper.IS); + condition.orCondition(new MongoCondition[]{new MongoCondition("emergencyChar", null, MongoOper.IS), new MongoCondition("emergencyChar", "", MongoOper.IS)}); } } +// if (null != referVal) { +// if(1 == referVal) { +// condition.and("charRefer", null, MongoOper.NE); +// } else if(2 == referVal) { +// condition.and("charRefer", null, MongoOper.IS); +// } +// } +// if (null != emergencyVal) { +// if(1 == emergencyVal) { +// condition.and("emergencyChar", null, MongoOper.NE); +// } else if(2 == emergencyVal) { +// condition.and("emergencyChar", null, MongoOper.IS); +// } +// } + if(null != yn) { condition.and("yn", yn, MongoOper.IS); } -- 1.8.3.1