Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r37927 -r37957
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 37927)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 37957)
@@ -81,7 +81,11 @@
 				 var remark = $('#remarks'+i).val();
 				 var materialName = $('#materialName'+i).html();
 		         var includeImplant = $('#includeImplant'+i).html();
-		         var amount = parseInt($('#amount'+i).html(),10);
+				 var amount = $('#amount'+i).html() || '';
+				 if(amount == '' || amount == 'null'){
+					amount = 0;
+				 }
+		         amount = parseInt(amount,10);
 		         var minDismantleAmount = $('#minDismantleAmount'+i).html();
 		         var usedAmountOfIncludeImplant = $('#usedAmountOfIncludeImplant'+i).html();
 		         
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r37955 -r37957
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 37955)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 37957)
@@ -3165,10 +3165,10 @@
 		height = size.height;
 
 		offsetTop = offsetTop * zoomRatio;
+		var recyclingStatus = $("#recyclingStatus").val();
 		var canUpdatePrice = false;
 		if(sstsConfig.enableModifyThePriceOfForeignTousseInrecyclingRecord){
-			var recyclingItemId = $('#recyclingItemId' + row).val();
-			if(recyclingItemId == ''){
+			if(recyclingStatus == '待接收' || recyclingStatus == '部分接收'){
 				canUpdatePrice = true;
 			}
 		}