Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/action/TousseGroupAction.java
===================================================================
diff -u -r16731 -r16786
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/action/TousseGroupAction.java	(.../TousseGroupAction.java)	(revision 16731)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/action/TousseGroupAction.java	(.../TousseGroupAction.java)	(revision 16786)
@@ -129,54 +129,36 @@
 
 	}
 	
-	public void getAllTousseGroup(){
-		List<TousseGroup> allTousseGroup = tousseGroupManager.findAllTousseGroup();
-		if(allTousseGroup == null){
-			allTousseGroup = new ArrayList<TousseGroup>();
-		}
-		HttpServletResponse httpServletResponse = StrutsParamUtils
-				.getResponse();
-		httpServletResponse.setCharacterEncoding("UTF-8");
-		try {
-			String jsonStr = new Gson().toJson(allTousseGroup);
-			httpServletResponse.getWriter().print(jsonStr);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
 	/**
-	 * 获取所有器械包分组的名称
+	 * 获取系统上的所有器械包分组
 	 * 
 	 */
-	public void getAllTousseGroupName(){
+	public void getAllTousseGroup(){
 		
-		List<TousseGroup> allTousseGroup = tousseGroupManager.findAllTousseGroup();
-		if(allTousseGroup == null){
-			allTousseGroup = new ArrayList<TousseGroup>();
-		}
+		String needAll = StrutsParamUtils.getPraramValue("needAll", "");
 		
-		JSONArray jSONArray = new JSONArray();
-		JSONArray all = new JSONArray();
-		all.add("全部");
-		jSONArray.add(all);
-		for (TousseGroup tousseGroup : allTousseGroup) {
-			JSONArray temp = new JSONArray();
-			temp.add(tousseGroup.getTousseGroupName());
-			jSONArray.add(temp);
+		List<TousseGroup> allTousseGroup = new ArrayList<TousseGroup>();
+		if ("yes".equals(needAll)) {  //前台combo需要一个“全部”的标志，
+			TousseGroup tousseGroupAll = new TousseGroup();
+			tousseGroupAll.setId(new Long(-1L));
+			tousseGroupAll.setTousseGroupName("全部");
+			allTousseGroup.add(tousseGroupAll);
 		}
 		
+		allTousseGroup.addAll(tousseGroupManager.findAllTousseGroup());
+		
 		HttpServletResponse httpServletResponse = StrutsParamUtils
 				.getResponse();
 		httpServletResponse.setCharacterEncoding("UTF-8");
 		try {
-			httpServletResponse.getWriter().print(jSONArray.toString());
+			String jsonStr = new Gson().toJson(allTousseGroup);
+			httpServletResponse.getWriter().print(jsonStr);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 		
 	}
-
+	
 	/**
 	 * 按器械包分组下拉选项
 	 */
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r16740 -r16786
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16740)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16786)
@@ -336,14 +336,23 @@
 					triggerAction : 'all',
 					//--------------------//
 //					mode:'local',
-					store : new Ext.data.SimpleStore({
-						url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroupName.do',
-						fields:['tousseGroupName']
+					store : new Ext.data.JsonStore({
+						url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroup.do',
+						fields : ['tousseGroupName'],
+						listeners : {
+							beforeload : function(_this, options) {
+								_this.baseParams.needAll = 'yes';
+							}
+						}
 					}),
+//					store : new Ext.data.SimpleStore({
+//						url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroup.do',
+//						fields:['tousseGroupName']
+//					}),
 					
 //					store : new Ext.data.Store({
 //						proxy : new Ext.data.HttpProxy({
-//							url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroupName.do',
+//							url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroup.do',
 //							method : 'POST'
 //						}),
 //						reader : new Ext.data.JsonReader({