From 3bb56d822ad1de56f55eedd5d48e633e0f14bb44 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Thu, 30 Jun 2022 08:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B-=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E5=A6=87=E5=B9=BC=E7=AE=A1=E7=90=86-=E5=AD=95=E4=BA=A7?=
 =?UTF-8?q?=E5=A6=87=E7=BB=9F=E8=AE=A1-=E5=BB=BA=E6=A1=A3=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 70d9765..2e1fd49 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
@@ -1381,8 +1381,12 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             while (iterator2.hasNext()) {
                 Patients next = iterator2.next();
                 Integer age = DateUtil.getAge(next.getBirth());
-                if (age != null) {
-                    if (age >= endAge || age <= startAge) {
+                if (age != null && null!=endAge) {
+                    if (age > endAge ) {
+                        iterator2.remove();
+                    }
+                }else if (age != null && null!=startAge) {
+                    if (age < startAge ) {
                         iterator2.remove();
                     }
                 }
-- 
1.8.3.1