Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r13974 -r14000
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 13974)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 14000)
@@ -1699,6 +1699,18 @@
         alertDiv('还有部分器械包未装入容器，不能保存。');
         return false;
     }
+    
+    //验证清点人是否为空(前提为配置清点人强制不能为空,默认为允许为空)
+    if(sstsConfig.recyclePageOperatorNotNull == true && $("#operator").val() == ''){
+    	alertDiv('清点人不能为空,请扫描清点人条码。');
+        return false;
+    }
+    
+    //验证清点人是否为空(前提为配置清点人强制不能为空)
+    if(sstsConfig.recyclePageRecyclingUserNotNull == true && $("#recyclingUser").val() == ''){
+    	alertDiv('回收人不能为空,请扫描回收人条码。');
+        return false;
+    }
     return true;
 }
 
@@ -2139,10 +2151,18 @@
     //如果配置为默认当前登录人为清点人,则赋值
     if(recyclePageCheckUserDefaultCurrentUser != false){
     	$("#operator").val(userName);
-    	if(sessionRecyclingUser != null && sessionRecyclingUser != 'null'){
-    		$("#recyclingUser").val(sessionRecyclingUser);
-    	}
     }
+    
+    //回收人使用上一次回收时选的回收人
+    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);
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r13886 -r14000
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 13886)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 14000)
@@ -71,6 +71,7 @@
 var errorTypeReduce = "<%= RecyclingError.ERRORTYPE_REDUCE%>";
 
 var sessionRecyclingUser = "<%= session.getAttribute("recyclingUser")%>";
+var sessionOperator = "<%= session.getAttribute("sessionOperator")%>";
 
 var today = '<%=request.getAttribute("today")%>';
 var userName = '<%=request.getAttribute("userName")%>';
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r13988 -r14000
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 13988)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 14000)
@@ -60,8 +60,16 @@
   disableDeviceInterface : false,
   // 器械保养模块使能
   disabeleTousseMaintain : false,
+  //回收界面回收人是否强制不能为空,true表示为是,未配置或false或true以外的其它值表示否
+  recyclePageRecyclingUserNotNull : true,
+  //回收界面回收人是否默认是否为上一次回收的清点人,默认为false
+  recyclePageRecyclingUserDefaultLastRecyclingUser : true,
   //回收界面清点人默认是否为当前登录人(false表示回收清点人员不默认为当前登录人,即清点人默认为空,不配置或配置其它值则默认为当前登录人)
   recyclePageCheckUserDefaultCurrentUser : false,
+  //回收界面清点人是否强制不能为空,true表示为是,未配置或false或true以外的其它值表示否
+  recyclePageOperatorNotNull : true,
+  //回收界面清点人默认是否为上一次回收的清点人,true表示为是,未配置或false或true以外的其它值表示否
+  recyclePageOperatorDefaultLastOperator : true,
    // 灭菌完成输入完成确认人
   needFinishComfirmer : true,
   // 灭菌是否扫描条码录入灭菌员信息