From 4fdde41a2d656823f455c9e1f06ca3693fe1adf4 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 29 Aug 2017 23:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) 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 1ccc596..a8590ac 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 @@ -1941,18 +1941,7 @@ public class AntenatalExaminationFacade { antExChuQuery.setStart(max); //获取初诊记录 List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); - if (CollectionUtils.isNotEmpty(antExChulist)) { - AntExChuModel latelyAntExChuModel = null; /** 最近的一次初诊 */ - for (AntExChuModel antExChuModel : antExChulist) { - if(latelyAntExChuModel == null || antExChuModel.getCheckTime().getTime() > latelyAntExChuModel.getCheckTime().getTime()) { - latelyAntExChuModel = antExChuModel; - } - } - antexListResult.setPregnancyTimes(latelyAntExChuModel.getPregnancyTimes()); // 孕次 - antexListResult.setProdTime(latelyAntExChuModel.getProdTime()); // 产次 - antexListResult.setAbortion(latelyAntExChuModel.getAbortion()); // 流产 - antexListResult.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数 - } + HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false); AntExQuery antExQuery = new AntExQuery(); @@ -2023,6 +2012,19 @@ public class AntenatalExaminationFacade { antexListResult.setIsH("1"); } + if (CollectionUtils.isNotEmpty(antExChulist)) { + AntExChuModel latelyAntExChuModel = null; /** 最近的一次初诊 */ + for (AntExChuModel antExChuModel : antExChulist) { + if(latelyAntExChuModel == null || antExChuModel.getCheckTime().getTime() > latelyAntExChuModel.getCheckTime().getTime()) { + latelyAntExChuModel = antExChuModel; + } + } + antexListResult.setPregnancyTimes(latelyAntExChuModel.getPregnancyTimes()); // 孕次 + antexListResult.setProdTime(latelyAntExChuModel.getProdTime()); // 产次 + antexListResult.setAbortion(latelyAntExChuModel.getAbortion()); // 流产 + antexListResult.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数 + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } -- 1.8.3.1