Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/SterilizerReocrdHelp.java =================================================================== diff -u -r39330 -r40942 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/SterilizerReocrdHelp.java (.../SterilizerReocrdHelp.java) (revision 39330) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/SterilizerReocrdHelp.java (.../SterilizerReocrdHelp.java) (revision 40942) @@ -9,6 +9,10 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterisAmscoVPMaxStageDetails; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterisAmscoVPMaxSteRecord; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.XinhuaCleanH101513; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.XinhuaCleanH101513Details; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.XinHuaSuper6000Data; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.XinHuaSuper6000Details; import com.forgon.tools.date.DateTools; import com.forgon.tools.hibernate.ObjectDao; @@ -89,4 +93,62 @@ } return rueslt; } + + /** + * 获取XinhuaCleanH101513的灭菌参数 + * @param sterilizationRecord 灭菌记录 + * @return + */ + public JSONObject createEChartDataForXinhuaCleanH101513(SterilizationRecord sterilizationRecord) { + XinhuaCleanH101513 record = (XinhuaCleanH101513)objectDao.getByProperty(XinhuaCleanH101513.class.getSimpleName(), "sterilizationRecordId", sterilizationRecord.getId()); + JSONObject rueslt = null; + if(record != null){ + List detailsList = record.getXinhuaCleanH101513DetailsList(); + JSONArray timeArray = new JSONArray(); + JSONArray innerPressureArray = new JSONArray(); + JSONArray innerTemperatureArray = new JSONArray(); + JSONArray interlayerPressureArray = new JSONArray(); + JSONArray interlayerTemperatureArray = new JSONArray(); + JSONArray stageNameArray = new JSONArray(); + DateFormat ymdhmsFormat = DateTools.YMDHMSFORMAT.get(); + for (XinhuaCleanH101513Details detail : detailsList) { + String time = detail.getTime(); + timeArray.add(time); + innerPressureArray.add(detail.getInnerPressure()); + innerTemperatureArray.add(detail.getInnerTemperature()); + interlayerPressureArray.add(detail.getInterlayerPressure()); + interlayerTemperatureArray.add(detail.getInterlayerTemperature()); + 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()); + + rueslt.put("startTime", ymdhmsFormat.format(record.getStartDate())); + rueslt.put("endDate", ymdhmsFormat.format(record.getEndDate())); + + + rueslt.put("status", sterilizationRecord.getStatus()); + + rueslt.put("operationCount", record.getOperationCount()); + + rueslt.put("sterilizationUser", sterilizationRecord.getSterilizationUser()); + + rueslt.put("sterilizationRunTime", record.getSterilizationRunTime()); + + rueslt.put("totalRunTime", record.getTotalRunTime()); + + rueslt.put("runResult", record.getRunResult()); + + } + return rueslt; + } } Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r40302 -r40942 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 40302) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 40942) @@ -123,6 +123,8 @@ rueslt = melag43BPlusSterilizerParaManagerImpl.createEChartData(sterilizationRecord, false); } else if(SterilizationRecord.STERILIZATIONPARATYPE_AMSCO_V_PRO_MAX.equals(sterilizationParaType)){ rueslt = sterilizerReocrdHelp.createEChartDataForAmscoVProMax(sterilizationRecord); + } else if(SterilizationRecord.STERILIZATIONPARATYPE_XINHUA_PDF.equals(sterilizationParaType)){ + rueslt = sterilizerReocrdHelp.createEChartDataForXinhuaCleanH101513(sterilizationRecord); }else{ rueslt = sterilizerRecordManager.createEChartData(sterilizationRecord, queryTable, sterilizerRecordId); }