科室人员修改

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

@@ -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;

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

@@ -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业务层处理
  *
@@ -78,7 +75,8 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
         return hospitalPersonInfoMapper.selectHospitalPersonInfoList(hospitalPersonInfo);
     }
 
-	@Override public List<HospitalPersonInfo> getList(HospitalPersonInfo hospitalPersonInfo) {
+    @Override
+    public List<HospitalPersonInfo> getList(HospitalPersonInfo hospitalPersonInfo) {
         return hospitalPersonInfoMapper.selectList(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());
@@ -136,8 +135,9 @@ public class HospitalPersonInfoServiceImpl implements IHospitalPersonInfoService
         }
         // 保存到sys_user表
         SysUser sysUser = new SysUser();
-		sysUser.setUserName(hospitalPersonInfo.getPersonAccount());
+        sysUser.setUserName(hospitalPersonInfo.getPersonPhone());
-		sysUser.setPassword(SecurityUtils.encryptPassword(hospitalPersonInfo.getPersonPassword()));
+        sysUser.setPhonenumber(hospitalPersonInfo.getPersonPhone());
+        sysUser.setPassword(SecurityUtils.encryptPassword("Abc@123"));
         sysUser.setNickName(hospitalPersonInfo.getPersonName());
         sysUser.setHospitalPersonId(hospitalPersonInfo.getId());
         sysUser.setHospitalId(hospitalPersonInfo.getHospitalId());
@@ -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) {