diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index e0b5bb8..cb0d4c1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -44,6 +44,16 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { this.mphone = mphone; } + private String areaId; + + public String getAreaId() { + return areaId; + } + + public void setAreaId(String areaId) { + this.areaId = areaId; + } + /** * 母亲的id */ @@ -149,6 +159,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if(-1!=yn){ condition = condition.and("yn", yn, MongoOper.IS); } + if(null!=areaId){ + condition = condition.and("areaId", areaId, MongoOper.IS); + } /* * if(null!=keyword){ if(null!=keyword){ MongoCondition con1= MongoCondition.newInstance("phone", keyword, MongoOper.LIKE); MongoCondition con * = MongoCondition.newInstance("name", keyword, MongoOper.LIKE); condition = condition.orCondition(new MongoCondition[]{con1,con}); } } 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 bf101f0..37e7e2a 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 @@ -39,7 +39,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ */ private int visitstatus=-1; - private int areaId=-1; + private String areaId; /** * 产妇手机号 */ @@ -75,11 +75,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ */ private Date birthEnd; - public int getAreaId() { + public String getAreaId() { return areaId; } - public void setAreaId(int areaId) { + public void setAreaId(String areaId) { this.areaId = areaId; } @@ -199,7 +199,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{ if(null!=communityId&&!"-1".equals(communityId)){ condition= condition.and("communityId", communityId, MongoOper.IS); } - if(-1!=areaId){ + if(null!=areaId){ condition= condition.and("areaId", areaId, MongoOper.IS); } if(null!=id){