Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r30414 -r30415
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 30414)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 30415)
@@ -2607,12 +2607,12 @@
 		if(StringUtils.isNotBlank(barcodeSearch)){
 			BarcodeDevice barcodeDevice = barcodeManager
 					.getBarcodeByBarcode(barcodeSearch);
-			if(barcodeDevice == null
+			/*if(barcodeDevice == null
 					&& StringUtils.isBlank(barcodes)) {  //1、若无此条码	2、用户没启用多次扫描模式，或者是启用了而且是第一次扫描		同时满足1和2则两个条件直接返回
 				return " and 1=2 ";
-			}
+			}*/
 			
-			if (barcodeDevice instanceof IDCardInstance) {  //是标识牌的条码
+			if (barcodeDevice != null && barcodeDevice instanceof IDCardInstance) {  //是标识牌的条码
 				IDCardInstance idCardInstance = (IDCardInstance) barcodeDevice;
 				List<TousseInstance> tousseInstances = idCardInstance
 						.getTousseInstances(objectDao);
@@ -2633,7 +2633,7 @@
 					sqlBuilder.append(" AND" + SqlBuilder.build_IN_Statement("po.barcode",
 						SqlBuilder.IN, barcodeList));
 				} else {
-					sqlBuilder.append(String.format(" AND po.barcode = '%s'",
+					sqlBuilder.append(String.format(" AND po.barcode like '%%%s%%'",
 							barcodeSearch));
 				}
 			}
@@ -2663,7 +2663,7 @@
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
-			sqlBuilder.append(String.format(" AND po.sterilizerName = '%s'" ,sterilizerName));
+			sqlBuilder.append(String.format(" AND po.sterilizerName like '%%%s%%'" ,sterilizerName));
 		}else{	
 			String sterilizerGroup = StrutsParamUtils.getPraramValue("sterilizerGroup",null);   	//灭菌炉分组
 			if(StringUtils.isNotBlank(sterilizerGroup)){
@@ -2774,8 +2774,8 @@
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
-			sqlBuilder.append(" AND po.tousseDefinition.name = '" + tousseName
-					+ "'");
+			sqlBuilder.append(" AND po.tousseDefinition.name like '%" + tousseName
+					+ "%'");
 		}else if (StringUtils.isNotBlank(tousseNameFuzzy)) {
 			try {
 				tousseNameFuzzy = URLDecoder.decode(tousseNameFuzzy, "utf-8");
@@ -2862,7 +2862,7 @@
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
-			sqlBuilder.append(String.format(" AND po.locationForDisplay = '%s' ",locationForDisplay));
+			sqlBuilder.append(String.format(" AND po.locationForDisplay like '%%%s%%' ",locationForDisplay));
 		}
 		
 		String recyclingUser = StrutsParamUtils.getPraramValue("recyclingUser",null);				//回收人
@@ -2872,7 +2872,7 @@
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
-			sqlBuilder.append(String.format(" AND po.recyclingUser = '%s' ",recyclingUser));
+			sqlBuilder.append(String.format(" AND po.recyclingUser like '%%%s%%' ",recyclingUser));
 		}
 		
 		String recyclingOperator = StrutsParamUtils.getPraramValue("recyclingOperator",null);		//回收清点人
@@ -2882,7 +2882,7 @@
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
-			sqlBuilder.append(String.format(" AND po.recyclingOperator = '%s' ",recyclingOperator));
+			sqlBuilder.append(String.format(" AND po.recyclingOperator like '%%%s%%' ",recyclingOperator));
 		}
 		
 		String washOperator = StrutsParamUtils.getPraramValue("washOperator",null);					//清洗人
@@ -2892,7 +2892,7 @@
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
-			sqlBuilder.append(String.format(" AND po.washOperator = '%s' ",washOperator));
+			sqlBuilder.append(String.format(" AND po.washOperator like '%%%s%%' ",washOperator));
 		}
 		
 		String operator = StrutsParamUtils.getPraramValue("operator",null);							//装配人
@@ -2902,7 +2902,7 @@
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
-			sqlBuilder.append(String.format(" AND po.operator = '%s' ",operator));
+			sqlBuilder.append(String.format(" AND po.operator like '%%%s%%' ",operator));
 		}
 		
 		String reviewer = StrutsParamUtils.getPraramValue("reviewer",null);							//审核人
@@ -2912,7 +2912,7 @@
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
-			sqlBuilder.append(String.format(" AND po.reviewer = '%s' ",reviewer));
+			sqlBuilder.append(String.format(" AND po.reviewer like '%%%s%%' ",reviewer));
 		}
 		
 		String packageType = StrutsParamUtils.getPraramValue("packageType",null);					//包装类型
@@ -2922,7 +2922,7 @@
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
-			sqlBuilder.append(String.format(" AND po.packageType = '%s' ",packageType));
+			sqlBuilder.append(String.format(" AND po.packageType like '%%%s%%' ",packageType));
 		}
 		
 		String sterilizationBasket = StrutsParamUtils.getPraramValue("sterilizationBasket",null);	//灭菌篮筐
@@ -2932,7 +2932,7 @@
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
 			}
-			sqlBuilder.append(String.format(" AND po.sterilizationBasket = '%s' ",sterilizationBasket));
+			sqlBuilder.append(String.format(" AND po.sterilizationBasket like '%%%s%%' ",sterilizationBasket));
 		}
 		
 		// 器械包不追溯且是固定条码  不显示