Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
===================================================================
diff -u -r33379 -r33384
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js	(.../setGoodsOption.js)	(revision 33379)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js	(.../setGoodsOption.js)	(revision 33384)
@@ -266,30 +266,38 @@
 			addGoodsToGridPanel(name,id);
 		}
 	},{
-		text : '全部器械包',
+		text : '添加所有搜索结果',
 		hidden : !isTousse,
 		handler:function(){
-			Ext.Ajax.request({
-				url :  WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchTousseByTypeArr.do',
-				params : {
-					tousseTypes : tousseTypes,
-					model : model
-				},
-				success : function(response, options) {
-					var result = Ext.decode(response.responseText);
-					if (result && result.data) {
-						var recordArray = new Array();
-						var tousseArray = result.data;
-						for(var i = 0; i < tousseArray.length; i ++){
-							recordArray.push(new GoodsRecord({name : tousseArray[i].name,id : tousseArray[i].id}));
+			if(tousseAndDiposableGoodsStore.getCount() > 0){
+				for (var i = 0; i < tousseAndDiposableGoodsStore.getCount(); i++) {
+					if(apparatusInfuTypeStore.getCount() > 0){
+						var isHas = false;
+						for (var j = 0; j < apparatusInfuTypeStore.getCount(); j++) {
+							if(apparatusInfuTypeStore.getAt(j).get('name') == tousseAndDiposableGoodsStore.getAt(i).get('name')){
+								isHas = true;
+								continue;
+							}
 						}
-						batchAddGoodsToGridPanel(recordArray);
+						if(!isHas){
+							var goodsRecord  = new GoodsRecord({
+								name:tousseAndDiposableGoodsStore.getAt(i).get('name'),
+								id:tousseAndDiposableGoodsStore.getAt(i).get('id')
+							});
+							apparatusInfuTypeStore.add(goodsRecord);
+						}
+					}else {
+						var goodsRecord  = new GoodsRecord({
+							name:tousseAndDiposableGoodsStore.getAt(i).get('name'),
+							id:tousseAndDiposableGoodsStore.getAt(i).get('id')
+						});
+						apparatusInfuTypeStore.add(goodsRecord);
 					}
-				},
-				failure : function(response, options) {
-					showResult('加载器械包异常');
 				}
-			});
+				tousseAndDiposableGoodsStore.removeAll();
+			}else {
+				showResult('请先输入物品名称进行搜索！')
+			}
 		}
 	},{
 		text : '全部一次性物品',