From c5b1ea169265c24257593bd157fe7a36d2d87e70 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 7 Feb 2018 20:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=AB=98=E5=8D=B1=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=BF=94=E5=9B=9E=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/result/AntenatalExaminationResult.java      | 13 +++++++++++--
 .../lyms/platform/operate/web/result/AntexChuResult.java    | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index fd1dc20..9d86795 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -8,6 +8,7 @@ import com.lyms.platform.operate.web.facade.HosptialHighRiskFacade;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
 import scala.actors.threadpool.Arrays;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -374,14 +375,22 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
             if (StringUtils.isNotEmpty(destModel.getOtherRisk()) && !"{}".equals(destModel.getOtherRisk()) && !"[]".equals(destModel.getOtherRisk())) {
                 if (destModel.getOtherRisk().startsWith("[") && destModel.getOtherRisk().endsWith("]")) {
                     List<Map> list2 = JsonUtil.toList(destModel.getOtherRisk(), Map.class);
-                    for (Map map : list2) {
+                    Iterator<Map> listIterator = list2.iterator();
+                    while (listIterator.hasNext()){
+                        Map map = listIterator.next();
                         suppleOtherHigh(map);
+                        if(map.isEmpty()){
+                            listIterator.remove();
+                        }
                     }
                     setOtherRisk(list2);
                 } else if(org.apache.commons.lang.StringUtils.isNotEmpty(destModel.getOtherRisk())){
                     Map map = JsonUtil.str2Obj(destModel.getOtherRisk(), Map.class);
                     suppleOtherHigh(map);
-                    setOtherRisk(Arrays.asList(new Object[]{map}));
+                    if(!map.isEmpty()){
+                        setOtherRisk(Arrays.asList(new Object[]{map}));
+                    }
+
                 }
             }
         } catch (Exception e) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index 39553f0..b2994c1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -9,6 +9,7 @@ import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
 import com.lyms.platform.pojo.AntExChuModel;
 import scala.actors.threadpool.Arrays;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -1403,14 +1404,22 @@ public class AntexChuResult {
             if (StringUtils.isNotEmpty(antExChuModel.getOtherHighRisk()) && !"{}".equals(antExChuModel.getOtherHighRisk()) && !"[]".equals(antExChuModel.getOtherHighRisk())) {
                 if (antExChuModel.getOtherHighRisk().startsWith("[") && antExChuModel.getOtherHighRisk().endsWith("]")) {
                     List<Map> list2 = JsonUtil.toList(antExChuModel.getOtherHighRisk(), Map.class);
-                    for (Map map : list2) {
+
+                    Iterator<Map> listIterator = list2.iterator();
+                    while (listIterator.hasNext()){
+                        Map map = listIterator.next();
                         suppleOtherHigh(map);
+                        if(map.isEmpty()){
+                            listIterator.remove();
+                        }
                     }
                     setOtherHighRisk(list2);
                 } else {
                     Map map = JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class);
                     suppleOtherHigh(map);
-                    setOtherHighRisk(Arrays.asList(new Object[]{map}));
+                    if(!map.isEmpty()){
+                        setOtherHighRisk(Arrays.asList(new Object[]{map}));
+                    }
                 }
             }
 
-- 
1.8.3.1