From 3e659032c3e221932bc09ae0725d414be76aa963 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 22 Sep 2017 14:18:17 +0800 Subject: [PATCH] update code --- .../java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java index e0f742e..43851c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java @@ -262,6 +262,7 @@ public class SieveRecordFacade { map.put("username",model.getUsername()); //用户名称 map.put("vcCardNo",model.getVcCardNo()); //就诊卡号 map.put("cardNo",model.getCardNo()); //证件号 + map.put("certeTypeId",model.getPcerteTypeId()); //证件类型 map.put("phone",model.getPhone());//手机号码 map.put("birth",DateUtil.getyyyy_MM_dd(model.getBirth())); //出生日期 map.put("age",DateUtil.getAge(model.getBirth(), model.getCreated())); //年龄 @@ -269,7 +270,8 @@ public class SieveRecordFacade { map.put("currentDueWeek",DateUtil.getWeekDesc(model.getLastMenses(), model.getCreated())); //当前孕周 map.put("dueDate",DateUtil.getyyyy_MM_dd(model.getDueDate())); //预产期 map.put("created",DateUtil.gety_m_dhm(model.getCreated()));//创建日期 - map.put("status",model.getStatus() == 0 ? "未导出" : "已导出");//导出状态 + map.put("status",model.getStatus());//导出状态 + map.put("statusStr",model.getStatus() == 0 ? "未导出" : "已导出");//导出状态 result.add(map); } } @@ -311,7 +313,6 @@ public class SieveRecordFacade { cnames.put("currentDueWeek","当前孕周"); //当前孕周 cnames.put("dueDate","预产期"); //预产期 cnames.put("created","创建日期");//创建日期 - cnames.put("status","导出状态");//导出状态 response.setContentType("application/octet-stream"); response.setCharacterEncoding("UTF-8"); response.setHeader("Content-Disposition", "attachment;fileName=datas.xls"); -- 1.8.3.1