Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r30839 -r30841
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 30839)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 30841)
@@ -5899,25 +5899,43 @@
             if(application.useRecordId != null){
             	$("#useRecordId").val(application.useRecordId);
 			}
-           	if(application.recyclingRecordId != null){//外来器械申请单二次回收,会有历史回收记录
+           	if(application.recyclingRecordId != null && application.type !== TYPE_FOREIGNTOUSSEAPPLIACTION){
 				loadRecyclingRecordById(application.recyclingRecordId);
-           		findMaterialErrorDamageByTousseBarcode(application.tousseBarcodes)
-     	   		//如果回收数量为0不显示
-         	   	if(sstsConfig.hideZeroPrerecycleAmountTousseItem && application.isPrepareRecycled === 1){
-   					//配置为预回收为0的物品不显示，相当于删除，但是需要是没有丢失报损的
-         	   		var rows = $("#tousseItemTable > tbody > tr").length;
-         	   		for(var index = 0; index < rows;++index){
-	         	   		var message = checkHaveErrorDamage(index);
-	       	        	if(isUndefinedOrNullOrEmpty(message)){
-	       	        		var recycleAmountStr = $("#recycleAmount" + index).val();
-	       	        		var recycleAmount = parseInt(recycleAmountStr);
-	       	        		if(recycleAmount==0){
-	       	        			deleteTousseItem(index);
-	       	        		}
-	       	        	}
-         	   		}
-   				}
-           	}else{
+				findMaterialErrorDamageByTousseBarcode(application.tousseBarcodes)
+				//如果回收数量为0不显示
+				if(sstsConfig.hideZeroPrerecycleAmountTousseItem && application.isPrepareRecycled === 1){
+					//配置为预回收为0的物品不显示，相当于删除，但是需要是没有丢失报损的
+					var rows = $("#tousseItemTable > tbody > tr").length;
+					for(var index = 0; index < rows;++index){
+						var message = checkHaveErrorDamage(index);
+						if(isUndefinedOrNullOrEmpty(message)){
+							var recycleAmountStr = $("#recycleAmount" + index).val();
+							var recycleAmount = parseInt(recycleAmountStr);
+							if(recycleAmount==0){
+								deleteTousseItem(index);
+							}
+						}
+					}
+				}
+           	}else if(application.recyclingRecordId != null && application.type == TYPE_FOREIGNTOUSSEAPPLIACTION && application.recyclingStatus == "部分接收"){
+				loadRecyclingRecordById(application.recyclingRecordId);
+				findMaterialErrorDamageByTousseBarcode(application.tousseBarcodes)
+				//如果回收数量为0不显示
+				if(sstsConfig.hideZeroPrerecycleAmountTousseItem && application.isPrepareRecycled === 1){
+					//配置为预回收为0的物品不显示，相当于删除，但是需要是没有丢失报损的
+					var rows = $("#tousseItemTable > tbody > tr").length;
+					for(var index = 0; index < rows;++index){
+						var message = checkHaveErrorDamage(index);
+						if(isUndefinedOrNullOrEmpty(message)){
+							var recycleAmountStr = $("#recycleAmount" + index).val();
+							var recycleAmount = parseInt(recycleAmountStr);
+							if(recycleAmount==0){
+								deleteTousseItem(index);
+							}
+						}
+					}
+				}
+			}else{
            		if (sstsConfig.showSettleAccountsDepartInRecycling){
 	           		$("#depart").text(application.settleAccountsDepart);
 	                $("#departCode").val(application.settleAccountsDepartCoding);