Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33043 -r33052
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33043)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33052)
@@ -5552,10 +5552,8 @@
 		}
 		String typeFilterSql = " ";
 		String expensiveDisposablegoodsSql = "";
+		String expensiveDisposablegoodsIdSql = "";
 		if (StringUtils.isNotBlank(typeSearch)) {
-			
-		}
-		if (StringUtils.isNotBlank(typeSearch)) {
 			typeFilterSql = String.format(" and (%s)", SqlUtils.getStringFieldInLargeCollectionsPredicate("ii.tousseType", allTousseType));
 			returnGoodsItemPredicate += String.format(" and ri.tousseDefinition_id in (select id from TousseDefinition where %s) ", SqlUtils.getStringFieldInLargeCollectionsPredicate("tousseType", allTousseType));
 			returnGoodsFilterSql += " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("rr.type", returnGoodType);
@@ -5599,11 +5597,15 @@
 							materialTypeFilterSql = " and 1=2 ";
 						}else{
 							materialTypeFilterSql = " and d.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'";
+							expensiveDisposablegoodsIdSql = " and 1=2 ";
 						}
 					}else{
 						materialTypeFilterSql += " and d.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'";
 					}
 				}
+			}else{
+				lostMaterialFilterSql += " and 1=2 ";
+				damageFilterSql += " and 1=2 ";
 			}
 		}else{
 			if(!enableExpensiveGoods){
@@ -5794,6 +5796,7 @@
 						+ iDepartCodingSql
 						+ nameFilterSql
 						+ " and d.expensiveDisposablegoodsId is not null "
+						+ expensiveDisposablegoodsIdSql
 						+ " group by  i.depart,i.settleaccountsdepart,d.name,d.batch,dgbs.expDate "+ dgbsOfSupplierNameSql +") ";
 			}
 			if(typeSearch.contains(TYPE_AUTO_DEDUCTION)){
@@ -5971,7 +5974,7 @@
 					, chargeDepartSql,chargeDateSql,chargeItemSql,
 					ciOrgUnitCodeSql);
 			sql += chargeSql;
-		}else if(StringUtils.isBlank(typeSearch) || typeSearch.contains(TYPE_ALL)){
+		}else if(StringUtils.isBlank(typeSearch)){
 			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,