Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29731 -r29862
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29731)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 29862)
@@ -3693,34 +3693,47 @@
 		dataType:'json',
 		success:function(result){
 		  	if(result.success){
+				document.onkeydown = null;
 				var htmlCode = "";
 				var oldRemark = $('#tousseRemark'+row).val();
+				var remark = $('#tousseRemark'+row).val() || '';
+				var remarks = [];
+				var otherIsCheck = false;
 				for(var i = 0 ; i < result.data.length ; i++){
 					var tmpRemark = result.data[i].value;
 					var redColor = "";
+					var checked = "";
 					if(oldRemark == tmpRemark){
 						redColor = "color:red;";
 					}
-					htmlCode += '<div class="radioRemark">';
-					if(i == 0){
-						htmlCode += '<input type="radio" checked name="remarks" id="remarks_'+i+'" value="'+result.data[i].value+'" />';
-					}else {
-						htmlCode += '<input type="radio" name="remarks" id="remarks_'+i+'" value="'+result.data[i].value+'" />';
+					if(remark == tmpRemark){
+						checked = "checked";
 					}
+					htmlCode += '<div class="radioRemark">';
+					htmlCode += '<input type="radio" '+checked+' name="remarks" id="remarks_'+i+'" value="'+result.data[i].value+'" />';
 					htmlCode += '<label for="remarks_'+i+'">'+result.data[i].value+'</label>';
 					htmlCode += '<span class="radioRemark-custom"></span>';
-					htmlCode += '</div>'
+					htmlCode += '</div>';
+					remarks[i] = tmpRemark;
+					otherIsCheck = false;
 				}
 				htmlCode += '<div class="radioRemark">';
 				if(result.data.length == 0){
+					otherIsCheck = true;
 					htmlCode += '<input type="radio" checked name="remarks" id="remarks_'+result.data.length+'" value="其他" />';
 				}else {
-					htmlCode += '<input type="radio" name="remarks" id="remarks_'+result.data.length+'" value="其他" />';
+					if(remark == '' || remarks.indexOf(remark) == -1){
+						otherIsCheck = true;
+						checked = "checked";
+					}else {
+						checked = "";
+					}
+					htmlCode += '<input type="radio" '+checked+' name="remarks" id="remarks_'+result.data.length+'" value="其他" />';
 				}
 				htmlCode += '<label for="remarks_'+result.data.length+'">其他：</label>';
 				htmlCode += '<span class="radioRemark-custom"></span>';
 				htmlCode += '</div>'
-				htmlCode += '<textarea class="otherRemarks" rows="3" style="width:100%"></textarea>';
+				htmlCode += '<textarea class="otherRemarks" rows="3" style="width:100%">'+(otherIsCheck?remark:"")+'</textarea>';
 			  	if(htmlCode == ""){
 					alertDiv("未设置回收物品备注信息！");
 			  	}else{
@@ -3739,6 +3752,7 @@
 						buttons: {
 							"取消": function() {
 								$( this ).dialog( "close" );
+								document.onkeydown = showKeyDown;
 							},
 							"确定": function() {
 								var radios = document.getElementsByName("remarks");