Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r28409 -r29064
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 28409)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 29064)
@@ -29,8 +29,10 @@
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
+import com.forgon.disinfectsystem.entity.assestmanagement.DiposableGoodsInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.invoicemanager.MaterialInvoice;
 import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail;
@@ -767,6 +769,26 @@
 						obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd,
 						obj.tousseTypeAndPackageSizeSql);
 			}
+			//一次性物品
+			if(obj.includeDisposableGoods){
+				amountSql += String
+						.format(" union all select " + obj.monthlyStr + " monthstr, sum(dgi.amount) amount "
+								+ "from %s ti inner join %s td on ti.tousseDefinition_id = td.id "
+								+ "inner join %s dgi on dgi.tousseDefinition_id=td.id "
+								+ " where ti.operationTime %s %s "
+								+ "%s %s %s %s "
+								+ "group by " 
+								+ obj.monthlyStr,
+								TousseInstance.class.getSimpleName(),
+								TousseDefinition.class.getSimpleName(),
+								DiposableGoodsInstance.class.getSimpleName(),
+								obj.betweenSql,
+								SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom),
+								obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,
+								obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd,
+								obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd,
+								obj.tousseTypeAndPackageSizeSql);
+			}
 			break;
 			
 		case "检查数量":
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r28913 -r29064
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 28913)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 29064)
@@ -867,7 +867,7 @@
 			reportParams.querySupplyRoom = departCoding;
 			reportParams.tousseTypes = TousseDefinition.PACKAGE_TYPE_DRESSING;
 			reportParams.tousseTypeAndPackageSizeSql = DataIndex.getTousseTypesAndPackageSizesFilterSQL(TousseDefinition.PACKAGE_TYPE_DRESSING, null);
-		    
+			reportParams.includeDisposableGoods = true;
 			reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3("ti.operationTime","mm");
 			int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3);
 			String sql = dataIndex.getWorkAmountByMaterialSQL("年度报表中的配包数量（按材料）",
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
===================================================================
diff -u -r27331 -r29064
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 27331)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 29064)
@@ -395,6 +395,7 @@
 		reportParams.tousseTypeAndPackageSizeSql = DataIndex
 				.getTousseTypesAndPackageSizesFilterSQL(
 						TousseDefinition.PACKAGE_TYPE_DRESSING, null);
+		reportParams.includeDisposableGoods = true;
 		int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3);
 		String sql = "select monthstr,sum(tl.amount) from ("
 				+ dataIndex.getWorkAmountByMaterialSQL("年度报表中的配包数量（按材料）",
@@ -759,6 +760,7 @@
 		
 		reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3("ti.operationTime","mm");
 		reportParams.tousseTypeAndPackageSizeSql = "";
+		reportParams.includeDisposableGoods = true;
 		int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3);
 		String sql = "select monthstr,sum(tl.amount) from ("
 				+ dataIndex.getWorkAmountByMaterialSQL("年度报表中的配包数量（按材料）",