Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/BelimedSterilizerRecordManagerImpl.java =================================================================== diff -u -r30373 -r30374 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/BelimedSterilizerRecordManagerImpl.java (.../BelimedSterilizerRecordManagerImpl.java) (revision 30373) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/service/BelimedSterilizerRecordManagerImpl.java (.../BelimedSterilizerRecordManagerImpl.java) (revision 30374) @@ -19,6 +19,7 @@ import jcifs.smb.SmbFileInputStream; import com.forgon.databaseadapter.service.DateQueryAdapter; +import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerGrossRecord; @@ -158,11 +159,17 @@ Session session = objectDao.getHibernateSession(); DeviceInterface df = (DeviceInterface)objectDao.getById(DeviceInterface.class.getSimpleName(), sr.getSterilizer().getDeviceInterfaceId()); String cycleCounterOrDateSql = null; - if(df != null && DeviceInterface.BELIMED.equals(df.getDeviceBrand())){ + boolean sterilizaMatchPatternForDate = CssdUtils.getSystemSetConfigByNameBool("sterilizaMatchPatternForDate", false); + boolean useCycleCounter = false; + if(df != null + && (DeviceInterface.BELIMED.equals(df.getDeviceBrand()) + || + (sterilizaMatchPatternForDate && DeviceInterface.GETINGE.equals(df.getDeviceBrand())))){ String beginStartTimeStr = ForgonDateUtils.safelyFormatDate(new Date(sr.getStartDate().getTime() - 10*60*1000),ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); String endStartTimeStr = ForgonDateUtils.safelyFormatDate(new Date(sr.getStartDate().getTime() + 10*60*1000),ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS,""); cycleCounterOrDateSql = " and " + dateQueryAdapter.dateAreaSql("s.procStartTime", beginStartTimeStr, endStartTimeStr, false); - }else{ + } else { + useCycleCounter = true; cycleCounterOrDateSql = " and s.cycleCounter = :cycleCounter"; } String queryString = "select s from SterilizerRecord s" @@ -174,7 +181,7 @@ Query query = session.createQuery(queryString); query.setParameter("devInterfaceId", sr.getSterilizer().getDeviceInterfaceId()); query.setParameter("machineNo", sr.getSterilizer().getMachineNumber()); - if(!(df != null && DeviceInterface.BELIMED.equals(df.getDeviceBrand()))){ + if(useCycleCounter){ query.setParameter("cycleCounter", sr.getCycleCounter()); } List result = query.list();