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); }