From fc55a9089a54f6e0682be076a1857fd1ddf5ec0e Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sun, 12 Jul 2020 17:10:05 +0800
Subject: [PATCH] 增加医院ID、科室ID和医生ID，由调用方传入，避免非前端请求时产生的错误。
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index ffd3b8b..9724248 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -86,7 +86,6 @@
private SysRoleMapper sysRoleMapper;
@Autowired
private SysUserRoleMapper sysUserRoleMapper;
-
@Override
public LoginAppUser findByUsername(String username) {
SysUser sysUser = this.selectByUsername(username);
@@ -114,6 +113,7 @@
@Override
public LoginAppUser getLoginAppUser(SysUser sysUser) {
LoginAppUser loginAppUser = new LoginAppUser();
+ SysUser sysUserNew = this.baseMapper.selectById(sysUser);
if (sysUser != null) {
//返回的数据为什么要把密码也返回？清空!!
loginAppUser.setPassword("");
@@ -122,6 +122,7 @@
BeanUtils.copyProperties(sysUser, loginAppUser);
//获取用户所属组织机构列表
+ loginAppUser.setDefaultAuth(sysUserNew.getDefaultAuth());
List<SysOrganization> sysOrganizations = organizationService.findListByUserId(sysUser.getId());
//设置组织机构集合
loginAppUser.setOrganizations(sysOrganizations);
@@ -241,6 +242,8 @@
user.setPassword(passwordEncoder.encode(newPassword));
if (isdefault) {
user.setDefaultAuth(true);
+ }else {
+ user.setDefaultAuth(false);
}
baseMapper.updateById(user);
if (isdefault) {
@@ -648,7 +651,7 @@
}
//创建人id
Long createUserId = CommonConstant.CREATE_USER_ID;
- //创建人id
+ //创建人名称
String createUserName = CommonConstant.CREATE_USER_NAME;
//是否注册用户
Boolean isReg = false;
@@ -912,7 +915,7 @@
}
/**
- * 获取医院科室下的所有有效的医生
+ * 获取医院科室下的所有H端有效的医生
*
* @param hospitalId
* @param departmentId
@@ -921,7 +924,7 @@
@Override
public ResultBody hospitalDoctorList(Long hospitalId, Long departmentId) {
if (hospitalId > 0 && departmentId > 0) {
- List<HospitalDoctorListVo> listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId);
+ List<HospitalDoctorListVo> listVoList = baseMapper.hospitalDoctorList(hospitalId, departmentId,CommonConstant.HOSPITAL_DOCTOR_ID,CommonConstant.HOSPITAL_ADMIN_ID);
return ResultBody.ok().data(listVoList);
} else {
return ResultBody.failed("医院数据有误");
@@ -934,9 +937,10 @@
* @param phone
* @return
*/
- private boolean phoneIsUsed(String phone) {
+ public boolean phoneIsUsed(String phone) {
Map<String, Object> selectMap = new HashMap<>();
selectMap.put("mobile", phone);
+ selectMap.put("is_del", 0);
List<SysUser> sysUsers = baseMapper.selectByMap(selectMap);
return (sysUsers.size() > 0);
}
@@ -947,17 +951,14 @@
* @param depatmentId
* @return
*/
- private Integer departmetAccountsCount(Long depatmentId) {
+ public Integer departmetAccountsCount(Long depatmentId) {
SysDepartment sysDepartment = departmentService.getById(depatmentId);
if (sysDepartment == null) {
return 0;
} else {
- Map<String, Object> selectMap = new HashMap<>();
- selectMap.put("department_id", depatmentId);
- selectMap.put("enabled", 1);
- List<SysDoctor> sysDoctorList = sysDoctorMapper.selectByMap(selectMap);
- if (sysDoctorList != null) {
- int doctorCount = sysDoctorList.size();
+ List<HospitalDoctorListVo> hospitalDoctorListVos = baseMapper.hospitalDoctorList(sysDepartment.getHospitalId(), depatmentId, CommonConstant.HOSPITAL_DOCTOR_ID, CommonConstant.HOSPITAL_ADMIN_ID);
+ if (hospitalDoctorListVos != null) {
+ int doctorCount = hospitalDoctorListVos.size();
int accountCount = sysDepartment.getAccountsCount();
return (accountCount - doctorCount);
} else {
@@ -965,6 +966,24 @@
}
}
}
+// private Integer departmetAccountsCount(Long depatmentId) {
+// SysDepartment sysDepartment = departmentService.getById(depatmentId);
+// if (sysDepartment == null) {
+// return 0;
+// } else {
+// Map<String, Object> selectMap = new HashMap<>();
+// selectMap.put("department_id", depatmentId);
+// selectMap.put("enabled", 1);
+// List<SysDoctor> sysDoctorList = sysDoctorMapper.selectByMap(selectMap);
+// if (sysDoctorList != null) {
+// int doctorCount = sysDoctorList.size();
+// int accountCount = sysDepartment.getAccountsCount();
+// return (accountCount - doctorCount);
+// } else {
+// return 0;
+// }
+// }
+// }
/**
* 检查用户登录名是否已经注册 true存在 false不存在
--
Gitblit v1.8.0