Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r37805 -r37951
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 37805)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 37951)
@@ -287,6 +287,17 @@
 			}
 		}
 		
+		//回收开始时间ZSRY-84
+		String recyclingTimeStart = sqlWhereParamMap.get("recyclingTimeStart");
+		if(StringUtils.isNotBlank(recyclingTimeStart)){
+			sqlBuilder.append(String.format(" AND po.recyclingTime >= %s ",parseStartTime(recyclingTimeStart,true)));
+		}
+		//回收结束时间ZSRY-84
+		String recyclingTimeEnd = sqlWhereParamMap.get("recyclingTimeEnd");
+		if(StringUtils.isNotBlank(recyclingTimeEnd)){
+			sqlBuilder.append(String.format(" AND po.recyclingTime < %s ",parseStartTime(recyclingTimeEnd,true)));
+		}
+		
 		//过滤条件：灭菌
 		//灭菌炉名称
 		String sterilizerName = sqlWhereParamMap.get("sterilizerName");
@@ -464,6 +475,17 @@
 				}
 			}
 		}
+		//器械包类型ZSRY-84
+		String tousseType = sqlWhereParamMap.get("tousseType");
+		if (StringUtils.isNotBlank(tousseType) && tousseType.indexOf("全部") == -1) { 
+			String[] tousseTypes = tousseType.split(", ");
+			if(tousseTypes.length == 1){
+				sqlBuilder.append(String.format(" AND (po.tousseDefinition.tousseType = '%s') ",tousseTypes[0]));
+			}else{
+				sqlBuilder.append(String.format(" AND (%s) ",
+						SqlUtils.getStringFieldInLargeCollectionsPredicate("po.tousseDefinition.tousseType", Arrays.asList(tousseTypes))));
+			}
+		}
 		//科室
 		String department = sqlWhereParamMap.get("department");
 		if (StringUtils.isNotBlank(department)){