From 7212566437d363e671d97973f6e74778b8bf555f Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Mon, 8 Oct 2018 09:13:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/PremaritalCheckupFacade.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 0931e1f..0b8b76b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -163,12 +163,18 @@ public class PremaritalCheckupFacade { archiveMap.put("sex", "男"); } } - archiveMap.put("birthday", getBirthday(archiveModel.getBirthday()!=null ? DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()) : null )); + archiveMap.put("birthday", getBirthday(archiveModel.getBirthday() != null ? DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()) : null)); archiveMap.put("phone", archiveModel.getPhone()); archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(), archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), archiveModel.getAddressRegister(), basicConfigService)); archiveMap.put("workUnit", archiveModel.getWorkUnit()); archiveMap.put("buildDay", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); + + //增加返回基本信息字段（gxk） + archiveMap.put("nation",FunvCommonUtil.getBaseicConfigByid(archiveModel.getLevelTypeId(), basicConfigService)); + archiveMap.put("address",CommonsHelper.getResidence(archiveModel.getProvinceId(),archiveModel.getCityId(), + archiveModel.getAreaId(),archiveModel.getStreetId(),archiveModel.getAddress(),basicConfigService)); + } resultMap.put("archiveResult", archiveMap); -- 1.8.3.1