Commit 3e659032c3e221932bc09ae0725d414be76aa963
1 parent
466917c736
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 3 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java
View file @
3e65903
... | ... | @@ -262,6 +262,7 @@ |
262 | 262 | map.put("username",model.getUsername()); //用户名称 |
263 | 263 | map.put("vcCardNo",model.getVcCardNo()); //就诊卡号 |
264 | 264 | map.put("cardNo",model.getCardNo()); //证件号 |
265 | + map.put("certeTypeId",model.getPcerteTypeId()); //证件类型 | |
265 | 266 | map.put("phone",model.getPhone());//手机号码 |
266 | 267 | map.put("birth",DateUtil.getyyyy_MM_dd(model.getBirth())); //出生日期 |
267 | 268 | map.put("age",DateUtil.getAge(model.getBirth(), model.getCreated())); //年龄 |
... | ... | @@ -269,7 +270,8 @@ |
269 | 270 | map.put("currentDueWeek",DateUtil.getWeekDesc(model.getLastMenses(), model.getCreated())); //当前孕周 |
270 | 271 | map.put("dueDate",DateUtil.getyyyy_MM_dd(model.getDueDate())); //预产期 |
271 | 272 | map.put("created",DateUtil.gety_m_dhm(model.getCreated()));//创建日期 |
272 | - map.put("status",model.getStatus() == 0 ? "未导出" : "已导出");//导出状态 | |
273 | + map.put("status",model.getStatus());//导出状态 | |
274 | + map.put("statusStr",model.getStatus() == 0 ? "未导出" : "已导出");//导出状态 | |
273 | 275 | result.add(map); |
274 | 276 | } |
275 | 277 | } |
... | ... | @@ -311,7 +313,6 @@ |
311 | 313 | cnames.put("currentDueWeek","当前孕周"); //当前孕周 |
312 | 314 | cnames.put("dueDate","预产期"); //预产期 |
313 | 315 | cnames.put("created","创建日期");//创建日期 |
314 | - cnames.put("status","导出状态");//导出状态 | |
315 | 316 | response.setContentType("application/octet-stream"); |
316 | 317 | response.setCharacterEncoding("UTF-8"); |
317 | 318 | response.setHeader("Content-Disposition", "attachment;fileName=datas.xls"); |