【市一】问题统计接口调整

陈昶聿

3 天以前 14c05113b72698a331259ce7c34c7ae8dd69ffd7

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

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

import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -24,7 +25,9 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
@@ -58,7 +61,8 @@
     */
    @ApiOperation("查询任务列表")
    //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:list')")
    @PostMapping("/list")
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("list")
    public TableDataInfo list(@RequestBody ServiceTask serviceTask) {
        PageUtils.startPageByPost(serviceTask.getPageNum(), serviceTask.getPageSize());
//        List<ServiceTask> list = serviceTaskService.selectServiceTaskList(serviceTask);
@@ -127,6 +131,7 @@
    @ApiOperation("新增任务")
    //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:add')")
    @Log(title = "语音任务", businessType = BusinessType.INSERT)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/add")
    public AjaxResult add(@RequestBody ServiceTask ServiceTask) {
        SysUser user = getLoginUser().getUser();
@@ -135,11 +140,25 @@
    }

    /**
     * 获取随访及时率
     */
    @ApiOperation("获取随访及时率")
    //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:add')")
    @Log(title = "获取随访及时率", businessType = BusinessType.INSERT)
    @PostMapping("/selectTimelyRate")
    public AjaxResult selectTimelyRate(@RequestBody ServiceSubtask serviceSubtask) {
        SysUser user = getLoginUser().getUser();
        serviceSubtask.setOrgid(user.getOrgid());
        return success(serviceTaskService.selectTimelyRate(serviceSubtask));
    }

    /**
     * 修改语音任务
     */
    @ApiOperation("修改任务")
    //@PreAuthorize("@ss.hasPermi('smartor:ServiceTask:edit')")
    @Log(title = "任务", businessType = BusinessType.UPDATE)
    @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ServiceTask ServiceTask) {
        return toAjax(serviceTaskService.updateServiceTask(ServiceTask));
@@ -214,9 +233,36 @@
            log.error("getScriptInfoByCondition报错了：{}", e.getMessage());
        }

        log.error("tid和pid的值为：{},{}", tid, pid);
        log.info("tid和pid的值为：{},{}", tid, pid);
        if (StringUtils.isEmpty(serviceTaskScriptQues.getPatfrom())) serviceTaskScriptQues.setPatfrom("0");
        return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true, serviceTaskScriptQues.getPatfrom()));
    }


    /**
     * 通过任务ID和患者ID获取单个人的题目信息
     *
     * @return
     */
    @ApiOperation("通过任务ID和诊疗记录号获取单个人的题目信息")
    @PostMapping("/getScriptByCondition")
    public AjaxResult getScriptByCondition(@RequestBody ServiceTaskScriptQues serviceTaskScriptQues) {
        RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
        Long taskId = Long.valueOf(rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam1(), pri_key));
        String zyserialnum = null;
        String mzserialnum = null;
        String tsserialnum = null;
        if (StringUtils.isNotEmpty(serviceTaskScriptQues.getParam2()))
            zyserialnum = rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam2(), pri_key);
        if (StringUtils.isNotEmpty(serviceTaskScriptQues.getParam3()))
            mzserialnum = rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam3(), pri_key);
        if (StringUtils.isNotEmpty(serviceTaskScriptQues.getParam4()))
            tsserialnum = rsaPublicKeyExample.decryptedData(serviceTaskScriptQues.getParam4(), pri_key);
        Map<String, Object> scriptByCondition = serviceTaskService.getScriptByCondition(taskId, zyserialnum, mzserialnum, tsserialnum);
        scriptByCondition.put("zy", serviceTaskScriptQues.getParam2());
        scriptByCondition.put("mz", serviceTaskScriptQues.getParam3());
        scriptByCondition.put("tid", serviceTaskScriptQues.getParam1());
        return success(scriptByCondition);
    }

}