From 24e5e18e7dee621e74dd7e3629f32e32402b1ece Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 13 Jul 2018 15:32:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=A4=A9=E5=84=BF=E7=AB=A5=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/BabyCheckFacade.java | 12 ++++++++---- .../java/com/lyms/platform/operate/web/facade/LisFacade.java | 12 +++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 0419925..62a9329 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -1760,8 +1760,8 @@ public class BabyCheckFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setYn(YnEnums.YES.getId()); -// List babyCheckList = babyCheckService.queryBabyCheckRecord(query, "checkDate,created", Sort.Direction.DESC); List babyCheckList = babyCheckService.queryBabyCheckRecord(query); + List ids = new ArrayList<>(); List babyModels = new ArrayList<>(); if (CollectionUtils.isNotEmpty(babyCheckList)) { @@ -1770,12 +1770,16 @@ public class BabyCheckFacade { String buildId = babyCheck.getBuildId(); if (StringUtils.isNotEmpty(buildId)) { - babyQuery.setId(buildId); - List babyResult = babyBookbuildingService.queryBabyBuildByCond(babyQuery); - babyModels.addAll(babyResult); + if (!ids.contains(buildId)) + { + babyQuery.setId(buildId); + List babyResult = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + babyModels.addAll(babyResult); + } } } } + ids.clear(); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(babyModels)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index bb027b6..0555823 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -407,6 +407,10 @@ public class LisFacade { else if("2100001605".equals(model.getHospitalId())){ model.setVcCardNo(cardNo); } +// //昌邑市妇幼保健院 lis检查表中存的是病历号 需要用身份证号码转换成病历好查询 +// else if("2100001605".equals(model.getHospitalId())){ +// model.setVcCardNo(cardNo); //TODO +// } else { model.setVcCardNo(vcCardNo); } @@ -554,7 +558,13 @@ public class LisFacade { else if("2100001605".equals(pat.getHospitalId())) { vcCardNos.add(pat.getCardNo()); - }else { + } +// //昌邑市妇幼保健院 lis检查表中存的是病历号 需要用身份证号码转换成病历好查询 +// else if("2100001605".equals(pat.getHospitalId())){ +// vcCardNos.add(pat.getCardNo()); //TODO +// } + else + { vcCardNos.add(pat.getVcCardNo()); } -- 1.8.3.1