Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r35451 -r35452 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 35451) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 35452) @@ -8559,7 +8559,8 @@ } } }else{ - result = getSterilizaerRecordsById(sterilizationRecord.getId()); + result = getSterilizaerRecordsById(sterilizationRecord.getId() + , SterilizerRecord.buildConstructionMethodSql("s.t1Temp,s.p1Mbar,s.time,s.phase,s.cycleCounter,s.procStartTime")); if(CollectionUtils.isNotEmpty(sterilizerRecords)){ lastSlrProcStartTime = sterilizerRecords.get(sterilizerRecords.size()-1).getTime(); firstSlrProcStartTime = sterilizerRecords.get(0).getTime(); @@ -8787,7 +8788,7 @@ } }else{ List sterilizerRecords = getSterilizaerRecordsById(sr.getId() - ,SterilizerRecord.buildConstructionMethodSql("s.t1Temp,s.p1Mbar,s.time,s.phase,cycleCounter")); + ,SterilizerRecord.buildConstructionMethodSql("s.t1Temp,s.p1Mbar,s.time,s.phase,s.cycleCounter")); if(CollectionUtils.isNotEmpty(sterilizerRecords)){ for (SterilizerRecord detail : sterilizerRecords) { Date time = parseDateStr(sdfHms, sdfHms2, detail.getTime()); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/SterilizerRecord.java =================================================================== diff -u -r35451 -r35452 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/SterilizerRecord.java (.../SterilizerRecord.java) (revision 35451) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/SterilizerRecord.java (.../SterilizerRecord.java) (revision 35452) @@ -301,7 +301,14 @@ + deviceInterfaceID + "]"; } public SterilizerRecord(){} - + public SterilizerRecord(String t1Temp, String p1Mbar, String time, String phase, Long cycleCounter, Date procStartTime){ + this.t1Temp = t1Temp; + this.p1Mbar = p1Mbar; + this.time = time; + this.phase = phase; + this.cycleCounter = cycleCounter; + this.procStartTime = procStartTime; + } public SterilizerRecord(String t1Temp, String p1Mbar, String time, String phase, Long cycleCounter){ this.t1Temp = t1Temp; this.p1Mbar = p1Mbar;