From db166a83926826bff8d6f5c4c7e316590854a42d Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 28 Jun 2019 11:09:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=A3=80=E6=9F=A5=E5=88=97?= =?UTF-8?q?=E8=A1=A8bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/BabyCheckController.java | 20 ++++++++++---------- .../operate/web/facade/BabyCheckFacade.java | 22 ++++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) 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 e81fb93..df74bbf 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 @@ -157,11 +157,11 @@ public class BabyCheckController extends BaseController { public BaseResponse list( @RequestParam(value = "checkTime", required = false) String checkTime, @RequestParam(value = "queryNo", required = false) String queryNo, - @RequestParam(value = "startCheckMonthAge", required = false) Integer startCheckMonthAge, - @RequestParam(value = "endCheckMonthAge", required = false) Integer endCheckMonthAge, + @RequestParam(value = "startMonthAge", required = false) Integer startCheckMonthAge, + @RequestParam(value = "endMonthAge", required = false) Integer endCheckMonthAge, @RequestParam(value = "nextDate", required = false) String nextDate, - @RequestParam(value = "highRisk", required = false) String highRisk, - @RequestParam(value = "waskSon", required = false) String waskSon, + @RequestParam(value = "highRisk", required = false) Integer highRisk, + @RequestParam(value = "waskSon", required = false) Integer waskSon, Integer page, Integer limit, HttpServletRequest request) { return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, getUserId(request)); } @@ -178,17 +178,17 @@ public class BabyCheckController extends BaseController { public BaseResponse lists( @RequestParam(value = "checkTime", required = false) String checkTime, @RequestParam(value = "queryNo", required = false) String queryNo, - @RequestParam(value = "startCheckMonthAge", required = false) Integer startCheckMonthAge, - @RequestParam(value = "endCheckMonthAge", required = false) Integer endCheckMonthAge, + @RequestParam(value = "startMonthAge", required = false) Integer startCheckMonthAge, + @RequestParam(value = "endMonthAge", required = false) Integer endCheckMonthAge, @RequestParam(value = "nextDate", required = false) String nextDate, @RequestParam(value = "highRisk", required = false) String highRisk, @RequestParam(value = "waskSon", required = false) String waskSon, @RequestParam(value = "hospitalId", required = false) String hospitalId, - @RequestParam(required = false) String proviceId, - @RequestParam(required = false) String cityId, - @RequestParam(required = false) String areaId, + @RequestParam(value = "proviceId", required = false) String proviceId, + @RequestParam(value = "cityId", required = false) String cityId, + @RequestParam(value = "areaId", required = false) String areaId, Integer page, Integer limit, HttpServletRequest request) { - return babyCheckFacade.babyRegionCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, hospitalId, getUserId(request),proviceId,cityId,areaId); + return babyCheckFacade.babyRegionCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, hospitalId, getUserId(request), proviceId, cityId, areaId); } 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 4bf9de4..2f73cb7 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 @@ -755,7 +755,7 @@ public class BabyCheckFacade extends BaseServiceImpl { return br; } - public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, String highRisk, String waskSon, Integer page, Integer limit, Integer userId) { + public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, Integer highRisk, Integer waskSon, Integer page, Integer limit, Integer userId) { boolean flag = false; List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); @@ -791,11 +791,12 @@ public class BabyCheckFacade extends BaseServiceImpl { } catch (Exception e) { } } - if (StringUtils.isNotEmpty(highRisk)) { + if (null != highRisk) { criteria.and("highRisk").is(highRisk); + System.out.println(highRisk); } - if (StringUtils.isNotEmpty(waskSon)) { - criteria.and("waskSon").and(waskSon); + if (null != waskSon) { + criteria.and("waskSon").is(waskSon); } PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List babyCheckModelList = (List) pageResult.getGrid(); @@ -808,7 +809,7 @@ public class BabyCheckFacade extends BaseServiceImpl { map.put("babyName", babyModel.getName()); map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); map.put("mName", babyModel.getMname()); - map.put("mCardNo", babyModel.getCardNo()); + map.put("mCardNo", babyModel.getMcertNo()); map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); } @@ -848,7 +849,8 @@ public class BabyCheckFacade extends BaseServiceImpl { * 区域查询 */ public BaseResponse babyRegionCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, - String nextDate, String highRisk, String waskSon, Integer page, Integer limit, String hospitalId, Integer userId, String proviceId, String cityId, String areaId) { + String nextDate, Integer highRisk, Integer waskSon, Integer page, Integer limit, + String hospitalId, Integer userId, String proviceId, String cityId, String areaId) { boolean flag = false; List hospitalIds = new ArrayList<>(); if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hospitalId)) { @@ -891,11 +893,11 @@ public class BabyCheckFacade extends BaseServiceImpl { } catch (Exception e) { } } - if (StringUtils.isNotEmpty(highRisk)) { + if (null != highRisk) { criteria.and("highRisk").is(highRisk); } - if (StringUtils.isNotEmpty(waskSon)) { - criteria.and("waskSon").and(waskSon); + if (null != waskSon) { + criteria.and("waskSon").is(waskSon); } PageResult pageResult = findMongoPage(BabyCheckModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "created")), page, limit); List babyCheckModelList = (List) pageResult.getGrid(); @@ -908,7 +910,7 @@ public class BabyCheckFacade extends BaseServiceImpl { map.put("babyName", babyModel.getName()); map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); map.put("mName", babyModel.getMname()); - map.put("mCardNo", babyModel.getCardNo()); + map.put("mCardNo", babyModel.getMcertNo()); map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); } -- 1.8.3.1