Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r14412 -r14416
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 14412)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 14416)
@@ -458,7 +458,18 @@
 		}
 		//为外来器械申请单设置科室查看权限
 		setReaders(foreignTousseApplication);
-		foreignTousseApplication.setRemark("病人："+foreignTousseApplication.getPatient()+",住院号："+foreignTousseApplication.getHospitalNumber());
+		
+		String remark = foreignTousseApplication.getRemark();
+		if(StringUtils.isBlank(remark)){
+			remark = "";
+		}
+		if(StringUtils.isNotBlank(foreignTousseApplication.getPatient())){
+			remark += ("，病人："+foreignTousseApplication.getPatient());
+		}
+		if(StringUtils.isNotBlank(foreignTousseApplication.getHospitalNumber())){
+			remark += ("，住院号："+foreignTousseApplication.getHospitalNumber());
+		}
+		foreignTousseApplication.setRemark(remark);
 		foreignTousseApplication.setApplicationItems(foreignTousseItems);
 	}
 
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r14414 -r14416
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 14414)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 14416)
@@ -608,6 +608,7 @@
 					canReturn = true;
 				}else{//已接收、未发货状态
 					preReturn = true;
+					canReturn = true;
 				}
 			}
 		});
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r14414 -r14416
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 14414)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 14416)
@@ -48,28 +48,35 @@
 		var length = $("#recyclingErrorTable tr").length;
 		var materials = new Array();
 		var msg = "";
-		for ( var i = 1; i < length; i++) {
-			var materialName = $('#materialName' + i).text();
-			var includeImplant = $('#includeImplant' + i).text();
-			var amount = $('#amount' + i).text();
-			var usedAmountOfIncludeImplant = $('#usedAmountOfIncludeImplant' + i).text();
-			var materialInstanceId = $('#materialInstanceId' + i).val();
-			if(materialName == ""){
-				msg = "外来器械材料必须填写名称！";
-				break;
-			}
-			if(includeImplant == ""){
-				msg = "外来器械材料必须填写是否植入物！";
-				break;
-			}
-			materials.push({
-				materialInstanceId : materialInstanceId,
-				materialName : materialName,
-				amount : amount,
-				includeImplant : includeImplant,
-				usedAmountOfIncludeImplant : usedAmountOfIncludeImplant
-			});
-		}
+		
+		var i = 1;
+		 $("#recyclingErrorTable tr").each(function () {
+			 if(i > 1){
+				 var materialInstanceId = $(this).find("input:first").val();
+				 var materialName = $(this).find("td:nth-child(3)").html();
+		         var includeImplant = $(this).find("td:nth-child(4)").html();
+		         var amount = parseInt($(this).find("td:nth-child(5)").html(),10);
+		         var usedAmountOfIncludeImplant = $(this).find("td:nth-child(7)").html();
+		         
+		         if(materialName == ""){
+					msg = "外来器械材料必须填写名称！";
+					return false;
+				 }
+				 if(includeImplant == ""){
+					msg = "外来器械材料必须填写是否植入物！";
+					return false;
+				 }
+				 materials.push({
+					materialInstanceId : materialInstanceId,
+					materialName : materialName,
+					amount : amount,
+					includeImplant : includeImplant,
+					usedAmountOfIncludeImplant : usedAmountOfIncludeImplant
+				 });
+			 }
+			 i++;
+	     });
+		
 		if(msg != ""){
 			alert(msg);
 			return false;
@@ -197,7 +204,6 @@
 					var materialItem = children[i];
 					
 					var materialElement = $('<tr>'
-							+ '<input type="hidden" id="type'+ rowNum +'" value="material"/>'
 							+ '<input type="hidden" id="materialInstanceId'+rowNum+'" value="'+materialItem.id+'"/>'
 							+ '<td class="w111">&nbsp</td>'
 							+ '<td class="w222" id="materialName' + rowNum + '" onclick="openSearcheMaterialFrom(this,' + rowNum + ')">' + materialItem.tousseName + '</td>'
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp
===================================================================
diff -u -r14414 -r14416
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 14414)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp	(.../customIntoBasket.jsp)	(revision 14416)
@@ -552,6 +552,9 @@
 				var tousseDefinitionID = msg[i].tousseDefinitionID;
 				var tousseAmount = msg[i].tousseAmountForMaterial;
 				var idCardBarcode = msg[i].idCardBarcode;
+				if(materialAmount <= 0){
+					continue;
+				}
 				addToussItem(i,tousseName,materialName,materialAmount,tousseDefinitionID,tousseAmount,idCardBarcode);
 			}
 		},