Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r25134 -r25138
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 25134)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 25138)
@@ -2483,7 +2483,7 @@
 			
 			// 灭菌器使用炉次
 			getCountFrequencyOfMonth(startAndEndDays, list,querySupplyRoom);
-			// 灭菌物品总包数（普通灭菌、代理灭菌、外部代理灭菌）的统计，上下半年数据.
+			// 灭菌物品总包数（普通灭菌、代理灭菌、外来器械灭菌）的统计，上下半年数据.
 			getSterilizationAmount(startAndEndDays, list,querySupplyRoom);
 			// 发放无菌物品总件数
 			getSendTousseAmount(startAndEndDays, list,querySupplyRoom);
@@ -3025,7 +3025,7 @@
 			getPackingTousseMaterialAmountAllYear(list,reportParams);
 			// 灭菌器使用炉次
 			getCountFrequencyOfMonthAllYear(year, list,querySupplyRoom);
-			// 灭菌物品总包数（普通灭菌、代理灭菌、外部代理灭菌）的统计，全年数据.
+			// 灭菌物品总包数（普通灭菌、代理灭菌、外来器械灭菌）的统计，全年数据.
 			getSterilizationAmountAllYear(year, list,querySupplyRoom);
 			// 发放无菌物品总包数（器械包）
 			getSendTousseAmountAllYear(list,reportParams);
@@ -6451,7 +6451,7 @@
 	}
 	
 	/**
-	 * 灭菌物品总包数（普通灭菌、代理灭菌、外部代理灭菌）的统计，上下半年数据.
+	 * 灭菌物品总包数（普通灭菌、代理灭菌、外来器械灭菌）的统计，上下半年数据.
 	 * @param startAndEndDays
 	 * @param list
 	 * @param querySupplyRoom
@@ -6484,7 +6484,7 @@
 			foreignTousseBean.setRowNum(list.size()+3);
 			tousseBean.setTitle("灭菌物品总包数（普通灭菌）");
 			proxyTousseBean.setTitle("灭菌物品总包数（代理灭菌）");
-			foreignTousseBean.setTitle("灭菌物品总包数（外部代理灭菌）");
+			foreignTousseBean.setTitle("灭菌物品总包数（外来器械灭菌）");
 			Integer amount = 0;
 			Integer proxyamount = 0;
 			Integer foreignamount = 0;
@@ -6511,7 +6511,7 @@
 		}
 	}
 	/**
-	 * 灭菌物品总包数（普通灭菌、代理灭菌、外部代理灭菌）的统计，全年数据.
+	 * 灭菌物品总包数（普通灭菌、代理灭菌、外来器械灭菌）的统计，全年数据.
 	 * @param year
 	 * @param list
 	 * @param querySupplyRoom
@@ -6543,7 +6543,7 @@
 		foreignTousseBean.setRowNum(list.size()+3);
 		tousseBean.setTitle("灭菌物品总包数（普通灭菌）");
 		proxyTousseBean.setTitle("灭菌物品总包数（代理灭菌）");
-		foreignTousseBean.setTitle("灭菌物品总包数（外部代理灭菌）");
+		foreignTousseBean.setTitle("灭菌物品总包数（外来器械灭菌）");
 		String key = "";
 		Integer amount = 0;
 		Integer proxyamount = 0;
@@ -9312,7 +9312,8 @@
 			// 灭菌外来手术器械包数
 			params.tousseTypeAndPackageSizeSql = DataIndex
 					.getTousseTypesAndPackageSizesFilterSQL(
-							TousseDefinition.PACKAGE_TYPE_FOREIGN, null);
+							TousseDefinition.PACKAGE_TYPE_FOREIGN + ","
+									+ TousseDefinition.PACKAGE_TYPE_SPLIT, null);
 			String sterileForeignSql = String.format("select sum(tl.amount) amount from ("
 					+DataIndex.getWorkAmountByPackageSQL("灭菌数量", params)
 					+ ") tl ");
@@ -12397,6 +12398,7 @@
 		params.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = tousseGroupSqlWithAliasOfTousseDefinitionIsTd;
 		params.tousseTypeAndPackageSizeSql = tousseTypeAndPackageSizeSql;
 		params.sqlLengthFunctionName = sqlLengthFunctionName;
+		params.tousseTypes = tousseTypes;
 		
 		String isDisableIDCardFalseSqlCondition = "";
 		String taskGroupFalseSqlCondition = "";
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/DataIndex.java
===================================================================
diff -u -r25134 -r25138
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/DataIndex.java	(.../DataIndex.java)	(revision 25134)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/DataIndex.java	(.../DataIndex.java)	(revision 25138)
@@ -431,12 +431,20 @@
 			// 判断是否需要统计单独清洗的材料的数量
 			if ("全部".equals(obj.tousseTypes) || StringUtils.isBlank(obj.tousseTypes)
 					|| obj.tousseTypes.indexOf("材料") >= 0) {
-				amountSql += " union all ";
-				amountSql += String
-						.format("select wr.operator userName,wrm.amount amount,md.name tousseName,'材料' tousseType "
-								+ getWashMaterialAmountSqlFromTousseTypeIsMaterial()
-								+ "and wr.orgUnitCoding = '%s' and wr.endDate %s",
-								obj.querySupplyRoom, obj.betweenSql);
+
+				if (StringUtils
+						.isBlank(obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd)
+						&& StringUtils
+								.isBlank(obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd)
+						&& StringUtils
+								.isBlank(obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd)) {
+					amountSql += " union all ";
+					amountSql += String
+							.format("select wr.operator userName,wrm.amount amount,md.name tousseName,'材料' tousseType "
+									+ getWashMaterialAmountSqlFromTousseTypeIsMaterial()
+									+ "and wr.orgUnitCoding = '%s' and wr.endDate %s",
+									obj.querySupplyRoom, obj.betweenSql);
+				}
 			}
 			
 			break;