From 75853c1304937b2329d88dc90db395a2a768c461 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 12 Dec 2017 17:17:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/operate/web/result/BabyPageResult.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
index 8e87cdc..e1a84ba 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
@@ -561,7 +561,7 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
 
         setBabyHeight(StringUtils.unitHandle(destModel.getBabyHeight(), UnitConstants.CM));
         setBabyHead(StringUtils.unitHandle(destModel.getBabyHead(), UnitConstants.CM));
-        if (StringUtils.isNotEmpty(destModel.getApgarScore()) && !"{}".equals(destModel.getApgarScore()))
+        if (StringUtils.isNotEmpty(destModel.getApgarScore()) && !"{}".equals(destModel.getApgarScore())&&!"null".equals(destModel.getApgarScore()))
         {
             Map<String,String> map = JsonUtil.getMap(destModel.getApgarScore());
             String as = (map.get("pf1") == null ? "" : map.get("pf1"))+"分 - "+(map.get("pf5") == null ?
-- 
1.8.3.1