From 28e3b1932efeeccdf251270e455fd5371bae66dd Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 14 Feb 2017 15:36:01 +0800 Subject: [PATCH] update code --- .../web/controller/BabyBuildController.java | 21 +++++++- .../operate/web/facade/BabyBookbuildingFacade.java | 58 ++++++++++++++++++++-- 2 files changed, 72 insertions(+), 7 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index f8c72d6..ca95cb6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -303,7 +303,7 @@ public class BabyBuildController extends BaseController { return new BaseResponse().setErrormsg("babyid不能为空").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); } LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return babyBookbuildingFacade.bookBuildList(babyId,loginState.getId()); + return babyBookbuildingFacade.bookBuildList(babyId, loginState.getId()); } /** @@ -398,6 +398,23 @@ public class BabyBuildController extends BaseController { @RequestParam("page") Integer page, @RequestParam("limit") Integer limit){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return babyBookbuildingFacade.getBabyGrowthRightList(babyManageRequest,loginState.getId(),page,limit); + return babyBookbuildingFacade.getBabyGrowthRightList(babyManageRequest, loginState.getId(), page, limit,"true"); } + + + /** + * 导出儿童生长发育统计 + * @param babyManageRequest + * @param request + * @param httpServletResponse + */ + @RequestMapping(value = "/exportBabyGrowthRightList", method = RequestMethod.GET) + @TokenRequired + public void exportBabyGrowthRightList(@Valid BabyManageRequest babyManageRequest,HttpServletRequest request,HttpServletResponse httpServletResponse){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + babyBookbuildingFacade.exportBabyGrowthRightList(babyManageRequest, loginState.getId(), httpServletResponse); + } + + + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 901837d..7c39f31 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1815,7 +1815,7 @@ public class BabyBookbuildingFacade { String birthStr = request.getBirth(); String[] dates = birthStr.split(" - "); babyQuery.setBirthStart(DateUtil.parseYMD(dates[0])); - babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1])); + babyQuery.setBirthEnd(new Date(DateUtil.parseYMD(dates[1]).getTime()+24*60*60*1000 -1 )); } else if (request.getMonthAgeStart() != null && request.getMonthAgeEnd() != null) { @@ -2316,7 +2316,7 @@ public class BabyBookbuildingFacade { * @param userId * @return */ - public BaseResponse getBabyGrowthRightList(BabyManageRequest request, Integer userId,Integer page,Integer limit) { + public BaseListResponse getBabyGrowthRightList(BabyManageRequest request, Integer userId,Integer page,Integer limit,String isPage) { String hospitalId = ""; //得到当前登录的医院id if (userId != null) { @@ -2347,9 +2347,13 @@ public class BabyBookbuildingFacade { babyQuery.setCheckMonthEnd(request.getMonthAgeEnd()); } - babyQuery.setPage(page); - babyQuery.setLimit(limit); - babyQuery.setNeed("true"); + if (isPage != null) + { + babyQuery.setPage(page); + babyQuery.setLimit(limit); + babyQuery.setNeed(isPage); + } + if (StringUtils.isNotEmpty(request.getItemType()) && "1".equals(request.getItemType())) { @@ -2559,4 +2563,48 @@ public class BabyBookbuildingFacade { return map1; } + + public void exportBabyGrowthRightList(BabyManageRequest babyManageRequest, Integer userId, HttpServletResponse httpServletResponse) { + BaseListResponse listRespones = getBabyGrowthRightList( babyManageRequest, userId,null,null,null); + List> results = new ArrayList<>(); + try{ + List> list = listRespones.getData(); + if (CollectionUtils.isNotEmpty(list)) + { + for (Map map : list) + { + Map result = new HashMap<>(); + map.put("babyName", map.get("babyName")); //姓名 + map.put("sex", map.get("sex")); //性别 + map.put("age", map.get("age")); //检查月龄 + map.put("birthday", map.get("birthday")); //生日 + map.put("height",map.get("height")); //身长 + map.put("weight", map.get("weight")); //体重 + map.put("growthEvaluate",map.get("growthEvaluate")); //体格发育评价 + map.put("checkDate",map.get("checkDate")); //检查日期 + map.put("checkDoctor",map.get("checkDoctor"));//检查医生 + results.add(result); + } + } + + OutputStream out = httpServletResponse.getOutputStream(); + Map cnames = new LinkedHashMap<>(); + cnames.put("babyName", "姓名"); //姓名 + cnames.put("sex", "性别"); //性别 + cnames.put("age", "检查月龄"); //检查月龄 + cnames.put("birthday", "出生日期"); //生日 + cnames.put("height","身长"); //身长 + cnames.put("weight", "体重"); //体重 + cnames.put("growthEvaluate","体格发育评价"); //体格发育评价 + cnames.put("checkDate","检查日期"); //检查日期 + cnames.put("checkDoctor","检查医生");//检查医生 + httpServletResponse.setContentType("application/octet-stream"); + httpServletResponse.setCharacterEncoding("UTF-8"); + httpServletResponse.setHeader("Content-Disposition", "attachment;fileName=" + "data.xls"); + ExcelUtil.toExcel(out, results, cnames); + } catch (IOException e) { + e.printStackTrace(); + ExceptionUtils.catchException(e,"儿童生长发育统计异常"); + } + } } \ No newline at end of file -- 1.8.3.1