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 babyEyeChecks, List ids) { - Iterator iterator = babyEyeChecks.iterator(); - while (iterator.hasNext()) { - BabyEyeCheck babyEyeCheck = iterator.next(); + List 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> setDatas(List 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(); }