新注册用户更新完善信息

server/src/main/java/com/pica/cloud/account/account/server/controller/DoctorController.java

@@ -4,6 +4,7 @@ import com.pica.cloud.account.account.server.entity.AccountUser;
 import com.pica.cloud.account.account.server.entity.Doctor;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
+import com.pica.cloud.account.account.server.req.DoctorReq;
 import com.pica.cloud.account.account.server.req.RevertAcctsReq;
 import com.pica.cloud.account.account.server.service.DoctorService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
@@ -60,6 +61,15 @@ public class DoctorController extends AccountBaseController {
         return PicaResponse.toResponse();
     }
 
+    @ApiOperation("注册完新用户 完善信息接口")
+    @PutMapping(value = "/register/welcome", produces = "application/json;charset=utf-8")
+    @EnabledLoginValidate
+    public PicaResponse registerWelcome(@RequestBody DoctorReq doctorReq) {
+        doctorReq.setId(fetchPicaUser().getId());
+        doctorService.registerWelcome(doctorReq);
+        return PicaResponse.toResponse();
+    }
+
     /**
      * 当前医生是哪个admin账户添加的
      *

server/src/main/java/com/pica/cloud/account/account/server/req/DoctorReq.java

+package com.pica.cloud.account.account.server.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@ApiModel
+public class DoctorReq {
+
+    private Integer id;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("科室")
+    private String department;
+
+    @ApiModelProperty("职称")
+    private String title;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(String department) {
+        this.department = department;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/service/DoctorService.java

 package com.pica.cloud.account.account.server.service;
 
 import com.pica.cloud.account.account.server.entity.Doctor;
+import com.pica.cloud.account.account.server.req.DoctorReq;
 
 import java.util.List;
 
@@ -26,6 +27,8 @@ public interface DoctorService {
      */
     void modifyDoctorInfo(Doctor doctor,Long doctorId);
 
+    int registerWelcome(DoctorReq doctorReq);
+
     /**
      * 修改医生信息
      *

server/src/main/java/com/pica/cloud/account/account/server/service/impl/DoctorServiceImpl.java

@@ -8,11 +8,13 @@ import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.mapper.*;
+import com.pica.cloud.account.account.server.req.DoctorReq;
 import com.pica.cloud.account.account.server.service.DoctorService;
 import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
+import com.pica.cloud.foundation.entity.PicaWarnException;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.utils.StringUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -91,6 +93,26 @@ public class DoctorServiceImpl implements DoctorService {
         accountInfoDetailMapper.updateByPrimaryKeySelective(accountInfoEntity);
     }
 
+    @Override
+    public int registerWelcome(DoctorReq doctorReq) {
+        logger.info("registerWelcome req:{}",JSONObject.toJSONString(doctorReq));
+        Doctor doctor = doctorMapper.selectByPrimaryKey(doctorReq.getId());
+        if (null == doctor) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_PARAMS_ERROR.getCode(),
+                    AccountExceptionEnum.PICA_PARAMS_ERROR.getMessage());
+        }
+        if(StringUtil.isNotNull(doctorReq.getDepartment())){
+            doctor.setDepartment(doctorReq.getDepartment());
+        }
+        if(StringUtil.isNotNull(doctorReq.getTitle())){
+            doctor.setTitle(doctorReq.getTitle());
+        }
+        if(StringUtil.isNotNull(doctorReq.getName())){
+            doctor.setName(doctorReq.getName());
+        }
+        return doctorMapper.updateByPrimaryKeySelective(doctor);
+    }
+
     @Transactional
     @Override
     public void deleteDoctorInfo(Integer id, Long modifyId) {
@@ -211,15 +233,15 @@ public class DoctorServiceImpl implements DoctorService {
     @Override
     public List<Integer> getDoctorsByInnerOrg() {
         String ids = cacheClient.get(Constants.INNER_ORG_IDS);
-        if(StringUtil.isEmpty(ids)){
+        if (StringUtil.isEmpty(ids)) {
             List<Integer> dbIds = doctorMapper.getDoctorsByInnerOrg(null);
             String arrStr = "";
-            for(Integer i : dbIds){
+            for (Integer i : dbIds) {
                 arrStr = arrStr + i + ",";
             }
-            cacheClient.setex(Constants.INNER_ORG_IDS,arrStr,3600);
+            cacheClient.setex(Constants.INNER_ORG_IDS, arrStr, 3600);
             return dbIds;
-        }else {
+        } else {
             List<Integer> rtnIds = Arrays.asList(ids.split(",")).stream().filter(s -> !"".equals(s)).map(s -> Integer.parseInt(s)).collect(Collectors.toList());
             return rtnIds;
         }

server/src/main/resources/mybatis/DoctorMapper.xml

@@ -126,7 +126,7 @@
         select
         <include refid="Base_Column_List"/>
         from p_doctor
-        where id = #{id} and delete_flag=1
+        where id = #{id} and delete_flag = 1
     </select>
 
     <!--删除用户-->