Commit 3bb56d822ad1de56f55eedd5d48e633e0f14bb44
1 parent
943e3361fc
Exists in
master
and in
6 other branches
秦皇岛-区域妇幼管理-孕产妇统计-建档统计bug修复
Showing 1 changed file with 6 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
3bb56d8
| ... | ... | @@ -1381,8 +1381,12 @@ |
| 1381 | 1381 | while (iterator2.hasNext()) { |
| 1382 | 1382 | Patients next = iterator2.next(); |
| 1383 | 1383 | Integer age = DateUtil.getAge(next.getBirth()); |
| 1384 | - if (age != null) { | |
| 1385 | - if (age >= endAge || age <= startAge) { | |
| 1384 | + if (age != null && null!=endAge) { | |
| 1385 | + if (age > endAge ) { | |
| 1386 | + iterator2.remove(); | |
| 1387 | + } | |
| 1388 | + }else if (age != null && null!=startAge) { | |
| 1389 | + if (age < startAge ) { | |
| 1386 | 1390 | iterator2.remove(); |
| 1387 | 1391 | } |
| 1388 | 1392 | } |