Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java
===================================================================
diff -u -r36585 -r36898
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java	(.../StatisticalWorkloadHelper.java)	(revision 36585)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/StatisticalWorkloadHelper.java	(.../StatisticalWorkloadHelper.java)	(revision 36898)
@@ -15,6 +15,7 @@
 
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.forgon.disinfectsystem.common.CssdUtils;
@@ -26,6 +27,7 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.StatisticalWorkload;
 import com.forgon.disinfectsystem.jasperreports.service.dataindex.DataIndex;
 import com.forgon.disinfectsystem.reportforms.vo.ReportQueryParams;
+import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.SqlUtils;
@@ -35,6 +37,8 @@
  */
 @Component(value = "statisticalWorkloadHelper")
 public class StatisticalWorkloadHelper extends ReportHelper{
+	@Autowired
+	private ReportSqlUtil reportSqlUtil;
 	/**
 	 * 获取“消毒供应中心员工工作量统计报表”的数据..
 	 * @param startTime	统计的开始时间（精确到天如：2017-01-01 00:00）
@@ -114,13 +118,20 @@
 				packageSizeSql = SqlUtils.getStringFieldInLargeCollectionsPredicate("td.packageSize", packageSizeList);
 			}
 			String tousseTypeAndPackageSizeSql = String.format(" and %s and  %s ", tousseTypeSql, packageSizeSql);
-			
-			
+			String tousseGroupId = StrutsParamUtils.getPraramValue("tousseGroupId", "");
+			String tousseWhereSql = "";
+			if(StringUtils.isNotBlank(tousseGroupId) && !"全部".equals(tousseGroupId)){
+				tousseWhereSql += SqlUtils.getInStringListSql("tdc.tousseGroupId", SqlUtils.splitStringToSet(tousseGroupId, ","));
+			}
+			String instrumentSetTypeIds = StrutsParamUtils.getPraramValue("instrumentSetTypeIds", null);
+			if(StringUtils.isNotBlank(instrumentSetTypeIds)){
+				tousseWhereSql += reportSqlUtil.getInstrumentSetTypeSql(SqlUtils.splitStringToSet(instrumentSetTypeIds, ";",false));
+			}
 			ReportQueryParams params = new ReportQueryParams(objectDao);
 			params.betweenSql = betweenSql;
 			params.querySupplyRoom = querySupplyRoom;
 			params.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = "";
-			params.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = "";
+			params.tousseGroupSqlWithAliasOfTousseDefinitionIsTd = tousseWhereSql;
 			params.tousseTypeAndPackageSizeSql = tousseTypeAndPackageSizeSql;
 			//params.sqlLengthFunctionName = sqlLengthFunctionName;
 			params.tousseTypes = tousseTypes;