From 4e73d85c4ee1613ae2b3bccdc06d755d9c5aeccc Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 21 Oct 2020 11:23:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AF=8A=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 58a18ff..ec9db61 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -5865,7 +5865,31 @@ public class AntenatalExaminationFacade { map.put("type", pat.getType()); map.put("cardNoType", pat.getPcerteTypeId()); - map.put("fid", model.getFid() == null ? "" : model.getFid()); + if (StringUtils.isEmpty(model.getFid())) + { + String fid = ""; + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setParentId(pat.getPid()); + antExQuery.setYn(YnEnums.YES.getId()); + List antEx = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate")); + if (CollectionUtils.isNotEmpty(antEx)) { + fid = antEx.get(0).getId(); + } else { + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setParentId(pat.getPid()); + antExChuQuery.setYn(YnEnums.YES.getId()); + List antExChu = antenatalExaminationService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChu)) { + fid = antExChu.get(0).getId(); + } + } + map.put("fid",fid); + } + else + { + map.put("fid",model.getFid()); + } + map.put("autoTime", DateUtil.getyyyy_MM_dd(model.getCreated())); map.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated())); -- 1.8.3.1