Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r32763 -r32764
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32763)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 32764)
@@ -5827,7 +5827,7 @@
 					+ " group by rr.depart,rr.settleAccountsDepart,ri.toussename,"+returnGoodsTousseType+",ri.batchNumber"+ groupByMaterialAmountAtThatTime +",dgbs.expDate,"+returnGoodsTousseDefinitionId+ dgbsOfSupplierNameSql +") ";
 		
 		String supplyRoomTousseTypeSql = "";
-		if(typeSearch.contains(TYPE_AUTO_DEDUCTION)){
+		if(StringUtils.isBlank(typeSearch) || typeSearch.contains(TYPE_AUTO_DEDUCTION)){
 			supplyRoomTousseTypeSql = String.format(" and rr.type='%s' ", InvoiceItem.TYPE_AUTO_DEDUCTION);
 		}
 		String supplyRoomDiposableGoodsSql = " union all (select "+ sumRriAmountSql +" rr.depart,rr.depart as settleaccountsdepart "+ dgbsOfSupplierNameSql + noQueryIntegralSql +",rri.goodsName,sum(rri.amount),"
@@ -5873,26 +5873,26 @@
 //			sql += materialInvoiceSql;
 		}
 		
-		if (typeSearch.contains("器械包") || typeSearch.contains("器械材料") || typeSearch.contains("全部") || StringUtils.isBlank(typeSearch) || typeSearch.contains("全部器械包") || typeSearch.contains("高值耗材")) {
+		if (StringUtils.isBlank(typeSearch) && typeSearch.contains("器械包") || typeSearch.contains("器械材料") || typeSearch.contains("全部") || StringUtils.isBlank(typeSearch) || typeSearch.contains("全部器械包") || typeSearch.contains("高值耗材")) {
 			sql += lostMaterial;
 			sql += damageMaterial;
 		}
 		String chargeDateSql = "";//收费项目时间过滤
-		if(TYPE_CHARGE.equals(typeSearch) || TYPE_ALL.equals(typeSearch) || StringUtils.isBlank(typeSearch)){
+		if(StringUtils.isBlank(typeSearch) || typeSearch.contains(TYPE_CHARGE) || typeSearch.contains(TYPE_ALL)){
 			if(StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)){
 				chargeDateSql = String.format(" and chargeTime %s ", betweenSql);
 			}
 			if(StringUtils.isNotBlank(departSearch)){
 				chargeDepartSql = String.format(" and %s ", SqlUtils.getStringFieldInLargeCollectionsPredicate("ci.orgUnitCode", departCodingSet));
 			}
 		}
-		if(TYPE_CHARGE.equals(typeSearch)){
+		if(StringUtils.isNotBlank(typeSearch) && typeSearch.contains(TYPE_CHARGE)){
 			String chargeSql = String.format(" select "+ noMaterialAmountSql +"ci.orgUnitName depart, ci.orgUnitName settleAccountsDepart"+ noQueryIntegralSql +",chargeItem  name,1 amount,price settlementprice,0 settlementDiscountPrice,'收费项目' type ,''  batchNumber,NULL as expDate ,null as tousseDefinitionId "
 					+ " from ChargeRecordItem ci inner join ChargeRecord cr on cr.id=ci.chargeRecord_id where 1=1 %s %s %s %s group by ci.orgUnitName,chargeItem,price,chargeTime "
 					, chargeDepartSql,chargeDateSql,chargeItemSql,
 					ciOrgUnitCodeSql);
 			sql = chargeSql;
-		}else if(TYPE_ALL.equals(typeSearch) || StringUtils.isBlank(typeSearch)){
+		}else if(StringUtils.isBlank(typeSearch) || typeSearch.contains(TYPE_ALL)){
 			sql += String.format(" union all select "+ noMaterialAmountSql +"ci.orgUnitName depart,ci.orgUnitName settleAccountsDepart"+ noQueryIntegralSql +",chargeItem  name,1 amount,price settlementprice,0 settlementDiscountPrice,'收费项目' type ,''  batchNumber,NULL as expDate ,null as tousseDefinitionId "
 					+ " from ChargeRecordItem ci inner join ChargeRecord cr on cr.id=ci.chargeRecord_id where 1=1 %s %s %s %s group by ci.orgUnitName,chargeItem,price,chargeTime "
 					, chargeDepartSql,chargeDateSql,chargeItemSql,