Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r15735 -r15862
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15735)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 15862)
@@ -4605,7 +4605,7 @@
 		String sql = null;
 		String sql2 = String.format("select t.materialsMD5 from %s t where t.materialsMD5 is not null and %s and %s", TousseDefinition.class
 				.getSimpleName(), SqlUtils
-				.getStringFieldPredicate("t.name",tousseDefinitionName), SqlUtils
+				.getStringFieldPredicate("t.ancestorID",String.valueOf(tousseDefinition.getAncestorID())), SqlUtils
 				.getNonStringFieldInCollectionsPredicate(
 						"t.invoicePlanID", invoicePlanIDSet));
 		List<String> materialsMD5List = objectDao.findByHql(sql2);
@@ -4617,8 +4617,8 @@
 				.format(" where %s and %s and (%s and po.tousseFixedBarcode=false and %s )",
 						SqlUtils.getStringFieldPredicate("po.status", TousseInstance.STATUS_DISINFECTED),
 						getValidUntilPredicate(dateQueryAdapter, "po.validUntil"),
-						SqlUtils.getStringFieldPredicate("po.tousseName",
-								tousseDefinitionName),
+						SqlUtils.getStringFieldPredicate("po.tousseDefinition.ancestorID",
+								String.valueOf(tousseDefinition.getAncestorID())),
 						 SqlUtils.getStringFieldInCollectionsPredicate(
 								"po.tousseDefinition.materialsMD5", materialsMD5Set));
 		return sql;