Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r33948 -r33949 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 33948) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 33949) @@ -4404,13 +4404,15 @@ + "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 td.cleanMethod is not null and td.cleanMethod <> ''" - + "and td.cleanMethod <> '%s' " + + "and ancestor.cleanMethod is not null and ancestor.cleanMethod <> '' " + + "and ancestor.cleanMethod <> '%s' " + "and %s ", ClassifyBasket.class.getSimpleName(), ClassifiedItem.class.getSimpleName(), TousseDefinition.class.getSimpleName(), + TousseDefinition.class.getSimpleName(), disinfectProgram, SqlUtils.getNonStringFieldInLargeCollectionsPredicate("cb.id", classifyBasketId)); ResultSet rs = null;