Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/vo/ReportQueryParams.java
===================================================================
diff -u -r26059 -r26087
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/vo/ReportQueryParams.java	(.../ReportQueryParams.java)	(revision 26059)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/vo/ReportQueryParams.java	(.../ReportQueryParams.java)	(revision 26087)
@@ -131,17 +131,17 @@
 	/**
 	 * 只查询聚合包
 	 */
-	public boolean isOnlyQueryCom = false;
+	public boolean isOnlyQueryComboTousse = false;
 	
 	/**
 	 * 获取是否只查询聚合包
 	 * @return
 	 */
-	public boolean getIsOnlyQueryCom(){
+	public boolean getIsOnlyQueryComboTousse(){
 		if(TousseDefinition.PACKAGE_TYPE_COMBO.equals(tousseTypes)){
-			isOnlyQueryCom = true;
+			isOnlyQueryComboTousse = true;
 		}
-		return isOnlyQueryCom;
+		return isOnlyQueryComboTousse;
 	}
 
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r26077 -r26087
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 26077)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 26087)
@@ -462,7 +462,7 @@
 			}
 			// 按包定义的材料数量统计
 			else{
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql = String
 							.format("select sum(mi.count) amount ,case when (ti.operator is null) then '系统用户' else ti.operator end userName, td.tousseType,td.name tousseName "
 									+ "%s from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id "
@@ -480,7 +480,7 @@
 									obj.extraGroupBy);
 				}
 				if(obj.getIsQueryCom()){
-					if(!obj.getIsOnlyQueryCom()){
+					if(!obj.getIsOnlyQueryComboTousse()){
 						amountSql += " union all ";
 					}
 					amountSql += String
@@ -548,7 +548,7 @@
 			break;
 			
 		case "检查数量":
-			if(!obj.getIsOnlyQueryCom()){
+			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 "
@@ -565,7 +565,7 @@
 								obj.tousseTypeAndPackageSizeSql);
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -607,7 +607,7 @@
 			break;
 			
 		case "审核数量":
-			if(!obj.getIsOnlyQueryCom()){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select sum(mi.count) amount ,ti.reviewer userName, td.tousseType,td.name tousseName "
 								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id "
@@ -624,7 +624,7 @@
 								obj.tousseTypeAndPackageSizeSql);
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -644,7 +644,7 @@
 			}
 			break;
 		case "灭菌数量":
-			if(!obj.getIsOnlyQueryCom()){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select sum(mi.count) amount ,ti.sterilizationUser userName, td.tousseType,td.name tousseName "
 								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id inner join MaterialInstance mi on mi.tousse_id = td.id "
@@ -660,7 +660,7 @@
 								obj.tousseTypeAndPackageSizeSql);			
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -679,7 +679,7 @@
 			}
 			break;
 		case "发货数量":
-			if(!obj.getIsOnlyQueryCom()){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select sum(mi.count) amount ,i.sender userName, td.tousseType,td.name tousseName "
 								+ "from Invoice i inner join TousseInstance ti on ti.invoice_id = i.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id inner join MaterialInstance mi on mi.tousse_id = td.id "
@@ -695,7 +695,7 @@
 								obj.tousseTypeAndPackageSizeSql);
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -767,7 +767,7 @@
 			
 			
 		case "核对数量":
-			if(!obj.getIsOnlyQueryCom()){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select sum(mi.count) amount ,i.assistantSender userName, td.tousseType,td.name tousseName "
 								+ "from Invoice i inner join TousseInstance ti on ti.invoice_id = i.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id inner join MaterialInstance mi on mi.tousse_id = td.id "
@@ -796,7 +796,7 @@
 				}
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -816,7 +816,7 @@
 			break;
 			
 		case "下送数量":
-			if(!obj.getIsOnlyQueryCom()){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select sum(mi.count) amount ,i.personInCharge userName, td.tousseType,td.name tousseName "
 								+ "from Invoice i inner join TousseInstance ti on ti.invoice_id = i.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id inner join MaterialInstance mi on mi.tousse_id = td.id "
@@ -847,7 +847,7 @@
 				}
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -984,7 +984,7 @@
 			String selectUserNameSql = ",case when (ti.operator is null) then '系统用户' else ti.operator end userName ";
 			String selectTousseTypeSql = ",td.tousseType tousseType ";
 			String selectTousseNameSql = ",td.name tousseName ";
-			if(!obj.getIsOnlyQueryCom()){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select %s count(*) amount %s %s %s %s "
 								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id %s "
@@ -1007,7 +1007,7 @@
 								getMultipleFieldsGroupBySql(obj,",ti.operator"));
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -1084,7 +1084,7 @@
 		
 
 		case "审核数量":
-			if(!obj.getIsOnlyQueryCom()){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select count(*) amount ,ti.reviewer userName, td.tousseType,td.name tousseName "
 								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id "
@@ -1100,7 +1100,7 @@
 								obj.tousseTypeAndPackageSizeSql);
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -1137,7 +1137,7 @@
 		
 		// 支持按日期分组查询灭菌数量
 		case "灭菌数量":
-			if(!obj.getIsOnlyQueryCom()){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select %s count(*) amount %s %s %s %s "
 								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id %s "
@@ -1162,7 +1162,7 @@
 								getMultipleFieldsGroupBySql(obj,",ti.sterilizationUser"));
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -1189,7 +1189,7 @@
 			}
 			break;
 		case "发货数量":
-			if(!obj.isOnlyQueryCom){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				if (obj.includeTousses) {
 					amountSql = String
 							.format("select sum(ii.amount) amount ,i.sender userName, td.tousseType, td.name tousseName "
@@ -1226,7 +1226,7 @@
 				}
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -1292,7 +1292,7 @@
 			break;
 			
 		case "核对数量":
-			if(!obj.isOnlyQueryCom){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select sum(ii.amount) amount ,i.assistantSender userName, td.tousseType, td.name tousseName "
 								+ "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id inner join TousseDefinition td on td.id=ii.tousseDefinitionId "
@@ -1308,7 +1308,7 @@
 								obj.tousseTypeAndPackageSizeSql);
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String
@@ -1347,7 +1347,7 @@
 			break;
 			
 		case "签收数量":
-			if(!obj.getIsOnlyQueryCom()){
+			if(!obj.getIsOnlyQueryComboTousse()){
 				amountSql = String
 						.format("select count(*) amount ,ti.signedUser userName, td.tousseType, td.name tousseName "
 								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id=td.id "
@@ -1363,7 +1363,7 @@
 								obj.tousseTypeAndPackageSizeSql);
 			}
 			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryCom()){
+				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
 				amountSql += String