From 97d760b81d3a3ce15911cf15790df865481b4d28 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 22 Jun 2021 15:20:33 +0800 Subject: [PATCH] update --- .../operate/web/facade/ResidentsArchiveFacade.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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 ce749ae..5efdf58 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 @@ -241,6 +241,7 @@ public class ResidentsArchiveFacade { mapData.put("firstBuildData", getResult(newModel)); mapData.put("archiveHistory", resultList); mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); + mapData.put("premaritalCheckup", getPremaritalCheckup(newModel));//婚检信息 list.add(mapData); BaseListResponse listResponse = new BaseListResponse(); @@ -251,6 +252,24 @@ public class ResidentsArchiveFacade { } /** + * 获取婚检信息 + * @return + */ + private PremaritalCheckup getPremaritalCheckup(ResidentsArchiveModel newModel) + { + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); + query.setParentId(newModel.getId()); + query.setYn(YnEnums.YES.getId()); + List datas = premaritalCheckupService.queryPremaritalCheckupWithSort(query, "created", Sort.Direction.DESC); + if (CollectionUtils.isNotEmpty(datas)) + { + return datas.get(0); + } + return null; + } + + + /** * 查询居民基本信息 * * @param residentsArchiveQueryRequest -- 1.8.3.1