From bed75002899942fcbe6bae2eb33cdd1c50db0929 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 11 Aug 2016 15:27:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 5d17d27..37c954b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -236,7 +236,7 @@ public class AntenatalExaminationFacade {
                     break;
                 }
                 //复诊
-                if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"{}".equals(model.getRiskFactor())) {
+                if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"[]".equals(model.getRiskFactor())) {
                     List list1 = JsonUtil.toList(model.getRiskFactor(), List.class);
                     highScoreResult = queryRisk(list1, needLevel);
                     next=false;
@@ -247,8 +247,14 @@ public class AntenatalExaminationFacade {
                     //风险因素
                     Map map1 = new HashMap();
                     map1.put("id", "");
-                    map1.put("name", map.get("fxysu"));
-                    highScoreResult.getHighRisk().add(map1);
+                    Object obj = map.get("fxysu");
+                    if(null!=obj&&!"null".equals(obj.toString())&&!"".equals(obj.toString())){
+                        map1.put("name", map.get("fxysu"));
+                        highScoreResult.getHighRisk().add(map1);
+                    }else {
+                        continue;
+                    }
+
                     //风险评分
                     Object idObj = map.get("fxpf");
                     if (null!=idObj&&!"null".equals(idObj.toString())&&!"".equals(idObj.toString())) {
@@ -285,7 +291,7 @@ public class AntenatalExaminationFacade {
                         if(!next){
                             break;
                         }
-                        if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"{}".equals(antExChuModel.getHighrisk())) {
+                        if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"[]".equals(antExChuModel.getHighrisk())) {
                             List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
                             highScoreResult = queryRisk(list2,true);
                             next=false;
@@ -295,8 +301,13 @@ public class AntenatalExaminationFacade {
                             //风险因素
                             Map map1 = new HashMap();
                             map1.put("id", "");
-                            map1.put("name", map.get("fxysu"));
-                            highScoreResult.getHighRisk().add(map1);
+                            Object obj = map.get("fxysu");
+                            if(null!=obj&&!"null".equals(obj.toString())&&!"".equals(obj.toString())){
+                                map1.put("name", map.get("fxysu"));
+                                highScoreResult.getHighRisk().add(map1);
+                            }else {
+                                continue;
+                            }
                             //风险评分
                             Object idObj = map.get("fxpf");
                             if (null!=idObj&&!"null".equals(idObj.toString())&&!"".equals(idObj.toString())) {
-- 
1.8.3.1