Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
===================================================================
diff -u -r14494 -r14524
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 14494)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 14524)
@@ -42,6 +42,7 @@
 		}
 		var querySupplyRoom = Ext.getCmp('querySupplyRoom').getValue();
 		var materialName = Ext.getCmp('maerialName').getRawValue();
+		var tousseName = Ext.getCmp('tousseName').getRawValue();
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
 			removeMask: true
@@ -52,7 +53,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+"&materialName="+materialName+"",'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+"&tousseName="+tousseName+"",'thisIframe','_self');
 	}
 
 		var columns = [
@@ -132,6 +133,23 @@
 			])
 		});
 		
+		var tousseDefinitionStore = new Ext.data.Store({
+			proxy : new Ext.data.HttpProxy({
+				url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do',
+				method : 'POST'
+			}),
+			reader : new Ext.data.JsonReader({
+				totalProperty : 'totalCount',
+				root : 'data'
+			}, [
+			    {name : 'id',mapping : 'id'}, 
+			    {name : 'spelling',mapping : 'spelling'}, 
+			    {name : 'name',mapping : 'name'}, 
+			    {name : 'displayName',mapping : 'displayName'}, 
+			    {name : 'amount',mapping : 'amount'}]
+			)
+		});
+		
 		var monitoringTypeStore = new Ext.data.SimpleStore( {
 			fields : [ 'value' ],
 			data : [['质量监测'], ['定期监测']]
@@ -279,7 +297,7 @@
 						id : 'maerialName',
 						name : 'maerialName',
 						queryParam : 'spell',
-						fieldLabel : '物品名称',
+						fieldLabel : '材料名称',
 						minChars : 0,
 						valueField : 'name',
 						displayField : 'name',
@@ -293,6 +311,29 @@
 						typeAhead : false,
 						allowBlank : true
 					}]
+				},{
+					layout:'form',
+					columnWidth:.22,
+					labelWidth:70,
+					items:[{
+						xtype : 'combo',
+						id : 'tousseName',
+						name : 'tousseName',
+						queryParam : 'spell',
+						fieldLabel : '器械包名称',
+						minChars : 0,
+						valueField : 'name',
+						displayField : 'name',
+						store : tousseDefinitionStore,
+						forceSelection : true,
+						lazyInit : true,
+						anchor : '95%',
+						listWidth:200,
+						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						allowBlank : true
+					}]
 				}]
 			}],
 			buttons:[{
@@ -310,6 +351,7 @@
 					Ext.getCmp('startDate').setValue("");
 					Ext.getCmp('endDate').setValue("");
 					Ext.getCmp('maerialName').setValue("");
+					Ext.getCmp('tousseName').setValue("");
 				}
 			}]
 		});
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r14514 -r14524
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 14514)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 14524)
@@ -1923,6 +1923,7 @@
 		String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", "");
 		String inspectItem = StrutsParamUtils.getPraramValue("inspectItem", "");
 		String materialName = StrutsParamUtils.getPraramValue("materialName", "");
+		String tousseName = StrutsParamUtils.getPraramValue("tousseName", "");
 		String monitoringType = StrutsParamUtils.getPraramValue(
 				"monitoringType", "");
 		if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)
@@ -1938,8 +1939,11 @@
 			if( StringUtils.isNotBlank(materialName)){
 				sql += " and po.material like '%" + materialName + "%'";
 			}
+			if( StringUtils.isNotBlank(tousseName)){
+				sql += " and po.tousseName like '%" + tousseName + "%'";
+			}
 			// 根据材料名称排序
-			sql += " order by " + dateQueryAdapter.dateConverAdapter("po.dateTime","yyyy-MM-dd")+",po.material";
+			sql += " order by " + dateQueryAdapter.dateConverAdapter("po.dateTime","yyyy-MM-dd")+",po.tousseName,po.material";
 			List<QualityMonitoring> qualityMonitoringList = qualityMonitoringManager
 					.findQualityMonitoringBySql(sql);
 			for (QualityMonitoring qualityMonitoring : qualityMonitoringList) {