Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r13124 -r13127 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13124) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13127) @@ -4022,7 +4022,7 @@ disposableGoodsInvoiceAmountPredicate = String.format(" (ii.diposable='是' and ii.disposableGoodsId in(%s)) ", disposableGoodsIdSql); // returnGoodsItemPredicate = String.format(" (rr.type!='一次性物品' or rr.disposableGoodsId in(%s)) ", disposableGoodsIdSql); returnGoodsItemPredicate = String.format(" (ri.disposableGoodsId in(%s)) ", disposableGoodsIdSql); - receiveRecordItemPredicate = String.format(" (rri.disposableGoodsId in(%s)) ", disposableGoodsIdSql); + receiveRecordItemPredicate = String.format(" (rri.type!='一次性物品' or rri.disposableGoodsId in(%s)) ", disposableGoodsIdSql); } if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)) {