From 45f5d0ebb18e236d85781eab465a4f5ddddd6fc3 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 18 Aug 2016 17:08:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E7=94=B5=E5=AD=90=E7=97=85?=
 =?UTF-8?q?=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyBookbuildingFacade.java | 18 ++++++-
 .../operate/web/facade/BabyCheckFacade.java        | 63 ++++------------------
 2 files changed, 26 insertions(+), 55 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 6dcd326..c75aee9 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
@@ -92,6 +92,16 @@ public class BabyBookbuildingFacade {
         BabyModelQuery babyQuery = new BabyModelQuery();
         babyQuery.setId(babyId);
         babyQuery.setYn(YnEnums.YES.getId());
+
+        //查询建档记录 得到pid 通过pid查询所有的儿童建档记录
+        List<BabyModel> builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
+        if (CollectionUtils.isNotEmpty(builds))
+        {
+            babyQuery.setId(null);
+            babyQuery.setPid(builds.get(0).getPid());
+        }
+
+
         List<Map<String, String>> list = new ArrayList<>();
         //查询建档记录
         List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
@@ -118,7 +128,13 @@ public class BabyBookbuildingFacade {
         }
         //查询儿童的基本信息
         BabyModel model = babyCheckFacade.getBabyModel(babyId, base);
-        babyCheckFacade.getBabyCheckList(babyId, model, list);
+
+        if(CollectionUtils.isNotEmpty(models)){
+            for(BabyModel babyModel:models){
+                babyCheckFacade.getBabyCheckList(babyModel.getId(), babyModel, list);
+            }
+        }
+
         resMap.put("baseInfo", base);
         resMap.put("checkList", list);
         br.setData(resMap);
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 7ebd22c..d102016 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
@@ -255,6 +255,15 @@ public class BabyCheckFacade {
                     checkRecord.put("monthAge", monthAge);
                     checkRecord.put("buildId", cmodel.getBuildId());
                     checkRecord.put("type","2");
+
+                    checkRecord.put("hospitalId",model.getHospitalId());
+                    //查询建档医院
+                    Organization org = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
+                    if (org != null) {
+                        checkRecord.put("hospitalName", org.getName());
+                    } else {
+                        checkRecord.put("hospitalName", "");
+                    }
                     list.add(checkRecord);
                 }
             }
@@ -304,60 +313,6 @@ public class BabyCheckFacade {
                 //母亲是否高危
                 if (!StringUtils.isEmpty(model.getMcertNo()))
                 {
-//                    PatientsQuery patientsQuery = new PatientsQuery();
-//                    patientsQuery.setCardNo(model.getMcertNo());
-//                    patientsQuery.setYn(YnEnums.YES.getId());
-//
-//
-//                    List listHighRisk = new ArrayList();
-//                    List<Patients> list = patientsService.queryPatient(patientsQuery);
-//                    Patients patients = null;
-//                    if (CollectionUtils.isNotEmpty(list)) {
-//                        patients = list.get(0);
-//                        base.setCardNo(patients.getCardNo());
-//                        base.setVcCardNo(patients.getVcCardNo());
-//                        AntExChuQuery antExChuQuery=new AntExChuQuery();
-//                        antExChuQuery.setParentId(patients.getId());
-//                        antExChuQuery.setYn(YnEnums.YES.getId());
-//                        //查询产前检查记录
-//                        List checkList = antenatalExaminationService.findAllByParentId(patients.getId());
-//
-//                        String highRisk = "";
-//                        if (CollectionUtils.isNotEmpty(checkList))
-//                        {
-//                            AntenatalExaminationModel m = (AntenatalExaminationModel)checkList.get(0);
-//                            highRisk = m.getRiskFactor();
-//                        }
-//                        else
-//                        {
-//
-//                            //获取初诊记录
-//                            List<AntExChuModel> antExChulist  =  antenatalExaminationService.queryAntExChu(antExChuQuery);
-//                            AntExChuModel antExChuModel=null;
-//                            if(CollectionUtils.isNotEmpty(antExChulist)){
-//                                antExChuModel=  antExChulist.get(0);
-//                            }
-//                            if (antExChuModel != null)
-//                            {
-//                                highRisk = antExChuModel.getHighrisk();
-//                            }
-//
-//                        }
-//
-//                        if (!StringUtils.isEmpty(highRisk))
-//                        {
-//                            listHighRisk = JsonUtil.toList(highRisk, List.class);
-//                        }
-
-//                    if (CollectionUtils.isNotEmpty(listHighRisk))
-//                    {
-//                        base.setHighRisk("高危");
-//                    }
-//                    else
-//                    {
-//                        base.setHighRisk("健康");
-//                    }
-
 
                     PatientsQuery patientsQuery = new PatientsQuery();
                     patientsQuery.setCardNo(model.getMcertNo());
-- 
1.8.3.1