Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r26724 -r26817
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 26724)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 26817)
@@ -15,6 +15,7 @@
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -2078,9 +2079,20 @@
 		return null;
 	}
 	
+	/**
+	 * 根据关键字查找所有类型器械包(不包含已经停用的器械包)
+	 */
 	public void searchAllTousse() {
-		List<Map<String, Object>> list = tousseDefinitionManager
-				.searchAllTousseByKeyword(spell);
+		List<TousseDefinition> tdList =  tousseDefinitionManager.getTousseByKeywordAndTousseTypeArr(spell, null, false);
+		List<Map<String, Object>> list = new LinkedList<Map<String,Object>>();
+		if (CollectionUtils.isNotEmpty(tdList)) {
+			for (TousseDefinition td : tdList) {
+				Map<String, Object> map = new HashMap<String, Object>();
+				map.put("id", td.getId());
+				map.put("name", td.getName());
+				list.add(map);
+			}
+		}
 		JSONObject jSONObject = new JSONObject();
 		jSONObject.put("totalCount", list.size());
 		jSONObject.put("data", list);