Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r20042 -r20045 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 20042) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 20045) @@ -2731,7 +2731,7 @@ Calendar endDate = Calendar.getInstance(); endDate.setTime(startDate); endDate.add(Calendar.MINUTE, useTime); - if (endDate.getTimeInMillis() >= now.getTimeInMillis()) { //已经结束了 + if ((endDate.getTimeInMillis() + 5*60*1000) >= now.getTimeInMillis()) { //已经结束了 List list = new ArrayList(); list.add(sterilizationRecord.getId()); completeSterilization(list, sterilizationRecord.getOrgUnitCoding(), "定时器自动完成");