From 0a676eb609e118e1b2fb170a8626ebc8221c94f9 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Thu, 8 Dec 2016 14:21:54 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java | 4 +++-
 1 file changed, 3 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 2452ac9..1d50711 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
@@ -98,7 +98,9 @@ public class PremaritalCheckupFacade {
             query.setParentId(archiveModel.getId());
             List<PremaritalCheckup> checkupList = premaritalCheckupService.queryPremaritalCheckup(query);
             if (CollectionUtils.isNotEmpty(checkupList)) {
-                result = checkupList.get(0);
+                if (result==null){
+                    result = checkupList.get(0);
+                }
                 historyList = new ArrayList<>();
                 //历史婚检记录
                 for (PremaritalCheckup data : checkupList){
-- 
1.8.3.1