From 51d3336d1ea4ff08b97a812e0bcddc58b594cafe Mon Sep 17 00:00:00 2001 From: landong2015 Date: Fri, 30 Dec 2016 11:46:49 +0800 Subject: [PATCH] update bug --- .../web/facade/PremaritalCheckupFacade.java | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) 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 917eb70..09c51a5 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 @@ -822,12 +822,18 @@ public class PremaritalCheckupFacade { String username = ""; String phone = ""; Integer age = null; + String certificateTypeId = ""; + String certificateNum = ""; + String vcCardNo = ""; if (StringUtils.isNotEmpty(checkup.getParentId())){ ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(checkup.getParentId()); if (archiveModel!=null && archiveModel.getYn()==YnEnums.YES.getId()){ username = archiveModel.getUsername(); phone = archiveModel.getPhone(); + certificateTypeId = archiveModel.getCertificateTypeId(); + certificateNum = archiveModel.getCertificateNum(); + vcCardNo = archiveModel.getVcCardNo(); if (archiveModel.getBirthday()!=null){ age = DateUtil.getAge(archiveModel.getBirthday()); } @@ -845,9 +851,9 @@ public class PremaritalCheckupFacade { } } map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime())); - map.put("certificateTypeId", getBaseicConfigByid(checkup.getCertificateTypeId())); - map.put("certificateNum", DefenceUtils.getId(checkup.getCertificateNum())); - map.put("vcCardNo", checkup.getVcCardNo()); + map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId)); + map.put("certificateNum", DefenceUtils.getId(certificateNum)); + map.put("vcCardNo", vcCardNo); map.put("sexType", "女"); if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) { map.put("deliverStatus", "提供"); @@ -1185,12 +1191,18 @@ public class PremaritalCheckupFacade { String username = ""; String phone = ""; Integer age = null; + String certificateTypeId = ""; + String certificateNum = ""; + String vcCardNo = ""; if (StringUtils.isNotEmpty(checkup.getParentId())){ ResidentsArchiveModel archiveModel = residentsArchiveService.getResident(checkup.getParentId()); if (archiveModel!=null && archiveModel.getYn()==YnEnums.YES.getId()){ username = archiveModel.getUsername(); phone = archiveModel.getPhone(); + certificateTypeId = archiveModel.getCertificateTypeId(); + certificateNum = archiveModel.getCertificateNum(); + vcCardNo = archiveModel.getVcCardNo(); if (archiveModel.getBirthday()!=null){ age = DateUtil.getAge(archiveModel.getBirthday()); } @@ -1208,9 +1220,9 @@ public class PremaritalCheckupFacade { } } map.put("premaritalUpTime", DateUtil.getYmd(checkup.getPremaritalUpTime())); - map.put("certificateTypeId", getBaseicConfigByid(checkup.getCertificateTypeId())); - map.put("certificateNum", DefenceUtils.getId(checkup.getCertificateTypeId())); - map.put("vcCardNo", checkup.getVcCardNo()); + map.put("certificateTypeId", getBaseicConfigByid(certificateTypeId)); + map.put("certificateNum", DefenceUtils.getId(certificateNum)); + map.put("vcCardNo", vcCardNo); map.put("sexType", "男"); if (checkup.getDeliverStatus()!=null && checkup.getDeliverStatus() == one) { map.put("deliverStatus", "提供"); -- 1.8.3.1