From 5cf77982575cb93d8b1d043f42b91c908a6f04db Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 3 Aug 2016 09:59:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyBookbuildingFacade.java | 45 ++++++++++++++-------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 61946a6..28680ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -825,6 +825,7 @@ public class BabyBookbuildingFacade { List models = null; if (!StringUtils.isEmpty(param.getCardNo())) { babyQuery.setCardId(param.getCardNo()); + babyQuery.setHospitalId(param.getHospitalId()); //通过查询孕妇 PatientsQuery puerperaQuery = new PatientsQuery(); @@ -861,23 +862,35 @@ public class BabyBookbuildingFacade { for (BabyModel model : models) { if (id.equals(model.getId())) { - Map buildRecords = new HashMap<>(); - buildRecords.put("id", model.getId()); - buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(model.getBuildDate())); - - //查询建档医院 - Organization org = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); - if (org != null) { - buildRecords.put("buildHospital", org.getName()); - } else { - buildRecords.put("buildHospital", ""); - } - result.setId(model.getId()); - result.setCardNo(model.getCardNo()); - result.setName(model.getName()); - result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); - list.add(buildRecords); + BabyModelQuery hospBuildRecordsQuery = new BabyModelQuery(); + hospBuildRecordsQuery.setYn(YnEnums.YES.getId()); + hospBuildRecordsQuery.setMcertNo(model.getMcertNo()); + List builds = babyBookbuildingService.queryBabyBuildByCond(hospBuildRecordsQuery); + if (CollectionUtils.isNotEmpty(builds)) + { + for(BabyModel build: builds) + { + Map buildRecords = new HashMap<>(); + buildRecords.put("id", build.getId()); + buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate())); + + //查询建档医院 + Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId())); + if (org != null) { + buildRecords.put("buildHospital", org.getName()); + } else { + buildRecords.put("buildHospital", ""); + } + + result.setId(build.getId()); + result.setCardNo(build.getCardNo()); + result.setName(build.getName()); + result.setMonthAge(DateUtil.getBabyMonthAge(build.getBirth(), new Date())); + list.add(buildRecords); + } + + } } result.setBuildRecords(list); -- 1.8.3.1