Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r15487 -r15500
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 15487)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 15500)
@@ -1076,7 +1076,11 @@
 		obj.put("msg", msg);
 		return obj.toString();
 	}
-	
+	/**
+	 * 根据条码或登录名获取科室下的用户
+	 * @param params
+	 * @return
+	 */
 	public String getUserFullNameByLoginNameAndDepart(JSONObject params){
 		JSONObject obj = new JSONObject();
 		String fullName = "";
@@ -1091,7 +1095,7 @@
 			}else if(StringUtils.isBlank(depart)){
 				msg = "缺少参数depart";
 			}else if(StringUtils.isNotBlank(loginName)){
-				User user = userManager.getUserByUserId(loginName);
+				User user = userManager.getUserByBarcode(loginName);
 				if(user != null){
 					fullName = user.getFullName();
 					Set<OrgUserRelation> ours = user.getOrgUserRelations();