Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java =================================================================== diff -u -r24110 -r24111 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 24110) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java (.../TousseInstanceManagerImpl.java) (revision 24111) @@ -1727,7 +1727,7 @@ //否则判断要灭菌装载的包的灭菌方式与篮筐内已有的包的灭菌方式是否一致(排除不追溯的包) //判断现有篮筐实例里的包实例的灭菌方式与本次要灭菌装载的器械包实例的灭菌方式是否有不一致的包(排除掉不追溯的包),如果有不一致则抛出异常 String condition = String.format(" where tousseDefinition.isTraceable='%s' %s and %s", - Constants.STR_YES, StringUtils.isNotBlank(sterilingMode) ? " and sterilingMode <> '"+ sterilingMode +"'" : " and sterilingMode is not null ", + Constants.STR_YES, StringUtils.isNotBlank(sterilingMode) ? " and (sterilingMode is null or sterilingMode <> '"+ sterilingMode +"')" : " and sterilingMode is not null ", SqlUtils.getStringFieldInLargeCollectionsPredicate("barcode", tousseInstanceBarcodes)); TousseInstance ti = (TousseInstance)objectDao.getBySql_ForUpdate(TousseInstance.class.getSimpleName(), condition); if(ti != null){