Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r36484 -r36489
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 36484)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 36489)
@@ -1202,18 +1202,27 @@
 				User user = userManager.getUserByBarcode(loginName);
 				if(user != null){
 					if(user.isEnabled()){
-						fullName = user.getFullName();
-						userName = user.getName();
-						Set<OrgUserRelation> ours = user.getOrgUserRelations();
-						for(OrgUserRelation our : ours){
-							if(departCoding.equals(our.getOrgUnit().getOrgUnitCoding())){
-								success = true;
-								msg = "查询成功";
+						//如果配置为全部科室的用户,则不限制科室
+						//发货单签收人限制范围是否为“发货单签收人限制范围”
+						if(CssdUtils.getSystemSetConfigByNameBool("enableDisplaysTheItemInformationOfPDAInvoice")
+								&& StringUtils.equals(KeyValue.SIGN_USER_SCOPE_ALL_DEPART,keyValueManager.getStringValue(KeyValue.SIGN_USER_SCOPE_KEY, KeyValue.SIGN_USER_SCOPE_CURRENT_DEPART))){
+							success = true;
+							msg = "查询成功";
+						}else{
+							fullName = user.getFullName();
+							userName = user.getName();
+							Set<OrgUserRelation> ours = user.getOrgUserRelations();
+							for(OrgUserRelation our : ours){
+								if(departCoding.equals(our.getOrgUnit().getOrgUnitCoding())){
+									success = true;
+									msg = "查询成功";
+									break;
+								}
 							}
+							if(!success){
+								msg = "请扫描" + depart + "的用户信息";
+							}
 						}
-						if(!success){
-							msg = "请扫描" + depart + "的用户信息";
-						}
 					}else{
 						msg = "该用户已被停用！";
 					}
@@ -5883,10 +5892,10 @@
 		JSONObject resultObj = null;
 		try {
 			String[] searchOrgUnitCodingCondition = new String[]{orgUnitCoding};
-			if(CssdUtils.getSystemSetConfigByNameBool("enableDisplaysTheItemInformationOfPDAInvoice")){
-				if(StringUtils.equals(KeyValue.SIGN_USER_SCOPE_ALL_DEPART,keyValueManager.getStringValue(KeyValue.SIGN_USER_SCOPE_KEY, KeyValue.SIGN_USER_SCOPE_CURRENT_DEPART))){
-					searchOrgUnitCodingCondition = null;
-				}
+			//发货单签收人限制范围是否为“发货单签收人限制范围”
+			if(CssdUtils.getSystemSetConfigByNameBool("enableDisplaysTheItemInformationOfPDAInvoice")
+					&& StringUtils.equals(KeyValue.SIGN_USER_SCOPE_ALL_DEPART,keyValueManager.getStringValue(KeyValue.SIGN_USER_SCOPE_KEY, KeyValue.SIGN_USER_SCOPE_CURRENT_DEPART))){
+				searchOrgUnitCodingCondition = null;
 			}
 			//默认不查询已经停用用户FSSDERMYY-22
 			JSONArray allArray = userManager.searchUsers(keyWord, searchOrgUnitCodingCondition, false);