Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r26375 -r26381
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 26375)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 26381)
@@ -3766,16 +3766,18 @@
 		if(StringUtils.isBlank(batch)){
 		if ((StringUtils.isBlank(typeSearch) || "器械材料".equals(typeSearch) || "高值耗材".equals(typeSearch))) {
 			// 材料发货
-			materialInvoiceSql = " union all (select i.settleAccountsDepart "+ noQuerySupplierName +",ii.materialName,sum(ii.amount),sum(ii.settlementPrice),"
-					+"sum(ii.settlementPrice) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId "
-				   	+ " from MaterialInvoice i,"
-				   	+ "MaterialInvoiceItem ii,materialDefinition d where i.id = ii.materialInvoice_id " 
-				   	+ " and ii.materialDefinitionId = d.id and  "+getHandleDeptCodeSql("i.orgUnitCoding")+"  "
+			materialInvoiceSql = " union all (select i.settleAccountsDepart "+ noQuerySupplierName +",case when td.name is null then ii.materialName else  ii.materialName "+ concatSymbolInDb +"'('"+ concatSymbolInDb +" td.name "+ concatSymbolInDb +"')' end,sum(ii.amount),sum(ii.settlementPrice),"
+					+"sum(ii.settlementPrice) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,td.id as tousseDefinitionId "
+				   	+ " from MaterialInvoiceItem ii" 
+				   	+ " left join TousseDefinition td on td.id= ii.tousseDefinitionId "
+				   	+ " inner join MaterialInvoice i on i.id = ii.materialInvoice_id "
+				   	+ " inner join materialDefinition d on ii.materialDefinitionId = d.id where "
+				   	+ getHandleDeptCodeSql("i.orgUnitCoding")+"  "
 				   	+ monthFilterSql
 				   	+ departFilterSql
 				   	+ materialNameFilterSql
 				   	+ materialTypeFilterSql
-					+ " group by i.settleaccountsdepart,ii.materialName) ";
+					+ " group by i.settleaccountsdepart,case when td.name is null then ii.materialName else ii.materialName "+ concatSymbolInDb +" '(' "+ concatSymbolInDb +" td.name "+ concatSymbolInDb +"')' end,td.id) ";
 		}
 		// 材料退货
 		materialReturnSql = " union all (select rr.depart as settleaccountsdepart "+ noQuerySupplierName+",ii.materialName,-sum(ii.amount),-sum(ii.settlementPrice),"