Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r34767 -r34842
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 34767)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 34842)
@@ -653,6 +653,8 @@
 				}
 			}
 		}
+		var errorRemark = '';
+		var damageRemark = '';
 		for (var m = 0; m < materials.length; m++) {
 			var detail = materials[m];
 			if (detail.amount <= 0) {
@@ -672,6 +674,9 @@
 					errorDamageQmKey: detail.errorDamageQmKey,
 					amountPerTousse: detail.amountPerTousse
 				};
+				if((detail.errorRemark || '') !== ''){
+					errorRemark = detail.errorRemark
+				}
 				recyclingErrorJsonArray.push(errorObj);
 			} else if (detail.type == '器械报损') {
 				var item = {
@@ -685,17 +690,20 @@
 					errorDamageQmKey: detail.errorDamageQmKey,
 					amountPerTousse: detail.amountPerTousse
 				};
+				if((detail.damageRemark || '') !== ''){
+					damageRemark = detail.damageRemark
+				}
 				recyclingDamageJsonArray.push(item);
 			}
 		}
 		if (recyclingErrorJsonArray.length > 0) {
-			setTousseItemRecyclingError(tmpRow, JSON.stringify(recyclingErrorJsonArray));
+			setTousseItemRecyclingError(tmpRow, JSON.stringify(recyclingErrorJsonArray), errorRemark);
 			if (document.getElementById('recyclingErrorButton' + tmpRow)) {
 				document.getElementById('recyclingErrorButton' + tmpRow).className = 'btn-b-edit';
 			}
 		}
 		if (recyclingDamageJsonArray.length > 0) {
-			setTousseItemRecyclingDamage(tmpRow, JSON.stringify(recyclingDamageJsonArray));
+			setTousseItemRecyclingDamage(tmpRow, JSON.stringify(recyclingDamageJsonArray), damageRemark);
 			if (document.getElementById('recyclingDamageButton' + tmpRow)) {
 				document.getElementById('recyclingDamageButton' + tmpRow).className = 'btn-c-edit';
 			}