Commit 6661797ecd8049ce10b05177e7be3a7e3687d874
1 parent
59cae63e64
Exists in
master
and in
6 other branches
【妇女健康管理】--婚前检查--婚检预建档界面的导出数据加上居住地的数据。
Showing 1 changed file with 20 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
View file @
6661797
| ... | ... | @@ -457,6 +457,25 @@ |
| 457 | 457 | } |
| 458 | 458 | data.put("type",typeStr); |
| 459 | 459 | data.put("created",DateUtil.getyyyy_MM_dd(womanArchive.getCreated())); |
| 460 | + | |
| 461 | + | |
| 462 | + /*******************************************************************/ | |
| 463 | + /** | |
| 464 | + * 导出添加居住地 | |
| 465 | + */ | |
| 466 | + Map<String,Object> data1 = womanArchive.getData(); | |
| 467 | + String provinceId = String.valueOf(data1.get("provinceId")); | |
| 468 | + String cityId = String.valueOf(data1.get("cityId")); | |
| 469 | + String areaId = String.valueOf(data1.get("areaId")); | |
| 470 | + String streetId = String.valueOf(data1.get("streetId")); | |
| 471 | + String address = String.valueOf(data1.get("address")); | |
| 472 | + String liveAddress = ""; | |
| 473 | + if (StringUtils.isNotEmpty(provinceId) && StringUtils.isNotEmpty(streetId)) | |
| 474 | + { | |
| 475 | + liveAddress = CommonsHelper.getResidence(provinceId,cityId,areaId,streetId,address,basicConfigService); | |
| 476 | + } | |
| 477 | + data.put("liveAddress",liveAddress); | |
| 478 | + /*******************************************************************/ | |
| 460 | 479 | datas.add(data); |
| 461 | 480 | } |
| 462 | 481 | } |
| ... | ... | @@ -471,6 +490,7 @@ |
| 471 | 490 | cnames.put("phone", "手机号"); |
| 472 | 491 | cnames.put("type", "检查类型"); |
| 473 | 492 | cnames.put("created", "登记日期"); |
| 493 | + cnames.put("liveAddress", "居住地"); | |
| 474 | 494 | response.setContentType("application/octet-stream"); |
| 475 | 495 | response.setCharacterEncoding("UTF-8"); |
| 476 | 496 | response.setHeader("Content-Disposition", "attachment;fileName=" + "预约建档管理.xls"); |