Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java =================================================================== diff -u -r36972 -r37020 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 36972) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java (.../SterilizationRecordTableManager.java) (revision 37020) @@ -261,6 +261,12 @@ if(StringUtils.isNotBlank(sqlWhereParamMap.get("isInterfereStr"))){ sql += " and po.status <> '" + SterilizationRecord.STERILIZATION_STATUS_DRAFT + "' "; } + String tousseName = sqlWhereParamMap.get("tousseName"); + if(StringUtils.isNotBlank(tousseName)){ + sql += " and (exists (select 1 from po.tousseInstanceList tis where tis.tousseDefinition.name like '%"+tousseName+"%')" + + " or exists (select 1 from po.reviewedBaskets rbs where exists " + + "(select 1 from TousseInstance ti where ti.reviewBasket_id=rbs.id and ti.tousseDefinition.name like '%"+ tousseName +"%'))) "; + } String renderGrid = gridManager.renderGrid(parameterMap, SterilizationRecord.class.getSimpleName(), sql, new String[] { "tousseInstanceList", "reviewedBaskets",