Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r15928 -r15974
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 15928)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 15974)
@@ -872,7 +872,15 @@
 		listeners : {
 			specialkey : function(thiz, e){
 				if(e.getKey() == 13){
-					loadUserByBarcode(thiz,Ext4.getCmp('operator'),Ext4.getCmp('operatorCode'),Ext4.getCmp('reviewerBarcode'));
+					var focusField = Ext4.getCmp('reviewerBarcode');
+					if(sstsConfig.hideReviewerField){
+						if(sstsConfig.showSterileField){
+							focusField = Ext4.getCmp('sterileBarcode');
+						}else{
+							focusField = Ext4.getCmp('wrapperBarcode');
+						}
+					}
+					loadUserByBarcode(thiz,Ext4.getCmp('operator'),Ext4.getCmp('operatorCode'),focusField);
 					operatorCode = Ext4.getCmp('operatorCode').getValue();
 					jobType_pack_name = Ext4.getCmp('operator').getValue();
 				}
@@ -900,7 +908,7 @@
 		componentCls:'formItemMgn',
 		id : 'reviewerBarcode',
 		name : 'reviewerBarcode',
-		hidden : sstsConfig.printLabelWhenReviewing,
+		hidden : sstsConfig.printLabelWhenReviewing || sstsConfig.hideReviewerField,
 		labelWidth:90,
 		anchor : '90%',
 		labelAlign:'right',
@@ -925,7 +933,7 @@
 		componentCls:'formItemMgn',
 		id : 'reviewer',
 		name : 'reviewer',
-		hidden : sstsConfig.printLabelWhenReviewing,
+		hidden : sstsConfig.printLabelWhenReviewing || sstsConfig.hideReviewerField,
 		labelAlign:'right',
 		labelWidth:60,
 		anchor : '95%',