diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 3408a29..b975953 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -134,7 +134,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Date lastMensesEnd; - /** * 地址 */ @@ -519,19 +518,19 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("dueStatus", dueStatus, MongoOper.IS); } if (buildType != -1) { - MongoCondition mongoCondition=MongoCondition.newInstance("buildType",3,MongoOper.IS); - MongoCondition condition1=mongoCondition.and("enable", "1", MongoOper.IS); + MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS); + MongoCondition condition1 = mongoCondition.and("enable", "1", MongoOper.IS); MongoCondition condition12 = MongoCondition.newInstance("buildType", buildType, MongoOper.NE); condition = condition.orCondition(new MongoCondition[]{condition12, condition1}); - }else if(null!=buildTypeList){ - MongoCondition mongoCondition=MongoCondition.newInstance("buildType",3,MongoOper.IS); - MongoCondition condition1=mongoCondition.and("enable", "1", MongoOper.IS); + } else if (null != buildTypeList) { + MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS); + MongoCondition condition1 = mongoCondition.and("enable", "1", MongoOper.IS); - MongoCondition condition2=MongoCondition.newInstance("buildType", buildTypeList, MongoOper.IN); + MongoCondition condition2 = MongoCondition.newInstance("buildType", buildTypeList, MongoOper.IN); - condition = condition.orCondition(new MongoCondition[]{condition1,condition2}); + condition = condition.orCondition(new MongoCondition[]{condition1, condition2}); } if (buildTypeEq != null) { @@ -546,9 +545,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != created) { condition = condition.and("created", created, MongoOper.LTE); } - - - if (StringUtils.isNotEmpty( rLevel)) { + if (StringUtils.isNotEmpty(rLevel)) { condition = condition.and("riskLevelId", rLevel, MongoOper.LIKE); } if (null != areaId) { @@ -564,7 +561,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("cardNo", cardNo, MongoOper.IS); } - if (StringUtils.isNotEmpty( phone)) { + if (StringUtils.isNotEmpty(phone)) { condition = condition.and("phone", phone, MongoOper.IS); } if (StringUtils.isNotEmpty(name)) { @@ -579,29 +576,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("pid", pid, MongoOper.IS); } - if (fmDateStart != null && fmDateEnd != null) - { + if (fmDateStart != null && fmDateEnd != null) { Criteria cr = Criteria.where("fmDate").gte(fmDateStart).lte(fmDateEnd); condition.andCondition(new MongoCondition(cr)); } - - /* *//** - * 服务类型 - *//* - private String serviceType; - *//** - * 风险等级 - *//* - private String rLevel; - *//** - * 高危评分 - *//* - private String hScore; - *//** - * 高危因素 - *//* - private String rFactor*/ if (null != serviceType) { condition = condition.and("serviceType", serviceType, MongoOper.IS); } @@ -617,8 +596,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (null != orServiceStatus && orServiceStatus.length > 1) { condition = condition.and("serviceStatus", Arrays.asList(orServiceStatus), MongoOper.IN); -// Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0], orServiceStatus[1]); -// condition.andCondition(new MongoCondition(c)); } if (null != hcertificateNum) { condition = condition.and("hcertificateNum", hcertificateNum, MongoOper.LIKE); @@ -635,7 +612,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("communityId", null, MongoOper.IS); } //去掉type为3 的情况 - /* */ if (-1 != type) { condition = condition.and("type", type, MongoOper.IS); } @@ -652,90 +628,95 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } else { c = Criteria.where("lastMenses").lte(lastMensesEnd); } - isAddStart = Boolean.TRUE; } - - if(null!=lastRhTimeStart){ - c = Criteria.where("lastRhTime").gte(lastRhTimeStart); + if (null != c) { + condition = condition.andCondition(new MongoCondition(c)); + } + isAddStart = Boolean.FALSE; + Criteria c1 = null; + if (null != lastRhTimeStart) { + c1 = Criteria.where("lastRhTime").gte(lastRhTimeStart); isAddStart = Boolean.TRUE; } if (null != lastRhTimeEnd) { if (isAddStart) { - c = c.lte(lastRhTimeEnd); + c1 = c1.lte(lastRhTimeEnd); } else { - c = Criteria.where("lastRhTime").lte(lastRhTimeEnd); + c1 = Criteria.where("lastRhTime").lte(lastRhTimeEnd); } - isAddStart = Boolean.TRUE; } - + if (null != c1) { + condition = condition.andCondition(new MongoCondition(c1)); + } + isAddStart = Boolean.FALSE; if (null != hScoreStart) { -// condition = condition.and("riskScore", hScore, MongoOper.IS); - + Criteria c2 = null; if (null != hScoreStart) { - c = Criteria.where("riskScore").gte(hScoreStart); + c2 = Criteria.where("riskScore").gte(hScoreStart); isAddStart = Boolean.TRUE; } if (null != hScoreEnd) { if (isAddStart) { - c = c.lte(hScoreEnd); + c2 = c2.lte(hScoreEnd); } else { - c = Criteria.where("riskScore").lte(hScoreEnd); + c2 = Criteria.where("riskScore").lte(hScoreEnd); } - isAddStart = Boolean.TRUE; } - }else if (null != isHighRisk) { + if (null != c2) { + condition = condition.andCondition(new MongoCondition(c2)); + } + } else if (null != isHighRisk) { condition = condition.and("riskScore", 0, MongoOper.GT); } - + isAddStart = Boolean.FALSE; + Criteria c3 = null; if (null != bookbuildingDateStart) { - c = Criteria.where("bookbuildingDate").gte(bookbuildingDateStart); + c3 = Criteria.where("bookbuildingDate").gte(bookbuildingDateStart); isAddStart = Boolean.TRUE; } if (null != bookbuildingDateEnd) { if (isAddStart) { - c = c.lte(bookbuildingDateEnd); + c3 = c3.lte(bookbuildingDateEnd); } else { - c = Criteria.where("bookbuildingDate").lte(bookbuildingDateEnd); + c3 = Criteria.where("bookbuildingDate").lte(bookbuildingDateEnd); } - isAddStart = Boolean.TRUE; } - - if (isAddStart) { - return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + if (null != c3) { + condition = condition.andCondition(new MongoCondition(c3)); } + Criteria c4 = null; + isAddStart = Boolean.FALSE; if (null != dueDateStart) { - c = Criteria.where("dueDate").gte(dueDateStart); + c4 = Criteria.where("dueDate").gte(dueDateStart); isAddStart = Boolean.TRUE; } - if (null != dueDateEnd) { if (isAddStart) { - c = c.lte(dueDateEnd); + c4 = c4.lte(dueDateEnd); } else { - c = Criteria.where("dueDate").lte(dueDateEnd); + c4 = Criteria.where("dueDate").lte(dueDateEnd); } - isAddStart = Boolean.TRUE; } - if (isAddStart) { - return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + if (null != c4) { + condition = condition.andCondition(new MongoCondition(c4)); } boolean isAddStart1 = Boolean.FALSE; + Criteria c5 = null; if (null != birthStart) { - c = Criteria.where("birth").gte(birthStart); + c5 = Criteria.where("birth").gte(birthStart); isAddStart1 = Boolean.TRUE; } if (null != birthEnd) { if (isAddStart1) { - c = c.lte(birthEnd); + c5 = c5.lte(birthEnd); } else { - c = Criteria.where("birth").lte(birthEnd); + c5 = Criteria.where("birth").lte(birthEnd); } - isAddStart1 = Boolean.TRUE; } - if (isAddStart || isAddStart1) { - return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + if (null != c5) { + condition = condition.andCondition(new MongoCondition(c5)); } return condition.toMongoQuery(); }