Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r38806 -r38845
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 38806)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 38845)
@@ -10392,7 +10392,7 @@
 					wareHouseIdSql,
 					tousseName, TousseInstance.STATUS_STERILED, TousseInstance.STATUS_DISINFECTED, TousseInstance.STATUS_SHIPPED);
 		}else{
-  			sql = String.format("select ti.sterileFrequency,ti.sterilizerName,ti.sterileEndTime ,ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ou.name depart "
+  			String invoice1Sql = String.format("select ti.sterileFrequency,ti.sterilizerName,ti.sterileEndTime ,ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ou.name depart "
   					+ "from %s ti "
 					+ "inner join %s i on i.id = ti.invoice_id "
 					+ "inner join %s td on td.id =ti.tousseDefinition_id "
@@ -10403,6 +10403,28 @@
 					+ "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') "
+					+ "and ti.invoice2_id is null ", 
+					TousseInstance.class.getSimpleName(),
+ 					Invoice.class.getSimpleName(),
+ 					TousseDefinition.class.getSimpleName(),
+ 					TousseDefinition.class.getSimpleName(),
+ 					GoodsStock.class.getSimpleName(),
+					BarcodeDevice.class.getSimpleName(),
+					OrgUnit.class.getSimpleName(),
+					departCode, tousseName, TousseInstance.STATUS_SHIPPED, TousseInstance.STATUS_SIGNED);
+  			
+  			String invoice2Sql = String.format("select ti.sterileFrequency,ti.sterilizerName,ti.sterileEndTime ,ti.id,ti.signedDate,ti.signedUser,bd.barcode,ti.validUntil, ti.invoiceSender, ti.invoiceSendTime, ou.name depart "
+  					+ "from %s ti "
+					+ "inner join %s i on i.id = ti.invoice2_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 "
+					+ "left join %s ou on ou.orgUnitCoding = ti.departCoding "
+					+ "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(),
@@ -10412,6 +10434,8 @@
 					BarcodeDevice.class.getSimpleName(),
 					OrgUnit.class.getSimpleName(),
 					departCode, tousseName, TousseInstance.STATUS_SHIPPED, TousseInstance.STATUS_SIGNED);
+  			
+  			sql = String.format("select * from (%s union all %s) rs ", invoice1Sql, invoice2Sql);
 		}
 		ResultSet rs = null;
 		try {