From 9c597af69b1c4734ec2e906df1568f6af0efd56c Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 10 Aug 2022 17:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=99=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/CancerScreeningFacade.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index e35103a..a045258 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -1284,7 +1284,10 @@ public class CancerScreeningFacade { cervicalCancerListRequest.setQuarter(model.getQuarter()); cervicalCancerListRequest.setYear(model.getYear()); List> data = (List >)cervicalCancerService.queryCervicalCancerCount( cervicalCancerListRequest, userId); - datas.addAll(data); + if(CollectionUtils.isNotEmpty(data)) + { + datas.addAll(data); + } } else { @@ -1295,9 +1298,11 @@ public class CancerScreeningFacade { cancerScreeningRequest.setQuarter(model.getQuarter()); cancerScreeningRequest.setYear(model.getYear()); List> data = (List >)queryCancerScreeningCount(cancerScreeningRequest,userId).getObject(); - datas.addAll(data); + if(CollectionUtils.isNotEmpty(data)) + { + datas.addAll(data); + } } - } } try { -- 1.8.3.1