Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
===================================================================
diff -u -r33409 -r33771
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 33409)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 33771)
@@ -634,6 +634,15 @@
 			isShowTousseMaerialSumAmount: isShowTousseMaerialSumAmount,
 			reportName: 'QualityMonitoring'
 		}
+
+		if(sstsConfig.enableInstrumentSetTypeSetting){
+			var instrumentSetTypes = Ext.getCmp('instrumentSetTypes').getValue();
+			if(instrumentSetTypes !== ''){
+				instrumentSetTypes = instrumentSetTypes.replace(/;/g,',');
+			}
+			params.instrumentSetTypes = instrumentSetTypes;
+		}
+
 		Ext.Ajax.request({
 			url: url,
 			async: false,
@@ -825,7 +834,7 @@
 					readOnly: false,
 					format: 'Y-m-d',
 					value: newDate,
-					anchor: '95%',
+					anchor: '90%',
 					listeners: {
 						specialkey: function (field, ee) {
 							if (ee.getKey() == Ext.EventObject.ENTER) {
@@ -966,9 +975,34 @@
 					typeAhead: false,
 					allowBlank: true
 				}]
-			}, {
+			},{
+				layout:'form',
+				columnWidth:.4,
+				hidden:!sstsConfig.enableInstrumentSetTypeSetting,
+		    	items:[{
+					//用于保存时：传递器械包种类id
+					xtype : 'hidden',
+					id : 'instrumentSetTypes',
+					name : 'instrumentSetTypes'
+				},{
+					xtype : 'trigger',
+					fieldLabel : "器械包种类",
+					allowBlank : true,
+					name : "tousseSetTypeName",
+					id : "tousseSetTypeName",
+					msgTarget:'side',
+					readOnly:true,
+					onTriggerClick : function(){
+						var ids = Ext.getCmp('instrumentSetTypes').getValue();
+						var names = Ext.getCmp('tousseSetTypeName').getValue();
+						setInstrumentSetType('instrumentSetTypes' , 'tousseSetTypeName' , ids, names);
+					},
+					triggerClass : 'x-form-search-trigger',
+					anchor : '95%'
+				}]
+		    }, {
 				layout: 'form',
-				columnWidth: .4,
+				columnWidth: .2,
 				id: 'showCheckBox',
 				hidden: true,
 				items: [new Ext.form.Checkbox({
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp
===================================================================
diff -u -r33333 -r33771
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp	(.../qualityMonitoringView.jsp)	(revision 33333)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp	(.../qualityMonitoringView.jsp)	(revision 33771)
@@ -9,6 +9,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta http-equiv= "X-UA-Compatible" content="IE=8,chrome=1" />
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/ReportFormsCenterTableManager.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r33667 -r33771
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 33667)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 33771)
@@ -4259,11 +4259,21 @@
             nameArr.push(record.get('name'));
         }
         if (idsArr.length != 0) {
-            top.Ext.getCmp(extHiddenElementId).setValue(idsArr.join(";"));
-            top.Ext.getCmp(extComboElementId).setValue(nameArr.join(";"));
+            if (top.Ext.getCmp(extHiddenElementId)) {
+                top.Ext.getCmp(extHiddenElementId).setValue(idsArr.join(";"));
+                top.Ext.getCmp(extComboElementId).setValue(nameArr.join(";"));
+            } else if (Ext.getCmp(extHiddenElementId)) {
+                Ext.getCmp(extHiddenElementId).setValue(idsArr.join(";"));
+                Ext.getCmp(extComboElementId).setValue(nameArr.join(";"));
+            }
         } else {
-            top.Ext.getCmp(extHiddenElementId).setValue("");
-            top.Ext.getCmp(extComboElementId).setValue("");
+            if (top.Ext.getCmp(extHiddenElementId)) {
+                top.Ext.getCmp(extHiddenElementId).setValue("");
+                top.Ext.getCmp(extComboElementId).setValue("");
+            } else if (Ext.getCmp(extHiddenElementId)) {
+                Ext.getCmp(extHiddenElementId).setValue("");
+                Ext.getCmp(extComboElementId).setValue("");
+            }
         }
         select_TypeGridStore.removeAll();
         win.close();
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
===================================================================
diff -u -r33499 -r33771
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js	(.../tousseWorkLoadView.js)	(revision 33499)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js	(.../tousseWorkLoadView.js)	(revision 33771)
@@ -66,6 +66,14 @@
 		queryType:statType
 	}
 
+	if(sstsConfig.enableInstrumentSetTypeSetting){
+		var instrumentSetTypes = Ext.getCmp('instrumentSetTypes').getValue();
+		if(instrumentSetTypes !== ''){
+			instrumentSetTypes = instrumentSetTypes.replace(/;/g,',');
+		}
+		params.instrumentSetTypes = instrumentSetTypes;
+	}
+	
 	searchReport(url,params);
 }
 
@@ -487,7 +495,32 @@
 		    },{
 				layout:'form',
 				columnWidth:.2,
+				hidden:!sstsConfig.enableInstrumentSetTypeSetting,
 		    	items:[{
+					//用于保存时：传递器械包种类id
+					xtype : 'hidden',
+					id : 'instrumentSetTypes',
+					name : 'instrumentSetTypes'
+				},{
+					xtype : 'trigger',
+					fieldLabel : "器械包种类",
+					allowBlank : true,
+					name : "tousseSetTypeName",
+					id : "tousseSetTypeName",
+					msgTarget:'side',
+					readOnly:true,
+					onTriggerClick : function(){
+						var ids = Ext.getCmp('instrumentSetTypes').getValue();
+						var names = Ext.getCmp('tousseSetTypeName').getValue();
+						setInstrumentSetType('instrumentSetTypes' , 'tousseSetTypeName' , ids, names);
+					},
+					triggerClass : 'x-form-search-trigger',
+					anchor : '95%'
+				}]
+		    },{
+				layout:'form',
+				columnWidth:.2,
+		    	items:[{
 		    		xtype : 'combo',
 					fieldLabel : '灭菌方式',
 					id : 'sterilizationMode',