Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r15064 -r15069
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 15064)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 15069)
@@ -6350,9 +6350,10 @@
 				supplyRoomDiposableGoodsFilterSql += " and rri.materialDefinition_id in (select id from MaterialDefinition) ";
 				outEntryFilterSql += " and 1=2";
 			} else if ("高值耗材".equals(typeSearch)) {
+				//goodsType是高值耗材类型，值有全部、一次性物品、器械
 				if(StringUtils.isNotBlank(goodsType)){
 					if("一次性物品".equals(goodsType)){
-						returnGoodsFilterSql += " and ri.expensiveDisposablegoodsId is not null ";
+						returnGoodsFilterSql += " and ri.expensiveDisposablegoodsId is not null and  ri.expensiveDisposablegoodsId <> 0";
 						materialTypeFilterSql = " and 1=2 ";
 						supplyRoomDiposableGoodsFilterSql += " and d.goodsType = '"+DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS+"'";
 						lostMaterialFilterSql += " and 1=2 ";
@@ -6368,7 +6369,7 @@
 						expensiveDisposablegoodsSql = " and 1=2 ";
 					}
 				}else{
-					returnGoodsFilterSql += " and ri.expensiveDisposablegoodsId is not null";
+					returnGoodsFilterSql += " and ri.expensiveDisposablegoodsId is not null and  ri.expensiveDisposablegoodsId <> 0";
 					materialTypeFilterSql = " and d.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'";
 					supplyRoomDiposableGoodsFilterSql += " and rri.materialDefinition_id in (select id from MaterialDefinition where goodsType = '"
 							+ MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS + "') ";