Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r34007 -r34021 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 34007) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 34021) @@ -4402,15 +4402,19 @@ if(StringUtils.isBlank(disinfectProgram) || CollectionUtils.isEmpty(classifyBasketId)){ return; } - + String notBlankSql = ""; + if(dbConnection.isSqlServer()){ + notBlankSql = " and ancestor.cleanMethod <> '' "; + } Set errorDisinfectProgramToussNames = new HashSet(); String sql = String.format("select td.cleanMethod, td.name tousseName " + "from %s cb " + "join %s ci on ci.classifybasket_id = cb.id " + "join %s td on td.id = ci.toussedefinition_id " + "join %s ancestor on ancestor.id = td.ancestorId " + "where ci.itemType <> '材料' " - + "and ancestor.cleanMethod is not null and ancestor.cleanMethod <> '' " + + "and ancestor.cleanMethod is not null " + + notBlankSql + "and ancestor.cleanMethod <> '%s' " + "and %s ", ClassifyBasket.class.getSimpleName(),