Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r33521 -r33530
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 33521)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 33530)
@@ -4091,16 +4091,19 @@
 	
 	tousseDefinitionStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchAllTousseAndAllDisposableGoods.do',
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do?type='+encodeURI('器械包和外来器械包'),
 			method : 'POST'
 		}),
 		reader : new Ext.data.JsonReader({
 			totalProperty : 'totalCount',
 			root : 'data'
 		}, [
 		    {name : 'id',mapping : 'id'}, 
-		    {name : 'name',mapping : 'name'}
-		])
+		    {name : 'spelling',mapping : 'spelling'}, 
+		    {name : 'name',mapping : 'name'}, 
+		    {name : 'displayName',mapping : 'displayName'}, 
+		    {name : 'amount',mapping : 'amount'}]
+		)
 	});
 	
 	formDefinitionStore = new Ext.data.Store({
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r33521 -r33530
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 33521)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 33530)
@@ -1428,16 +1428,19 @@
 	
 	var tousseDefinitionStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchAllTousseAndAllDisposableGoods.do',
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do?type='+encodeURI('器械包和外来器械包'),
 			method : 'POST'
 		}),
 		reader : new Ext.data.JsonReader({
 			totalProperty : 'totalCount',
 			root : 'data'
 		}, [
 		    {name : 'id',mapping : 'id'}, 
-		    {name : 'name',mapping : 'name'}
-		])
+		    {name : 'spelling',mapping : 'spelling'}, 
+		    {name : 'name',mapping : 'name'}, 
+		    {name : 'displayName',mapping : 'displayName'}, 
+		    {name : 'amount',mapping : 'amount'}]
+		)
 	});
 	
 	var formDefinitionStore = new Ext.data.Store({