From 9405500f314394b33bec938d1f25bbd0df9df74b Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 2 Feb 2021 13:20:38 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/BabyBookbuildingFacade.java | 97 +++++++++++-----------
 1 file changed, 50 insertions(+), 47 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 5ed0592..15f4d5f 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
@@ -2277,67 +2277,70 @@ public class BabyBookbuildingFacade {
                             List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
 
                             if (CollectionUtils.isNotEmpty(models)) {
-                                BabyModel model = models.get(0);
-                                if (model != null) {
+                                for (BabyModel model : models)
+                                {
+                                    if (model != null) {
 
-                                    puerperaQuery.setCardNo(model.getMcertNo());
+                                        puerperaQuery.setCardNo(model.getMcertNo());
 
-                                    BabyInfoResult result = new BabyInfoResult();
+                                        BabyInfoResult result = new BabyInfoResult();
 
-                                    result.setPid(model.getPid());
-                                    result.setCardNo(model.getMcertNo());//母亲的身份证号码
-                                    result.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString());
-                                    if (model.getBirth() != null) {
-                                        result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
-                                    } else {
-                                        result.setMonthAge("");
-                                    }
+                                        result.setPid(model.getPid());
+                                        result.setCardNo(model.getMcertNo());//母亲的身份证号码
+                                        result.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString());
+                                        if (model.getBirth() != null) {
+                                            result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
+                                        } else {
+                                            result.setMonthAge("");
+                                        }
 
-                                    BabyModelQuery babyBuildQuery = new BabyModelQuery();
-                                   // babyBuildQuery.setYn(YnEnums.YES.getId());
-                                    babyBuildQuery.setPid(model.getPid());
-                                    List <BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyBuildQuery, "buildDate", Sort.Direction.DESC);
+                                        BabyModelQuery babyBuildQuery = new BabyModelQuery();
+                                        // babyBuildQuery.setYn(YnEnums.YES.getId());
+                                        babyBuildQuery.setPid(model.getPid());
+                                        List <BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyBuildQuery, "buildDate", Sort.Direction.DESC);
 
-                                    List <Map <String, String>> list = new ArrayList <>();
-                                    if (CollectionUtils.isNotEmpty(builds)) {
-                                        for (BabyModel build : builds) {
+                                        List <Map <String, String>> list = new ArrayList <>();
+                                        if (CollectionUtils.isNotEmpty(builds)) {
+                                            for (BabyModel build : builds) {
 
-                                            if (build == null || StringUtils.isEmpty(build.getHospitalId())) {
-                                                continue;
-                                            }
-                                            if (build.getHospitalId().equals(param.getHospitalId())) {
-                                                isCurrentHosp = true;
-                                                buildInfo = build;
-                                                buildInfo.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString());
-                                            }
+                                                if (build == null || StringUtils.isEmpty(build.getHospitalId())) {
+                                                    continue;
+                                                }
+                                                if (build.getHospitalId().equals(param.getHospitalId())) {
+                                                    isCurrentHosp = true;
+                                                    buildInfo = build;
+                                                    buildInfo.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString());
+                                                }
+
+                                                if (build != null && build.getYn() == YnEnums.YES.getId()) {
+                                                    result.setIsBuild(true);
+                                                }
 
-                                            if (build != null && build.getYn() == YnEnums.YES.getId()) {
-                                                result.setIsBuild(true);
-                                            }
 
+                                                Map <String, String> buildRecords = new HashMap <>();
+                                                buildRecords.put("id", build.getId());
+                                                buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate()));
+                                                buildRecords.put("hospitalId", build.getHospitalId());
+                                                //查询建档医院
+                                                Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId()));
+                                                if (org != null) {
+                                                    buildRecords.put("buildHospital", org.getName());
+                                                } else {
+                                                    buildRecords.put("buildHospital", "");
+                                                }
 
-                                            Map <String, String> buildRecords = new HashMap <>();
-                                            buildRecords.put("id", build.getId());
-                                            buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate()));
-                                            buildRecords.put("hospitalId", build.getHospitalId());
-                                            //查询建档医院
-                                            Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId()));
-                                            if (org != null) {
-                                                buildRecords.put("buildHospital", org.getName());
-                                            } else {
-                                                buildRecords.put("buildHospital", "");
+                                                list.add(buildRecords);
                                             }
 
-                                            list.add(buildRecords);
-                                        }
+                                            if (!isCurrentHosp) {
+                                                buildInfo = builds.get(0);
+                                            }
 
-                                        if (!isCurrentHosp) {
-                                            buildInfo = builds.get(0);
+                                            result.setBuildRecords(list);
                                         }
-
-                                        result.setBuildRecords(list);
+                                        results.add(result);
                                     }
-                                    results.add(result);
+
                                 }
 
                             } else {
-- 
1.8.3.1