Commit 1cdde2f1a63fb457d70551a60b1f10edbcd50a4d
1 parent
9d05de0c18
Exists in
master
and in
8 other branches
增加
Showing 2 changed files with 20 additions and 5 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java
View file @
1cdde2f
| ... | ... | @@ -36,11 +36,6 @@ |
| 36 | 36 | return iBabyDao.getOneBabyById(id); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - public int queryBabyCount(BabyModelQuery babyQuery){ | |
| 40 | - | |
| 41 | - return iBabyDao.queryBabyCount(babyQuery.convertToQuery()); | |
| 42 | - } | |
| 43 | - | |
| 44 | 39 | public List<BabyModel> queryBabyWithQuery(BabyModelQuery babyQuery){ |
| 45 | 40 | MongoQuery query = babyQuery.convertToQuery(); |
| 46 | 41 | if (StringUtils.isNotEmpty(babyQuery.getNeed())) { |
| ... | ... | @@ -49,6 +44,11 @@ |
| 49 | 44 | } |
| 50 | 45 | |
| 51 | 46 | return iBabyDao.queryBabyWithQuery(query.addOrder(Direction.DESC, "id")); |
| 47 | + } | |
| 48 | + | |
| 49 | + public int queryBabyCount(BabyModelQuery babyQuery){ | |
| 50 | + | |
| 51 | + return iBabyDao.queryBabyCount(babyQuery.convertToQuery()); | |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 |
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
View file @
1cdde2f
| ... | ... | @@ -27,7 +27,19 @@ |
| 27 | 27 | private String mphone; |
| 28 | 28 | private String mname; |
| 29 | 29 | private String communityId; |
| 30 | + /** | |
| 31 | + * 是否分配社区 | |
| 32 | + */ | |
| 33 | + private Boolean isNull; | |
| 30 | 34 | |
| 35 | + public Boolean getIsNull() { | |
| 36 | + return isNull; | |
| 37 | + } | |
| 38 | + | |
| 39 | + public void setIsNull(Boolean isNull) { | |
| 40 | + this.isNull = isNull; | |
| 41 | + } | |
| 42 | + | |
| 31 | 43 | public String getMname() { |
| 32 | 44 | return mname; |
| 33 | 45 | } |
| ... | ... | @@ -173,6 +185,9 @@ |
| 173 | 185 | } |
| 174 | 186 | if(null!=communityId){ |
| 175 | 187 | condition=condition.and("communityId",communityId,MongoOper.IS); |
| 188 | + } | |
| 189 | + if(null!=isNull){ | |
| 190 | + condition=condition.and("communityId", null, MongoOper.IS); | |
| 176 | 191 | } |
| 177 | 192 | if (null != keyword) { |
| 178 | 193 | if (null != keyword) { |