推送

tr-modules/tr-module-mobile/src/main/java/cn/tr/module/mobile/service/impl/ImMsgReceivedServiceImpl.java

@@ -48,9 +48,9 @@ public class ImMsgReceivedServiceImpl implements IImMsgReceivedService {
             if(p!=null){
                 return;
             }
-//            if(MsgContentType.DOCTOR_IN.equals(msgDTO.getType())||MsgContentType.DOCTOR_OUT.equals(msgDTO.getType())){
-//
-//            }else {
+            if(MsgContentType.DOCTOR_IN.equals(msgDTO.getType())||MsgContentType.DOCTOR_OUT.equals(msgDTO.getType())){
+
+            }else {
                 ImMsgReceivedPO receivedPO = new ImMsgReceivedPO();
                 receivedPO.setMsgId(msgDTO.getMsgId());
                 receivedPO.setMsgFrom(msgDTO.getFromUserId());
@@ -62,7 +62,7 @@ public class ImMsgReceivedServiceImpl implements IImMsgReceivedService {
                 receivedPO.setMsgFromRole(msgDTO.getRole());
                 receivedPO.setDuration(msgDTO.getDuration());
                 baseRepository.insert(receivedPO);
-//            }
+            }
             //发送群组消息
             List<String> userIds = ServerEventCallbackHandler.onGetGroupUserIds.apply(msgDTO.getClinicId());
             CollectionUtil.removeAny(userIds,msgDTO.getFromUserId());

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/app/config/DoctorAppLoginOperator.java

@@ -25,6 +25,8 @@ import cn.tr.module.sys.oauth2.dto.OAuth2PswReqDTO;
 import cn.tr.module.sys.oauth2.mapper.OAuth2Mapper;
 import cn.tr.module.sys.oauth2.psw.operator.AbstractOAuth2PswUserOperator;
 import cn.tr.module.sys.oauth2.psw.operator.LoginOAuth2PswUserOperator;
+import cn.tr.module.sys.tenant.po.SysTenantPO;
+import cn.tr.module.sys.tenant.repository.SysTenantRepository;
 import cn.tr.module.sys.user.dto.SysUserDTO;
 import cn.tr.module.sys.user.po.SysUserPO;
 import cn.tr.module.sys.user.repository.SysUserRepository;
@@ -63,6 +65,9 @@ public class DoctorAppLoginOperator extends AbstractOAuth2PswUserOperator {
     private IBizSmsService smsService;
     @Autowired
     private ISysUserService sysUserService;
+
+    @Autowired
+    private SysTenantRepository tenantRepository;
     private static final String LOGIN_TYPE = "APP";
     @Override
     public String auth(OAuth2PswReqDTO source) {
@@ -170,6 +175,14 @@ public class DoctorAppLoginOperator extends AbstractOAuth2PswUserOperator {
         String currentUserId = LoginUserStrategy.tr.getCurrentUserId();
         SysUserPO sysUser = sysUserRepository.selectById(currentUserId);
         OAuth2PswLoginInfoDTO pswLoginInfo = OAuth2Mapper.INSTANCE.toPswLoginInfo(sysUser);
+        String tenantId = LoginUserStrategy.tr.getTenantId();
+        if(StrUtil.isNotEmpty(tenantId)){
+            SysTenantPO tenant = tenantRepository.selectById(tenantId);
+            if(ObjectUtil.isNotNull(tenant)){
+                pswLoginInfo.setTenantId(tenantId);
+                pswLoginInfo.setTenantName(tenant.getName());
+            }
+        }
         if(ObjectUtil.isNull(sysUser)){
             pswLoginInfo.setHavePassword(Boolean.FALSE);
         }else {

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizClinicRoomServiceImpl.java

@@ -437,7 +437,7 @@ public class BizClinicRoomServiceImpl implements IBizClinicRoomService {
             clinicRoom.setPatientId(patient.getId());
             clinicRoom.setFollowUpCount(0);
             clinicRoom.setFollowUp(Boolean.FALSE);
-            clinicRoom.setLastModifyUserType(UserTypeEnums.PATIENT_WX_APPLET);
+            clinicRoom.setLastModifyUserType(UserTypeEnums.APP_DOCTOR);
             clinicRoom.setLastModifyUserBy(userId);
             clinicRoom.setClinicStatus(ClinicPhaseEnums.BEFORE);
             this.baseRepository.insert(clinicRoom);

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/dto/OAuth2PswLoginInfoDTO.java

@@ -54,6 +54,10 @@ public class OAuth2PswLoginInfoDTO implements Serializable {
     @ApiModelProperty("公众号是否关注了,微信小程序使用")
     private Boolean concern;
 
+    private String tenantId;
+
+    private String tenantName;
+
     public String getAvatar() {
         if(StrUtil.isBlank(avatar)){
             return UserUtil.getAvatar(userId);

tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/oauth2/psw/operator/LoginOAuth2PswUserOperator.java

@@ -22,6 +22,8 @@ import cn.tr.module.sys.oauth2.dto.OAuth2PswLoginInfoDTO;
 import cn.tr.module.sys.oauth2.mapper.OAuth2Mapper;
 import cn.tr.module.sys.oauth2.dto.OAuth2PswReqDTO;
 import cn.tr.module.sys.tenant.dto.SysTenantCommonDTO;
+import cn.tr.module.sys.tenant.po.SysTenantPO;
+import cn.tr.module.sys.tenant.repository.SysTenantRepository;
 import cn.tr.module.sys.tenant.service.ISysTenantService;
 import cn.tr.module.sys.tenant.vo.SysTenantCommonVO;
 import cn.tr.module.sys.user.dto.SysOrgDTO;
@@ -89,6 +91,8 @@ public class LoginOAuth2PswUserOperator extends AbstractOAuth2PswUserOperator{
     @Lazy
     private ISysUserService userService;
 
+    @Autowired
+    private SysTenantRepository tenantRepository;
     @Value("${tr.tenant.enable}")
     private Boolean tenantEnable;
     @Override
@@ -183,6 +187,14 @@ public class LoginOAuth2PswUserOperator extends AbstractOAuth2PswUserOperator{
         String currentUserId = LoginUserStrategy.tr.getCurrentUserId();
         SysUserPO sysUser = sysUserRepository.selectById(currentUserId);
         OAuth2PswLoginInfoDTO pswLoginInfo = OAuth2Mapper.INSTANCE.toPswLoginInfo(sysUser);
+        String tenantId = LoginUserStrategy.tr.getTenantId();
+        if(StrUtil.isNotEmpty(tenantId)){
+            SysTenantPO tenant = tenantRepository.selectById(tenantId);
+            if(ObjectUtil.isNotNull(tenant)){
+                pswLoginInfo.setTenantId(tenantId);
+                pswLoginInfo.setTenantName(tenant.getName());
+            }
+        }
         if(ObjectUtil.isNull(sysUser)){
             pswLoginInfo.setHavePassword(Boolean.FALSE);
         }else {