Commit eb2724efe8d9a4e7efecafcf1de8c9947c4e1708
1 parent
3e0b02fe73
Exists in
master
and in
6 other branches
隆化-儿保登记统计，搜索框update
Showing 1 changed file with 2 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java
View file @
eb2724e
| ... | ... | @@ -184,13 +184,12 @@ |
| 184 | 184 | if(null!=queryStartBirth&&null!=queryEndtBirth){ |
| 185 | 185 | criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth); |
| 186 | 186 | } |
| 187 | - Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); | |
| 188 | 187 | if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) { |
| 189 | - pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), | |
| 188 | + criteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), | |
| 190 | 189 | Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo)); |
| 191 | 190 | flag = true; |
| 192 | 191 | } |
| 193 | - PageResult pageResult = findMongoPage(BabyModel.class, new Query(pCriteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); | |
| 192 | + PageResult pageResult = findMongoPage(BabyModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); | |
| 194 | 193 | List<BabyModel> babykModelsList = (List<BabyModel>) pageResult.getGrid(); |
| 195 | 194 | List<Map<String, Object>> grid = new ArrayList<>(); |
| 196 | 195 |