Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r16786 -r16790
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16786)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16790)
@@ -341,7 +341,7 @@
 						fields : ['tousseGroupName'],
 						listeners : {
 							beforeload : function(_this, options) {
-								_this.baseParams.needAll = 'yes';
+								_this.baseParams.needAll = '是';
 							}
 						}
 					}),
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/action/TousseGroupAction.java
===================================================================
diff -u -r16786 -r16790
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/action/TousseGroupAction.java	(.../TousseGroupAction.java)	(revision 16786)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/action/TousseGroupAction.java	(.../TousseGroupAction.java)	(revision 16790)
@@ -8,6 +8,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.forgon.Constants;
 import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.util.PageUtil;
 
@@ -138,7 +139,7 @@
 		String needAll = StrutsParamUtils.getPraramValue("needAll", "");
 		
 		List<TousseGroup> allTousseGroup = new ArrayList<TousseGroup>();
-		if ("yes".equals(needAll)) {  //前台combo需要一个“全部”的标志，
+		if (Constants.STR_YES.equals(needAll)) {  //前台combo是否需要一个“全部”的标志，
 			TousseGroup tousseGroupAll = new TousseGroup();
 			tousseGroupAll.setId(new Long(-1L));
 			tousseGroupAll.setTousseGroupName("全部");
@@ -147,15 +148,8 @@
 		
 		allTousseGroup.addAll(tousseGroupManager.findAllTousseGroup());
 		
-		HttpServletResponse httpServletResponse = StrutsParamUtils
-				.getResponse();
-		httpServletResponse.setCharacterEncoding("UTF-8");
-		try {
-			String jsonStr = new Gson().toJson(allTousseGroup);
-			httpServletResponse.getWriter().print(jsonStr);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		JSONArray jSONArray = JSONArray.fromObject(allTousseGroup);
+		StrutsResponseUtils.output(jSONArray);
 		
 	}