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 933f9f5..0fe22c7 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 @@ -54,11 +54,10 @@ public class PremaritalCheckupFacade { public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam) { PremaritalCheckup result = null; - PremaritalCheckupHistoryResult historyResult = null; ResidentsArchiveModel archiveModel = null; Map archiveMap = null; - Map resultMap = new HashMap<>(); + List historyList = null; //婚检ID不为空 if (StringUtils.isNotEmpty(requestParam.getId())) { @@ -101,7 +100,7 @@ public class PremaritalCheckupFacade { result = checkupList.get(0); //历史婚检记录 for (PremaritalCheckup data : checkupList){ - historyResult = new PremaritalCheckupHistoryResult(); + PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult(); historyResult.setId(data.getId()); historyResult.setPremaritalUpTime(data.getPremaritalUpTime()); Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId())); @@ -109,6 +108,7 @@ public class PremaritalCheckupFacade { historyResult.setPremaritalUpHospital(org.getName()); historyResult.setHospitalId(data.getHospitalId()); } + historyList.add(historyResult); } } } @@ -130,7 +130,7 @@ public class PremaritalCheckupFacade { resultMap.put("archiveResult", archiveMap); resultMap.put("checkupResult", result); - resultMap.put("premaritalCheckupHistory",historyResult); + resultMap.put("premaritalCheckupHistory",historyList); BaseObjectResponse response = new BaseObjectResponse(); response.setData(resultMap);