From fc3559ee3cf3df292f717ec5a32cd74de29cb68f Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Thu, 13 Dec 2018 18:47:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E6=8A=A5=E5=91=8A=E5=8D=A1?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/MatDeliverController.java  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
index c639d9c..28a3d01 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
@@ -341,8 +341,16 @@ public class MatDeliverController extends BaseController{
                     map.put("yc","");
                     map.put("cc","");
                 }*/
-                map.put("yc",queryModel.getGravidity());
-                map.put("cc",queryModel.getDueCount());
+                if(null == queryModel.getGravidity()){
+                    map.put("yc","");
+                }else{
+                    map.put("yc",queryModel.getGravidity());
+                }
+                if(null == queryModel.getDueCount()){
+                    map.put("cc","");
+                }else{
+                    map.put("cc",queryModel.getDueCount());
+                }
                 map.put("week",queryModel.getDueWeek());
                 HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), false);
                 //妊娠期高危因素
@@ -350,9 +358,8 @@ public class MatDeliverController extends BaseController{
                 String a = "";
                 String m = "";
                 String y = "";
-                /*Map<String,Object> amy = new HashMap<String,Object>();
-                amy = queryModel.getMyzd();
-                if(!amy.isEmpty()){
+                Map<String,Object> amy = queryModel.getMyzd();
+                if(null != amy && amy.size() > 0){
                     if(true == (boolean)amy.get("0")){
                         a = "√";
                     }
@@ -364,7 +371,7 @@ public class MatDeliverController extends BaseController{
                     if(true == (boolean)amy.get("2")){
                         y = "√";
                     }
-                }*/
+                }
                 map.put("A",a);
                 map.put("M",m);
                 map.put("Y",y);
-- 
1.8.3.1