diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java index 582856d..4cc5887 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHealthFacade.java @@ -184,13 +184,12 @@ public class BabyHealthFacade extends BaseServiceImpl { if(null!=queryStartBirth&&null!=queryEndtBirth){ criteria.and("birth").gte(queryStartBirth).lte(queryEndtBirth); } - Criteria pCriteria = Criteria.where("yn").ne(0).and("hospitalId").is(hospitalId); if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) { - pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), + criteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo)); flag = true; } - PageResult pageResult = findMongoPage(BabyModel.class, new Query(pCriteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); + PageResult pageResult = findMongoPage(BabyModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List babykModelsList = (List) pageResult.getGrid(); List> grid = new ArrayList<>();