Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r13641 -r13705
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 13641)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 13705)
@@ -902,12 +902,36 @@
 			}
 			JSONObject json = tousseDefinitionManager.searchTousseDefinition(
 					spell, TousseDefinition.PACKAGE_TYPE_FOREIGN, null,false);
+
+			//外来器械去掉下划线、相同名称的物品取最后一次的包定义
+			Map<String, JSONObject> map = new HashMap<String, JSONObject>();
+			JSONArray array = json.optJSONArray("data");
+			if(array != null && array.size() > 0){
+				for (int i = 0 ; i < array.size() ; i++) {
+					JSONObject obj = array.optJSONObject(i);
+					String tousseName = obj.optString("name");
+					int index = tousseName.lastIndexOf("_");
+					if(index != -1){
+						tousseName = tousseName.substring(0,index);
+						obj.put("name", tousseName);
+					}
+					map.put(tousseName,obj);
+				}
+			}
+			JSONObject obj = new JSONObject();
+			JSONArray data = new JSONArray();
+			
+			for (String tousseName : map.keySet()) {
+				data.add(map.get(tousseName));
+			}
+			obj.put("totalCount", data.size());
+			obj.put("data", data);
 			HttpServletResponse response = StrutsParamUtils.getResponse();
 			response.setCharacterEncoding("UTF-8");
 			PrintWriter out;
 			try {
 				out = response.getWriter();
-				out.print(json);
+				out.print(obj);
 				out.close();
 			} catch (IOException e) {
 				e.printStackTrace();
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js
===================================================================
diff -u -r13686 -r13705
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js	(.../foreignTousseApplicationForm.js)	(revision 13686)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js	(.../foreignTousseApplicationForm.js)	(revision 13705)
@@ -208,26 +208,7 @@
 		    {name : 'amount',mapping : 'amount'},
 		    {name : 'suppler',mapping : 'suppler'},
 		    {name : 'includeImplant',mapping : 'includeImplant'}]
-		),
-		listeners:{
-			load:function(thiz,records,options){
-				var map = new Map();
-				var array = new Array();
-				//过滤重复的包名、影藏的Id
-				for ( var i = 0; i < records.length; i++) {
-					var name = records[i].data.name;
-					records[i].set("name",name);
-					if(map.get(name) == null){
-						map.put(name,name);
-					}else{
-						array[array.length] = records[i];
-					}
-				}
-				for ( var j = 0; j < array.length; j++) {
-					foreignTousseJsonStore.remove(array[j]);
-				}
-			}
-		}
+		)
 	});
 	var sexArray = [['男'],['女']];
 	var form = new top.Ext.FormPanel( {
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js
===================================================================
diff -u -r12331 -r13705
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/tousseGoods/tousseGoodsWarningView.js	(.../tousseGoodsWarningView.js)	(revision 13705)
@@ -57,19 +57,20 @@
     if(count == 0 || count == null){
         showResult("当前无"+entityName+"可操作！");
         return false;
-        
     }
-    var warningType = Ext.getCmp('warningType').getValue();
-    var remark = showSelectTousseDiscardCauseWin();
-    Ext.Ajax.request({
-        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteAllTousseGoods.do',
-        params : {reason:remark,warningType : warningType,department:department},
-        success : function(response, options) {
-            showResult("废弃成功!");
-            grid.dwrReload();
-        },
-        failure : function(response, options) {}
-    });
+    if(window.confirm('是否确定要全部废弃？')){
+    	var warningType = Ext.getCmp('warningType').getValue();
+	    var remark = showSelectTousseDiscardCauseWin();
+	    Ext.Ajax.request({
+	        url :  WWWROOT + '/disinfectSystem/tousseInstanceAction!deleteAllTousseGoods.do',
+	        params : {reason:remark,warningType : warningType,department:department},
+	        success : function(response, options) {
+	            showResult("废弃成功!");
+	            grid.dwrReload();
+	        },
+	        failure : function(response, options) {}
+	    });
+    }
 }
 
 function loadDepartByBarcode(barcode){