Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r40943 -r40951
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 40943)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 40951)
@@ -4459,23 +4459,43 @@
 		}
 
 		if(washData != null){
-			JSONObject keyValues = new JSONObject();
 			Rinser rinser = rinserManager.get(wdr.getRinserId());
-			keyValues.put("机器：", rinser.getName());
-			keyValues.put("锅次", wdr.getCycleCounter());
-			keyValues.put("程序", washData.getProgramName());
-			keyValues.put("启动时间", DateTools.YMDHMSFORMAT.get().format(washData.getStartDate()));
-			keyValues.put("结束时间", DateTools.YMDHMSFORMAT.get().format(washData.getEndDate()));
-			keyValues.put("清洗状态", wdr.getWashStatus());
-			keyValues.put("循环次数", washData.getRunCount());
-			keyValues.put("操作员", wdr.getOperator());
-			keyValues.put("AO值", washData.getA0Value());
-			keyValues.put("总运行时间", washData.getTotalRunTime());
-			keyValues.put("运行结果", washData.getRunResult());
-			resultData.put("keyValues", keyValues);
+			resultData.put("rinserName", rinser.getName());
+			resultData.put("CycleCounter", wdr.getCycleCounter());
+			resultData.put("programName", washData.getProgramName());
+			resultData.put("startDate", DateTools.YMDHMSFORMAT.get().format(washData.getStartDate()));
+			resultData.put("endDate", DateTools.YMDHMSFORMAT.get().format(washData.getEndDate()));
+			resultData.put("washStatus", wdr.getWashStatus());
+			resultData.put("runCount", washData.getRunCount());
+			resultData.put("operator", wdr.getOperator());
+			resultData.put("A0Value", washData.getA0Value());
+			resultData.put("totalRunTime", washData.getTotalRunTime());
+			resultData.put("runResult", washData.getRunResult());
 			
-			resultData.put("details", JSONUtil.toJSONString(washData.getXinHuaSuper6000DetailsList()));
-			//转json
+			
+			
+			List<XinHuaSuper6000Details> detailsList = washData.getXinHuaSuper6000DetailsList();
+			JSONArray timeArray = new JSONArray();
+			JSONArray innerTemperatureArray = new JSONArray();
+			JSONArray airTemperatureArray = new JSONArray();
+			JSONArray lowTempWaterTankArray = new JSONArray();
+			JSONArray highTempWaterTankArray = new JSONArray();
+			JSONArray stageNameArray = new JSONArray();
+			for (XinHuaSuper6000Details detail : detailsList) {
+				String time = detail.getTime();
+				timeArray.add(time);
+				innerTemperatureArray.add(detail.getInnerTemperature());
+				airTemperatureArray.add(detail.getAirTemperature());
+				lowTempWaterTankArray.add(detail.getLowTempWaterTank());
+				highTempWaterTankArray.add(detail.getHighTempWaterTank());
+				stageNameArray.add(detail.getStage());
+			}
+			resultData.put("timeData", timeArray);
+			resultData.put("innerTemperatureArray", innerTemperatureArray);
+			resultData.put("airTemperatureArray", airTemperatureArray);
+			resultData.put("lowTempWaterTankArray", lowTempWaterTankArray);
+			resultData.put("highTempWaterTankArray", highTempWaterTankArray);
+			resultData.put("stageNameArray", stageNameArray);
 		}
 		return resultData;
 	}