Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Johnson100NXDataManagerImpl.java =================================================================== diff -u -r38013 -r38046 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Johnson100NXDataManagerImpl.java (.../Johnson100NXDataManagerImpl.java) (revision 38013) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/Johnson100NXDataManagerImpl.java (.../Johnson100NXDataManagerImpl.java) (revision 38046) @@ -311,10 +311,9 @@ }else{ record.setEndDate(sdf2.parse(nextLine[1].trim() + " " + nextLine[2].trim())); } - boolean sterilizaMatchPatternForDate = CssdUtils.getSystemSetConfigByNameBool("sterilizaMatchPatternForDate", false); - String beginStartTimeStr = null; + String beginStartTimeStr = null; String endStartTimeStr = null; - if(sterilizaMatchPatternForDate){ + if(!DeviceInterface.PARAMATCHINGMETHOD_CYCLECOUNTER.equals(devInterface.getParaMatchingMethod())){ Long time = record.getStartDate().getTime(); // 灭菌炉自动完成灭菌 beginStartTimeStr = ForgonDateUtils.safelyFormatDate(new Date(time - 10*60*1000),ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); endStartTimeStr = ForgonDateUtils.safelyFormatDate(new Date(time + 10*60*1000),ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,"");