diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 2f73cb7..2a2d6cc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -762,7 +762,7 @@ public class BabyCheckFacade extends BaseServiceImpl { Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) { pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), - Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo)); + Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo)); flag = true; } if (flag) { @@ -798,6 +798,9 @@ public class BabyCheckFacade extends BaseServiceImpl { if (null != waskSon) { criteria.and("waskSon").is(waskSon); } + if (null != checkMonthAge && null != endCheckMonthAge) { + criteria.and("checkMonth").gte(checkMonthAge).lte(endCheckMonthAge); + } PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List babyCheckModelList = (List) pageResult.getGrid(); List> list = new ArrayList(); @@ -829,19 +832,9 @@ public class BabyCheckFacade extends BaseServiceImpl { map.put("weight", babyCheckModel.getWeight()); list.add(map); } - if (null != checkMonthAge && null != endCheckMonthAge) { - List> list1 = new ArrayList<>(); - for (Map mapList : list) { - if ((int) mapList.get("monthAge") >= checkMonthAge && (int) mapList.get("monthAge") <= endCheckMonthAge) { - list1.add(mapList); - } - } - pageResult.setGrid(list1); - return RespBuilder.buildSuccess(pageResult); - } else { - pageResult.setGrid(list); - return RespBuilder.buildSuccess(pageResult); - } + pageResult.setGrid(list); + return RespBuilder.buildSuccess(pageResult); + } @@ -864,7 +857,7 @@ public class BabyCheckFacade extends BaseServiceImpl { Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospitalIds); if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) { pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), - Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo)); + Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo), Criteria.where("mname").regex(queryNo)); flag = true; } if (flag) { @@ -899,6 +892,9 @@ public class BabyCheckFacade extends BaseServiceImpl { if (null != waskSon) { criteria.and("waskSon").is(waskSon); } + if (null != checkMonthAge && null != endCheckMonthAge) { + criteria.and("checkMonth").gte(checkMonthAge).lte(endCheckMonthAge); + } PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List babyCheckModelList = (List) pageResult.getGrid(); List> list = new ArrayList(); @@ -930,19 +926,10 @@ public class BabyCheckFacade extends BaseServiceImpl { map.put("weight", babyCheckModel.getWeight()); list.add(map); } - if (null != checkMonthAge && null != endCheckMonthAge) { - List> list1 = new ArrayList<>(); - for (Map mapList : list) { - if ((int) mapList.get("monthAge") >= checkMonthAge && (int) mapList.get("monthAge") <= endCheckMonthAge) { - list1.add(mapList); - } - } - pageResult.setGrid(list1); - return RespBuilder.buildSuccess(pageResult); - } else { - pageResult.setGrid(list); - return RespBuilder.buildSuccess(pageResult); - } + + pageResult.setGrid(list); + return RespBuilder.buildSuccess(pageResult); + }