Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r23225 -r23484
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 23225)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 23484)
@@ -7373,6 +7373,7 @@
 			allType.add(TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY);
 			allType.add(TousseDefinition.PACKAGE_TYPE_INSIDE);
 			allType.add(TousseDefinition.PACKAGE_TYPE_SPLIT);
+			allType.add(TousseDefinition.PACKAGE_TYPE_COMBO);
 			if(StringTools.isBlank(tousseType) && enableExpensiveGoods){
 				allType.add(ExpensiveGoods.TYPE_NAME);
 			}
@@ -20499,7 +20500,7 @@
 		String sql = "select trdr.orgUnitName,td.tousseType,trdi.tousseName,amount,case when bd.barcode is not null then bd.barcode else trdi.scanBarcode end barcode "
 					+ ",idiBd.barcode idBarcode,ti.sterilizerName,ti.sterileFrequency,ti.sterileEndTime,ti.validUntil from TousseReturnDisinfectRecord trdr join TousseReturnDisinfectItem trdi on trdr.id=trdi.tousseReturnDisinfectRecordId "
 					+ " join TousseDefinition td on td.id=trdi.tousseDefinitionId "
-					+ " left join TousseInstance ti on convert(varchar(20),ti.id)=trdi.tousseInstanceIds "
+					+ " left join TousseInstance ti on "+ (DatabaseUtil.isSqlServer(dbConnection.getDatabase()) ? "convert(varchar(20),ti.id)" : "to_char(ti.id)") +"=trdi.tousseInstanceIds "
 					+ " left join barcodeDevice bd on bd.id=ti.id "
 					+ " left join IDCardInstance idi on idi.id=ti.idCardInstanceID "
 					+ " left join barcodeDevice idiBd on idiBd.id=idi.id "