Commit 27108dbdfd34ef0730f3b515a191e73ec683ede1

Authored by hujiaqi
1 parent e2ad1c86b1

BUG

Showing 1 changed file with 8 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyStatisticsManagerController.java View file @ 27108db
... ... @@ -196,9 +196,9 @@
196 196 header.put("sex", "性别");
197 197 header.put("monthAge", "月龄");
198 198 header.put("birth", "出生日期");
199   - header.put("buildDate", "检查日期");
  199 + header.put("checkDate", "检查日期");
200 200 header.put("diagnose", "高危诊断");
201   - header.put("buildDoctor", "检查医生");
  201 + header.put("checkDoctor", "检查医生");
202 202 httpServletResponse.setContentType("application/force-download");
203 203 httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("检查医生统计.xls").getBytes("UTF-8"), "ISO-8859-1"));
204 204 ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header);
... ... @@ -235,7 +235,7 @@
235 235 /**
236 236 * @auther HuJiaqi
237 237 * @createTime 2017年01月09日 16时34分
238   - * @discription 体检医生统计右边
  238 + * @discription 体检月龄统计右边
239 239 */
240 240 @TokenRequired
241 241 @ResponseBody
242 242  
... ... @@ -265,10 +265,10 @@
265 265 babyStatisticsManagerWeekAgeListRequest.setExcel(true);
266 266 // 这里返回的结果必然是这个泛型,之所以query返回的结果集没有用泛型是为了更好的传递数据
267 267 @SuppressWarnings("unchecked")
268   - List<BabyStatisticsManagerWeekAgeListResult> babyStatisticsManagerWeekAgeListResultList = babyStatisticsManagerFacade.babyStatisticsManagerWeekAgeList(babyStatisticsManagerWeekAgeListRequest).getData();
  268 + List<BabyStatisticsManagerWeekAgeListQueryModel> babyStatisticsManagerWeekAgeListQueryModelList = babyStatisticsManagerFacade.babyStatisticsManagerWeekAgeList(babyStatisticsManagerWeekAgeListRequest).getData();
269 269 List<Map<String, Object>> list = new ArrayList<>();
270   - for (BabyStatisticsManagerWeekAgeListResult babyStatisticsManagerWeekAgeListResult : babyStatisticsManagerWeekAgeListResultList) {
271   - Map<String, Object> map = BeanUtils.objectToObjectMap(babyStatisticsManagerWeekAgeListResult);
  270 + for (BabyStatisticsManagerWeekAgeListQueryModel babyStatisticsManagerWeekAgeListQueryModel : babyStatisticsManagerWeekAgeListQueryModelList) {
  271 + Map<String, Object> map = BeanUtils.objectToObjectMap(babyStatisticsManagerWeekAgeListQueryModel);
272 272 for (String key : map.keySet()) {
273 273 if (StringUtils.isEmpty(String.valueOf(map.get(key)))) {
274 274 map.put(key, "-");
275 275  
... ... @@ -281,9 +281,9 @@
281 281 header.put("sex", "性别");
282 282 header.put("monthAge", "月龄");
283 283 header.put("birth", "出生日期");
284   - header.put("buildDate", "检查日期");
  284 + header.put("checkDate", "检查日期");
285 285 header.put("diagnose", "高危诊断");
286   - header.put("buildDoctor", "检查医生");
  286 + header.put("checkDoctor", "检查医生");
287 287 httpServletResponse.setContentType("application/force-download");
288 288 httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("检查医生统计.xls").getBytes("UTF-8"), "ISO-8859-1"));
289 289 ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header);