Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java =================================================================== diff -u -r29262 -r29758 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java (.../WorkQualityCollectionReportImpl.java) (revision 29262) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java (.../WorkQualityCollectionReportImpl.java) (revision 29758) @@ -289,7 +289,9 @@ // 外来器械清洗总件数 workQualityCollectionDataIndex.getWashForeignMaterialAmountAllYear(list,reportParams); // 消毒物品工作量 + reportParams.includeDisposableGoods = false; workQualityCollectionDataIndex.getDisinfectGoodsQuantityAllYear(list,reportParams); + reportParams.includeDisposableGoods = true; reportParams.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = ""; // CSSD包装物品总包数 workQualityCollectionDataIndex.getPackingAmountAllYear(list,reportParams); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java =================================================================== diff -u -r29401 -r29758 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 29401) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java (.../DataIndex.java) (revision 29758) @@ -1085,7 +1085,7 @@ // 一次性物品的发货统计 if (obj.includeDisposableGoods) { amountSql += " union all "; - amountSql = String + amountSql += String .format("select " + obj.monthlyStr + " monthstr, sum(ii.amount) amount " + "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id " + "where ii.tousseType = '一次性物品' and i.sendTime %s %s "