From dc2ff214aa82313c850e0afd9fe0f6cf3b86c1c0 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 3 Jan 2018 09:57:54 +0800 Subject: [PATCH] bbbbbb --- .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 416abcb..9b975f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -828,6 +828,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } // 建档孕周 1=孕早期(0~12周) 2=孕中期(13-27) 3=孕晚期(28~42) + // ageType 1=全部年龄 2=20岁以下 3=20-30岁 4=30-40岁 5=40岁以上 private void doFilter(List patients, Integer ageType, Integer patientType) { if(patientType != null) { Iterator iterator = patients.iterator(); @@ -853,15 +854,15 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService iterator.remove(); continue; } - if(ageType == 2 && age >= 20) { + if(ageType == 2 && age > 20) { iterator.remove(); continue; } - if(ageType == 3 && age >= 30) { + if(ageType == 3 && (age > 30 || age < 20)) { iterator.remove(); continue; } - if(ageType == 4 && age >= 40) { + if(ageType == 4 && (age > 40 || age < 30)) { iterator.remove(); continue; } -- 1.8.3.1