推送

tr-modules/tr-module-mobile/src/main/java/cn/tr/module/mobile/dto/ImMsgUnreadTotalCountQueryDTO.java

@@ -4,10 +4,13 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-
+import java.util.*;
 @Data
 public class ImMsgUnreadTotalCountQueryDTO {
     @ApiModelProperty(value = "用户id",required = true)
     @NotBlank(message = "用户id不能为空")
     private String userId;
-}
+
+    @ApiModelProperty(value = "显示哪些消息类型")
+    private List<String> msgType;
+}

tr-modules/tr-module-mobile/src/main/java/cn/tr/module/mobile/enums/MsgContentType.java

@@ -25,4 +25,14 @@ public interface MsgContentType {
      * 视频
      */
     String Video="video";
+
+    /**
+     * 医生进入
+     */
+    String DOCTOR_IN="dIn";
+
+    /**
+     * 医生退出
+     */
+    String DOCTOR_OUT="dOut";
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.tr.core.exception.ServiceException;
 import cn.tr.core.exception.TRExcCode;
+import cn.tr.core.utils.JsonUtils;
 import cn.tr.module.smart.common.dto.BizMpPublishTaskDTO;
 import cn.tr.module.smart.common.dto.BizMpPublishTaskQueryDTO;
 import cn.tr.module.smart.common.entity.JobKeyEntity;
@@ -130,7 +131,7 @@ public class BizMpPublishTaskServiceImpl implements IBizMpPublishTaskService {
         rabbitTemplate.convertAndSend(
                 RabbitMQConstant.TOPIC_EXCHANGE_MP_NAME,
                 RabbitMQConstant.ROUTING_KEY_MP_PUSH,
-                task,
+                task.getId(),
                 message -> {
                     message.getMessageProperties().getHeaders().put("x-delay", delayTime);
                     return message;

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/vo/BizClinicVO.java

@@ -73,12 +73,18 @@ public class BizClinicVO extends BaseDTO  {
         return !Objects.isNull(this.lastBeforeQuestionTime);
     }
 
+    @ApiModelProperty("微信的看护人id")
+    private String wxUserId;
+
     @ApiModelProperty("微信的看护人昵称")
     private String wxUserNickname;
 
     @ApiModelProperty("微信的看护人头像")
     private String wxUserAvatar;
 
+    @ApiModelProperty("看护的医生id")
+    private String doctorId;
+
     @ApiModelProperty("看护的医生昵称")
     private String doctorNickname;
 

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizClinicRoomMapper.xml

@@ -219,10 +219,12 @@
         <result property="followUpCount" column="follow_up_count"/>
         <result property="assessCount" column="assess_count"/>
         <result property="lastBeforeQuestionTime" column="last_before_question_time"/>
+        <result property="wxUserId" column="wx_user_id"/>
         <result property="wxUserNickname" column="wx_user_nickname"/>
         <result property="wxUserAvatar" column="wx_user_avatar"/>
         <result property="doctorNickname" column="doctor_nickname"/>
         <result property="doctorAvatar" column="doctor_avatar"/>
+        <result property="doctorId" column="doctor_id"/>
     </resultMap>
 
     <select id="selectClinicByCondition" resultMap="webClinicListVO">
@@ -240,10 +242,12 @@
         bcr.follow_up_count as follow_up_count,
         bcr.assess_count as assess_count,
         bcr.last_before_question_time as last_before_question_time,
+        bwu.id as wx_user_id,
         bwu.nickname as wx_user_nickname,
         bwu.avatar as wx_user_avatar,
         su.nickname as doctor_nickname,
         su.avatar as doctor_avatar,
+        su.id as doctor_id,
         bcr.create_time as create_time
         FROM
         biz_clinic_room bcr