From 28f7543286f5b817cf08b0aabe39782a8c85b43c Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Tue, 29 Aug 2017 20:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java |  6 +++---
 .../operate/web/service/impl/BabyEyeCheckServiceImpl.java     | 11 ++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index 160dfc9..0b537a5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -504,10 +504,10 @@ public class BabyCheckFacade {
         Date lastDate = null;
         for (BabyModel b : models) {
             if(lastDate == null) {
-                lastDate = b.getCreated();
+                lastDate = b.getBuildDate();
             } else {
-                if (b.getCreated() != null && lastDate.getTime() < b.getCreated().getTime()) {
-                    lastDate = b.getCreated();
+                if (b.getBuildDate() != null && lastDate.getTime() < b.getBuildDate().getTime()) {
+                    lastDate = b.getBuildDate();
                 }
             }
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
index 476240f..4823640 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
@@ -312,17 +312,16 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
     }
 
     private void doFilter(List<BabyEyeCheck> babyEyeChecks, List<String> ids) {
-        Iterator<BabyEyeCheck> iterator = babyEyeChecks.iterator();
-        while (iterator.hasNext()) {
-            BabyEyeCheck babyEyeCheck = iterator.next();
+        List<BabyEyeCheck> deleteList = new ArrayList<>();
+        for (BabyEyeCheck babyEyeCheck : babyEyeChecks) {
             for (String id : ids) {
                 String value = (String) ReflectUtil.invoke(babyEyeCheck, "get" + StringUtils.captureName(id));
                 if(!"yang".equals(value)) {
-                    iterator.remove();
-                    return;
+                    deleteList.add(babyEyeCheck);
                 }
             }
         }
+        babyEyeChecks.removeAll(deleteList);
     }
 
     private List<Map<String, Object>> setDatas(List<BabyEyeCheck> babyEyeChecks) {
@@ -423,6 +422,8 @@ public class BabyEyeCheckServiceImpl  extends BaseServiceImpl implements BabyEye
                     && !"yang".equals(babyEyeCheck.getRedReflex())
                     && !"yang".equals(babyEyeCheck.getConjunctiva())
                     && !"yang".equals(babyEyeCheck.getCorneal())
+                    && !"yang".equals(babyEyeCheck.getExtEyelook())
+                    && !"yang".equals(babyEyeCheck.getNystagmus())
                     && !"yang".equals(babyEyeCheck.getLacrimalApparatus())) {
                 iterator.remove();
             }
-- 
1.8.3.1