Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r13316 -r13332
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13316)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13332)
@@ -4181,6 +4181,12 @@
 				lostMaterialFilterSql += " and 1=2 ";
 				damageFilterSql += " and 1=2 ";
 				supplyRoomDiposableGoodsFilterSql += " and rri.type = '一次性物品' ";
+			} else if ("器械材料".equals(typeSearch)) {
+				typeFilterSql = " and 1=2";
+				returnGoodsFilterSql += " and 1=2";
+				lostMaterialFilterSql += " and 1=1 ";
+				damageFilterSql += " and 1=1 ";
+				supplyRoomDiposableGoodsFilterSql += " and rri.materialDefinition_id in (select id from MaterialDefinition) ";
 			}
 		}
 		String goodsNameFilterSql = " ";
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r13299 -r13332
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 13299)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 13332)
@@ -37,6 +37,9 @@
 		if(tousseType == "全部"){
 			tousseType = "";
 		}
+		if(disposableGoodsType == "全部"){
+			disposableGoodsType = "";
+		}
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
 			removeMask: true