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 ba0de88..e70f0bb 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 @@ -5,25 +5,22 @@ import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; -import org.bson.types.ObjectId; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; /** - * * 产妇模型定义 - * - * @author Administrator * + * @author Administrator */ -public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ - +public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { + private String id; - /** - * 关键字 - */ + /** + * 关键字 + */ private String keyword; /** * 是否分配社区 @@ -49,19 +46,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ /** * 访视状态 */ - private int visitstatus=-1; + private int visitstatus = -1; private String areaId; //社区id private String areaIdOrRestId; - public String getAreaIdOrRestId() { - return areaIdOrRestId; - } - - public void setAreaIdOrRestId(String areaIdOrRestId) { - this.areaIdOrRestId = areaIdOrRestId; - } /** * 产妇手机号 @@ -71,9 +61,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ * 产妇分娩日期 */ private Date dueDateStart; - + private Date dueDateEnd; - + /** * 地址 */ @@ -82,7 +72,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ * 社区id */ private String communityId; - + /** * 身份证号码 */ @@ -101,41 +91,43 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ * 生日 */ private Date birthEnd; + /** + * 服务类型 + */ + private String serviceType; - public String getAreaId() { - return areaId; - } - - public void setAreaId(String areaId) { - this.areaId = areaId; - } - - public Date getBirthEnd() { - return birthEnd; - } - - public void setBirthEnd(Date birthEnd) { - this.birthEnd = birthEnd; - } + private String serviceStatus; - public Date getBirthStart() { - return birthStart; - } + /** + * 风险等级 + */ + private String rLevel; + /** + * 高危评分 + */ + private String hScore; + /** + * 高危因素 + */ + private String rFactor; - public void setBirthStart(Date birthStart) { - this.birthStart = birthStart; - } /** * 是否有效 */ - private int yn=-1; + private int yn = -1; /** * 1:孕妇,2:儿童 */ - private int type=-1; + private int type = -1; + public String getServiceStatus() { + return serviceStatus; + } + public void setServiceStatus(String serviceStatus) { + this.serviceStatus = serviceStatus; + } public int getType() { return type; @@ -148,122 +140,234 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ public String getCardNo() { return cardNo; } + public void setCardNo(String cardNo) { this.cardNo = cardNo; } + public int getVisitstatus() { return visitstatus; } + public void setVisitstatus(int visitstatus) { this.visitstatus = visitstatus; } + public String getKeyword() { return keyword; } + public void setKeyword(String keyword) { this.keyword = keyword; } + public Date getDueDateStart() { return dueDateStart; } + public void setDueDateStart(Date dueDateStart) { this.dueDateStart = dueDateStart; } + public Date getDueDateEnd() { return dueDateEnd; } + public void setDueDateEnd(Date dueDateEnd) { this.dueDateEnd = dueDateEnd; } - - - + + public String getAreaIdOrRestId() { + return areaIdOrRestId; + } + + public void setAreaIdOrRestId(String areaIdOrRestId) { + this.areaIdOrRestId = areaIdOrRestId; + } + + public String gethScore() { + return hScore; + } + + public void sethScore(String hScore) { + this.hScore = hScore; + } + + public String getrFactor() { + return rFactor; + } + + public void setrFactor(String rFactor) { + this.rFactor = rFactor; + } + + public String getrLevel() { + return rLevel; + } + + public void setrLevel(String rLevel) { + this.rLevel = rLevel; + } + + public String getServiceType() { + return serviceType; + } + + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + + public Date getBirthEnd() { + return birthEnd; + } + + public void setBirthEnd(Date birthEnd) { + this.birthEnd = birthEnd; + } + + public Date getBirthStart() { + return birthStart; + } + + public void setBirthStart(Date birthStart) { + this.birthStart = birthStart; + } + public int getYn() { return yn; } + public void setYn(int yn) { this.yn = yn; } + public String getName() { return name; } + public void setName(String name) { this.name = name; } + public int getAge() { return age; } + public void setAge(int age) { this.age = age; } + public String getPhone() { return phone; } + public void setPhone(String phone) { this.phone = phone; } - + public String getAddress() { return address; } + public void setAddress(String address) { this.address = address; } + public String getCommunityId() { return communityId; } + public void setCommunityId(String communityId) { this.communityId = communityId; } + public MongoQuery convertToQuery() { - MongoCondition condition = MongoCondition.newInstance(); - if(null!=keyword){ - MongoCondition con1= MongoCondition.newInstance("phone", "^"+keyword, MongoOper.LIKE); - MongoCondition con = MongoCondition.newInstance("username", "^"+keyword, MongoOper.LIKE); - condition = condition.orCondition(new MongoCondition[]{con1,con}); + MongoCondition condition = MongoCondition.newInstance(); + if (null != keyword) { + MongoCondition con1 = MongoCondition.newInstance("phone", "^" + keyword, MongoOper.LIKE); + MongoCondition con = MongoCondition.newInstance("username", "^" + keyword, MongoOper.LIKE); + condition = condition.orCondition(new MongoCondition[]{con1, con}); } - if(null!=areaIdOrRestId){ - MongoCondition con1= MongoCondition.newInstance("areaId", areaIdOrRestId, MongoOper.IS); - MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS); - condition=condition.orCondition(new MongoCondition[]{con1, con}); + if (null != areaIdOrRestId) { + MongoCondition con1 = MongoCondition.newInstance("areaId", areaIdOrRestId, MongoOper.IS); + MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS); + condition = condition.orCondition(new MongoCondition[]{con1, con}); } - if(visitstatus!=-1){ - condition= condition.and("isVisit", visitstatus, MongoOper.IS); + if (visitstatus != -1) { + condition = condition.and("isVisit", visitstatus, MongoOper.IS); } - if(null!=communityId&&!"-1".equals(communityId)){ - condition= condition.and("communityId", communityId, MongoOper.IS); + if (null != communityId && !"-1".equals(communityId)) { + condition = condition.and("communityId", communityId, MongoOper.IS); } - if(null!=areaId){ - condition= condition.and("areaId", areaId, MongoOper.IS); + if (null != areaId) { + condition = condition.and("areaId", areaId, MongoOper.IS); } - if(null!=id){ - condition= condition.and("id", id, MongoOper.IS); + if (null != id) { + condition = condition.and("id", id, MongoOper.IS); } - if(null!=vcCardNo){ - condition= condition.and("vcCardNo", vcCardNo, MongoOper.IS); + if (null != vcCardNo) { + condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS); } - if(null!=cardNo){ - condition=condition.and("cardno", cardNo, MongoOper.IS); + if (null != cardNo) { + condition = condition.and("cardno", cardNo, MongoOper.IS); } - if(null!=phone){ - condition=condition.and("phone", phone, MongoOper.IS); + if (null != phone) { + condition = condition.and("phone", phone, MongoOper.IS); } - if(null!=name){ - condition=condition.and("username", name, MongoOper.IS); + if (null != name) { + condition = condition.and("username", name, MongoOper.IS); } - - - if(-1!=yn){ - condition=condition.and("yn", yn, MongoOper.IS); + /* *//** + * 服务类型 + *//* + private String serviceType; + *//** + * 风险等级 + *//* + private String rLevel; + *//** + * 高危评分 + *//* + private String hScore; + *//** + * 高危因素 + *//* + private String rFactor*/ + if (null != serviceType) { + condition = condition.and("serviceType", serviceType, MongoOper.IS); + } + if(null!=serviceStatus){ + condition = condition.and("serviceStatus", serviceStatus, MongoOper.IS); } - if(null!=isNull){ - condition=condition.and("communityId", null, MongoOper.IS); + if (null != rLevel) { + condition = condition.and("riskLevelId", rLevel, MongoOper.IS); + } + if (null != hScore) { + condition = condition.and("riskScore", hScore, MongoOper.IS); + } + if (null != hScore) { + condition = condition.and("riskFactorId", rFactor, MongoOper.ALL); + } + if (-1 != yn) { + condition = condition.and("yn", yn, MongoOper.IS); + } + if (null != isNull) { + condition = condition.and("communityId", null, MongoOper.IS); } //去掉type为3 的情况 - /* if(-1!=type){ - condition=condition.and("type", type, MongoOper.IS); - }*/ + /* */ + if (-1 != type) { + condition = condition.and("type", type, MongoOper.IS); + } boolean isAddStart = Boolean.FALSE; Criteria c = null; @@ -274,7 +378,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ if (null != dueDateEnd) { if (isAddStart) { - c=c.lte(dueDateEnd); + c = c.lte(dueDateEnd); } else { c = Criteria.where("dueDate").lte(dueDateEnd); } @@ -297,14 +401,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ } isAddStart1 = Boolean.TRUE; } - if (isAddStart ||isAddStart1) { + if (isAddStart || isAddStart1) { return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); } return condition.toMongoQuery(); } + public String getId() { return id; } + public void setId(String id) { this.id = id; }