Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTournoverDaysStatisticsReport.js
===================================================================
diff -u -r37024 -r37034
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTournoverDaysStatisticsReport.js	(.../tousseTournoverDaysStatisticsReport.js)	(revision 37024)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseTournoverDaysStatisticsReport.js	(.../tousseTournoverDaysStatisticsReport.js)	(revision 37034)
@@ -143,21 +143,27 @@
 	var startDay = fullYear + "/01/01";
 	var currentDate = fullYear + "/" + (dt.getMonth() + 1) + "/" + dt.getDate();
 
+	//XJJQZYY-127：器械包名称store
 	var tousseDefinitionStore = new Ext.data.Store({
-		proxy: new Ext.data.HttpProxy({
-			url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do',
-			method: 'POST'
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
+			method : 'POST'
 		}),
-		reader: new Ext.data.JsonReader({
-			totalProperty: 'totalCount',
-			root: 'data'
+		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' }]
-		)
+		    {name : 'id',mapping : 'id'}, 
+		    {name : 'spelling',mapping : 'spelling'}, 
+		    {name : 'name',mapping : 'name'}, 
+		    {name : 'displayName',mapping : 'displayName'}, 
+		    {name : 'amount',mapping : 'amount'}]
+		),listeners : {
+			beforeload : function (){
+				tousseDefinitionStore.baseParams["tousseTypes"] = '敷料包,聚合包,器械包,外部代理灭菌,外来器械包,外来器械拆分小包,消毒物品,自定义器械包'
+				tousseDefinitionStore.baseParams["distinctName"] = true;//同名只返回一个
+			}
+		}
 	});
 
 	var form = new Ext.form.FormPanel({