Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r40570 -r40573
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 40570)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 40573)
@@ -96,25 +96,15 @@
 					top.Ext4.getCmp(idBox).setValue(result.id);
 				}
 			}else {
-				if(barcodeBox !== 'applicantBarcode'){
-					if(result.isNotSameOrgUnit){
-						showResult(result.message || '不允许登记非本科室人员，请扫描本科室人员条码');
-						return
-					}else {
-						showResult(result.message || '输入的条码有误！');
-						return
+				if(result.isNotSameOrgUnit){
+					top.Ext4.getCmp(barcodeBox).setValue('');
+					top.Ext4.getCmp(fullNameBox).setValue(result.fullName);
+					if(idBox){
+						top.Ext4.getCmp(idBox).setValue(result.id);
 					}
 				}else {
-					if(result.isNotSameOrgUnit){
-						top.Ext4.getCmp(barcodeBox).setValue('');
-						top.Ext4.getCmp(fullNameBox).setValue(result.fullName);
-						if(idBox){
-							top.Ext4.getCmp(idBox).setValue(result.id);
-						}
-					}else {
-						showResult(result.message || '输入的条码有误！');
-						return
-					}
+					showResult(result.message || '输入的条码有误！');
+					return
 				}
 			}
 		}else{