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 {