update

消除提醒

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

@@ -21,4 +21,12 @@ public interface IBizClinicRoomUndoService{
 
 
     Boolean insertBizClinicRoomUndo(BizClinicRoomUndoDTO source);
+
+    /**
+     * 完成待办事项
+     * @param type {@link  cn.tr.module.smart.common.enums.ClinicUndoType}
+     * @param clinicId  手术id
+     * @return
+     */
+    Boolean doneBizClinicRoom(String type,String clinicId);
 }

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

@@ -48,5 +48,13 @@ public class BizClinicRoomUndoServiceImpl implements IBizClinicRoomUndoService {
         return baseRepository.insert(po)!=0;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean doneBizClinicRoom(String type, String clinicId) {
+        return  baseRepository.delete(new LambdaQueryWrapper<BizClinicRoomUndoPO>()
+                .eq(BizClinicRoomUndoPO::getClinicRoomId,clinicId)
+                .eq(BizClinicRoomUndoPO::getType,type))!=0;
+    }
+
     ;
 }

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

@@ -49,7 +49,7 @@ public class BizPainAssessmentServiceImpl implements IBizPainAssessmentService {
     private WxTemplateSendHelper wxTemplateSendHelper;
 
     @Autowired
-    private IBizClinicRoomUndoService bizClinicRoomUndoService;
+    private IBizClinicRoomUndoService clinicRoomUndoService;
     /**
     * 根据条件查询患者疼痛评估
     * @param    query 查询参数
@@ -115,6 +115,8 @@ public class BizPainAssessmentServiceImpl implements IBizPainAssessmentService {
         if (baseRepository.insert(BizPainAssessmentMapper.INSTANCE.convertPO(source))!=0) {
             clinicRoom.setLastPainAssessmentTime(new Date());
             clinicRoomRepository.updateById(clinicRoom);
+            //消除镇痛提醒 todo
+            clinicRoomUndoService.doneBizClinicRoom(ClinicUndoType.questionGroup,source.getClinicId());
             return Boolean.TRUE;
         }
         return Boolean.FALSE;
@@ -172,7 +174,7 @@ public class BizPainAssessmentServiceImpl implements IBizPainAssessmentService {
     public BizUndoMsgPushResultVO pushMpInfo(String clinicId) {
         BizUndoMsgPushResultVO result = new BizUndoMsgPushResultVO();
         BizMpPublishInfoDTO publishInfo=clinicRoomRepository.selectMpPushTaskInfoById(clinicId);
-        bizClinicRoomUndoService.insertBizClinicRoomUndo(
+        clinicRoomUndoService.insertBizClinicRoomUndo(
                 BizClinicRoomUndoDTO.builder()
                         .clinicRoomId(clinicId)
                         .publishUserId(LoginUserStrategy.tr.getCurrentUserId())

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

@@ -9,6 +9,7 @@ import cn.tr.module.smart.app.controller.vo.AppQuestionAndDeptListVO;
 import cn.tr.module.smart.common.entity.BizQuestionEntity;
 import cn.tr.module.smart.common.entity.BizWxAppletQuestionAnswerEntity;
 import cn.tr.module.smart.common.enums.ClinicPhaseEnums;
+import cn.tr.module.smart.common.enums.ClinicUndoType;
 import cn.tr.module.smart.common.mapper.BizQuestionAnswerMapper;
 import cn.tr.module.smart.common.mapper.BizQuestionMapper;
 import cn.tr.module.smart.common.po.BizClinicRoomPO;
@@ -19,6 +20,7 @@ import cn.tr.module.smart.common.repository.BizClinicRoomRepository;
 import cn.tr.module.smart.common.repository.BizQuestionAnswerRepository;
 import cn.tr.module.smart.common.repository.BizQuestionGroupRepository;
 import cn.tr.module.smart.common.repository.BizQuestionRepository;
+import cn.tr.module.smart.common.service.IBizClinicRoomUndoService;
 import cn.tr.module.smart.common.service.IBizQuestionAnswerService;
 import cn.tr.module.smart.common.service.IBizQuestionService;
 import cn.tr.module.smart.web.dto.BizWebQuestionAnswerByClinicIdDTO;
@@ -62,6 +64,10 @@ public class BizQuestionAnswerServiceImpl implements IBizQuestionAnswerService {
     @Autowired
     @Lazy
     private IBizQuestionService questionService;
+
+    @Autowired
+    @Lazy
+    private IBizClinicRoomUndoService clinicRoomUndoService;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean stdWxAppletCommitPreSurgeryQuestionnaireAnswer(BizWxAppletCommitSurgeryQuestionDTO source) {
@@ -90,6 +96,8 @@ public class BizQuestionAnswerServiceImpl implements IBizQuestionAnswerService {
         baseRepository.insert(questionAnswer);
         clinicRoom.setLastBeforeQuestionTime(new Date());
         clinicRoomRepository.updateById(clinicRoom);
+        //消除镇痛提醒
+        clinicRoomUndoService.doneBizClinicRoom(ClinicUndoType.assessment,clinicRoom.getId());
         return Boolean.TRUE;
     }
 

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/BizWXAppletUndoController.java

@@ -50,4 +50,4 @@ public class BizWXAppletUndoController extends BaseController{
         }
         return CommonResult.success(result);
     }
-}
+}