diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index 2c781de..269f956 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -197,9 +197,10 @@ public class BabyCheckController extends BaseController { @RequestParam(value = "checkDoctorId", required = false) String checkDoctorId, @RequestParam(value = "articleTypes", required = false) Integer articleTypes,//中医指导类型, @RequestParam(value = "level", required = false) String level, + @RequestParam(value = "type", required = false) Integer type, //肥胖分类 1 重度肥胖 2 肥胖 3 超重 Integer page, Integer limit, HttpServletRequest request) { return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, - nextDate, highRisk, waskSon, checkDoctorId,articleTypes, page, limit, getUserId(request), level); + nextDate, highRisk, waskSon, checkDoctorId,articleTypes, page, limit, getUserId(request), level,type); } /** 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 9a0b940..9d6e94d 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 @@ -1458,7 +1458,7 @@ public class BabyCheckFacade extends BaseServiceImpl { } public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, - Integer highRisk, Integer waskSon, String checkDoctorId,Integer articleTypes,Integer page, Integer limit, Integer userId,String level) { + Integer highRisk, Integer waskSon, String checkDoctorId,Integer articleTypes,Integer page, Integer limit, Integer userId,String level,Integer type) { boolean flag = false; // List hospital = groupsFacade.findGroupHospital(userId, false); String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -1506,6 +1506,21 @@ public class BabyCheckFacade extends BaseServiceImpl { if (StringUtils.isNotEmpty(level)) { criteria.and("diagnoseLevel").in(level); } + + if (type != null) { + if (type == 1) + { + criteria.and("heightWeight").is("上"); + }else if (type == 2) + { + criteria.and("heightWeight").is("中上"); + } + else if (type == 3) + { + criteria.and("heightWeight").is("中+"); + } + } + if (null != checkDoctorId) { criteria.and("checkDoctor").is(checkDoctorId); } @@ -1526,10 +1541,7 @@ public class BabyCheckFacade extends BaseServiceImpl { criteria.and("articleTypes").in(Arrays.asList(articleTypes)); } } - - Query query = new Query(criteria); - System.out.println(query.toString()); PageResult pageResult = findMongoPage(BabyCheckModel.class, query.with(new Sort(Sort.Direction.DESC, "created")), page, limit); List babyCheckModelList = (List ) pageResult.getGrid(); List > list = new ArrayList();