Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp
===================================================================
diff -u -r12331 -r14471
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp	(.../qualityMonitoringView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp	(.../qualityMonitoringView.jsp)	(revision 14471)
@@ -60,6 +60,7 @@
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_monthSearch" name="parm_s_monthSearch" value="">
     <input type="hidden" id="parm_s_departSearch" name="parm_s_departSearch" value="">
+    <input type="hidden" id="parm_s_maerialSearch" name="parm_s_maerialSearch" value="">
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
===================================================================
diff -u -r12331 -r14471
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 14471)
@@ -41,6 +41,7 @@
 			return;
 		}
 		var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue();
+		var materialName = Ext.getCmp('maerialName').getRawValue();
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
 			removeMask: true
@@ -51,7 +52,7 @@
 		if(monitoringType == "定期监测"){
 			reportFile = "routineMonitoringReport.jasper";
 		}
-		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+reportFile+"&monitoringType="+monitoringType+"&reportName=QualityMonitoring&startDate="+startDate+"&endDate="+endDate+"&inspectItem="+inspectItem+"&querySupplyRoom="+querySupplyRoom+"",'thisIframe','_self');
+		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+reportFile+"&monitoringType="+monitoringType+"&reportName=QualityMonitoring&startDate="+startDate+"&endDate="+endDate+"&inspectItem="+inspectItem+"&querySupplyRoom="+querySupplyRoom+"&materialName="+materialName+"",'thisIframe','_self');
 	}
 
 		var columns = [
@@ -115,6 +116,21 @@
 			thiz.baseParams["type"] = Ext.getCmp('monitoringType').getValue();
 		});
 		
+		var materialDefinitionStore = new Ext.data.Store({
+			proxy : new Ext.data.HttpProxy({
+				url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionDataForMaterial.do',
+				method : 'POST'
+			}),
+			reader : new Ext.data.JsonReader({
+				totalProperty : 'totalCount',
+				root : 'data'
+			}, [
+			    {name : 'id',mapping : 'id'},
+			    {name : 'spelling',mapping : 'spelling'},
+			    {name : 'type',mapping : 'type'},
+			    {name : 'name',mapping : 'name'}
+			])
+		});
 		
 		var monitoringTypeStore = new Ext.data.SimpleStore( {
 			fields : [ 'value' ],
@@ -254,6 +270,29 @@
 						id : "inspectItem",
 						anchor : '95%'
 					}]
+				},{
+					layout:'form',
+					columnWidth:.22,
+					labelWidth:60,
+					items:[{
+						xtype : 'combo',
+						id : 'maerialName',
+						name : 'maerialName',
+						queryParam : 'spell',
+						fieldLabel : '物品名称',
+						minChars : 0,
+						valueField : 'name',
+						displayField : 'name',
+						store : materialDefinitionStore,
+						forceSelection : true,
+						lazyInit : true,
+						anchor : '95%',
+						listWidth:200,
+						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						allowBlank : true
+					}]
 				}]
 			}],
 			buttons:[{
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r14367 -r14471
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 14367)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 14471)
@@ -218,8 +218,7 @@
 		String rootPath = StrutsParamUtils.getRequest().getSession()
 				.getServletContext().getRealPath("");
 		String realPath = rootPath + "\\jasperRtp\\" + jasperreportName;// 报表文件workload.jasper路径
-		if (StringUtils
-				.equals("workQualityCollection.jasper", jasperreportName)) {
+		if (StringUtils.equals("workQualityCollection.jasper", jasperreportName)) {
 			if (StringUtils.equals(parameters.get("type"),"split")) {
 				realPath = rootPath
 						+ "\\jasperRtp\\workQualityCollection2.jasper";
@@ -1924,6 +1923,7 @@
 		
 		String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", "");
 		String inspectItem = StrutsParamUtils.getPraramValue("inspectItem", "");
+		String materialName = StrutsParamUtils.getPraramValue("materialName", "");
 		String monitoringType = StrutsParamUtils.getPraramValue(
 				"monitoringType", "");
 		if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)
@@ -1935,6 +1935,12 @@
 					+ " and po.type = '" + monitoringType
 					+ "' and po.inspectItem = '" + inspectItem + "'"
 					+ " and po.orgUnitCoding = '" + querySupplyRoom + "'";
+					
+			if( StringUtils.isNotBlank(materialName)){
+				sql += " and po.material like '%" + materialName + "%'";
+			}
+			// 根据材料名称排序
+			sql += " order by " + dateQueryAdapter.dateConverAdapter("po.dateTime","yyyy-MM-dd")+",po.material";
 			List<QualityMonitoring> qualityMonitoringList = qualityMonitoringManager
 					.findQualityMonitoringBySql(sql);
 			for (QualityMonitoring qualityMonitoring : qualityMonitoringList) {