Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java =================================================================== diff -u -r23891 -r25278 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 23891) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 25278) @@ -19,6 +19,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.packing.ReviewedBasket; +import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; @@ -139,7 +140,9 @@ + ReviewedBasket.class.getSimpleName() + " po left join po.sterilizationRecords s where s.id is null and po.container.status = '" + Container.CONTAINER_STATUS_STERILIZELOADING - + "' and po.container.departCode = '" + departCode + "'" + + "' and (po.container.departCode = '" + departCode + "'" + + " or po.id in (select rbs.id from "+ ProxyDisinfection.class.getSimpleName() +" pd join pd.reviewedBaskets rbs where pd.handleDepartCoding='" + departCode + "')" + + ")" + " and po.container.purpose<>'" + Container.CONTAINER_PURPOSE_VIRTUAL + "'"; List objs = objectDao.findByHql(sql); List baskets = new ArrayList();