Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r30865 -r30902 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 30865) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 30902) @@ -1654,8 +1654,9 @@ + "and po.time > '" + beginStartTimeStr + "' and po.time < '" + endStartTimeStr + "'"; } }else if(StringUtils.equals(devInterface.getDeviceBrand(), DeviceInterface.GETINGE)){ - if(StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.GETING_86_SERIES)){ - // 型号为86-series的洁定清洗机,根据清洗记录的开始结束时间匹配清洗数据(KLMYSRMYY-8)(时间格式为"yyyy-MM-dd HH:mm:ss") + if(StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.GETING_86_SERIES) + || StringUtils.equals(devInterface.getDeviceModel(), DeviceInterface.GETING_SUZHOUJIEDING_46_5)){ + // 型号为86-series\"苏州洁定46-5" 的洁定清洗机,根据清洗记录的开始结束时间匹配清洗数据(KLMYSRMYY-8)(时间格式为"yyyy-MM-dd HH:mm:ss") String beginStartTimeStr = DateTools.getFormatDateStr(beginStartTime, "yyyy-MM-dd HH:mm:ss"); String endStartTimeStr = DateTools.getFormatDateStr(endStartTime, "yyyy-MM-dd HH:mm:ss");