Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r14000 -r14110
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 14000)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 14110)
@@ -2141,28 +2141,30 @@
     var id = params_id;
     if(id != ''){
     	loadRecyclingRecordById(id);
+    }else{
+    	
+    	$("#recyclingTime").val(today);
+    	
+    	var recyclePageCheckUserDefaultCurrentUser = true;
+    	if(sstsConfig.recyclePageCheckUserDefaultCurrentUser == false){
+    		recyclePageCheckUserDefaultCurrentUser = false;
+    	}
+    	//如果配置为默认当前登录人为清点人,则赋值
+    	if(recyclePageCheckUserDefaultCurrentUser != false){
+    		$("#operator").val(userName);
+    	}
+    	
+    	//回收人使用上一次回收时选的回收人
+    	if(sstsConfig.recyclePageRecyclingUserDefaultLastRecyclingUser == true && sessionRecyclingUser != null && sessionRecyclingUser != 'null'){
+    		$("#recyclingUser").val(sessionRecyclingUser);
+    	}
+    	
+    	//清点人使用上一次回收时选的清点人
+    	if(sstsConfig.recyclePageOperatorDefaultLastOperator == true && sessionOperator != null && sessionOperator != 'null'){
+    		$("#operator").val(sessionOperator);
+    	}
     }
-    $("#recyclingTime").val(today);
     
-    var recyclePageCheckUserDefaultCurrentUser = true;
-    if(sstsConfig.recyclePageCheckUserDefaultCurrentUser == false){
-    	recyclePageCheckUserDefaultCurrentUser = false;
-    }
-    //如果配置为默认当前登录人为清点人,则赋值
-    if(recyclePageCheckUserDefaultCurrentUser != false){
-    	$("#operator").val(userName);
-    }
-    
-    //回收人使用上一次回收时选的回收人
-    if(sstsConfig.recyclePageRecyclingUserDefaultLastRecyclingUser == true && sessionRecyclingUser != null && sessionRecyclingUser != 'null'){
-    	$("#recyclingUser").val(sessionRecyclingUser);
-    }
-    
-    //清点人使用上一次回收时选的清点人
-    if(sstsConfig.recyclePageOperatorDefaultLastOperator == true && sessionOperator != null && sessionOperator != 'null'){
-    	$("#operator").val(sessionOperator);
-    }
-    
     if(isSecondSupplyRoom && id == "" && params_appId == ""){
     	//二级供应室回收时科室名称与编码改为也不赋值
     	//$("#depart").val(secondOrgUnitName);
@@ -2216,6 +2218,7 @@
             $("#id").val(record.id);
             $("#depart").val(record.depart);
             $("#recyclingUser").val(record.recyclingUser);
+            $("#operator").val(record.operator);
             $("#departCode").val(record.departCode);
             if(record.recyclingApplication != null){
                 $("#recyclingApplicationId").val(record.recyclingApplication.id);