update 更换手机号正则验证规则

nb-service-api/app-doctor-api/src/main/java/com/nb/app/doctor/api/feign/result/AppDoctorUserResult.java

@@ -2,6 +2,7 @@ package com.nb.app.doctor.api.feign.result;
 
 import com.nb.core.entity.GenericEntity;
 import com.nb.core.enums.SexEnum;
+import com.nb.core.enums.StatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -29,6 +30,9 @@ public class AppDoctorUserResult {
     @ApiModelProperty(value = "职位，职位不得超过32个字节")
     private String post;
 
+    @ApiModelProperty(value = "状态 0、正常 1、停用",allowableValues = "0,1")
+    private StatusEnum status;
+
     @ApiModelProperty(value = "头像")
     private String avatar;
 

nb-service/app-assistant/src/main/java/com/nb/app/assistant/service/LocalAssistantUserBindService.java

@@ -23,6 +23,8 @@ import com.nb.app.assistant.api.event.AssistLiftEvent;
 import com.nb.app.assistant.mapper.AssistantUserBindMapper;
 import com.nb.app.assistant.service.dto.AssistPatientResult;
 import com.nb.app.assistant.service.dto.EditAssistBindDto;
+import com.nb.app.doctor.api.feign.IAppDoctorUserClient;
+import com.nb.app.doctor.api.feign.result.AppDoctorUserResult;
 import com.nb.app.msg.bean.MsgBean;
 import com.nb.app.msg.enums.MsgEnum;
 import com.nb.app.msg.event.SaveMsgEvent;
@@ -33,6 +35,7 @@ import com.nb.common.queue.delay.manager.DelayMessageManager;
 import com.nb.common.queue.delay.message.DelayMessage;
 import com.nb.common.queue.delay.message.DelayMessageProperties;
 import com.nb.core.Value;
+import com.nb.core.enums.StatusEnum;
 import com.nb.core.exception.CustomException;
 import com.nb.web.api.entity.BusClinicEntity;
 import com.nb.web.api.feign.IPatientClient;
@@ -68,6 +71,9 @@ public class LocalAssistantUserBindService extends BaseService<AssistantUserBind
     @Lazy
     private DelayMessageManager delayMessageManager;
 
+    @Autowired
+    @Lazy
+    private IAppDoctorUserClient doctorUserClient;
     @Override
     public void validateBeforeSave(AssistantUserBindEntity entity) {
         entity.setExistIm(false);
@@ -94,6 +100,14 @@ public class LocalAssistantUserBindService extends BaseService<AssistantUserBind
             entity.setManageType(patientClient.getManageType(entity.getPatientId()));
         }
         AssistantUserResult currentUser = userService.getById(id);
+        String doctorId = entity.getDoctorId();
+        AppDoctorUserResult doctorUer = doctorUserClient.lookById(doctorId);
+        if(doctorUer==null){
+            throw new CustomException("该医生账户已被删除,请重新选择");
+        }
+        if(StatusEnum.NO.equals(doctorUer.getStatus())){
+            throw new CustomException("该医生账户已被停用,请重新选择");
+        }
         entity.setStatus(BindEnum.WAITING);
         entity.setAssistId(currentUser.getId());
         entity.setAssistNickname(currentUser.getNickname());

nb-service/app-doctor/src/main/resources/mapper/AppDoctorUserMapper.xml

@@ -26,7 +26,7 @@
         u.skilled as skilled,
         u.dept as dept
         from
-        (select * from app_doctor_user where tenant_id=#{tenantId}) as u
+        (select * from app_doctor_user where tenant_id=#{tenantId} and status=0 and is_delete=0) as u
         left join app_user_consult_config as c
         on c.user_id=u.id
         where c.consult=1