From 27108dbdfd34ef0730f3b515a191e73ec683ede1 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Mon, 16 Jan 2017 10:58:16 +0800 Subject: [PATCH] BUG --- .../web/controller/BabyStatisticsManagerController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java index ed48249..9b8d1b5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java @@ -196,9 +196,9 @@ public class BabyStatisticsManagerController extends BaseController { header.put("sex", "性别"); header.put("monthAge", "月龄"); header.put("birth", "出生日期"); - header.put("buildDate", "检查日期"); + header.put("checkDate", "检查日期"); header.put("diagnose", "高危诊断"); - header.put("buildDoctor", "检查医生"); + header.put("checkDoctor", "检查医生"); httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("检查医生统计.xls").getBytes("UTF-8"), "ISO-8859-1")); ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header); @@ -235,7 +235,7 @@ public class BabyStatisticsManagerController extends BaseController { /** * @auther HuJiaqi * @createTime 2017年01月09日 16时34分 - * @discription 体检医生统计右边 + * @discription 体检月龄统计右边 */ @TokenRequired @ResponseBody @@ -265,10 +265,10 @@ public class BabyStatisticsManagerController extends BaseController { babyStatisticsManagerWeekAgeListRequest.setExcel(true); // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据 @SuppressWarnings("unchecked") - List babyStatisticsManagerWeekAgeListResultList = babyStatisticsManagerFacade.babyStatisticsManagerWeekAgeList(babyStatisticsManagerWeekAgeListRequest).getData(); + List babyStatisticsManagerWeekAgeListQueryModelList = babyStatisticsManagerFacade.babyStatisticsManagerWeekAgeList(babyStatisticsManagerWeekAgeListRequest).getData(); List> list = new ArrayList<>(); - for (BabyStatisticsManagerWeekAgeListResult babyStatisticsManagerWeekAgeListResult : babyStatisticsManagerWeekAgeListResultList) { - Map map = BeanUtils.objectToObjectMap(babyStatisticsManagerWeekAgeListResult); + for (BabyStatisticsManagerWeekAgeListQueryModel babyStatisticsManagerWeekAgeListQueryModel : babyStatisticsManagerWeekAgeListQueryModelList) { + Map map = BeanUtils.objectToObjectMap(babyStatisticsManagerWeekAgeListQueryModel); for (String key : map.keySet()) { if (StringUtils.isEmpty(String.valueOf(map.get(key)))) { map.put(key, "-"); @@ -281,9 +281,9 @@ public class BabyStatisticsManagerController extends BaseController { header.put("sex", "性别"); header.put("monthAge", "月龄"); header.put("birth", "出生日期"); - header.put("buildDate", "检查日期"); + header.put("checkDate", "检查日期"); header.put("diagnose", "高危诊断"); - header.put("buildDoctor", "检查医生"); + header.put("checkDoctor", "检查医生"); httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("检查医生统计.xls").getBytes("UTF-8"), "ISO-8859-1")); ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header); -- 1.8.3.1