diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java index 74a60d4..58ace70 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java @@ -93,50 +93,50 @@ public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery { @Override public MongoQuery convertToQuery() { - MongoCondition condition=MongoCondition.newInstance(); - if(null!=parentId){ - condition= condition.and("parentId",parentId, MongoOper.IS); + MongoCondition condition = MongoCondition.newInstance(); + if (null != parentId) { + condition = condition.and("parentId", parentId, MongoOper.IS); } - if(null!=yn){ - condition= condition.and("yn",yn, MongoOper.IS); + if (null != yn) { + condition = condition.and("yn", yn, MongoOper.IS); } - if(null!=id){ - condition= condition.and("id",id, MongoOper.IS); + if (null != id) { + condition = condition.and("id", id, MongoOper.IS); } - if(null!=nextCheckTime){ - condition= condition.and("nextCheckTime",nextCheckTime, MongoOper.GTE); + if (null != nextCheckTime) { + condition = condition.and("nextCheckTime", nextCheckTime, MongoOper.GTE); } - if(null!=hospitalId){ - condition=condition.and("hospitalId",hospitalId,MongoOper.IS); + if (null != hospitalId) { + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); } - if(null!=pid){ - condition=condition.and("pid",pid,MongoOper.IS); + if (null != pid) { + condition = condition.and("pid", pid, MongoOper.IS); } - boolean isAddStart = Boolean.FALSE; Criteria c = null; if (null != start) { c = Criteria.where("checkTime").gte(start); - isAddStart = Boolean.TRUE; } if (null != end) { - if (isAddStart) { - c=c.lte(end); + if (null != c) { + c = c.lte(end); } else { c = Criteria.where("checkTime").lte(end); } - isAddStart = Boolean.TRUE; } if (null != nextCheckTimeStart && nextCheckTimeEnd != null) { - Criteria nc = Criteria.where("nextCheckTime").gte(nextCheckTimeStart).lte(nextCheckTimeEnd); - condition= condition.andCondition(new MongoCondition(nc)); + if (null != c) { + c = c.where("nextCheckTime").gte(nextCheckTimeStart).lte(nextCheckTimeEnd); + } else { + c = Criteria.where("nextCheckTime").gte(nextCheckTimeStart).lte(nextCheckTimeEnd); + } } - if (isAddStart) { - return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + if (null != c) { + condition = condition.andCondition(new MongoCondition(c)); } return condition.toMongoQuery(); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java index 26fc11c..a3b9dda 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/AntExQuery.java @@ -100,9 +100,17 @@ public class AntExQuery extends BaseQuery implements IConvertToNativeQuery { Criteria c = null; if (null != start) { if(neStart){ - c = Criteria.where("checkDate").gt(start); + if(null!=c){ + c = c.where("checkDate").gt(start); + }else{ + c = Criteria.where("checkDate").gt(start); + } }else{ - c = Criteria.where("checkDate").gte(start); + if(null!=c){ + c = c.where("checkDate").gt(start); + }else{ + c = Criteria.where("checkDate").gte(start); + } } isAddStart = Boolean.TRUE; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java index d5d054c..e367d97 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java @@ -331,57 +331,46 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if (null != rLevel) { condition = condition.and("rLevel", rLevel, MongoOper.IS); } - boolean isAddStart = Boolean.FALSE; Criteria c = null; if (null != scoreStart) { c = Criteria.where("score").gte(scoreStart); - isAddStart = Boolean.TRUE; } if (null != scoreEnd) { - if (isAddStart) { + if (null != c) { c = c.lte(scoreEnd); } else { c = Criteria.where("score").lte(scoreEnd); } } - if (null != c) { - condition = condition.andCondition(new MongoCondition(c)); - } - Criteria c1 = null; - isAddStart = Boolean.FALSE; if (null != revicedStart) { - c1 = Criteria.where("received").gte(revicedStart); - isAddStart = Boolean.TRUE; + if (null != c) { + c = c.where("received").gte(revicedStart); + } else { + c = Criteria.where("received").gte(revicedStart); + } } if (null != revicedEnd) { - if (isAddStart) { - c1 = c1.lte(revicedEnd); + if (c != null) { + c = c.lte(revicedEnd); } else { - c1 = Criteria.where("received").lte(revicedEnd); + c = Criteria.where("received").lte(revicedEnd); } - isAddStart = Boolean.TRUE; } - if (null != c1) { - condition = condition.andCondition(new MongoCondition(c1)); - } - Criteria c2 = null; - isAddStart = Boolean.FALSE; if (null != transferredStart) { - c2 = Criteria.where("created").gte(transferredStart); - isAddStart = Boolean.TRUE; + if (c != null) { + c = c.where("created").gte(transferredStart); + } else { + c = Criteria.where("created").gte(transferredStart); + } } if (null != transferredEnd) { - if (isAddStart) { - c2 = c2.lte(transferredEnd); + if (c != null) { + c = c.lte(transferredEnd); } else { - c2 = Criteria.where("created").lte(transferredEnd); + c = Criteria.where("created").lte(transferredEnd); } - isAddStart = Boolean.TRUE; - } - if (null != c2) { - condition = condition.andCondition(new MongoCondition(c2)); } @@ -412,55 +401,52 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati MongoCondition mongoCondition1 = MongoCondition.newInstance("transferredHospital", list, MongoOper.IN); condition = condition.andCondition(mongoCondition1); } - Criteria c24 = null; - isAddStart = Boolean.FALSE; if (null != dueDateStart) { - c24 = Criteria.where("days").gte(dueDateStart); - isAddStart = Boolean.TRUE; + if (null != c) { + c = c.where("days").gte(dueDateStart); + } else { + c = Criteria.where("days").gte(dueDateStart); + } } if (null != dueDateEnd) { - if (isAddStart) { - c24 = c.lte(dueDateEnd); + if (c != null) { + c = c.lte(dueDateEnd); } else { - c24 = Criteria.where("days").lte(dueDateEnd); + c = Criteria.where("days").lte(dueDateEnd); } } - if(null!=c24){ - condition=condition.andCondition(new MongoCondition(c24)); - } - Criteria c3 = null; - isAddStart = Boolean.FALSE; if (null != lastMensesStart) { - c3 = Criteria.where("lastMenses").gte(lastMensesStart); - isAddStart = Boolean.TRUE; + if (null != c) { + c = c.where("lastMenses").gte(lastMensesStart); + } else { + c = Criteria.where("lastMenses").gte(lastMensesStart); + } } if (null != lastMensesEnd) { - if (isAddStart) { - c3 = c3.lte(lastMensesEnd); + if (c != null) { + c = c.lte(lastMensesEnd); } else { - c3 = Criteria.where("lastMenses").lte(lastMensesEnd); + c = Criteria.where("lastMenses").lte(lastMensesEnd); } } - if (null != c3) { - condition = condition.andCondition(new MongoCondition(c3)); - } - Criteria c4 = null; - isAddStart = Boolean.FALSE; if (null != birthStart) { - c4 = Criteria.where("birth").gte(birthStart); - isAddStart = Boolean.TRUE; + if (null != c) { + c = c.where("birth").gte(birthStart); + } else { + c = Criteria.where("birth").gte(birthStart); + } } if (null != birthEnd) { - if (isAddStart) { - c4 = c4.lte(birthEnd); + if (null != c) { + c = c.lte(birthEnd); } else { - c4 = Criteria.where("birth").lte(birthEnd); + c = Criteria.where("birth").lte(birthEnd); } } - if (null != c4) { - condition = condition.andCondition(new MongoCondition(c4)); + if (null != c) { + condition = condition.andCondition(new MongoCondition(c)); } return condition.toMongoQuery(); } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java index 2f22a32..1f46144 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -192,32 +192,31 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { isAddStart = Boolean.TRUE; } if (null != dueWeekEnd) { - if (isAddStart) { + if (c!=null) { c = c.lte(dueWeekEnd); } else { c = Criteria.where("dueWeek").lte(dueWeekEnd); } } - if (null!=c) { - condition=condition.andCondition(new MongoCondition(c)); - } - Criteria c1 = null; - isAddStart = Boolean.FALSE; if (null != lastMensesStart) { - c1 = Criteria.where("lastMenses").gte(lastMensesStart); + if(c!=null){ + c = c.where("lastMenses").gte(lastMensesStart); + }else { + c = Criteria.where("lastMenses").gte(lastMensesStart); + } isAddStart = Boolean.TRUE; } if (null != lastMensesEnd) { - if (isAddStart) { - c1 = c1.lte(lastMensesEnd); + if (c!=null) { + c = c.lte(lastMensesEnd); } else { - c1 = Criteria.where("lastMenses").lte(lastMensesEnd); + c = Criteria.where("lastMenses").lte(lastMensesEnd); } } - if (null!=c1) { - condition=condition.andCondition(new MongoCondition(c1)); + if (null!=c) { + condition=condition.andCondition(new MongoCondition(c)); } return condition.toMongoQuery(); }