Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r30042 -r30047
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 30042)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 30047)
@@ -8572,28 +8572,34 @@
 						SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.wareHouseId", wareHouseIds),
 						SqlUtils.getNonStringFieldInLargeCollectionsPredicate("ti.wareHouseId2", wareHouseIds));
 			}
-			sql = String.format("select ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ti.depart from %s ti "
+			sql = String.format("select ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ti.depart "
+					+ "from %s ti "
 					+ "inner join %s td on td.id =ti.tousseDefinition_id "
 					+ "inner join %s bd on bd.id=ti.id "
-					+ "where  tousseFixedBarcode=0 %s "
-					+ "and td.name='%s' ",
-					//+ "and comboTousseInstanceId is null "
-					//+ "and (ti.status='%s' or ti.status='%s') ",
+					+ "where tousseFixedBarcode=0 %s "
+					+ "and td.name='%s' "
+					+ "and comboTousseInstanceId is null "
+					+ "and (ti.status='%s' or ti.status='%s') ",
 					TousseInstance.class.getSimpleName(),
 					TousseDefinition.class.getSimpleName(),
 					BarcodeDevice.class.getSimpleName(),
 					wareHouseIdSql,
-					tousseName);
+					tousseName, TousseInstance.STATUS_STERILED, TousseInstance.STATUS_DISINFECTED);
 		}else{
-  			sql = String.format("select ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ti.depart from %s ti "
-					+ "inner join %s  i on i.id=ti.invoice_id inner join %s td on td.id =ti.tousseDefinition_id "
-					+ "inner join %s gs on gs.tousseDefinitionId=ti.tousseDefinition_id inner join %s bd on bd.id=ti.id "
+  			sql = String.format("select ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ti.depart "
+  					+ "from %s ti "
+					+ "inner join %s i on i.id = ti.invoice_id "
+					+ "inner join %s td on td.id =ti.tousseDefinition_id "
+					+ "inner join %s ancestor on ancestor.id = td.ancestorID "
+					+ "inner join %s gs on gs.tousseDefinitionId = ancestor.id "
+					+ "inner join %s bd on bd.id=ti.id "
 					+ "where tousseFixedBarcode=0 and i.departCoding=gs.orgUnitCode and i.departCoding='%s' "
 					+ "and ( td.isCommonTousse is null or td.isCommonTousse !=1) and comboTousseInstanceId is null "
 					+ "and td.name='%s' and (ti.status='%s' or ti.status='%s') ", 
 					TousseInstance.class.getSimpleName(),
  					Invoice.class.getSimpleName(),
  					TousseDefinition.class.getSimpleName(),
+ 					TousseDefinition.class.getSimpleName(),
  					GoodsStock.class.getSimpleName(),
 					BarcodeDevice.class.getSimpleName(),
 					departCode, tousseName, TousseInstance.STATUS_SHIPPED, TousseInstance.STATUS_SIGNED);