科室人员修改
This commit is contained in:
parent
c840df74d1
commit
04e49febff
@ -6,12 +6,6 @@ import com.xinelu.common.custominterface.Insert;
|
||||
import com.xinelu.common.custominterface.Update;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
@ -20,6 +14,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/**
|
||||
* 健康咨询-科室人员信息对象 hospital_person_info
|
||||
*
|
||||
@ -75,6 +74,7 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
|
||||
*/
|
||||
@ApiModelProperty(value = "科室人员联系电话")
|
||||
@Excel(name = "科室人员联系电话")
|
||||
@NotBlank(message = "科室人员联系电话不能为空!", groups = {Insert.class, Update.class})
|
||||
private String personPhone;
|
||||
|
||||
/**
|
||||
@ -85,7 +85,9 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
|
||||
@NotBlank(message = "科室人员地址不能为空!", groups = {Insert.class, Update.class})
|
||||
@Length(max = 300, message = "科室人员地址不能超过300位", groups = {Insert.class, Update.class})
|
||||
private String personAddress;
|
||||
/**性别*/
|
||||
/**
|
||||
* 性别
|
||||
*/
|
||||
private String sex;
|
||||
|
||||
/**
|
||||
@ -130,6 +132,7 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
|
||||
/**
|
||||
* 科室人员头像地址
|
||||
*/
|
||||
@NotNull(message = "科室人员头像地址不能为空", groups = {Insert.class, Update.class})
|
||||
private String personPictureUrl;
|
||||
|
||||
/**
|
||||
@ -143,7 +146,7 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
|
||||
private String personPassword;
|
||||
|
||||
/**
|
||||
*1:家医医生 2:泉医医生 3:专病医生
|
||||
* 1:家医医生 2:泉医医生 3:专病医生
|
||||
*/
|
||||
@ApiModelProperty(value = "1:家医医生 2:泉医医生 3:专病医生")
|
||||
private String status;
|
||||
|
||||
@ -18,16 +18,6 @@ import com.xinelu.manage.mapper.hospitalpersoninfo.HospitalPersonInfoMapper;
|
||||
import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService;
|
||||
import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO;
|
||||
import com.xinelu.system.mapper.SysUserMapper;
|
||||
import java.io.File;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
import javax.annotation.Resource;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.compress.utils.Lists;
|
||||
import org.apache.commons.lang3.BooleanUtils;
|
||||
@ -35,6 +25,13 @@ import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.io.File;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 健康咨询-科室人员信息Service业务层处理
|
||||
*
|
||||
@ -52,8 +49,8 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
|
||||
@Resource
|
||||
private HospitalPersonCertificateMapper hospitalPersonCertificateMapper;
|
||||
|
||||
@Resource
|
||||
private SysUserMapper userMapper;
|
||||
@Resource
|
||||
private SysUserMapper userMapper;
|
||||
|
||||
/**
|
||||
* 查询健康咨询-科室人员信息
|
||||
@ -78,11 +75,12 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
|
||||
return hospitalPersonInfoMapper.selectHospitalPersonInfoList(hospitalPersonInfo);
|
||||
}
|
||||
|
||||
@Override public List<HospitalPersonInfo> getList(HospitalPersonInfo hospitalPersonInfo) {
|
||||
return hospitalPersonInfoMapper.selectList(hospitalPersonInfo);
|
||||
}
|
||||
@Override
|
||||
public List<HospitalPersonInfo> getList(HospitalPersonInfo hospitalPersonInfo) {
|
||||
return hospitalPersonInfoMapper.selectList(hospitalPersonInfo);
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* 新增健康咨询-科室人员信息
|
||||
*
|
||||
* @param hospitalPersonInfo 健康咨询-科室人员信息
|
||||
@ -114,6 +112,7 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
|
||||
return AjaxResult.error("咨询费用不能为0或者负数,请重新输入");
|
||||
}
|
||||
//创建人 创建时间 科室人员编码
|
||||
hospitalPersonInfo.setPersonAccount(hospitalPersonInfo.getPersonPhone());
|
||||
hospitalPersonInfo.setPersonCode(Constants.PERSON_CODE + generateSystemCodeUtil.generateSystemCode(Constants.PERSON_CODE));
|
||||
hospitalPersonInfo.setCreateTime(LocalDateTime.now());
|
||||
hospitalPersonInfo.setCreateBy(SecurityUtils.getUsername());
|
||||
@ -134,16 +133,17 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
|
||||
throw new ServiceException("新增科室人员资质证书信息失败,请联系管理员!");
|
||||
}
|
||||
}
|
||||
// 保存到sys_user表
|
||||
SysUser sysUser = new SysUser();
|
||||
sysUser.setUserName(hospitalPersonInfo.getPersonAccount());
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
|
||||
sysUser.setNickName(hospitalPersonInfo.getPersonName());
|
||||
sysUser.setHospitalPersonId(hospitalPersonInfo.getId());
|
||||
sysUser.setHospitalId(hospitalPersonInfo.getHospitalId());
|
||||
sysUser.setStatus("0");
|
||||
sysUser.setDelFlag("0");
|
||||
userMapper.insertUser(sysUser);
|
||||
// 保存到sys_user表
|
||||
SysUser sysUser = new SysUser();
|
||||
sysUser.setUserName(hospitalPersonInfo.getPersonPhone());
|
||||
sysUser.setPhonenumber(hospitalPersonInfo.getPersonPhone());
|
||||
sysUser.setPassword(SecurityUtils.encryptPassword("Abc@123"));
|
||||
sysUser.setNickName(hospitalPersonInfo.getPersonName());
|
||||
sysUser.setHospitalPersonId(hospitalPersonInfo.getId());
|
||||
sysUser.setHospitalId(hospitalPersonInfo.getHospitalId());
|
||||
sysUser.setStatus("0");
|
||||
sysUser.setDelFlag("0");
|
||||
userMapper.insertUser(sysUser);
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
@ -172,31 +172,31 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
|
||||
hospitalPersonInfo.setUpdateTime(LocalDateTime.now());
|
||||
hospitalPersonInfo.setUpdateBy(SecurityUtils.getUsername());
|
||||
hospitalPersonInfoMapper.updateHospitalPersonInfo(hospitalPersonInfo);
|
||||
// 修改sys_user表
|
||||
SysUser sysUser = new SysUser();
|
||||
sysUser.setHospitalPersonId(hospitalPersonInfo.getId());
|
||||
List<SysUser> userList = userMapper.selectUserList(sysUser);
|
||||
if (CollectionUtils.isEmpty(userList)) {
|
||||
SysUser newUser = new SysUser();
|
||||
newUser.setUserName(hospitalPersonInfo.getPersonAccount());
|
||||
newUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
|
||||
newUser.setNickName(hospitalPersonInfo.getPersonName());
|
||||
newUser.setHospitalPersonId(hospitalPersonInfo.getId());
|
||||
newUser.setHospitalId(hospitalPersonInfo.getHospitalId());
|
||||
newUser.setStatus("0");
|
||||
newUser.setDelFlag("0");
|
||||
userMapper.insertUser(newUser);
|
||||
} else {
|
||||
SysUser updUser = userList.get(0);
|
||||
updUser.setUserName(hospitalPersonInfo.getPersonAccount());
|
||||
updUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
|
||||
updUser.setNickName(hospitalPersonInfo.getPersonName());
|
||||
updUser.setHospitalPersonId(hospitalPersonInfo.getId());
|
||||
updUser.setHospitalId(hospitalPersonInfo.getHospitalId());
|
||||
updUser.setStatus("0");
|
||||
updUser.setDelFlag("0");
|
||||
userMapper.updateUser(updUser);
|
||||
}
|
||||
// 修改sys_user表
|
||||
SysUser sysUser = new SysUser();
|
||||
sysUser.setHospitalPersonId(hospitalPersonInfo.getId());
|
||||
List<SysUser> userList = userMapper.selectUserList(sysUser);
|
||||
if (CollectionUtils.isEmpty(userList)) {
|
||||
SysUser newUser = new SysUser();
|
||||
newUser.setUserName(hospitalPersonInfo.getPersonAccount());
|
||||
newUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
|
||||
newUser.setNickName(hospitalPersonInfo.getPersonName());
|
||||
newUser.setHospitalPersonId(hospitalPersonInfo.getId());
|
||||
newUser.setHospitalId(hospitalPersonInfo.getHospitalId());
|
||||
newUser.setStatus("0");
|
||||
newUser.setDelFlag("0");
|
||||
userMapper.insertUser(newUser);
|
||||
} else {
|
||||
SysUser updUser = userList.get(0);
|
||||
updUser.setUserName(hospitalPersonInfo.getPersonAccount());
|
||||
updUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
|
||||
updUser.setNickName(hospitalPersonInfo.getPersonName());
|
||||
updUser.setHospitalPersonId(hospitalPersonInfo.getId());
|
||||
updUser.setHospitalId(hospitalPersonInfo.getHospitalId());
|
||||
updUser.setStatus("0");
|
||||
updUser.setDelFlag("0");
|
||||
userMapper.updateUser(updUser);
|
||||
}
|
||||
|
||||
//根据科室人员id去查询对应的资质证书 使用流来获取所有的证书路径
|
||||
List<HospitalPersonCertificate> hospitalPersonCertificateList = hospitalPersonCertificateMapper.selectHospitalPersonCertificateByIds(Collections.singletonList(hospitalPersonInfo.getId()));
|
||||
@ -226,12 +226,12 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
|
||||
hospitalPersonCertificate.setUpdateBy(SecurityUtils.getUsername());
|
||||
hospitalPersonCertificate.setCertificateCode(Constants.CERTIFICATE_CODE + generateSystemCodeUtil.generateSystemCode(Constants.CERTIFICATE_CODE));
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(hospitalPersonInfo.getHospitalPersonCertificateList())) {
|
||||
int hospitalPersonCertificates = hospitalPersonCertificateMapper.insertHospitalPersonCertificateList(hospitalPersonInfo.getHospitalPersonCertificateList());
|
||||
if (hospitalPersonCertificates <= 0) {
|
||||
throw new ServiceException("修改科室人员资质证书信息失败,请联系管理员!");
|
||||
}
|
||||
}
|
||||
if (CollectionUtils.isNotEmpty(hospitalPersonInfo.getHospitalPersonCertificateList())) {
|
||||
int hospitalPersonCertificates = hospitalPersonCertificateMapper.insertHospitalPersonCertificateList(hospitalPersonInfo.getHospitalPersonCertificateList());
|
||||
if (hospitalPersonCertificates <= 0) {
|
||||
throw new ServiceException("修改科室人员资质证书信息失败,请联系管理员!");
|
||||
}
|
||||
}
|
||||
//删除人员的头像
|
||||
if (StringUtils.isNotBlank(personInfo.getPersonPictureUrl()) && StringUtils.isNotBlank(hospitalPersonInfo.getPersonPictureUrl()) && !personInfo.getPersonPictureUrl().equals(hospitalPersonInfo.getPersonPictureUrl())) {
|
||||
this.deletePictureUrl(personInfo.getPersonPictureUrl());
|
||||
@ -351,6 +351,7 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
|
||||
|
||||
/**
|
||||
* 修改医生手机号和密码
|
||||
*
|
||||
* @param hospitalPersonInfo
|
||||
* @return
|
||||
*/
|
||||
@ -360,11 +361,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
|
||||
}
|
||||
|
||||
/**
|
||||
* @return com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo
|
||||
* @Author mengkuiliang
|
||||
* @Description 根据科室人员编码查询人员信息
|
||||
* @Date 2023-10-20 020 14:37
|
||||
* @Param [personCode]
|
||||
* @return com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo
|
||||
**/
|
||||
@Override
|
||||
public HospitalPersonInfo getByPersonCode(String personCode, String status) {
|
||||
@ -372,11 +373,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
|
||||
}
|
||||
|
||||
/**
|
||||
* @return void
|
||||
* @Author mengkuiliang
|
||||
* @Description 新增
|
||||
* @Date 2023-10-20 020 14:54
|
||||
* @Param [body]
|
||||
* @return void
|
||||
**/
|
||||
@Override
|
||||
public int insert(HospitalPersonInfo body) {
|
||||
@ -384,11 +385,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int
|
||||
* @Author mengkuiliang
|
||||
* @Description 根据科室人员编号更新
|
||||
* @Date 2023-10-20 020 15:02
|
||||
* @Param [hospitalPersonInfo]
|
||||
* @return int
|
||||
**/
|
||||
@Override
|
||||
public int updateByPersonCode(HospitalPersonInfo hospitalPersonInfo) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user