lifang 2 месяцев назад
Родитель
Сommit
c3eca76dbe

+ 1 - 0
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionAnswerServiceImpl.java

@@ -176,6 +176,7 @@ public class BizQuestionAnswerServiceImpl implements IBizQuestionAnswerService {
         }
         questionAnswer.setQuestionType(ClinicPhaseEnums.AFTER);
         questionAnswer.setQuestion(questionList);
+        questionAnswer.setReasearchQueueId(source.getQueueId());
         baseRepository.insert(questionAnswer);
         Integer followUpCount = Optional.ofNullable(clinicRoom.getFollowUpCount()).orElse(0);
         clinicRoom.setFollowUpCount(++followUpCount);

+ 6 - 2
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizReasearchQueueClinicServiceImpl.java

@@ -86,6 +86,9 @@ public class BizReasearchQueueClinicServiceImpl extends ServiceImpl<BizReasearch
                     .map(BizReasearchQueueClinicPO::getClinicRoomId)
                     .collect(Collectors.toList()));
         }
+        if (CollectionUtil.isEmpty(clinicIds)) {
+            return Boolean.TRUE;
+        }
         List<BizReasearchQueueClinicPO> insertBatch = clinicIds.stream()
                 .map(clinicId -> {
                     BizReasearchQueueClinicPO result = new BizReasearchQueueClinicPO();
@@ -251,10 +254,11 @@ public class BizReasearchQueueClinicServiceImpl extends ServiceImpl<BizReasearch
         // 发送延迟消息
         rabbitTemplate.convertAndSend(
                 RabbitMQConstant.TOPIC_EXCHANGE_MP_NAME,
-                RabbitMQConstant.ROUTING_KEY_MP_PUSH,
+                RabbitMQConstant.QUEUE_REASEARCH_PUSH,
                 id,
                 message -> {
-                    message.getMessageProperties().getHeaders().put("x-delay", delayTime);
+//                    message.getMessageProperties().getHeaders().put("x-delay", delayTime);
+                    message.getMessageProperties().getHeaders().put("x-delay", 3);
                     return message;
                 }
         );

+ 1 - 0
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/BizWxAppletPainAssessmentController.java

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/wx/painAssessment")
 @AllArgsConstructor
+@Deprecated
 public class BizWxAppletPainAssessmentController extends BaseController{
 
     private final IBizPainAssessmentService bizPainAssessmentService;

+ 0 - 3
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/BizWxFastingController.java

@@ -1,12 +1,9 @@
 package cn.tr.module.smart.wx.controller;
 
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import cn.tr.core.annotation.TenantIgnore;
 import cn.tr.core.pojo.CommonResult;
 import cn.tr.module.smart.common.service.IBizFastingService;
 import cn.tr.module.smart.wx.controller.vo.BizFastingVo;
 import cn.tr.module.smart.wx.dto.BizFastingDTO;
-import cn.tr.module.sys.oauth2.LoginTypeConstant;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 3 - 0
tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/dto/BizWxAppletCommitSurgeryQuestionDTO.java

@@ -27,6 +27,9 @@ public class BizWxAppletCommitSurgeryQuestionDTO {
     @NotBlank(message = "术前问卷组id不能为空")
     private String questionGroupId;
 
+    @ApiModelProperty("研究队列id")
+    private String queueId;
+
     @ApiModelProperty("术前问卷问题回答")
     private List<BizWxAppletQuestionAnswerEntity> content;
 }