diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java index d95f8af..0232f9a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java @@ -420,7 +420,7 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo } if (null != birthEnd) { if (null != c) { - c = c.lte(birthEnd); + c = c.where("birth").lte(birthEnd); } else { c = Criteria.where("birth").lte(birthEnd); } @@ -435,18 +435,23 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo } if (null != dueDateEnd) { if (c != null) { - c = c.lte(dueDateEnd); + c = c.and("days").lte(dueDateEnd); } else { c = Criteria.where("days").lte(dueDateEnd); } } //高危评分 if (null != scoreStart) { - c = c.and("score").gte(scoreStart); + if (null != c) { + c = c.and("score").gte(scoreStart); + }else{ + c = Criteria.where("score").gte(scoreStart); + } + } if (null != scoreEnd) { if (null != c) { - c = c.lte(scoreEnd); + c = c.and("score").lte(scoreEnd); } else { c = Criteria.where("score").lte(scoreEnd); } @@ -477,7 +482,7 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo } if (null != transferredEnd) { if (c != null) { - c = c.lte(transferredEnd); + c = c.and("created").lte(transferredEnd); } else { c = Criteria.where("created").lte(transferredEnd); }