Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
===================================================================
diff -u -r15324 -r15594
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 15324)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 15594)
@@ -477,7 +477,7 @@
 		}
 	}
 	public void loadWashAndDisinfectRecord() {
-		StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
+//		StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
 		JsonConfig config = new JsonConfig();
 		PropertyFilter propertyFilter = new JsonPropertyFilter(new String[] {
 				"classifyBaskets", "washAndDisinfectMaterials","tousseInstanceList" });
@@ -487,12 +487,13 @@
 		map.put("success", true);
 		map.put("data", washAndDisinfectRecord);
 		JSONObject jsonObject = JSONObject.fromObject(map, config);
-		String jsonStr = jsonObject.toString();
-		try {
-			StrutsParamUtils.getResponse().getWriter().println(jsonStr);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
+		StrutsResponseUtils.output(jsonObject);
+//		String jsonStr = jsonObject.toString();
+//		try {
+//			StrutsParamUtils.getResponse().getWriter().println(jsonStr);
+//		} catch (IOException e) {
+//			e.printStackTrace();
+//		}
 	}
 
 	public void loadMaterialInfo() {
Index: forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
===================================================================
diff -u -r15364 -r15594
--- forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java	(.../JSONUtil.java)	(revision 15364)
+++ forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java	(.../JSONUtil.java)	(revision 15594)
@@ -282,7 +282,7 @@
 	 * @return
 	 */
 	public static JSONObject buildJsonObject(boolean success){
-		return buildJsonObject(success,null);
+		return buildJsonObject(success,"");
 	}
 	/**
 	 * 创建一个json对象,有一个标志是否成功的属性及消息描述
@@ -298,6 +298,14 @@
 		}
 		return json;
 	}
+	public static JSONObject buildJsonObject(boolean success,JSONObject data){
+		JSONObject json = new JSONObject();
+		addSuccess(json,success);
+		if(data != null){
+			addProperty(json, "data", data);
+		}
+		return json;
+	}
 	/**
 	 * 在json对象中添加是否成功的标志
 	 * @param json json对象,如果为null,不做处理