Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/Johnson100NXManagerImpl.java =================================================================== diff -u -r36957 -r36973 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/Johnson100NXManagerImpl.java (.../Johnson100NXManagerImpl.java) (revision 36957) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/Johnson100NXManagerImpl.java (.../Johnson100NXManagerImpl.java) (revision 36973) @@ -16,12 +16,15 @@ import com.forgon.tools.hibernate.ObjectDao; @Component -public class Johnson100NXManagerImpl implements SterilizerParaManager{ +public class Johnson100NXManagerImpl{ @Autowired private ObjectDao objectDao; - @Override - public JSONObject createEChartData(SterilizationRecord sterilizationRecord, - boolean queryTable) { + /** + * 获取曲线图数据 + * @param sterilizationRecord + * @return + */ + public JSONObject createEChartData(SterilizationRecord sterilizationRecord) { Johnson100NXSterilizerRecord record = (Johnson100NXSterilizerRecord)objectDao.getByProperty(Johnson100NXSterilizerRecord.class.getSimpleName(), "sterilizationRecordId", sterilizationRecord.getId()); JSONObject rueslt = null; if(record != null){ Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r36962 -r36973 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 36962) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 36973) @@ -92,7 +92,7 @@ } else if(SterilizationRecord.STERILIZATIONPARATYPE_XINHUA_XG2_C.equals(sterilizationParaType)){ rueslt = xg2cSterilizerRecordManagerImpl.createEChartData(sterilizationRecord, false); } else if(SterilizationRecord.STERILIZATIONPARATYPE_JOHNSON_100NX.equals(sterilizationParaType)){ - rueslt = johnson100NXManagerImpl.createEChartData(sterilizationRecord, false); + rueslt = johnson100NXManagerImpl.createEChartData(sterilizationRecord); }else{ rueslt = sterilizerRecordManager.createEChartData(sterilizationRecord, queryTable); }