Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
===================================================================
diff -u -r14652 -r14949
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java	(.../OrgUnitManager.java)	(revision 14652)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java	(.../OrgUnitManager.java)	(revision 14949)
@@ -129,4 +129,12 @@
 	
 	public void updateOldData(String orgCoding,String oldOrgName,String newOrgName);
 	
+	/**
+	 * 根据用户名得到前科室的名称和科室编码
+	 * @author Chenjiaru  2016-09-08
+	 * @param userName
+	 * @return List
+	 */
+	public List findOrgUnitCodingAndNameByUserName(String userName);
+	
 }
Index: forgon-core/src/main/java/com/forgon/security/service/UserManager.java
===================================================================
diff -u -r14352 -r14949
--- forgon-core/src/main/java/com/forgon/security/service/UserManager.java	(.../UserManager.java)	(revision 14352)
+++ forgon-core/src/main/java/com/forgon/security/service/UserManager.java	(.../UserManager.java)	(revision 14949)
@@ -66,4 +66,10 @@
 	 * @return
 	 */
 	public boolean isSterileUser(User user);
+	/**
+	 * @author Chenjiaru  2016-09-05
+	 * @param userName：需要查找的用户名（支持模糊查询）
+	 * @return：List<String[]>
+	 */
+	public List<String[]> findAllUserFillNameAndNameByUserName(String userName);
 }
Index: forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
===================================================================
diff -u -r14537 -r14949
--- forgon-core/src/main/java/com/forgon/directory/action/UserAction.java	(.../UserAction.java)	(revision 14537)
+++ forgon-core/src/main/java/com/forgon/directory/action/UserAction.java	(.../UserAction.java)	(revision 14949)
@@ -358,4 +358,34 @@
 			userManager.saveAndKeepPassword(user);
 		}
 	}
+	
+	/**
+	 * 获取所有用户的姓名和用户登录名
+	 * chenjiaru  2016-09-05
+	 */
+	public String getAllUserFillNameAndNameByUserName() {
+		try {
+			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
+			String userName = StrutsParamUtils.getPraramValue("userName", "");
+			
+			List<String[]> arrayList = userManager.findAllUserFillNameAndNameByUserName(userName);
+			
+			String jsonDataString = "[";
+			for (String[] stringArray : arrayList) {
+				jsonDataString += ("[\""+stringArray[0]+"\",\""+(stringArray[0]+"("+stringArray[1]+")")+"\"]"+",");
+			}
+			if (!"[".equals(jsonDataString)) {
+				jsonDataString = jsonDataString.substring(0, jsonDataString.length() - 1);
+			}
+			jsonDataString += "]";
+			jsonDataString = jsonDataString.replaceAll("\r\n", "");  //数据怎么会出现回车换行的符号呢？
+			StrutsParamUtils.getResponse().getWriter().println(jsonDataString);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return null;
+	}
+	
+	
 }
Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
===================================================================
diff -u -r14652 -r14949
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 14652)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 14949)
@@ -1,6 +1,7 @@
 package com.forgon.directory.service;
 
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -932,4 +933,30 @@
 		}
 		return null;
 	}
+	
+	/**
+	 * @author Chenjiaru  2016-09-05
+	 * @param attributeArray：需要查找的属性数组
+	 * @return：List
+	 */
+	@Override
+	public List<String[]> findOrgUnitCodingAndNameByUserName(String userName) {
+		
+		String sql = "select ou.orgUnitCoding,ou.name from SS_USERS u,OrgUnit ou,OrgUserRelation our where u.id=our.userId and ou.id=our.orgUnitId and u.name='"+userName+"'";
+		ResultSet rs = objectDao.executeSql(sql);
+		List<String[]> arrayList = new ArrayList<String[]>();
+		try {
+			while(rs.next()){
+				arrayList.add(new String[]{rs.getString(1), rs.getString(2)});
+			}
+			return arrayList;
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		
+		return null;
+		
+	}
 }
Index: forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
===================================================================
diff -u -r13024 -r14949
--- forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java	(.../OrgUnitAction.java)	(revision 13024)
+++ forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java	(.../OrgUnitAction.java)	(revision 14949)
@@ -384,5 +384,35 @@
 	public OrgUnit getModel() {
 		return orgUnit;
 	}
+	
+	/**
+	 * 根据用户名获取科室和科室编码
+	 * chenjiaru  2016-09-10
+	 */
+	public String getOrgUnitCodingAndNameByUserName() {
+		try {
+			StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8");
+			String userName = StrutsParamUtils.getPraramValue("userName", "");
+			
+			
+			List<String[]> arrayList = orgUnitManager.findOrgUnitCodingAndNameByUserName(userName);
+			
+			
+			String jsonDataString = "[";
+			for (String[] stringArray : arrayList) {
+				jsonDataString += ("[\""+stringArray[0]+"\",\""+(stringArray[1])+"\"]"+",");
+			}
+			if (!"[".equals(jsonDataString)) {
+				jsonDataString = jsonDataString.substring(0, jsonDataString.length() - 1);
+			}
+			jsonDataString += "]";
+			
+			StrutsParamUtils.getResponse().getWriter().println(jsonDataString);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
 
+		return null;
+	}
+
 }
Index: forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
===================================================================
diff -u -r14352 -r14949
--- forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java	(.../UserManagerImpl.java)	(revision 14352)
+++ forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java	(.../UserManagerImpl.java)	(revision 14949)
@@ -506,5 +506,35 @@
 			}
 		}	
 		return false;
-	}	
+	}
+	
+	/**
+	 * 根据用户名得到，用户名和用户姓名
+	 * @author Chenjiaru  2016-09-05
+	 * @param userName：需要查找的用户名（支持模糊查询）
+	 * @return：List
+	 */
+	@Override
+	public List<String[]> findAllUserFillNameAndNameByUserName(String userName) {
+		String sql = "select name,fullName from SS_USERS where name like '%"+userName+"%'";
+		ResultSet rs = objectDao.executeSql(sql);
+		List<String[]> arrayList = new ArrayList<String[]>();
+		try {
+			while(rs.next()){
+				arrayList.add(new String[]{rs.getString(1), rs.getString(2)});
+			}
+			return arrayList;
+		} catch (SQLException e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		
+		return null;
+	}
+	
+	
+	
+	
+	
 }