add 消息类型 文件

nb-auth/src/main/java/com/nb/auth/controller/vo/AccountInfoVO.java

@@ -3,9 +3,6 @@ package com.nb.auth.controller.vo;
 import com.nb.core.enums.SexEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 

nb-service/app-assistant/src/main/java/com/nb/app/assistant/auth/AssistantPhoneGranter.java

@@ -61,8 +61,10 @@ public class AssistantPhoneGranter implements IAuthGranter {
                 .eq(AssistantUserEntity::getPhone, source.getUsername())
                 .last("limit 1"));
 
+        boolean register=false;
        //自动注册
         if(user==null){
+            register=true;
             user=new AssistantUserEntity();
             user.setId(IdWorker.getIdStr());
             user.setPhone(source.getUsername());
@@ -86,15 +88,17 @@ public class AssistantPhoneGranter implements IAuthGranter {
         // 设置用户信息
         SecurityUtil.getStpLogic(StpTypeEnum.ASSISTANT.getText()).getTokenSession().set(LOGIN_USER_KEY,loginUser);
 
-        SpringUtil.publishEvent(new SaveMsgEvent(this,
-                MsgBean.builder()
-                        .msgType(MsgEnum.REGISTER)
-                        .senderId("1")
-                        .senderNickname("系统管理员")
-                        .receiverId(user.getId())
-                        .receiverName(user.getNickname())
-                        .sys(true)
-                        .build()));
+        if(register){
+            SpringUtil.publishEvent(new SaveMsgEvent(this,
+                    MsgBean.builder()
+                            .msgType(MsgEnum.REGISTER)
+                            .senderId("1")
+                            .senderNickname("系统管理员")
+                            .receiverId(user.getId())
+                            .receiverName(user.getNickname())
+                            .sys(true)
+                            .build()));
+        }
         return loginUser;
     }
 }

nb-service/app-assistant/src/main/java/com/nb/app/assistant/controller/PatientOperationController.java

@@ -69,7 +69,7 @@ public class PatientOperationController {
         if(userBind==null){
             throw new CustomException("您尚未看护该患者");
         }
-        if(!BindEnum.SUCCESS.equals(userBind.getStatus())){
+        if(!BindEnum.SUCCESS.equals(userBind.getStatus())&&!BindEnum.WAITING.equals(userBind.getStatus())){
             throw new CustomException("该监护关系已被解除,请重新进行绑定");
         }
         return R.success(true);

nb-service/app-assistant/src/main/java/com/nb/app/assistant/entity/AssistantUserEntity.java

@@ -44,4 +44,7 @@ public class AssistantUserEntity extends GenericEntity<String> {
 
     @ApiModelProperty(value = "性别")
     private SexEnum sex;
+
+    @ApiModelProperty(value = "24小时未评价通知")
+    private boolean unEvalNotify;
 }

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

@@ -209,6 +209,10 @@ public class LocalAssistantUserBindService extends BaseService<AssistantUserBind
                         .sys(false)
                         .build()
         ));
+
+        if(Boolean.TRUE.equals(source.getAgree())){
+            //24h未评价通知 todo
+        }
         //查询是否存在默认看护
         return result;
     }
@@ -220,6 +224,20 @@ public class LocalAssistantUserBindService extends BaseService<AssistantUserBind
                 ||((StrUtil.isEmpty(doctorId)&&StrUtil.isEmpty(assistId)))){
             throw new CustomException("医生id和看护人员id不可同时为空或同时不为空");
         }
+        AssistantUserBindEntity userBind = this.getById(bindId);
+        if(Boolean.TRUE.equals(userBind.getDefault_())){
+            //删除的为默认看护,重新选择一个新的为默认看护
+            AssistantUserBindEntity defaultBindUser = this.getOne(new QueryWrapper<AssistantUserBindEntity>()
+                    .lambda()
+                    .eq(AssistantUserBindEntity::getAssistId, assistId)
+                    .in(AssistantUserBindEntity::getStatus,BindEnum.WAITING,BindEnum.SUCCESS)
+                    .orderByDesc(AssistantUserBindEntity::getCreateTime)
+                    .last("limit 1"));
+            if(defaultBindUser!=null){
+                defaultBindUser.setDefault_(true);
+                this.updateById(defaultBindUser);
+            }
+        }
         boolean result = this
                 .update(new UpdateWrapper<AssistantUserBindEntity>()
                         .lambda()