Merge remote-tracking branch 'origin/master'

陈昶聿

12 小时以前 0d10bc99eec75672b049339399e4f762fbd9746e

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskAnswerController.java

@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.smartor;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -108,33 +109,54 @@
    //@PreAuthorize("@ss.hasPermi('system:answer:remove')")
    @Log(title = "任务问卷问题选项", businessType = BusinessType.DELETE)
    @ApiOperation("删除任务问卷问题选项")
    @DeleteMapping("/remove/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("【saveQuestionCache-----remove】的入参为：{}", ids);
        return toAjax(serviceSubtaskAnswerService.deleteServiceSubtaskAnswerByIds(ids));
    }

    @ApiOperation("患者问题结果记录(外链)")
    /**
     * 患者问题结果记录 (外链) - 异步处理
     */
    @ApiOperation("患者问题结果记录 (外链)")
    @PostMapping("/saveQuestionAnswer")
    public AjaxResult saveQuestionAnswer(@RequestBody ServiceSubTaskAnswerReq serviceSubTaskAnswerReq) {
        log.info("【saveQuestionCache-----saveQuestionAnswer】的入参为：{}", serviceSubTaskAnswerReq);
        return toAjax(serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 0L));
        log.info("【saveQuestionAnswer】的入参为 param1:{},param2:{},type:{},isabnormal:{}",
                serviceSubTaskAnswerReq.getParam1(), serviceSubTaskAnswerReq.getParam2(),
                serviceSubTaskAnswerReq.getType(), serviceSubTaskAnswerReq.getIsabnormal());
        // 异步处理保存逻辑，立即返回成功消息
        serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 0L);
        return success("提交成功，正在处理中...");
    }


    @ApiOperation("患者问题结果记录缓存(小程序外链)")
    @RepeatSubmit
    @PostMapping("/saveQuestionCacheXCH")
    public AjaxResult saveQuestionCacheXCH(@RequestBody ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
        log.info("【saveQuestionCache-----saveQuestionCacheXCH】的入参为：{}", serviceSubTaskCacheReq);
        return toAjax(serviceSubtaskAnswerService.saveQuestionCache(serviceSubTaskCacheReq, 1L));
    }

    @ApiOperation("患者问题结果保存")
    @RepeatSubmit
    @PostMapping("/savequestiondetail")
    public AjaxResult saveQuestionDetail(@RequestBody ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
        log.info("【saveQuestionDetail-----saveQuestionCache】的prarm1：{},prarm2：{},type：{},prarm6:{}", serviceSubTaskCacheReq.getParam1(), serviceSubTaskCacheReq.getParam2(), serviceSubTaskCacheReq.getType(), serviceSubTaskCacheReq.getParam6());
        return toAjax(serviceSubtaskAnswerService.saveQuestionDetail(serviceSubTaskCacheReq, 0L));
    }

    @ApiOperation("患者问题结果记录(小程充外链)")

    /**
     * 患者问题结果记录 (小程序外链) - 异步处理
     */
    @ApiOperation("患者问题结果记录 (小程充外链)")
    @PostMapping("/saveQuestionAnswerXCH")
    public AjaxResult saveQuestionAnswerXCH(@RequestBody ServiceSubTaskAnswerReq serviceSubTaskAnswerReq) {
        log.info("【saveQuestionCache-----saveQuestionAnswerXCH】的入参为：{}", serviceSubTaskAnswerReq);
        return toAjax(serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 1L));
        log.info("【saveQuestionAnswerXCH】的入参为：{}", serviceSubTaskAnswerReq);
        // 异步处理保存逻辑，立即返回成功消息
        serviceSubtaskAnswerService.saveQuestionAnswer(serviceSubTaskAnswerReq, 1L);
        return success("提交成功，正在处理中...");
    }

    @ApiOperation("获取患者问题结果记录缓存(小程序外链)")
@@ -149,7 +171,7 @@
    @ApiOperation("患者问题结果记录缓存(外链)")
    @PostMapping("/saveQuestionCache")
    public AjaxResult saveQuestionCache(@RequestBody ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
        log.info("【saveQuestionCache-----saveQuestionCache】的入参为：{}", serviceSubTaskCacheReq);
        log.info("【saveQuestionCache-----saveQuestionCache】的prarm1：{},prarm2：{},type：{},prarm6:{}", serviceSubTaskCacheReq.getParam1(), serviceSubTaskCacheReq.getParam2(), serviceSubTaskCacheReq.getType(), serviceSubTaskCacheReq.getParam6());
        return toAjax(serviceSubtaskAnswerService.saveQuestionCache(serviceSubTaskCacheReq, 0L));
    }

@@ -157,8 +179,8 @@
    @PostMapping("/getQuestionCache")
    public AjaxResult getQuestionCache(@RequestBody ServiceSubTaskCacheReq serviceSubTaskCacheReq) {
        log.info("【saveQuestionCache-----getQuestionCache】的入参为：{}", serviceSubTaskCacheReq);
        if (StringUtils.isEmpty(serviceSubTaskCacheReq.getParam1()) || StringUtils.isEmpty(serviceSubTaskCacheReq.getParam2()))
            throw new BaseException("请检查param1或param2的值");
//        if (StringUtils.isEmpty(serviceSubTaskCacheReq.getParam1()) || StringUtils.isEmpty(serviceSubTaskCacheReq.getParam2()))
//            throw new BaseException("请检查param1或param2的值");
        return AjaxResult.success(serviceSubtaskAnswerService.getQuestionCache(serviceSubTaskCacheReq, 0L));
    }

@@ -172,6 +194,7 @@


    @ApiOperation("患者满意度结果记录(外链)")
    @RepeatSubmit
    @PostMapping("/saveMYDQuestionAnswer")
    public AjaxResult saveMYDQuestionAnswer(@RequestBody ServiceSubTaskMYDAnswerReq serviceSubTaskAnswerReq) {
        log.info("【saveQuestionCache-----saveMYDQuestionAnswer】的入参为：{}", serviceSubTaskAnswerReq);