Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r29382 -r30414
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 29382)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 30414)
@@ -2855,6 +2855,86 @@
 			}
 		}
 		
+		String locationForDisplay = StrutsParamUtils.getPraramValue("locationForDisplay",null);		//位置
+		if (StringUtils.isNotBlank(locationForDisplay)){
+			try {
+				locationForDisplay = URLDecoder.decode(locationForDisplay, "utf-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			sqlBuilder.append(String.format(" AND po.locationForDisplay = '%s' ",locationForDisplay));
+		}
+		
+		String recyclingUser = StrutsParamUtils.getPraramValue("recyclingUser",null);				//回收人
+		if (StringUtils.isNotBlank(recyclingUser)){
+			try {
+				recyclingUser = URLDecoder.decode(recyclingUser, "utf-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			sqlBuilder.append(String.format(" AND po.recyclingUser = '%s' ",recyclingUser));
+		}
+		
+		String recyclingOperator = StrutsParamUtils.getPraramValue("recyclingOperator",null);		//回收清点人
+		if (StringUtils.isNotBlank(recyclingOperator)){
+			try {
+				recyclingOperator = URLDecoder.decode(recyclingOperator, "utf-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			sqlBuilder.append(String.format(" AND po.recyclingOperator = '%s' ",recyclingOperator));
+		}
+		
+		String washOperator = StrutsParamUtils.getPraramValue("washOperator",null);					//清洗人
+		if (StringUtils.isNotBlank(washOperator)){
+			try {
+				washOperator = URLDecoder.decode(washOperator, "utf-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			sqlBuilder.append(String.format(" AND po.washOperator = '%s' ",washOperator));
+		}
+		
+		String operator = StrutsParamUtils.getPraramValue("operator",null);							//装配人
+		if (StringUtils.isNotBlank(operator)){
+			try {
+				operator = URLDecoder.decode(operator, "utf-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			sqlBuilder.append(String.format(" AND po.operator = '%s' ",operator));
+		}
+		
+		String reviewer = StrutsParamUtils.getPraramValue("reviewer",null);							//审核人
+		if (StringUtils.isNotBlank(reviewer)){
+			try {
+				reviewer = URLDecoder.decode(reviewer, "utf-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			sqlBuilder.append(String.format(" AND po.reviewer = '%s' ",reviewer));
+		}
+		
+		String packageType = StrutsParamUtils.getPraramValue("packageType",null);					//包装类型
+		if (StringUtils.isNotBlank(packageType)){
+			try {
+				packageType = URLDecoder.decode(packageType, "utf-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			sqlBuilder.append(String.format(" AND po.packageType = '%s' ",packageType));
+		}
+		
+		String sterilizationBasket = StrutsParamUtils.getPraramValue("sterilizationBasket",null);	//灭菌篮筐
+		if (StringUtils.isNotBlank(sterilizationBasket)){
+			try {
+				sterilizationBasket = URLDecoder.decode(sterilizationBasket, "utf-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
+			sqlBuilder.append(String.format(" AND po.sterilizationBasket = '%s' ",sterilizationBasket));
+		}
+		
 		// 器械包不追溯且是固定条码  不显示
 		sqlBuilder.append(" AND (po.unTraceableTousse = 0 or po.tousseFixedBarcode = 0) ");