From cd0e7383906fe811efe0237513b1d15c99e36e33 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 24 Jan 2018 17:09:46 +0800
Subject: [PATCH] 1

---
 .../operate/web/facade/AntenatalExaminationFacade.java       |  1 +
 .../lyms/platform/operate/web/result/HighScoreResult.java    | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 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 4bb8ecf..4e7cab2 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
@@ -860,6 +860,7 @@ public class AntenatalExaminationFacade {
         } catch (Exception e) {
             e.printStackTrace();
         }
+        highScoreResult.setLevel(HighScoreResult.filter(highScoreResult.getLevel()));
         return highScoreResult;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
index 87483ff..a435256 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
@@ -1,6 +1,7 @@
 package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.common.utils.StringUtils;
+import org.apache.commons.collections.CollectionUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -51,12 +52,15 @@ public class HighScoreResult {
     public static List filter(List<java.util.Map> level){
         List list = new ArrayList();
         List addEdList  = new ArrayList();
-        for(java.util.Map map :level){
-            if(!addEdList.contains(map.get("name"))){
-                list.add(map);
-                addEdList.add(map.get("name"));
+        if(CollectionUtils.isNotEmpty(level)){
+            for(java.util.Map map :level){
+                if(!addEdList.contains(map.get("name"))){
+                    list.add(map);
+                    addEdList.add(map.get("name"));
+                }
             }
         }
+
         return list;
     }
 
-- 
1.8.3.1