Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
===================================================================
diff -u -r33190 -r33216
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 33190)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 33216)
@@ -419,6 +419,8 @@
 			if(statisticTousseWorkLoadIncludeDisposableGoodsAmountObj != null){
 				reportParams.includeDisposableGoodsInTousse = statisticTousseWorkLoadIncludeDisposableGoodsAmountObj.optBoolean("装配", true);
 			}
+		}else{
+			reportParams.includeDisposableGoodsInTousse = true;
 		}
 		String sql = "select monthstr,sum(tl.amount) from ("
 				+ dataIndex.getWorkAmountByMaterialSQL("年度报表中的配包数量（按材料）",
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33190 -r33216
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33190)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33216)
@@ -902,6 +902,8 @@
 			if(StringUtils.isNotBlank(statisticTousseWorkLoadIncludeDisposableGoodsAmountStr)){
 				JSONObject statisticTousseWorkLoadIncludeDisposableGoodsAmountObj = JSONObject.fromObject(statisticTousseWorkLoadIncludeDisposableGoodsAmountStr);
 				reportParams.includeDisposableGoodsInTousse = statisticTousseWorkLoadIncludeDisposableGoodsAmountObj.optBoolean("装配", true);
+			}else{
+				reportParams.includeDisposableGoodsInTousse = true;
 			}
 			int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3);
 			String sql = dataIndex.getWorkAmountByMaterialSQL("年度报表中的配包数量（按材料）",
@@ -8785,6 +8787,8 @@
 					materialAmountSql += "union all ";
 					if(statisticTousseWorkLoadIncludeDisposableGoodsAmountObj !=null){
 						params.includeDisposableGoodsInTousse = statisticTousseWorkLoadIncludeDisposableGoodsAmountObj.optBoolean("装配", true);
+					}else{
+						params.includeDisposableGoodsInTousse = true;
 					}
 					//装配记录（配包数量）
 					materialAmountSql += String.format("select '配包数量' type,tl.userName,sum(tl.amount) amount from ("
@@ -8812,6 +8816,8 @@
 					materialAmountSql += "union all ";
 					if(statisticTousseWorkLoadIncludeDisposableGoodsAmountObj !=null){
 						params.includeDisposableGoodsInTousse = statisticTousseWorkLoadIncludeDisposableGoodsAmountObj.optBoolean("审核", true);
+					}else{
+						params.includeDisposableGoodsInTousse = true;
 					}
 					//审核记录
 					String reviewAmountByMaterialSql = String.format("select '审核数量' type,tl.userName,sum(tl.amount) amount from ("
@@ -8822,6 +8828,8 @@
 					
 					if(statisticTousseWorkLoadIncludeDisposableGoodsAmountObj !=null){
 						params.includeDisposableGoodsInTousse = statisticTousseWorkLoadIncludeDisposableGoodsAmountObj.optBoolean("灭菌", true);
+					}else{
+						params.includeDisposableGoodsInTousse = true;
 					}
 					materialAmountSql += " union all ";
 					
@@ -8834,6 +8842,8 @@
 					params.includeDisposableGoods = false;
 					if(statisticTousseWorkLoadIncludeDisposableGoodsAmountObj !=null){
 						params.includeDisposableGoodsInTousse = statisticTousseWorkLoadIncludeDisposableGoodsAmountObj.optBoolean("发货", false);
+					}else{
+						params.includeDisposableGoodsInTousse = false;
 					}
 					params.extraSelectColumns = ",i.sender userName";
 					params.groupBySql = " group by i.sender " ;
@@ -12248,6 +12258,8 @@
 		querySqlList.add(packingSql);
 		if(statisticTousseWorkLoadIncludeDisposableGoodsAmountObj !=null){
 			params.includeDisposableGoodsInTousse = statisticTousseWorkLoadIncludeDisposableGoodsAmountObj.optBoolean("装配", true);
+		}else{
+			params.includeDisposableGoodsInTousse = true;
 		}
 		//装配数量（按材料统计）
 		sql	+= " union all ";
@@ -12293,6 +12305,8 @@
 		sql	+= " union all ";
 		if(statisticTousseWorkLoadIncludeDisposableGoodsAmountObj !=null){
 			params.includeDisposableGoodsInTousse = statisticTousseWorkLoadIncludeDisposableGoodsAmountObj.optBoolean("发货", false);
+		}else{
+			params.includeDisposableGoodsInTousse = false;
 		}
 		params.extraSelectColumns = " ,td.name tousseName,td.tousseType";
 		params.groupBySql = " group by td.name,td.tousseType";