From 2b0f5715e39d4f3fa7fe9aeb91d89f343211fcdd Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 25 Aug 2016 15:04:04 +0800
Subject: [PATCH] code update

---
 .../operate/web/facade/BabyBookbuildingFacade.java | 72 ++++++++++++++++------
 1 file changed, 52 insertions(+), 20 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 f7ebd62..c503583 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
@@ -1570,33 +1570,65 @@ public class BabyBookbuildingFacade {
             PatientsQuery patientsQuery = new PatientsQuery();
             patientsQuery.setYn(YnEnums.YES.getId());
 
-            if (!StringUtils.isEmpty(cardNo));
+            if (StringUtils.isNotEmpty(cardNo));
             {
-                patientsQuery.setCardNo(cardNo);
-                List<Patients> patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
-                if (CollectionUtils.isNotEmpty(patients))
+
+
+                BabyModelQuery babyQuery = new BabyModelQuery();
+                babyQuery.setYn(YnEnums.YES.getId());
+                babyQuery.setMcertNo(cardNo);
+                //获取最近一次的建档记录
+                List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
+                if (CollectionUtils.isNotEmpty(models))
+                {
+                    BabyModel babyModel = models.get(0);
+
+                    result = new BabyBuildResult();
+                    result.setMommyName(babyModel.getMname());
+                    result.setMommyCertificateTypeId(babyModel.getMcertTypeId());
+                    result.setMommyCertificateNum(babyModel.getMcertNo());
+                    result.setMommyBirthday(DateUtil.getyyyy_MM_dd(babyModel.getMbirth()));
+
+                    result.setMommyProfessionTypeId(babyModel.getMproTypeId());
+                    result.setMommyPhone(babyModel.getMphone());
+                    result.setFatherName(babyModel.getFname());
+                    result.setFatherPhone(babyModel.getFphone());
+                    result.setFatherBirthday(DateUtil.getyyyy_MM_dd(babyModel.getFbirth()));
+                    result.setFatherLevelId(babyModel.getfLevelId());
+                    result.setServiceStatus(String.valueOf(babyModel.getServiceStatus()));
+                    result.setServiceType(String.valueOf(babyModel.getServiceType()));
+
+
+                    result.setFatherProfessionTypeId(babyModel.getFproTypeId());
+                }
+                else
                 {
-                    Patients patient = patients.get(0);
-                    if (patients != null)
+                    patientsQuery.setCardNo(cardNo);
+                    List<Patients> patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
+                    if (CollectionUtils.isNotEmpty(patients))
                     {
+                        Patients patient = patients.get(0);
+                        if (patients != null)
+                        {
 
-                        result = new BabyBuildResult();
-                        result.setMommyName(patient.getUsername());
-                        result.setMommyCertificateTypeId(patient.getPcerteTypeId());
-                        result.setMommyCertificateNum(patient.getCardNo());
-                        result.setMommyBirthday(DateUtil.getyyyy_MM_dd(patient.getBirth()));
+                            result = new BabyBuildResult();
+                            result.setMommyName(patient.getUsername());
+                            result.setMommyCertificateTypeId(patient.getPcerteTypeId());
+                            result.setMommyCertificateNum(patient.getCardNo());
+                            result.setMommyBirthday(DateUtil.getyyyy_MM_dd(patient.getBirth()));
 
-                        result.setMommyProfessionTypeId(patient.getProvinceId());
-                        result.setMommyPhone(patient.getPhone());
-                        result.setFatherName(patient.getHusbandName());
-                        result.setFatherPhone(patient.getHusbandPhone());
-                        result.setFatherBirthday(DateUtil.getyyyy_MM_dd(patient.getHusbandBirth()));
-                        result.setFatherLevelId(patient.getHlevelTypeId());
-                        result.setServiceStatus(String.valueOf(patient.getServiceStatus()));
-                        result.setServiceType(String.valueOf(patient.getServiceType()));
+                            result.setMommyProfessionTypeId(patient.getProvinceId());
+                            result.setMommyPhone(patient.getPhone());
+                            result.setFatherName(patient.getHusbandName());
+                            result.setFatherPhone(patient.getHusbandPhone());
+                            result.setFatherBirthday(DateUtil.getyyyy_MM_dd(patient.getHusbandBirth()));
+                            result.setFatherLevelId(patient.getHlevelTypeId());
+                            result.setServiceStatus(String.valueOf(patient.getServiceStatus()));
+                            result.setServiceType(String.valueOf(patient.getServiceType()));
 
 
-                        result.setFatherProfessionTypeId(patient.getHprofessionTypeId());
+                            result.setFatherProfessionTypeId(patient.getHprofessionTypeId());
+                        }
                     }
                 }
             }
-- 
1.8.3.1