fix

nb-admin/src/test/java/com/nb/admin/BusClinicTest.java

@@ -120,7 +120,7 @@ public class BusClinicTest {
     @Test
     public void updateManage(){
         patientService.setManageType("1579644321062793219", ClinicManageEnum.hospital);
-        patientService.setManageType("1579644321062793219", ClinicManageEnum.family);
+//        patientService.setManageType("1579644321062793219", ClinicManageEnum.family);
         while (true){
 
         }

nb-im/src/main/java/com/nb/im/delay/ImRoomAutoFinishDelayHandler.java

@@ -70,7 +70,7 @@ public class ImRoomAutoFinishDelayHandler implements DelayMessageHandler {
                     }
                 }
             }else {
-                log.error("聊天室{}成功建立但是缺少successTime,无法24小时自动关闭");
+                log.error("聊天室{}成功建立但是缺少successTime,无法24小时自动关闭",roomId);
             }
         }else {
             log.info("聊天室未处于成功建立状态,处理聊天室超过24小时自动关闭失败,{}", roomId);

nb-im/src/main/java/com/nb/im/entity/ImRoomEntity.java

@@ -1,5 +1,6 @@
 package com.nb.im.entity;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.nb.app.msg.bean.MsgBean;
 import com.nb.core.entity.GenericEntity;
@@ -16,6 +17,7 @@ import lombok.ToString;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.Map;
 
 /**
  * @author lifang
@@ -107,7 +109,12 @@ public class ImRoomEntity extends GenericEntity<String> {
         //等待医生确认
         result.setStatus(ImStatusEnum.WAITING);
         //默认院内管理
-        result.setManageType(ClinicManageEnum.hospital);
+        Map<String, Object> properties = source.getProperties();
+        ClinicManageEnum manageType=ClinicManageEnum.hospital;
+        if(CollectionUtil.isNotEmpty(properties)){
+            manageType = (ClinicManageEnum) properties.getOrDefault("manageType", ClinicManageEnum.hospital);
+        }
+        result.setManageType(manageType);
         return result;
     }
 }

nb-service-api/app-msg-api/src/main/java/com/nb/app/msg/bean/MsgBean.java

@@ -7,6 +7,7 @@ import lombok.Builder;
 import lombok.Getter;
 
 import java.io.Serializable;
+import java.util.Map;
 
 /**
  * @author lifang
@@ -63,4 +64,6 @@ public class MsgBean implements Serializable {
     @ApiModelProperty("扩展字段，例：存放咨询问题id")
     private String extend;
 
+    private Map<String,Object> properties;
+
 }

nb-service/app-msg/pom.xml

@@ -15,6 +15,10 @@
     <description>内部消息通知模块</description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.tuoren</groupId>
+            <artifactId>web-service-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.tuoren</groupId>
             <artifactId>app-msg-api</artifactId>

nb-service/app-msg/src/main/java/com/nb/app/msg/service/LocalAppConsultService.java

@@ -1,5 +1,6 @@
 package com.nb.app.msg.service;
 
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.nb.app.msg.bean.MsgBean;
 import com.nb.app.msg.entity.AppConsultEntity;
@@ -9,8 +10,14 @@ import com.nb.app.msg.mapper.AppConsultMapper;
 import com.nb.auth.bean.LoginUser;
 import com.nb.auth.utils.SecurityUtil;
 import com.nb.common.crud.BaseService;
+import com.nb.web.api.enums.ClinicManageEnum;
+import com.nb.web.api.feign.IPatientClient;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import javax.validation.constraints.NotNull;
+import java.util.HashMap;
+
 /**
  * @author lifang
  * @version 1.0.0
@@ -19,9 +26,9 @@ import org.springframework.stereotype.Service;
  * @createTime 2022年08月12日 09:48:00
  */
 @Service
+@AllArgsConstructor
 public class LocalAppConsultService extends BaseService<AppConsultMapper, AppConsultEntity,String> {
-
-
+    private final IPatientClient patientClient;
     @Override
     public void validateBeforeSave(AppConsultEntity entity) {
 
@@ -40,6 +47,7 @@ public class LocalAppConsultService extends BaseService<AppConsultMapper, AppCon
     @Override
     public void postSave(AppConsultEntity entity) {
         LoginUser loginUser = SecurityUtil.getLoginUser();
+        ClinicManageEnum manageType = patientClient.getManageType(entity.getPatientId());
         SpringUtil.publishEvent(new SaveMsgEvent(
                 this,
                 MsgBean.builder()
@@ -55,6 +63,7 @@ public class LocalAppConsultService extends BaseService<AppConsultMapper, AppCon
                         .receiverName(entity.getDoctorNickName())
                         .payload(entity.getId())
                         .extend(entity.getId())
+                        .properties(MapUtil.of("manageType",manageType))
                         .build()
         ));
     }

nb-service/web-service/src/main/java/com/nb/web/service/system/auth/WebAuthGranter.java

@@ -74,7 +74,7 @@ public class WebAuthGranter implements IAuthGranter {
             String requestFrom = request.getHeader("RequestFrom");
             //来自app的请求不需要验证码
             if(!"TuoRenApp".equals(requestFrom)){
-//                captchaTool.ver(source.getCodeKey(),source.getCode());
+                captchaTool.ver(source.getCodeKey(),source.getCode());
             }
         }
         sysUser = sysUserService.getOne(Wrappers.lambdaQuery(SysUser.class).eq(SysUser::getAccount, source.getUsername())