From 4dbdc799b8d0e0a8ecb7ceb451d7172269207292 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Tue, 6 Dec 2016 16:41:30 +0800 Subject: [PATCH] update --- .../web/facade/PremaritalCheckupFacade.java | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 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 23b06aa..0f83fcd 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 @@ -89,28 +89,28 @@ public class PremaritalCheckupFacade { archiveModel = modelList.get(0); } } + } - if (archiveModel != null) { - PremaritalCheckupQuery query = new PremaritalCheckupQuery(); - query.setYn(YnEnums.YES.getId()); - query.setHospitalId(requestParam.getHospitalId()); - query.setParentId(archiveModel.getId()); - List checkupList = premaritalCheckupService.queryPremaritalCheckup(query); - if (CollectionUtils.isNotEmpty(checkupList)) { - result = checkupList.get(0); - //历史婚检记录 - for (PremaritalCheckup data : checkupList){ - PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult(); - historyResult.setId(data.getId()); - historyResult.setPremaritalUpTime(data.getPremaritalUpTime()); - Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId())); - if (org!=null){ - historyResult.setPremaritalUpHospital(org.getName()); - historyResult.setHospitalId(data.getHospitalId()); - } - historyList = new ArrayList<>(); - historyList.add(historyResult); + if (archiveModel != null) { + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId(requestParam.getHospitalId()); + query.setParentId(archiveModel.getId()); + List checkupList = premaritalCheckupService.queryPremaritalCheckup(query); + if (CollectionUtils.isNotEmpty(checkupList)) { + result = checkupList.get(0); + //历史婚检记录 + for (PremaritalCheckup data : checkupList){ + PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult(); + historyResult.setId(data.getId()); + historyResult.setPremaritalUpTime(data.getPremaritalUpTime()); + Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId())); + if (org!=null){ + historyResult.setPremaritalUpHospital(org.getName()); + historyResult.setHospitalId(data.getHospitalId()); } + historyList = new ArrayList<>(); + historyList.add(historyResult); } } } -- 1.8.3.1