diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java index 35a1fce..e67ff84 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java @@ -36,11 +36,6 @@ public class BabyService { return iBabyDao.getOneBabyById(id); } - public int queryBabyCount(BabyModelQuery babyQuery){ - - return iBabyDao.queryBabyCount(babyQuery.convertToQuery()); - } - public List queryBabyWithQuery(BabyModelQuery babyQuery){ MongoQuery query = babyQuery.convertToQuery(); if (StringUtils.isNotEmpty(babyQuery.getNeed())) { @@ -51,6 +46,11 @@ public class BabyService { return iBabyDao.queryBabyWithQuery(query.addOrder(Direction.DESC, "id")); } + public int queryBabyCount(BabyModelQuery babyQuery){ + + return iBabyDao.queryBabyCount(babyQuery.convertToQuery()); + } + public void findAndModify(MongoQuery query,BabyModel babyModel){ iBabyDao.findAndModify(query,babyModel); 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 d1f8d04..87426f7 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 @@ -27,6 +27,18 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { private String mphone; private String mname; private String communityId; + /** + * 是否分配社区 + */ + private Boolean isNull; + + public Boolean getIsNull() { + return isNull; + } + + public void setIsNull(Boolean isNull) { + this.isNull = isNull; + } public String getMname() { return mname; @@ -174,6 +186,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if(null!=communityId){ condition=condition.and("communityId",communityId,MongoOper.IS); } + if(null!=isNull){ + condition=condition.and("communityId", null, MongoOper.IS); + } if (null != keyword) { if (null != keyword) { MongoCondition con1 = MongoCondition.newInstance("mphone", "^"+keyword, MongoOper.LIKE);