Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r26429 -r26457
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 26429)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 26457)
@@ -653,12 +653,14 @@
 			
 		case "检查数量":
 			if(!obj.getIsOnlyQueryComboTousse()){
+				//非拆分包
 				amountSql = String
 						.format("select (sum(mi.count) * pr.amount) amount ,pr.inspector userName, td.tousseType,td.name tousseName "
 								+ "from PackingRecord pr inner join TousseDefinition td on pr.tousseDefinitionId = td.id "
 								+ "inner join MaterialInstance mi on td.id = mi.tousse_id "
 								+ "where pr.packTime %s %s "
-								+ "and pr.inspector is not null and %s(pr.inspector)<>0 %s %s %s %s "
+								+ " and pr.splitTousseName is null"
+								+ " and pr.inspector is not null and %s(pr.inspector)<>0 %s %s %s %s "
 								+ "group by pr.inspector,td.tousseType,td.name,pr.amount ",
 								obj.betweenSql,
 								SqlUtils.get_InSql_Extra("pr.orgUnitCoding", obj.querySupplyRoom),
@@ -667,6 +669,21 @@
 								obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd,
 								obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd,
 								obj.tousseTypeAndPackageSizeSql);
+				//拆分小包
+				amountSql += String
+						.format(" union all select sum(mi.count) amount ,pr.inspector userName, td.tousseType,td.name tousseName "
+								+ "from PackingRecord pr inner join TousseDefinition td on pr.tousseDefinitionId = td.parentID "
+								+ "inner join MaterialInstance mi on td.id = mi.tousse_id "
+								+ "where pr.packTime %s %s "
+								+ "and pr.inspector is not null and %s(pr.inspector)<>0 %s %s %s %s "
+								+ "group by pr.inspector,td.tousseType,td.name ",
+								obj.betweenSql,
+								SqlUtils.get_InSql_Extra("pr.orgUnitCoding", obj.querySupplyRoom),
+								obj.sqlLengthFunctionName,
+								obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,
+								obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd,
+								obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd,
+								obj.tousseTypeAndPackageSizeSql);
 			}
 			if(obj.getIsQueryCom()){
 				if(!obj.getIsOnlyQueryComboTousse()){