xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支

Browse Source
This commit is contained in:
haown 2023-11-15 14:53:01 +08:00
commit c1f3884028
3 changed files with 78 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/healthconsultation/HealthConsultationService.java
View File

@ -33,7 +33,7 @@ public interface HealthConsultationService {
/** /**
* 单查科室人员 * 单查科室人员
* *
* @param departmentId 科室id * @param hospitalPersonInfo 科室id
* @return AjaxResult * @return AjaxResult
*/ */
List<HospitalPersonInfo> selectHospitalPerson(HospitalPersonInfo hospitalPersonInfo); List<HospitalPersonInfo> selectHospitalPerson(HospitalPersonInfo hospitalPersonInfo);

21
xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/hospitalpersoninfo/HospitalPersonInfo.java
View File

@ -6,12 +6,6 @@ import com.xinelu.common.custominterface.Insert;
import com.xinelu.common.custominterface.Update; import com.xinelu.common.custominterface.Update;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; 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.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -20,6 +14,11 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import org.hibernate.validator.constraints.Length; 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 * 健康咨询-科室人员信息对象 hospital_person_info
* *
@ -33,6 +32,7 @@ import org.hibernate.validator.constraints.Length;
@ApiModel(value = "健康咨询-科室人员信息对象", description = "hospital_person_info") @ApiModel(value = "健康咨询-科室人员信息对象", description = "hospital_person_info")
public class HospitalPersonInfo extends BaseDomain implements Serializable { public class HospitalPersonInfo extends BaseDomain implements Serializable {
private static final long serialVersionUID = 8750821883343940709L; private static final long serialVersionUID = 8750821883343940709L;
/** /**
* 主键id * 主键id
*/ */
@ -75,6 +75,7 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
*/ */
@ApiModelProperty(value = "科室人员联系电话") @ApiModelProperty(value = "科室人员联系电话")
@Excel(name = "科室人员联系电话") @Excel(name = "科室人员联系电话")
@NotBlank(message = "科室人员联系电话不能为空！", groups = {Insert.class, Update.class})
private String personPhone; private String personPhone;
/** /**
@ -85,7 +86,10 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
@NotBlank(message = "科室人员地址不能为空！", groups = {Insert.class, Update.class}) @NotBlank(message = "科室人员地址不能为空！", groups = {Insert.class, Update.class})
@Length(max = 300, message = "科室人员地址不能超过300位", groups = {Insert.class, Update.class}) @Length(max = 300, message = "科室人员地址不能超过300位", groups = {Insert.class, Update.class})
private String personAddress; private String personAddress;
/**性别*/
/**
* 性别
*/
private String sex; private String sex;
/** /**
@ -129,6 +133,7 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
/** /**
* 科室人员头像地址 * 科室人员头像地址
*/ */
@NotBlank(message = "科室人员头像地址不能为空", groups = {Insert.class, Update.class})
private String personPictureUrl; private String personPictureUrl;
/** /**
@ -142,7 +147,7 @@ public class HospitalPersonInfo extends BaseDomain implements Serializable {
private String personPassword; private String personPassword;
/** /**
*1：家医医生 2：泉医医生 3：专病医生 * 1：家医医生 2：泉医医生 3：专病医生
*/ */
@ApiModelProperty(value = "1：家医医生 2：泉医医生 3：专病医生") @ApiModelProperty(value = "1：家医医生 2：泉医医生 3：专病医生")
private String status; private String status;

124
xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/hospitalpersoninfo/impl/HospitalPersonInfoServiceImpl.java
View File

@ -18,16 +18,6 @@ import com.xinelu.manage.mapper.hospitalpersoninfo.HospitalPersonInfoMapper;
import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService; import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService;
import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO; import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO;
import com.xinelu.system.mapper.SysUserMapper; 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.collections4.CollectionUtils;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.BooleanUtils;
@ -35,6 +25,13 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; 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业务层处理 * 健康咨询-科室人员信息Service业务层处理
* *
@ -52,8 +49,8 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
@Resource @Resource
private HospitalPersonCertificateMapper hospitalPersonCertificateMapper; private HospitalPersonCertificateMapper hospitalPersonCertificateMapper;
@Resource @Resource
private SysUserMapper userMapper; private SysUserMapper userMapper;
/** /**
* 查询健康咨询-科室人员信息 * 查询健康咨询-科室人员信息
@ -78,11 +75,12 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
return hospitalPersonInfoMapper.selectHospitalPersonInfoList(hospitalPersonInfo); return hospitalPersonInfoMapper.selectHospitalPersonInfoList(hospitalPersonInfo);
} }
@Override public List<HospitalPersonInfo> getList(HospitalPersonInfo hospitalPersonInfo) { @Override
return hospitalPersonInfoMapper.selectList(hospitalPersonInfo); public List<HospitalPersonInfo> getList(HospitalPersonInfo hospitalPersonInfo) {
} return hospitalPersonInfoMapper.selectList(hospitalPersonInfo);
}
/** /**
* 新增健康咨询-科室人员信息 * 新增健康咨询-科室人员信息
* *
* @param hospitalPersonInfo 健康咨询-科室人员信息 * @param hospitalPersonInfo 健康咨询-科室人员信息
@ -114,6 +112,7 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
return AjaxResult.error("咨询费用不能为0或者负数，请重新输入"); return AjaxResult.error("咨询费用不能为0或者负数，请重新输入");
} }
//创建人 创建时间 科室人员编码 //创建人 创建时间 科室人员编码
hospitalPersonInfo.setPersonAccount(hospitalPersonInfo.getPersonPhone());
hospitalPersonInfo.setPersonCode(Constants.PERSON_CODE + generateSystemCodeUtil.generateSystemCode(Constants.PERSON_CODE)); hospitalPersonInfo.setPersonCode(Constants.PERSON_CODE + generateSystemCodeUtil.generateSystemCode(Constants.PERSON_CODE));
hospitalPersonInfo.setCreateTime(LocalDateTime.now()); hospitalPersonInfo.setCreateTime(LocalDateTime.now());
hospitalPersonInfo.setCreateBy(SecurityUtils.getUsername()); hospitalPersonInfo.setCreateBy(SecurityUtils.getUsername());
@ -134,16 +133,17 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
throw new ServiceException("新增科室人员资质证书信息失败，请联系管理员！"); throw new ServiceException("新增科室人员资质证书信息失败，请联系管理员！");
} }
} }
// 保存到sys_user表 // 保存到sys_user表
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();
sysUser.setUserName(hospitalPersonInfo.getPersonAccount()); sysUser.setUserName(hospitalPersonInfo.getPersonPhone());
sysUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword())); sysUser.setPhonenumber(hospitalPersonInfo.getPersonPhone());
sysUser.setNickName(hospitalPersonInfo.getPersonName()); sysUser.setPassword(SecurityUtils.encryptPassword("Abc@123"));
sysUser.setHospitalPersonId(hospitalPersonInfo.getId()); sysUser.setNickName(hospitalPersonInfo.getPersonName());
sysUser.setHospitalId(hospitalPersonInfo.getHospitalId()); sysUser.setHospitalPersonId(hospitalPersonInfo.getId());
sysUser.setStatus("0"); sysUser.setHospitalId(hospitalPersonInfo.getHospitalId());
sysUser.setDelFlag("0"); sysUser.setStatus("0");
userMapper.insertUser(sysUser); sysUser.setDelFlag("0");
userMapper.insertUser(sysUser);
return AjaxResult.success(); return AjaxResult.success();
} }
@ -169,34 +169,37 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
return AjaxResult.error("咨询费用不能为0或者负数，请重新输入"); return AjaxResult.error("咨询费用不能为0或者负数，请重新输入");
} }
//修改人 修改时间 //修改人 修改时间
hospitalPersonInfo.setPersonAccount(hospitalPersonInfo.getPersonPhone());
hospitalPersonInfo.setUpdateTime(LocalDateTime.now()); hospitalPersonInfo.setUpdateTime(LocalDateTime.now());
hospitalPersonInfo.setUpdateBy(SecurityUtils.getUsername()); hospitalPersonInfo.setUpdateBy(SecurityUtils.getUsername());
hospitalPersonInfoMapper.updateHospitalPersonInfo(hospitalPersonInfo); hospitalPersonInfoMapper.updateHospitalPersonInfo(hospitalPersonInfo);
// 修改sys_user表 // 修改sys_user表
SysUser sysUser = new SysUser(); SysUser sysUser = new SysUser();
sysUser.setHospitalPersonId(hospitalPersonInfo.getId()); sysUser.setHospitalPersonId(hospitalPersonInfo.getId());
List<SysUser> userList = userMapper.selectUserList(sysUser); List<SysUser> userList = userMapper.selectUserList(sysUser);
if (CollectionUtils.isEmpty(userList)) { if (CollectionUtils.isEmpty(userList)) {
SysUser newUser = new SysUser(); SysUser newUser = new SysUser();
newUser.setUserName(hospitalPersonInfo.getPersonAccount()); newUser.setUserName(hospitalPersonInfo.getPersonPhone());
newUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword())); newUser.setPhonenumber(hospitalPersonInfo.getPersonPhone());
newUser.setNickName(hospitalPersonInfo.getPersonName()); newUser.setPassword(SecurityUtils.encryptPassword("Abc@123"));
newUser.setHospitalPersonId(hospitalPersonInfo.getId()); newUser.setNickName(hospitalPersonInfo.getPersonName());
newUser.setHospitalId(hospitalPersonInfo.getHospitalId()); newUser.setHospitalPersonId(hospitalPersonInfo.getId());
newUser.setStatus("0"); newUser.setHospitalId(hospitalPersonInfo.getHospitalId());
newUser.setDelFlag("0"); newUser.setStatus("0");
userMapper.insertUser(newUser); newUser.setDelFlag("0");
} else { userMapper.insertUser(newUser);
SysUser updUser = userList.get(0); } else {
updUser.setUserName(hospitalPersonInfo.getPersonAccount()); SysUser updUser = userList.get(0);
updUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword())); updUser.setUserName(hospitalPersonInfo.getPersonPhone());
updUser.setNickName(hospitalPersonInfo.getPersonName()); updUser.setPhonenumber(hospitalPersonInfo.getPersonPhone());
updUser.setHospitalPersonId(hospitalPersonInfo.getId()); updUser.setPassword(SecurityUtils.encryptPassword("Abc@123"));
updUser.setHospitalId(hospitalPersonInfo.getHospitalId()); updUser.setNickName(hospitalPersonInfo.getPersonName());
updUser.setStatus("0"); updUser.setHospitalPersonId(hospitalPersonInfo.getId());
updUser.setDelFlag("0"); updUser.setHospitalId(hospitalPersonInfo.getHospitalId());
userMapper.updateUser(updUser); updUser.setStatus("0");
} updUser.setDelFlag("0");
userMapper.updateUser(updUser);
}
//根据科室人员id去查询对应的资质证书 使用流来获取所有的证书路径 //根据科室人员id去查询对应的资质证书 使用流来获取所有的证书路径
List<HospitalPersonCertificate> hospitalPersonCertificateList = hospitalPersonCertificateMapper.selectHospitalPersonCertificateByIds(Collections.singletonList(hospitalPersonInfo.getId())); List<HospitalPersonCertificate> hospitalPersonCertificateList = hospitalPersonCertificateMapper.selectHospitalPersonCertificateByIds(Collections.singletonList(hospitalPersonInfo.getId()));
@ -226,12 +229,12 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
hospitalPersonCertificate.setUpdateBy(SecurityUtils.getUsername()); hospitalPersonCertificate.setUpdateBy(SecurityUtils.getUsername());
hospitalPersonCertificate.setCertificateCode(Constants.CERTIFICATE_CODE + generateSystemCodeUtil.generateSystemCode(Constants.CERTIFICATE_CODE)); hospitalPersonCertificate.setCertificateCode(Constants.CERTIFICATE_CODE + generateSystemCodeUtil.generateSystemCode(Constants.CERTIFICATE_CODE));
} }
if (CollectionUtils.isNotEmpty(hospitalPersonInfo.getHospitalPersonCertificateList())) { if (CollectionUtils.isNotEmpty(hospitalPersonInfo.getHospitalPersonCertificateList())) {
int hospitalPersonCertificates = hospitalPersonCertificateMapper.insertHospitalPersonCertificateList(hospitalPersonInfo.getHospitalPersonCertificateList()); int hospitalPersonCertificates = hospitalPersonCertificateMapper.insertHospitalPersonCertificateList(hospitalPersonInfo.getHospitalPersonCertificateList());
if (hospitalPersonCertificates <= 0) { if (hospitalPersonCertificates <= 0) {
throw new ServiceException("修改科室人员资质证书信息失败，请联系管理员！"); throw new ServiceException("修改科室人员资质证书信息失败，请联系管理员！");
} }
} }
//删除人员的头像 //删除人员的头像
if (StringUtils.isNotBlank(personInfo.getPersonPictureUrl()) && StringUtils.isNotBlank(hospitalPersonInfo.getPersonPictureUrl()) && !personInfo.getPersonPictureUrl().equals(hospitalPersonInfo.getPersonPictureUrl())) { if (StringUtils.isNotBlank(personInfo.getPersonPictureUrl()) && StringUtils.isNotBlank(hospitalPersonInfo.getPersonPictureUrl()) && !personInfo.getPersonPictureUrl().equals(hospitalPersonInfo.getPersonPictureUrl())) {
this.deletePictureUrl(personInfo.getPersonPictureUrl()); this.deletePictureUrl(personInfo.getPersonPictureUrl());
@ -351,6 +354,7 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
/** /**
* 修改医生手机号和密码 * 修改医生手机号和密码
*
* @param hospitalPersonInfo * @param hospitalPersonInfo
* @return * @return
*/ */
@ -360,11 +364,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
} }
/** /**
* @return com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo
* @Author mengkuiliang * @Author mengkuiliang
* @Description 根据科室人员编码查询人员信息 * @Description 根据科室人员编码查询人员信息
* @Date 2023-10-20 020 14:37 * @Date 2023-10-20 020 14:37
* @Param [personCode] * @Param [personCode]
* @return com.xinelu.manage.domain.hospitalpersoninfo.HospitalPersonInfo
**/ **/
@Override @Override
public HospitalPersonInfo getByPersonCode(String personCode, String status) { public HospitalPersonInfo getByPersonCode(String personCode, String status) {
@ -372,11 +376,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
} }
/** /**
* @return void
* @Author mengkuiliang * @Author mengkuiliang
* @Description 新增 * @Description 新增
* @Date 2023-10-20 020 14:54 * @Date 2023-10-20 020 14:54
* @Param [body] * @Param [body]
* @return void
**/ **/
@Override @Override
public int insert(HospitalPersonInfo body) { public int insert(HospitalPersonInfo body) {
@ -384,11 +388,11 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
} }
/** /**
* @return int
* @Author mengkuiliang * @Author mengkuiliang
* @Description 根据科室人员编号更新 * @Description 根据科室人员编号更新
* @Date 2023-10-20 020 15:02 * @Date 2023-10-20 020 15:02
* @Param [hospitalPersonInfo] * @Param [hospitalPersonInfo]
* @return int
**/ **/
@Override @Override
public int updateByPersonCode(HospitalPersonInfo hospitalPersonInfo) { public int updateByPersonCode(HospitalPersonInfo hospitalPersonInfo) {