From 2d43c000a6af96404c1be2f40d27753850be791c Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 21 Mar 2017 18:00:12 +0800
Subject: [PATCH] update code

---
 .../operate/web/facade/MatDeliverFacade.java       | 30 +++++++++++++++++++++-
 .../platform/operate/web/facade/ViewFacade.java    |  5 ++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 8c1625d..aaff360 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -1605,12 +1606,39 @@ public class MatDeliverFacade {
             for (BabyModel babyModel : babyModelList) {
                 if (maternalDeliverModel.getParentId().equals(babyModel.getParentId())) {
                     NewBabyManagerQueryModel newBabyManagerQueryModel = new NewBabyManagerQueryModel();
+                    List<MaternalDeliverModel.Baby> babies = maternalDeliverModel.getBaby();
+                    if (CollectionUtils.isNotEmpty(babies))
+                    {
+                        for(MaternalDeliverModel.Baby baby : babies)
+                        {
+                            if (baby.getId() != null && baby.getId().equals(babyModel.getId()))
+                            {
+                                String time = baby.getDueTime();
+                                if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(time))
+                                {
+                                   SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+                                    try {
+                                        Date date = format.parse(time);
+                                        newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(date));
+                                    } catch (ParseException e) {
+                                       ExceptionUtils.catchException(e,"新生儿管理娩出时间格式异常"+time);
+                                    }
+
+                                }
+                                else
+                                {
+                                    newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
+                                }
+                                break;
+                            }
+                        }
+                    }
                     BeanUtils.copy(babyModel, newBabyManagerQueryModel);
                     newBabyManagerQueryModel.setMcertNo(DefenceUtils.getCardNo(babyModel.getMcertNo()));
                     newBabyManagerQueryModel.setMcertNo2(babyModel.getMcertNo());
                     newBabyManagerQueryModel.setAge(DateUtil.getAge(babyModel.getMbirth()));
                     newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
-                    newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
+//                    newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
                     newBabyManagerQueryModel.setMphone(DefenceUtils.getPhone(babyModel.getMphone()));
                     newBabyManagerQueryModel.setBirthDays(DateUtil.getDays(babyModel.getBirth(), new Date()));
                     newBabyManagerQueryModel.setBabyId(babyModel.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 6a11438..c69467a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -1527,11 +1527,12 @@ public class ViewFacade {
             }
 
             //母亲是否高危
-            if (!com.lyms.platform.common.utils.StringUtils.isEmpty(model.getMcertNo())) {
+            if (!com.lyms.platform.common.utils.StringUtils.isEmpty(model.getParentId())) {
 
                 PatientsQuery patientsQuery = new PatientsQuery();
-                patientsQuery.setCardNo(model.getMcertNo());
+//                patientsQuery.setCardNo(model.getMcertNo());
                 patientsQuery.setYn(YnEnums.YES.getId());
+                patientsQuery.setId(model.getParentId());
 
                 List<Patients> list = patientsService.queryPatient(patientsQuery);
                 if (CollectionUtils.isNotEmpty(list)) {
-- 
1.8.3.1