Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/SterilizerReocrdHelp.java =================================================================== diff -u -r40942 -r40953 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/SterilizerReocrdHelp.java (.../SterilizerReocrdHelp.java) (revision 40942) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/SterilizerReocrdHelp.java (.../SterilizerReocrdHelp.java) (revision 40953) @@ -121,33 +121,42 @@ stageNameArray.add(detail.getStage()); } rueslt = new JSONObject(); - rueslt.put("timeData", timeArray); - rueslt.put("innerPressureArray", innerPressureArray); - rueslt.put("innerTemperatureArray", innerTemperatureArray); - rueslt.put("interlayerPressureArray", interlayerPressureArray); - rueslt.put("interlayerTemperatureArray", interlayerTemperatureArray); - rueslt.put("stageNameArray", stageNameArray); - rueslt.put("programName", record.getProgramName()); - rueslt.put("sterilizerName", sterilizationRecord.getSterilizer().getName()); - rueslt.put("cycleCounter", sterilizationRecord.getCycleCounter()); + JSONObject keyValues = new JSONObject(); + keyValues.put("机器:", sterilizationRecord.getSterilizer().getName()); - rueslt.put("startTime", ymdhmsFormat.format(record.getStartDate())); - rueslt.put("endDate", ymdhmsFormat.format(record.getEndDate())); + keyValues.put("炉次:", sterilizationRecord.getCycleCounter()); - rueslt.put("status", sterilizationRecord.getStatus()); + keyValues.put("程序:", record.getProgramName()); - rueslt.put("operationCount", record.getOperationCount()); - rueslt.put("sterilizationUser", sterilizationRecord.getSterilizationUser()); - rueslt.put("sterilizationRunTime", record.getSterilizationRunTime()); + keyValues.put("启动时间:", ymdhmsFormat.format(record.getStartDate())); + keyValues.put("结束时间:", ymdhmsFormat.format(record.getEndDate())); - rueslt.put("totalRunTime", record.getTotalRunTime()); - rueslt.put("runResult", record.getRunResult()); + keyValues.put("灭菌状态:", sterilizationRecord.getStatus()); + keyValues.put("循环次数:", record.getOperationCount()); + + keyValues.put("灭菌员:", sterilizationRecord.getSterilizationUser()); + + keyValues.put("灭菌运行时间:", record.getSterilizationRunTime()); + + keyValues.put("总运行时间:", record.getTotalRunTime()); + + keyValues.put("运行结果:", record.getRunResult()); + + keyValues.put("keyValues", keyValues); + + rueslt.put("timeData", timeArray); + rueslt.put("innerPressureArray", innerPressureArray); + rueslt.put("innerTemperatureArray", innerTemperatureArray); + rueslt.put("interlayerPressureArray", interlayerPressureArray); + rueslt.put("interlayerTemperatureArray", interlayerTemperatureArray); + rueslt.put("stageNameArray", stageNameArray); + } return rueslt; }