From d526d571cbe0a950e777fb325978d72f3ddb302b Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 13 Aug 2020 21:38:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java |   77 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java
index 8792cdd..9604b15 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java
@@ -3,7 +3,9 @@
 import com.kidgrow.common.model.*;
 import com.kidgrow.common.service.ISuperService;
 import com.kidgrow.usercenter.model.SysUserExcel;
+import com.kidgrow.usercenter.vo.UserRegVo;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -68,8 +70,13 @@
 	 * @param newPassword
 	 * @return
 	 */
-	ResultBody updatePassword(Long id, String oldPassword, String newPassword);
-
+	ResultBody updatePassword(Long id, String oldPassword, String newPassword,Boolean isdefault) throws Exception;
+	/**
+	 * 更新手机号
+	 * @param params
+	 * @return
+	 */
+	ResultBody updateUserTel(Map<String,Object> params) throws Exception ;
 	/**
 	 * 用户列表
 	 * @param params
@@ -107,4 +114,70 @@
 	boolean delUser(Long id);
 
 	ResultBody findAll(Map<String, Object> map);
+
+	ResultBody getThisUserOrganizationUser(HttpServletRequest request);
+
+	ResultBody findCountByMap(Map<String, Object> map);
+
+    ResultBody passwordByPhone(Map<String, Object> map) throws Exception;
+
+	ResultBody registerByPhone(Map<String, Object> map);
+
+    ResultBody updatePhone(Map<String, Object> map,SysUser sysUser);
+
+	/**
+	 * 查询指定角色用户
+	 * @param type：0销售，1运维
+	 * @return
+	 */
+	ResultBody findAppointUsers(Integer type);
+	/**
+	 * 获取登录用户的其它信息
+	 * @param userId
+	 * @return
+	 */
+	ResultBody findDoctorUserAllData(Long userId);
+
+	/**
+	 * H端用户注册  管理员添加用户
+	 * @param userRegVo
+	 * @return
+	 */
+	ResultBody doctorUserReg(UserRegVo userRegVo,SysUser sysUser) throws Exception;
+	/**
+	 * 获取医院科室下的所有有效的医生
+	 * @param hospitalId
+	 * @param departmentId
+	 * @return
+	 */
+	ResultBody hospitalDoctorList(Long hospitalId, Long departmentId,Boolean isdel);
+	/**
+	 * 获取医院科室下的所有有效的医生
+	 * @param userTel
+	 * @return
+	 */
+	ResultBody isRegUser(String userTel);
+
+	/**
+	 * 检查手机号是否已经注册 true存在  false不存在
+	 * @param phone
+	 * @return
+	 */
+	boolean phoneIsUsed(String phone);
+
+	ResultBody jiaMipython(String password);
+
+	/**
+	 * 根据科室id反查医院id
+	 * @param departmentId  科室id
+	 * @return
+	 */
+	Long HospitalIdByDepartmentId(Long departmentId);
+
+	/**
+	 * 删除用户  不删除关系表 ，role_user 表  和 用户组织
+	 *
+	 * @param id
+	 */
+    boolean deleteNoContact(Long id);
 }

--
Gitblit v1.8.0