Commit 9c597af69b1c4734ec2e906df1568f6af0efd56c
1 parent
a5891084b5
Exists in
master
and in
6 other branches
两癌
Showing 1 changed file with 8 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
View file @
9c597af
| ... | ... | @@ -1284,7 +1284,10 @@ |
| 1284 | 1284 | cervicalCancerListRequest.setQuarter(model.getQuarter()); |
| 1285 | 1285 | cervicalCancerListRequest.setYear(model.getYear()); |
| 1286 | 1286 | List<Map<String, Object>> data = (List <Map <String, Object>>)cervicalCancerService.queryCervicalCancerCount( cervicalCancerListRequest, userId); |
| 1287 | - datas.addAll(data); | |
| 1287 | + if(CollectionUtils.isNotEmpty(data)) | |
| 1288 | + { | |
| 1289 | + datas.addAll(data); | |
| 1290 | + } | |
| 1288 | 1291 | } |
| 1289 | 1292 | else |
| 1290 | 1293 | { |
| 1291 | 1294 | |
| ... | ... | @@ -1295,9 +1298,11 @@ |
| 1295 | 1298 | cancerScreeningRequest.setQuarter(model.getQuarter()); |
| 1296 | 1299 | cancerScreeningRequest.setYear(model.getYear()); |
| 1297 | 1300 | List<Map<String, Object>> data = (List <Map <String, Object>>)queryCancerScreeningCount(cancerScreeningRequest,userId).getObject(); |
| 1298 | - datas.addAll(data); | |
| 1301 | + if(CollectionUtils.isNotEmpty(data)) | |
| 1302 | + { | |
| 1303 | + datas.addAll(data); | |
| 1304 | + } | |
| 1299 | 1305 | } |
| 1300 | - | |
| 1301 | 1306 | } |
| 1302 | 1307 | } |
| 1303 | 1308 | try { |