From 2e1ab3e7ca68f046db50137911e7e00cdfd07005 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 26 May 2017 16:50:35 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/BabyBookbuildingFacade.java    | 10 +++++++++-
 .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java  |  2 +-
 .../src/main/resources/spring/applicationContext.xml           |  2 +-
 3 files changed, 11 insertions(+), 3 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 3c8e098..6e388b5 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
@@ -1134,7 +1134,15 @@ public class BabyBookbuildingFacade {
                 doctorObj.put("name", "产科病房");
             } else {
                 Users users = usersService.getUsers(Integer.parseInt(model.getBuildDoctor()));
-                doctorObj.put("name", users.getName());
+                if (users != null)
+                {
+                    doctorObj.put("name", users.getName());
+                }
+                else
+                {
+                    doctorObj.put("name", "");
+                }
+
             }
             result.setBuildDoctor(doctorObj);
         }
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 ac3ce4e..76bf1fd 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
@@ -1204,7 +1204,7 @@ public class BabyCheckFacade {
 
         boolean isShowNavel =  false;
         int monthes = DateUtil.getBabyAgeMonth(birthDate,date);
-        if (monthes == 1 || monthes == 3)
+        if (monthes == 1 || monthes == 1 || monthes == 3)
         {
             isShowNavel =  true;
         }
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext.xml b/platform-operate-api/src/main/resources/spring/applicationContext.xml
index e13051a..d4fbc77 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext.xml
@@ -36,7 +36,7 @@
     <import resource="classpath:/spring/applicationContext-slave.xml"/>-->
 
     <!--医院单机版的时候需要打开-->
-    <import resource="classpath:/spring/applicationContext-quartz.xml"/>
+    <!--<import resource="classpath:/spring/applicationContext-quartz.xml"/>-->
 
 
     <task:annotation-driven/>
-- 
1.8.3.1