Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r33816 -r34059
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 33816)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 34059)
@@ -45,6 +45,7 @@
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.directory.model.BarcodeSet_Object;
+import com.forgon.directory.model.CssdHandleTousses;
 import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.service.OrgUnitManager;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
@@ -9548,7 +9549,6 @@
     @Override
     public JSONArray loadAllBasketsArray(String thisDepartCode, String taskGroup) {
         try {
-            String departCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
             String currentOrgUnitCode = AcegiHelper.getCurrentOrgUnitCode();
             String basketsSql = "select distinct c.containerName,rb.id,bd.barcode, max(ul.grade) maxGrade "
 			            		+ " ,count(distinct case when ti.foreignProxyItem_id is not null or ti.proxyDisinfection_id is not null then ti.id else null end ) statisticsProxy,"
@@ -9570,24 +9570,18 @@
 								+" td on td.id=ti.TousseDefinition_Id left join  "+ 
 								UrgentLevel.class.getSimpleName()
 								+ " ul on ul.id=ti.UrgentLevel_Id left join sterilization_reviewed srd on srd.reviewedBasket_id=rb.id "
+								+ " left join " +
+								CssdHandleTousses.class.getSimpleName()
+								+ " tt on tt.tousseDefinitionId=td.ancestorID "
 								+ "where srd.sterilizationRecord_id is null and c.status = '"
 								+ Container.CONTAINER_STATUS_STERILIZELOADING +"' and c.purpose<>'"
 								+ Container.CONTAINER_PURPOSE_VIRTUAL + "' "
-								+ "and ti.orgUnitCoding='"
-								+ currentOrgUnitCode
-								+"' and ti.status='"
-								+ TousseInstance.STATUS_REVIEWED  +"'   "
-								+ "and (c.departCode = '"
-								+ departCode 
-								+ "' or rb.id in (select rbs.id from "+
-								ProxyDisinfection.class.getSimpleName()
-								+ " pd join "+
-								InvoicePlan.class.getSimpleName()
-								+ " ip on ip.id=pd.id join proxyDis_rBasket pr on pr.proxyDisinfection_id=pd.id join "+
-								ReviewedBasket.class.getSimpleName()
-								+" rbs on rbs.id=pr.reviewedBasket_id where ip.handleDepartCoding='"
-								+ departCode 
-								+"'))  group by c.containerName,rb.id,bd.barcode order by max(ul.grade) desc";
+								+ " and ((ti.proxyDisinfection_id is null and ti.orgUnitCoding='"+currentOrgUnitCode+"' and tt.orgUnitCode='"+currentOrgUnitCode+"' or "
+								+ "ti.proxyDisinfection_id is not null and ti.proxyDisinfection_id in (select ip.id from invoicePlan ip where ip.handleDepartCoding='"+currentOrgUnitCode+"')) "
+								+ " and ti.comboTousseInstanceId is null and td.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"','"+TousseDefinition.PACKAGE_TYPE_COMBO+"') "
+								+ " or td.tousseType not in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"','"+TousseDefinition.PACKAGE_TYPE_COMBO+"') "
+								+ "and ti.orgUnitCoding='"+currentOrgUnitCode+"') and ti.status='"
+								+ TousseInstance.STATUS_REVIEWED +"' group by c.containerName,rb.id,bd.barcode order by max(ul.grade) desc";
             ResultSet rs = null;
             JSONArray basketsArr = new JSONArray();
             try {