Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r34885 -r34894
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 34885)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 34894)
@@ -147,6 +147,7 @@
 	{name : 'disposableGoodsId'},
 	{name : 'oldTousseName'},
 	{name : 'tousseName'},
+	{name : 'oldName',mapping:'tousseName'},
 	{name : 'packed'},
 	{name : 'weight'},
 	{name : 'supplierName'},
@@ -759,9 +760,11 @@
 			}
 
 			if(materialNode.get("type") == '一次性物品'){
-				if(materialNode.get("tousseName") !== materialNode.get("oldName")){
-					disposableGoodsId = ''
-					type = 'material';
+				if(materialNode.get("oldName")){
+					if(materialNode.get("tousseName") !== materialNode.get("oldName")){
+						disposableGoodsId = ''
+						type = 'material';
+					}
 				}
 			}
 
@@ -791,7 +794,6 @@
 			msg = "外来器械材料数量不能都为0！";
 			break;
 		}
-		
 		foreignTousseInfo.push({
 			tousseItemId : n.get("id"),
 			tousseDefinitionId : n.get("tousseDefinitionId"),
@@ -2186,7 +2188,6 @@
 				select: function(v,r,p) {
 					currentRecord.set("type",r[0].data.type);
 					currentRecord.set("price",r[0].data.price);
-					currentRecord.set("oldName",r[0].data.name);
 					currentRecord.set("disposableGoodsId",r[0].data.id);
 				}
             }  
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addMaterials.jsp
===================================================================
diff -u -r29513 -r34894
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addMaterials.jsp	(.../addMaterials.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addMaterials.jsp	(.../addMaterials.jsp)	(revision 34894)
@@ -45,7 +45,17 @@
 					var htmlResultCode = "<ul class='list-item clearfix'>";
 					num = tousseArray.length>countOfLI?countOfLI:tousseArray.length;
 					for(var i = 0 ; i < num ; i++){
-						htmlResultCode += "<li><a href='#' onclick=\"addToussItem('"+tousseArray[i].materialDefinitionId+"','"+tousseArray[i].showName+"','"+tousseArray[i].isImplant+"');\">"+ tousseArray[i].showName + "</a></li>";
+						var showName = tousseArray[i].showName || '';
+						var id = tousseArray[i].materialDefinitionId || '';
+						var isImplant = tousseArray[i].isImplant || '否';
+						if(showName == ''){
+							showName = tousseArray[i].displayName || '';
+						}
+						if(id == ''){
+							id = tousseArray[i].id || '';
+						}
+
+						htmlResultCode += "<li><a href='#' onclick=\"addToussItem('"+id+"','"+showName+"','"+isImplant+"');\">"+ showName + "</a></li>";
 					}
 					if(tousseArray.length < countOfLI){
 						for(var i = tousseArray.length ; i < countOfLI ; i++){