diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index ceae121..e6061fe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -148,11 +148,18 @@ public class ResidentsArchiveFacade{ } } + ResidentsArchiveModel newModel = null; + //历史建档记录 List list = new ArrayList<>(); List resultList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(residents)){ + + //如果该身份证号或者就诊卡号已经在某家医院建档,拉取最新的一条建档记录返回给前端 + newModel = residents.get(0); + for (ResidentsArchiveModel data : residents){ + ResidentsArchiveHistoryResult result = new ResidentsArchiveHistoryResult(); //查询医院机构 if (StringUtils.isNotEmpty(data.getHospitalId())){ @@ -167,6 +174,7 @@ public class ResidentsArchiveFacade{ resultList.add(result); } } + //性别 List sexResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.SEX_ID); typeMap.put("sex", sexResults); @@ -208,6 +216,7 @@ public class ResidentsArchiveFacade{ //历史建档记录 Map mapData = new HashMap<>(); + mapData.put("firstBuildData",newModel); mapData.put("archiveHistory",resultList); mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); list.add(mapData);