Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r30040 -r30059
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 30040)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 30059)
@@ -5510,7 +5510,7 @@
 				   	+ materialTypeFilterSql
 					+ " group by i.depart,i.settleaccountsdepart,case when td.name is null then ii.materialName else ii.materialName "+ concatSymbolInDb +" '(' "+ concatSymbolInDb +" td.name "+ concatSymbolInDb +"')' end,td.id) ";
 		}
-		if("全部".equals(typeSearch) || "器械材料".equals(typeSearch)){
+		if(StringUtils.isBlank(typeSearch) || "全部".equals(typeSearch) || "器械材料".equals(typeSearch)){
 			// 材料退货
 			materialReturnSql = " union all (select rr.depart,rr.settleAccountsDepart "+ noQuerySupplierName + noQueryIntegralSql +",ii.materialName,-sum(ii.amount),-sum(ii.settlementPrice),"
 					+"-sum(ii.settlementPrice) as settlementDiscountPrice,'材料' as type,'' as batchNumber,null as expDate,0 as tousseDefinitionId "
@@ -5607,7 +5607,7 @@
 //			sql += materialInvoiceSql;
 		}
 		
-		if ("器械包".equals(typeSearch) || "器械材料".equals(typeSearch) || "全部".equals(typeSearch) || typeSearch == null || "全部器械包".equals(typeSearch) || "高值耗材".equals(typeSearch)) {
+		if ("器械包".equals(typeSearch) || "器械材料".equals(typeSearch) || "全部".equals(typeSearch) || StringUtils.isBlank(typeSearch) || "全部器械包".equals(typeSearch) || "高值耗材".equals(typeSearch)) {
 			sql += lostMaterial;
 			sql += damageMaterial;
 		}