From 08641b1662555c548e8c8970e208fea551ef5e71 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Mon, 5 Dec 2016 11:42:32 +0800
Subject: [PATCH] update

---
 .../web/facade/PremaritalCheckupFacade.java        | 34 ++++++++++++----------
 1 file changed, 19 insertions(+), 15 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 cc8155e..0c473e8 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
@@ -55,10 +55,11 @@ public class PremaritalCheckupFacade {
     public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam,Integer id) {
 
         PremaritalCheckup result = null;
-        Map<String, Object> resultMap = new HashMap<>();
-        Map<String, Object> archiveMap = new HashMap<>();
-
+        PremaritalCheckupHistoryResult historyResult = null;
         ResidentsArchiveModel archiveModel = null;
+        Map<String, Object> archiveMap = null;
+
+        Map<String, Object> resultMap = new HashMap<>();
 
         //婚检ID不为空
         if (StringUtils.isNotEmpty(requestParam.getId())) {
@@ -101,7 +102,7 @@ public class PremaritalCheckupFacade {
                     result = checkupList.get(0);
                     //历史婚检记录
                     for (PremaritalCheckup data : checkupList){
-                        PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult();
+                        historyResult = new PremaritalCheckupHistoryResult();
                         historyResult.setId(data.getId());
                         historyResult.setPremaritalUpTime(data.getPremaritalUpTime());
                         Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId()));
@@ -109,25 +110,28 @@ public class PremaritalCheckupFacade {
                             historyResult.setPremaritalUpHospital(org.getName());
                             historyResult.setHospitalId(data.getHospitalId());
                         }
-                        resultMap.put("premaritalCheckupHistory",historyResult);
                     }
                 }
             }
         }
 
-        archiveMap.put("certificateNum", archiveModel.getCertificateNum());
-        archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
-        archiveMap.put("username", archiveModel.getUsername());
-        archiveMap.put("age", archiveModel.getAge());
-        archiveMap.put("sex", archiveModel.getSex());
-        archiveMap.put("birthday", getBirthday(archiveModel.getBirthday()));
-        archiveMap.put("phone", archiveModel.getPhone());
-        archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceId(), archiveModel.getCityId(),
-                archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService));
-        archiveMap.put("workUnit", archiveModel.getWorkUnit());
+        if (archiveModel!=null){
+            archiveMap = new HashMap<>();
+            archiveMap.put("certificateNum", archiveModel.getCertificateNum());
+            archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
+            archiveMap.put("username", archiveModel.getUsername());
+            archiveMap.put("age", archiveModel.getAge());
+            archiveMap.put("sex", archiveModel.getSex());
+            archiveMap.put("birthday", getBirthday(archiveModel.getBirthday()));
+            archiveMap.put("phone", archiveModel.getPhone());
+            archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceId(), archiveModel.getCityId(),
+                    archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService));
+            archiveMap.put("workUnit", archiveModel.getWorkUnit());
+        }
 
         resultMap.put("archiveResult", archiveMap);
         resultMap.put("checkupResult", result);
+        resultMap.put("premaritalCheckupHistory",historyResult);
 
         BaseObjectResponse response = new BaseObjectResponse();
         response.setData(resultMap);
-- 
1.8.3.1