|  | @ -13,6 +13,7 @@ import com.yihu.ehr.basic.user.entity.Roles;
 | 
	
		
			
				|  |  | import com.yihu.ehr.basic.user.entity.UserTypeRoles;
 | 
	
		
			
				|  |  | import com.yihu.ehr.basic.user.service.RoleUserService;
 | 
	
		
			
				|  |  | import com.yihu.ehr.basic.user.service.RolesService;
 | 
	
		
			
				|  |  | import com.yihu.ehr.commons.constants.BasicServiceApi;
 | 
	
		
			
				|  |  | import com.yihu.ehr.constants.ServiceApi;
 | 
	
		
			
				|  |  | import com.yihu.ehr.basic.user.entity.Doctors;
 | 
	
		
			
				|  |  | import com.yihu.ehr.basic.user.entity.User;
 | 
	
	
		
			
				|  | @ -235,15 +236,13 @@ public class UserEndPoint extends EnvelopRestEndPoint {
 | 
	
		
			
				|  |  |     public MUser getUserByLoginCode(
 | 
	
		
			
				|  |  |             @ApiParam(name = "user_name", value = "登录账号", defaultValue = "")
 | 
	
		
			
				|  |  |             @PathVariable(value = "user_name") String userName) {
 | 
	
		
			
				|  |  |         //User user = userManager.getUserByUserName(userName);
 | 
	
		
			
				|  |  |         //TODO 可根据帐户,手机号,身份证号登陆接口新增
 | 
	
		
			
				|  |  |         // 帐户:手机号,身份证号,登录账号
 | 
	
		
			
				|  |  |         List<User> users = userService.getUserForLogin(userName);
 | 
	
		
			
				|  |  |         if (users != null) {
 | 
	
		
			
				|  |  |             if (users.size() == 1) {
 | 
	
		
			
				|  |  |                 MUser mUser = new MUser();
 | 
	
		
			
				|  |  |                 List<OrgMemberRelation> memberRelations = orgMemberRelationService.findByField("userId", users.get(0).getId());
 | 
	
		
			
				|  |  |                 mUser = convertToModel(users.get(0), MUser.class);
 | 
	
		
			
				|  |  |                 mUser = convertToModel(users.get(0), MUser.class);
 | 
	
		
			
				|  |  |                 if (memberRelations != null && memberRelations.size() > 0) {
 | 
	
		
			
				|  |  |                     mUser.setPosition(memberRelations.get(0).getDutyName());
 | 
	
		
			
				|  |  |                     mUser.setDepartment(memberRelations.get(0).getDeptName());
 | 
	
	
		
			
				|  | @ -1134,4 +1133,36 @@ public class UserEndPoint extends EnvelopRestEndPoint {
 | 
	
		
			
				|  |  |         return envelop;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     @RequestMapping(value = BasicServiceApi.Users.GetUserByLoginCode, method = RequestMethod.GET)
 | 
	
		
			
				|  |  |     @ApiOperation(value = "政府服务平台-根据登录账号获取当前用户", notes = "政府服务平台-根据登陆用户名及密码验证用户(一个人可属于多个机构)")
 | 
	
		
			
				|  |  |     public Envelop getUserInfoByLoginCode(
 | 
	
		
			
				|  |  |             @ApiParam(name = "userName", value = "登录账号", defaultValue = "")
 | 
	
		
			
				|  |  |             @PathVariable(value = "userName") String userName) {
 | 
	
		
			
				|  |  |         Envelop envelop=new Envelop();
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  |             // 帐户:手机号,身份证号,登录账号
 | 
	
		
			
				|  |  |             List<User> users = userService.getUserForLogin(userName);
 | 
	
		
			
				|  |  |             envelop.setObj(users);
 | 
	
		
			
				|  |  |             if (users != null) {
 | 
	
		
			
				|  |  |                 if (users.size() == 1) {
 | 
	
		
			
				|  |  |                     List<OrgMemberRelation> memberRelations = orgMemberRelationService.findByField("userId", users.get(0).getId());
 | 
	
		
			
				|  |  |                     envelop.setSuccessFlg(true);
 | 
	
		
			
				|  |  |                     envelop.setDetailModelList(memberRelations);
 | 
	
		
			
				|  |  |                 }else {
 | 
	
		
			
				|  |  |                     envelop.setSuccessFlg(false);
 | 
	
		
			
				|  |  |                     envelop.setErrorMsg("账号重复,请联系管理员!");
 | 
	
		
			
				|  |  |                 }
 | 
	
		
			
				|  |  |             }else {
 | 
	
		
			
				|  |  |                 envelop.setSuccessFlg(false);
 | 
	
		
			
				|  |  |                 envelop.setErrorMsg("该账号不存在,请确认或联系管理员!");
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  |         } catch (Exception e) {
 | 
	
		
			
				|  |  |             envelop.setSuccessFlg(false);
 | 
	
		
			
				|  |  |             envelop.setErrorMsg(e.getMessage());
 | 
	
		
			
				|  |  |             e.printStackTrace();
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         return envelop;
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | }
 |