Commit d979d5fbf18b615bab9ec453b622d88f971dde69
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 2 changed files
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
d979d5f
| ... | ... | @@ -504,10 +504,10 @@ |
| 504 | 504 | Date lastDate = null; |
| 505 | 505 | for (BabyModel b : models) { |
| 506 | 506 | if(lastDate == null) { |
| 507 | - lastDate = b.getCreated(); | |
| 507 | + lastDate = b.getBuildDate(); | |
| 508 | 508 | } else { |
| 509 | - if (b.getCreated() != null && lastDate.getTime() < b.getCreated().getTime()) { | |
| 510 | - lastDate = b.getCreated(); | |
| 509 | + if (b.getBuildDate() != null && lastDate.getTime() < b.getBuildDate().getTime()) { | |
| 510 | + lastDate = b.getBuildDate(); | |
| 511 | 511 | } |
| 512 | 512 | } |
| 513 | 513 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
d979d5f
| ... | ... | @@ -312,17 +312,16 @@ |
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | private void doFilter(List<BabyEyeCheck> babyEyeChecks, List<String> ids) { |
| 315 | - Iterator<BabyEyeCheck> iterator = babyEyeChecks.iterator(); | |
| 316 | - while (iterator.hasNext()) { | |
| 317 | - BabyEyeCheck babyEyeCheck = iterator.next(); | |
| 315 | + List<BabyEyeCheck> deleteList = new ArrayList<>(); | |
| 316 | + for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { | |
| 318 | 317 | for (String id : ids) { |
| 319 | 318 | String value = (String) ReflectUtil.invoke(babyEyeCheck, "get" + StringUtils.captureName(id)); |
| 320 | 319 | if(!"yang".equals(value)) { |
| 321 | - iterator.remove(); | |
| 322 | - return; | |
| 320 | + deleteList.add(babyEyeCheck); | |
| 323 | 321 | } |
| 324 | 322 | } |
| 325 | 323 | } |
| 324 | + babyEyeChecks.removeAll(deleteList); | |
| 326 | 325 | } |
| 327 | 326 | |
| 328 | 327 | private List<Map<String, Object>> setDatas(List<BabyEyeCheck> babyEyeChecks) { |
| ... | ... | @@ -423,6 +422,8 @@ |
| 423 | 422 | && !"yang".equals(babyEyeCheck.getRedReflex()) |
| 424 | 423 | && !"yang".equals(babyEyeCheck.getConjunctiva()) |
| 425 | 424 | && !"yang".equals(babyEyeCheck.getCorneal()) |
| 425 | + && !"yang".equals(babyEyeCheck.getExtEyelook()) | |
| 426 | + && !"yang".equals(babyEyeCheck.getNystagmus()) | |
| 426 | 427 | && !"yang".equals(babyEyeCheck.getLacrimalApparatus())) { |
| 427 | 428 | iterator.remove(); |
| 428 | 429 | } |