代码提交

liusheng

2024-06-27 afb277a81e060c6275f11e9f9f102b5dcfd80a72

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -284,12 +284,12 @@
                        String patid = rsaPublicKeyExample.encryptedData(svyTaskSingle1.getPatid().toString(), pub_key);
                        SendMagParam sendMagParam = new SendMagParam();
                        sendMagParam.setType("5");
                        sendMagParam.setUrl(req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskname());
                        log.info("链接完整路径：{}", req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskname());
                        sendMagParam.setUrl(req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskName());
                        log.info("链接完整路径：{}", req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + svyTask.getTaskName());
                        //这个模板ID先写死，后面做成可选
                        sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
                        Map map = new HashMap();
                        map.put("first", svyTask.getTaskname());
                        map.put("first", svyTask.getTaskName());
                        sendMagParam.setContent(JSON.toJSONString(map));
                        sendService.sendMsg(sendMagParam);
                    }

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

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaOutIcd10Controller.java ÐÞ¸Ä
@@ -7,8 +7,8 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.IvrLibaTargetIcd10;
import com.smartor.service.IIvrLibaOutIcd10Service;
import com.smartor.domain.Icd10Association;
import com.smartor.service.IIcd10AssociationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +27,9 @@
@Api(description = "指标疾病")
@RestController
@RequestMapping("/smartor/outicd10")
public class IvrLibaOutIcd10Controller extends BaseController {
public class Icd10AssociationController extends BaseController {
    @Autowired
    private IIvrLibaOutIcd10Service ivrLibaOutIcd10Service;
    private IIcd10AssociationService iIcd10AssociationService;

    /**
     * æŸ¥è¯¢æŒ‡æ ‡ç–¾ç—…列表
@@ -37,9 +37,9 @@
    @ApiOperation("查询指标疾病列表")
    @PreAuthorize("@ss.hasPermi('system:icd10:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody IvrLibaTargetIcd10 ivrLibaTargetIcd10) {
        PageUtils.startPageByPost(ivrLibaTargetIcd10.getPageNum(), ivrLibaTargetIcd10.getPageSize());
        List<IvrLibaTargetIcd10> list = ivrLibaOutIcd10Service.selectIvrLibaTargetIcd10List(ivrLibaTargetIcd10);
    public TableDataInfo list(@RequestBody Icd10Association icd10Association) {
        PageUtils.startPageByPost(icd10Association.getPageNum(), icd10Association.getPageSize());
        List<Icd10Association> list = iIcd10AssociationService.selectIcd10AssociationList(icd10Association);
        return getDataTable(list);
    }

@@ -50,9 +50,9 @@
    @PreAuthorize("@ss.hasPermi('system:icd10:export')")
    @Log(title = "指标疾病", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, IvrLibaTargetIcd10 ivrLibaTargetIcd10) {
        List<IvrLibaTargetIcd10> list = ivrLibaOutIcd10Service.selectIvrLibaTargetIcd10List(ivrLibaTargetIcd10);
        ExcelUtil<IvrLibaTargetIcd10> util = new ExcelUtil<IvrLibaTargetIcd10>(IvrLibaTargetIcd10.class);
    public void export(HttpServletResponse response, Icd10Association Icd10Association) {
        List<Icd10Association> list = iIcd10AssociationService.selectIcd10AssociationList(Icd10Association);
        ExcelUtil<Icd10Association> util = new ExcelUtil<Icd10Association>(Icd10Association.class);
        util.exportExcel(response, list, "指标疾病数据");
    }

@@ -63,7 +63,7 @@
    @PreAuthorize("@ss.hasPermi('system:icd10:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(ivrLibaOutIcd10Service.selectIvrLibaTargetIcd10ById(id));
        return success(iIcd10AssociationService.selectIcd10AssociationById(id));
    }

    /**
@@ -73,8 +73,8 @@
    @PreAuthorize("@ss.hasPermi('system:icd10:add')")
    @Log(title = "指标疾病", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody IvrLibaTargetIcd10 ivrLibaTargetIcd10) {
        return toAjax(ivrLibaOutIcd10Service.insertIvrLibaTargetIcd10(ivrLibaTargetIcd10));
    public AjaxResult add(@RequestBody Icd10Association Icd10Association) {
        return toAjax(iIcd10AssociationService.insertIcd10Association(Icd10Association));
    }

    /**
@@ -84,8 +84,8 @@
    @PreAuthorize("@ss.hasPermi('system:icd10:edit')")
    @Log(title = "指标疾病", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody IvrLibaTargetIcd10 ivrLibaTargetIcd10) {
        return toAjax(ivrLibaOutIcd10Service.updateIvrLibaTargetIcd10(ivrLibaTargetIcd10));
    public AjaxResult edit(@RequestBody Icd10Association Icd10Association) {
        return toAjax(iIcd10AssociationService.updateIcd10Association(Icd10Association));
    }

    /**
@@ -96,6 +96,6 @@
    @Log(title = "指标疾病", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(ivrLibaOutIcd10Service.deleteIvrLibaTargetIcd10ByIds(ids));
        return toAjax(iIcd10AssociationService.deleteIcd10AssociationByIds(ids));
    }
}

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

@@ -28,7 +28,7 @@
 */
@Api(description = "问卷模板")
@RestController
@RequestMapping("/smartor/svyTemplate")
@RequestMapping("/smartor/svyLibTemplate")
public class SvyLibTemplateController extends BaseController {
    @Autowired
    private ISvyLibTemplateService svyLibTemplateService;

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

@@ -1,98 +1,138 @@
package com.ruoyi.web.controller.smartor;

import com.github.pagehelper.ISelect;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.SvyTask;
import com.smartor.domain.*;
import com.smartor.service.ISvyTaskService;
import com.smartor.service.ISvyTaskSingleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

/**
 * ç»¼åˆé—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰Controller
 * é—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰Controller
 *
 * @author ruoyi
 * @date 2024-06-12
 */
@Api(description = " é—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰")
@RestController
@RequestMapping("/smartor/svytask")
public class SvyTaskController extends BaseController
{
public class SvyTaskController extends BaseController {
    @Autowired
    private ISvyTaskService svyTaskService;
    @Autowired
    private ISvyTaskSingleService iSvyTaskSingleService;

    /**
     * æŸ¥è¯¢ç»¼åˆé—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰åˆ—表
     * æŸ¥è¯¢é—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰åˆ—表
     */
    @ApiOperation("查询问卷任务（任务）列表")
    @PreAuthorize("@ss.hasPermi('system:task:list')")
    @GetMapping("/list")
    public TableDataInfo list(SvyTask svyTask)
    {
        startPage();
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody SvyTask svyTask) {
        PageUtils.startPageByPost(svyTask.getPageNum(), svyTask.getPageSize());
        List<SvyTask> list = svyTaskService.selectSvyTaskList(svyTask);
        return getDataTable(list);
        List<SvyTaskVO> svyTaskVOS = DtoConversionUtils.sourceToTarget(list, SvyTaskVO.class);
        if (CollectionUtils.isNotEmpty(svyTaskVOS)) {
            for (SvyTaskVO svyTaskVO : svyTaskVOS) {
                SvyTaskSingle svyTaskSingle = new SvyTaskSingle();
                svyTaskSingle.setTaskid(svyTaskVO.getTaskid());
                List<SvyTaskSingle> svyTaskSingles = iSvyTaskSingleService.selectSvyTaskSingleList(svyTaskSingle);
                if (CollectionUtils.isNotEmpty(svyTaskSingles)) {
                    //已发送
                    long yfs = svyTaskSingles.stream().filter(svyTaskcall1 -> svyTaskcall1.getSendstate() != null && svyTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
                    //未发送
                    long wfs = svyTaskSingles.stream().filter(svyTaskcall1 -> svyTaskcall1.getSendstate() != null && svyTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
                    svyTaskVO.setYfs(yfs);
                    svyTaskVO.setWfs(wfs);

                }
            }
            //获取total
            long total = PageUtils.count(new ISelect() {
                @Override
                public void doSelect() {
                    svyTask.setPageNum(null);
                    svyTask.setPageSize(null);
                    svyTaskService.selectSvyTaskList(svyTask);
                }
            });

            return getDataTable2(total, svyTaskVOS);

        }

        return getDataTable2(0, list);
    }

    /**
     * å¯¼å‡ºç»¼åˆé—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰åˆ—表
     * å¯¼å‡ºé—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰åˆ—表
     */
    @ApiOperation("导出问卷任务（任务）列表")
    @PreAuthorize("@ss.hasPermi('system:task:export')")
    @Log(title = "综合问卷任务（任务）", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, SvyTask svyTask)
    {
    public void export(HttpServletResponse response, SvyTask svyTask) {
        List<SvyTask> list = svyTaskService.selectSvyTaskList(svyTask);
        ExcelUtil<SvyTask> util = new ExcelUtil<SvyTask>(SvyTask.class);
        util.exportExcel(response, list, "综合问卷任务（任务）数据");
    }

    /**
     * èŽ·å–综合问卷任务（任务）详细信息
     * èŽ·å–问卷任务（任务）详细信息
     */
    @ApiOperation("获取问卷任务（任务）详细信息")
    @PreAuthorize("@ss.hasPermi('system:task:query')")
    @GetMapping(value = "/{taskid}")
    public AjaxResult getInfo(@PathVariable("taskid") Long taskid)
    {
    public AjaxResult getInfo(@PathVariable("taskid") Long taskid) {
        return success(svyTaskService.selectSvyTaskByTaskid(taskid));
    }

    /**
     * æ–°å¢žç»¼åˆé—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰
     * æ–°å¢žé—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰
     */
    @ApiOperation("新增问卷任务（任务）")
    @PreAuthorize("@ss.hasPermi('system:task:add')")
    @Log(title = "综合问卷任务（任务）", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody SvyTask svyTask)
    {
    @PostMapping("/add")
    public AjaxResult add(@RequestBody SvyTask svyTask) {
        return toAjax(svyTaskService.insertSvyTask(svyTask));
    }

    /**
     * ä¿®æ”¹ç»¼åˆé—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰
     * ä¿®æ”¹é—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰
     */
    @ApiOperation("修改问卷任务（任务）")
    @PreAuthorize("@ss.hasPermi('system:task:edit')")
    @Log(title = "综合问卷任务（任务）", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody SvyTask svyTask)
    {
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody SvyTask svyTask) {
        return toAjax(svyTaskService.updateSvyTask(svyTask));
    }

    /**
     * åˆ é™¤ç»¼åˆé—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰
     * åˆ é™¤é—®å·ä»»åŠ¡ï¼ˆä»»åŠ¡ï¼‰
     */
    @ApiOperation("删除问卷任务（任务）")
    @PreAuthorize("@ss.hasPermi('system:task:remove')")
    @Log(title = "综合问卷任务（任务）", businessType = BusinessType.DELETE)
    @DeleteMapping("/{taskids}")
    public AjaxResult remove(@PathVariable Long[] taskids)
    {
    @Log(title = "问卷任务（任务）", businessType = BusinessType.DELETE)
    @GetMapping("/{taskids}")
    public AjaxResult remove(@PathVariable Long[] taskids) {
        return toAjax(svyTaskService.deleteSvyTaskByTaskids(taskids));
    }
}

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

@@ -8,6 +8,8 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.SvyTaskScript;
import com.smartor.service.ISvyTaskScriptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -21,20 +23,20 @@
 * @author ruoyi
 * @date 2024-06-12
 */
@Api(description = "任务问卷题目")
@RestController
@RequestMapping("/smartor/svyTaskScript")
public class SvyTaskScriptController extends BaseController
{
public class SvyTaskScriptController extends BaseController {
    @Autowired
    private ISvyTaskScriptService svyTaskScriptService;

    /**
     * æŸ¥è¯¢ä»»åŠ¡é—®å·é¢˜ç›®åˆ—表
     */
    @ApiOperation("查询任务问卷题目列表")
    @PreAuthorize("@ss.hasPermi('system:script:list')")
    @GetMapping("/list")
    public TableDataInfo list(SvyTaskScript svyTaskScript)
    {
    public TableDataInfo list(SvyTaskScript svyTaskScript) {
        startPage();
        List<SvyTaskScript> list = svyTaskScriptService.selectSvyTaskScriptList(svyTaskScript);
        return getDataTable(list);
@@ -43,11 +45,11 @@
    /**
     * å¯¼å‡ºä»»åŠ¡é—®å·é¢˜ç›®åˆ—表
     */
    @ApiOperation("导出任务问卷题目列表")
    @PreAuthorize("@ss.hasPermi('system:script:export')")
    @Log(title = "任务问卷题目", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, SvyTaskScript svyTaskScript)
    {
    public void export(HttpServletResponse response, SvyTaskScript svyTaskScript) {
        List<SvyTaskScript> list = svyTaskScriptService.selectSvyTaskScriptList(svyTaskScript);
        ExcelUtil<SvyTaskScript> util = new ExcelUtil<SvyTaskScript>(SvyTaskScript.class);
        util.exportExcel(response, list, "任务问卷题目数据");
@@ -56,43 +58,43 @@
    /**
     * èŽ·å–任务问卷题目详细信息
     */
    @ApiOperation("获取任务问卷题目详细信息")
    @PreAuthorize("@ss.hasPermi('system:script:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(svyTaskScriptService.selectSvyTaskScriptById(id));
    }

    /**
     * æ–°å¢žä»»åŠ¡é—®å·é¢˜ç›®
     */
    @ApiOperation("新增任务问卷题目")
    @PreAuthorize("@ss.hasPermi('system:script:add')")
    @Log(title = "任务问卷题目", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody SvyTaskScript svyTaskScript)
    {
    @PostMapping("/add")
    public AjaxResult add(@RequestBody SvyTaskScript svyTaskScript) {
        return toAjax(svyTaskScriptService.insertSvyTaskScript(svyTaskScript));
    }

    /**
     * ä¿®æ”¹ä»»åŠ¡é—®å·é¢˜ç›®
     */
    @ApiOperation("修改任务问卷题目")
    @PreAuthorize("@ss.hasPermi('system:script:edit')")
    @Log(title = "任务问卷题目", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody SvyTaskScript svyTaskScript)
    {
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody SvyTaskScript svyTaskScript) {
        return toAjax(svyTaskScriptService.updateSvyTaskScript(svyTaskScript));
    }

    /**
     * åˆ é™¤ä»»åŠ¡é—®å·é¢˜ç›®
     */
    @ApiOperation("导出综合问卷任务（任务）列表")
    @PreAuthorize("@ss.hasPermi('system:script:remove')")
    @Log(title = "任务问卷题目", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(svyTaskScriptService.deleteSvyTaskScriptByIds(ids));
    }
}

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

@@ -7,11 +7,11 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.IvrTaskVO;
import com.smartor.domain.SvyTaskSingle;
import com.smartor.domain.SvyTaskVO;
import com.smartor.domain.*;
import com.smartor.service.ISvyTaskSingleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -26,6 +26,7 @@
 * @author ruoyi
 * @date 2024-06-12
 */
@Api(description = "单一任务（问卷）")
@RestController
@RequestMapping("/smartor/svysingle")
public class SvyTaskSingleController extends BaseController {
@@ -35,6 +36,7 @@
    /**
     * æŸ¥è¯¢å•ä¸€ä»»åŠ¡ï¼ˆé—®å·ï¼‰åˆ—表
     */
    @ApiOperation("查询单一任务（问卷）列表")
    @PreAuthorize("@ss.hasPermi('system:single:list')")
    @GetMapping("/list")
    public TableDataInfo list(SvyTaskSingle svyTaskSingle) {
@@ -46,6 +48,7 @@
    /**
     * å¯¼å‡ºå•ä¸€ä»»åŠ¡ï¼ˆé—®å·ï¼‰åˆ—表
     */
    @ApiOperation("导出单一任务（问卷）列表")
    @PreAuthorize("@ss.hasPermi('system:single:export')")
    @Log(title = "单一任务（问卷）", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
@@ -58,8 +61,9 @@
    /**
     * èŽ·å–单一任务（问卷）详细信息
     */
    @ApiOperation("获取单一任务（问卷）详细信息")
    @PreAuthorize("@ss.hasPermi('system:single:query')")
    @GetMapping(value = "/{id}")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(svyTaskSingleService.selectSvyTaskSingleById(id));
    }
@@ -67,9 +71,10 @@
    /**
     * æ–°å¢žå•ä¸€ä»»åŠ¡ï¼ˆé—®å·ï¼‰
     */
    @ApiOperation("新增单一任务（问卷）")
    @PreAuthorize("@ss.hasPermi('system:single:add')")
    @Log(title = "单一任务（问卷）", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    public AjaxResult add(@RequestBody SvyTaskSingle svyTaskSingle) {
        return toAjax(svyTaskSingleService.insertSvyTaskSingle(svyTaskSingle));
    }
@@ -77,9 +82,10 @@
    /**
     * ä¿®æ”¹å•ä¸€ä»»åŠ¡ï¼ˆé—®å·ï¼‰
     */
    @ApiOperation("修改单一任务（问卷）")
    @PreAuthorize("@ss.hasPermi('system:single:edit')")
    @Log(title = "单一任务（问卷）", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody SvyTaskSingle svyTaskSingle) {
        return toAjax(svyTaskSingleService.updateSvyTaskSingle(svyTaskSingle));
    }
@@ -87,9 +93,10 @@
    /**
     * åˆ é™¤å•ä¸€ä»»åŠ¡ï¼ˆé—®å·ï¼‰
     */
    @ApiOperation(" åˆ é™¤å•ä¸€ä»»åŠ¡ï¼ˆé—®å·ï¼‰")
    @PreAuthorize("@ss.hasPermi('system:single:remove')")
    @Log(title = "单一任务（问卷）", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(svyTaskSingleService.deleteSvyTaskSingleByIds(ids));
    }
@@ -101,10 +108,21 @@
    @PreAuthorize("@ss.hasPermi('system:task:add')")
    @PostMapping("/insertOrUpdateSvyTask")
    public AjaxResult insertOrUpdateSvyTask(@RequestBody SvyTaskVO svyTaskVO) {

        LoginUser loginUser = getLoginUser();
        SysUser user = loginUser.getUser();
        svyTaskVO.setCreateBy(user.getNickName());
        return toAjax(svyTaskSingleService.insertOrUpdateSvyTask(svyTaskVO));
    }

    /**
     * æ ¹æ®æ¡ä»¶æŸ¥è¯¢ä»»åŠ¡ä¿¡æ¯
     */
    @ApiOperation("根据条件查询任务信息")
    @PostMapping("/queryTaskByCondition")
    public AjaxResult queryTaskByCondition(@RequestBody SvyTaskSingleVO svyTaskSingleVO) {
        //根据入参查询信息
        SvyTaskSingle svyTaskSingle = DtoConversionUtils.sourceToTarget(svyTaskSingleVO, SvyTaskSingle.class);
        SvyTaskVO svyTaskVO = svyTaskSingleService.queryTaskByCondition(svyTaskSingle);
        return success(svyTaskVO);
    }
}

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

@@ -10,6 +10,7 @@
import com.smartor.domain.SvyTaskTemplate;
import com.smartor.domain.SvyTaskTemplateVO;
import com.smartor.service.ISvyTaskTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,8 +25,9 @@
 * @author ruoyi
 * @date 2024-06-12
 */
@Api(description = "任务问卷模板")
@RestController
@RequestMapping("/smartor/svytemplate")
@RequestMapping("/smartor/svytemplateTask")
public class SvyTaskTemplateController extends BaseController {
    @Autowired
    private ISvyTaskTemplateService svyTaskTemplateService;
@@ -34,6 +36,7 @@
     * æŸ¥è¯¢ä»»åŠ¡é—®å·æ¨¡æ¿åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('system:template:list')")
    @ApiOperation("查询任务问卷模板列表")
    @GetMapping("/list")
    public TableDataInfo list(SvyTaskTemplate svyTaskTemplate) {
        startPage();
@@ -44,6 +47,7 @@
    /**
     * å¯¼å‡ºä»»åŠ¡é—®å·æ¨¡æ¿åˆ—表
     */
    @ApiOperation("导出任务问卷模板列表")
    @PreAuthorize("@ss.hasPermi('system:template:export')")
    @Log(title = "任务问卷模板", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
@@ -56,6 +60,7 @@
    /**
     * èŽ·å–任务问卷模板详细信息
     */
    @ApiOperation("获取任务问卷模板详细信息")
    @PreAuthorize("@ss.hasPermi('system:template:query')")
    @GetMapping(value = "/{svyid}")
    public AjaxResult getInfo(@PathVariable("svyid") Long svyid) {
@@ -65,6 +70,7 @@
    /**
     * æ–°å¢žä»»åŠ¡é—®å·æ¨¡æ¿
     */
    @ApiOperation("新增任务问卷模板")
    @PreAuthorize("@ss.hasPermi('system:template:add')")
    @Log(title = "任务问卷模板", businessType = BusinessType.INSERT)
    @PostMapping
@@ -75,9 +81,10 @@
    /**
     * ä¿®æ”¹ä»»åŠ¡é—®å·æ¨¡æ¿
     */
    @ApiOperation("修改任务问卷模板")
    @PreAuthorize("@ss.hasPermi('system:template:edit')")
    @Log(title = "任务问卷模板", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody SvyTaskTemplate svyTaskTemplate) {
        return toAjax(svyTaskTemplateService.updateSvyTaskTemplate(svyTaskTemplate));
    }
@@ -85,9 +92,10 @@
    /**
     * åˆ é™¤ä»»åŠ¡é—®å·æ¨¡æ¿
     */
    @ApiOperation("删除任务问卷模板")
    @PreAuthorize("@ss.hasPermi('system:template:remove')")
    @Log(title = "任务问卷模板", businessType = BusinessType.DELETE)
    @DeleteMapping("/{svyids}")
    @GetMapping("/remove/{svyids}")
    public AjaxResult remove(@PathVariable Long[] svyids) {
        return toAjax(svyTaskTemplateService.deleteSvyTaskTemplateBySvyids(svyids));
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,21 +1,5 @@
package com.ruoyi.web.controller.system;

import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
@@ -32,6 +16,16 @@
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

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

/**
 * ç”¨æˆ·ä¿¡æ¯

 smartor/src/main/java/com/smartor/domain/Icd10Association.java

@@ -1,5 +1,7 @@
package com.smartor.domain;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,18 +11,29 @@
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

import java.util.Date;

/**
 * ç–¾ç—…关联对象 icd10_association
 * æŒ‡æ ‡ç–¾ç—…对象 ivr_liba_target_icd10
 *
 * @author ruoyi
 * @date 2023-06-26
 * @date 2023-12-20
 */
@Data
@ApiModel(value = "Icd10Association", description = "疾病关联对象")
public class Icd10Association {
@ApiModel(value = "Icd10Association", description = "指标疾病对象")
public class Icd10Association extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * è‡ªå¢žID
     */
    @ApiModelProperty(value = "主键")
    private Long id;

    /**
     * ç–¾ç—…id
     */
    @ApiModelProperty(value = "疾病id")
    @Excel(name = "疾病id")
    private Long icd10id;

    /**
     * ç–¾ç—…编码
@@ -36,19 +49,75 @@
    @Excel(name = "疾病名称")
    private String icd10name;

    /**
     * é—®å·ID
     */
    @ApiModelProperty(value = "问卷ID")
    @Excel(name = "问卷ID")
    private Long svyid;


    /**
     * æ›´æ–°æ—¶é—´
     * æœºæž„ID
     */
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updatetime;
    @ApiModelProperty(value = "机构ID")
    @Excel(name = " æœºæž„ID ")
    private String orgid;

    /**
     * åˆ é™¤æ ‡è®°
     */
    @ApiModelProperty(value = "删除标记")
    private String delFlag;

    /**
     * ä¸Šä¼ æ ‡è®°
     */
    @ApiModelProperty(value = "上传标记")
    @Excel(name = " ä¸Šä¼ æ ‡è®° ")
    private Long isupload;

    /**
     * ä¸Šä¼ æ—¶é—´
     */
    @ApiModelProperty(value = "上传时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " ä¸Šä¼ æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    private Date uploadTime;

    /**
     * å¤–部ID
     */
    @ApiModelProperty(value = "外部ID")
    @Excel(name = "外部ID ")
    private Long outid;

    /**
     * 1,指标 2,随访话术 3,随访模版  4,问卷话术 ï¼›5,问卷模版 6,宣教
     */
    @ApiModelProperty(value = "1,指标 2,随访话术 3,随访模版  4,问卷话术 ï¼›5,问卷模版 6,宣教")
    @Excel(name = "1,指标 2,随访话术 3,随访模版  4,问卷话术 ï¼›5,问卷模版 6,宣教")
    private Long type;

    /**
     * çˆ¶ID
     */
    @ApiModelProperty(value = "父ID")
    @Excel(name = "父ID")
    private Long pid;

    /**
     * GUID
     */
    @ApiModelProperty(value = "GUID")
    @Excel(name = "GUID")
    private String guid;

    /**
     * pageNum
     */
    @ApiModelProperty(value = "pageNum")
    @Excel(name = "pageNum")
    private Integer pageNum;

    /**
     * pageSize
     */
    @ApiModelProperty(value = "pageSize")
    @Excel(name = "pageSize")
    private Integer pageSize;

}

 smartor/src/main/java/com/smartor/domain/IvrLibaTargetIcd10.java

ÎļþÒÑɾ³ý

 smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java

@@ -121,8 +121,8 @@
    /**
     * ç—…历号
     */
    @Excel(name = "发送状态")
    @ApiModelProperty("发送状态")
    @Excel(name = "发送状态 ï¼š1 è¢«é¢†å–  2 å¾…发送  3 å·²å‘送")
    @ApiModelProperty("发送状态 ï¼š1 è¢«é¢†å–  2 å¾…发送  3 å·²å‘送")
    private Integer sendStatus;



 smartor/src/main/java/com/smartor/domain/SvyLibTemplate.java

@@ -1,16 +1,16 @@
package com.smartor.domain;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * é—®å·å¯¹è±¡ svy_lib_Template
@@ -150,8 +150,8 @@
    /**
     * ç–¾ç—…ID
     */
    @ApiModelProperty(value = "疾病ID")
    private List<String> icdID;
    @ApiModelProperty(value = "疾病关联表")
    private List<Icd10Association> icd10Associations;

    /**
     * é—®å·é¢˜ç›®é›†åˆ

 smartor/src/main/java/com/smartor/domain/SvyLibTemplateTargetoption.java

@@ -42,6 +42,12 @@
    @Excel(name = "指标名称")
    @ApiModelProperty(value = "指标名称")
    private String targetname;
    /**
     * æŒ‡æ ‡åç§°
     */
    @Excel(name = "分数")
    @ApiModelProperty(value = "分数")
    private String score;

    /**
     * æ¨¡æ¿ID
@@ -125,7 +131,7 @@
     */
    @Excel(name = "选项描述")
    @ApiModelProperty(value = "选项描述")
    private String optiondesc;
    private String optioncontent;

    /**
     * è¯­è¨€

 smartor/src/main/java/com/smartor/domain/SvyTask.java

@@ -38,7 +38,14 @@
     */
    @Excel(name = "  ")
    @ApiModelProperty(value = "任务名称")
    private String taskname;
    private String taskName;

    /**
     *
     */
    @Excel(name = "  ")
    @ApiModelProperty(value = "任务描述")
    private String taskDesc;

    /**
     * æ¨¡æ¿ID
@@ -239,10 +246,10 @@
    private Long sendType;

    /**
     * å‘送状态：  0  å¤±è´¥   1成功
     * å‘送状态: 1新建 2执行中 3暂停 4终止 5完成
     */
    @Excel(name = "发送状态：  0  å¤±è´¥   1成功")
    @ApiModelProperty(value = "发送状态：  0  å¤±è´¥   1成功")
    @Excel(name = "发送状态: 1新建 2执行中 3暂停 4终止 5完成")
    @ApiModelProperty(value = "发送状态: 1新建 2执行中 3暂停 4终止 5完成")
    private String sendState;

    /**
@@ -297,4 +304,16 @@
    @Excel(name = "模板库模版ID")
    private String libtemplateid;

    /**
     * pageNum
     */
    @ApiModelProperty("pageNum")
    private Integer pageNum;

    /**
     * pageSize
     */
    @ApiModelProperty("pageSize")
    private Integer pageSize;

}

 smartor/src/main/java/com/smartor/domain/SvyTaskSingle.java

@@ -164,7 +164,7 @@
     * å‘送状态 ï¼š1 è¢«é¢†å–  2 å¾…发送  3 å·²å‘送
     */
    @Excel(name = " å‘送状态 ï¼š1 è¢«é¢†å–  2 å¾…发送  3 å·²å‘送")
    @ApiModelProperty(value = "发送状态 ï¼š1 è¢«é¢†å–  2 å¾…发送  3 å·²å‘送")
    @ApiModelProperty(value = "发送状态 ï¼š1 è¢«é¢†å–  2 å¾…发送  3 å·²å‘送 4 ç»ˆæ­¢")
    private Long sendstate;

    /**
@@ -356,7 +356,7 @@
     */
    @Excel(name = "发送类型: 1 æ—¶é—´æ®µ   2 æ—¶é—´ç‚¹   3 å³åˆ»å‘送")
    @ApiModelProperty(value = "发送类型: 1 æ—¶é—´æ®µ   2 æ—¶é—´ç‚¹   3 å³åˆ»å‘送")
    private String sendType;
    private Long sendType;

    /**
     * å‘送时间段

 smartor/src/main/java/com/smartor/domain/SvyTaskSingleVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,452 @@
package com.smartor.domain;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * å•ä¸€ä»»åŠ¡ï¼ˆé—®å·ï¼‰å¯¹è±¡ svy_task_single
 *
 * @author ruoyi
 * @date 2024-06-12
 */
@Data
public class SvyTaskSingleVO extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * è®°å½•å…³é”®å€¼ID
     */
    @ApiModelProperty(value = "主键")
    private Long id;

    /**
     * å‘送人 ï¼ˆæ‚£è€…）
     */
    @Excel(name = " å‘送人 ", readConverterExp = "患=者")
    @ApiModelProperty(value = "发送人 ï¼ˆæ‚£è€…）")
    private String sendname;

    /**
     * æ‰‹æœºå·
     */
    @Excel(name = " æ‰‹æœºå· ")
    @ApiModelProperty(value = "手机号")
    private String phone;

    /**
     * æ‚£è€…ID
     */
    @Excel(name = " æ‚£è€…ID ")
    @ApiModelProperty(value = "患者ID")
    private Long patid;

    /**
     * æ€§åˆ«
     */
    @Excel(name = "  æ€§åˆ«")
    @ApiModelProperty(value = "性别")
    private String sex;

    /**
     * å¹´é¾„
     */
    @Excel(name = " å¹´é¾„ ")
    @ApiModelProperty(value = "年龄")
    private Long age;

    /**
     * èº«ä»½è¯å·
     */
    @Excel(name = " èº«ä»½è¯å· ")
    @ApiModelProperty(value = "身份证号")
    private String sfzh;

    /**
     * åœ°å€
     */
    @Excel(name = " åœ°å€ ")
    @ApiModelProperty(value = "地址")
    private String addr;

    /**
     * å‘送人详情
     */
    @Excel(name = "  å‘送人详情")
    @ApiModelProperty(value = "发送人详情")
    private String senderdetail;

    /**
     * ä»»åŠ¡ç±»åž‹(0通知、1宣教、2门诊、3出院、4复诊、5体检、6问卷、7医技……)
     */
    @Excel(name = "任务类型(0通知、1宣教、2门诊、3出院、4复诊、5体检、6问卷、7医技……)")
    @ApiModelProperty(value = "任务类型(0通知、1宣教、2门诊、3出院、4复诊、5体检、6问卷、7医技……)")
    private String type;

    /**
     * ä»»åŠ¡ID
     */
    @Excel(name = " ä»»åŠ¡ID ")
    @ApiModelProperty(value = "任务ID")
    private Long taskid;

    /**
     * æ¨¡æ¿ID
     */
    @Excel(name = "  æ¨¡æ¿ID")
    @ApiModelProperty(value = "模板ID")
    private String templateid;

    /**
     * æ¨¡æ¿å
     */
    @Excel(name = " æ¨¡æ¿å ")
    @ApiModelProperty(value = "模板名")
    private String templatename;

    /**
     * å‘送日期
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " å‘送日期 ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "发送日期")
    private Date senddate;

    /**
     * ä¸Šåˆå¼€å§‹å‘送时间限制
     */
    @Excel(name = " ä¸Šåˆå¼€å§‹å‘送时间限制")
    @ApiModelProperty(value = "上午开始发送时间限制")
    private String sendlimitabegin;

    /**
     * ä¸Šåˆç»“束发送时间限制
     */
    @Excel(name = " ä¸Šåˆç»“束发送时间限制")
    @ApiModelProperty(value = "上午结束发送时间限制")
    private String sendlimitaend;

    /**
     * ä¸‹åˆå¼€å§‹å‘送时间限制
     */
    @Excel(name = " ä¸‹åˆå¼€å§‹å‘送时间限制")
    @ApiModelProperty(value = "下午开始发送时间限制")
    private String sendlimitpbegin;

    /**
     * ä¸‹åˆç»“束发送时间限制
     */
    @Excel(name = " ä¸‹åˆç»“束发送时间限制")
    @ApiModelProperty(value = "下午结束发送时间限制")
    private String sendlimitpend;

    /**
     * æ™šä¸Šå¼€å§‹å‘送时间限制
     */
    @Excel(name = " æ™šä¸Šå¼€å§‹å‘送时间限制")
    @ApiModelProperty(value = "晚上开始发送时间限制")
    private String sendlimitnbegin;

    /**
     * æ™šä¸Šç»“束发送时间限制
     */
    @Excel(name = " æ™šä¸Šç»“束发送时间限制")
    @ApiModelProperty(value = "晚上结束发送时间限制")
    private String sendlimitnend;

    /**
     * å‘送状态 ï¼š1 è¢«é¢†å–  2 å¾…发送  3 å·²å‘送
     */
    @Excel(name = " å‘送状态 ï¼š1 è¢«é¢†å–  2 å¾…发送  3 å·²å‘送")
    @ApiModelProperty(value = "发送状态 ï¼š1 è¢«é¢†å–  2 å¾…发送  3 å·²å‘送")
    private Long sendstate;

    /**
     * å‘送UUID
     */
    @Excel(name = " å‘送UUID ")
    @ApiModelProperty(value = "发送UUID")
    private String senduuid;

    /**
     * ç»“æžœ
     */
    @Excel(name = " ç»“æžœ ")
    @ApiModelProperty(value = "结果")
    private String result;

    /**
     * å®Œæˆæ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " å®Œæˆæ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "完成时间")
    private Date finishtime;

    /**
     * ç”¨æˆ·ID
     */
    @Excel(name = " ç”¨æˆ·ID ")
    @ApiModelProperty(value = "用户ID")
    private String userid;

    /**
     * ç”¨æˆ·å
     */
    @Excel(name = " ç”¨æˆ·å ")
    @ApiModelProperty(value = "用户名")
    private String username;

    /**
     *
     */
    @Excel(name = "  ")
    @ApiModelProperty(value = "外呼UUID")
    private String outbounduuid;

    /**
     * å°±è¯Šè®°å½•ç¼–号 ï¼ˆå¯¹åº”“患者出院记录主键”、“患者门诊记录主键”）
     */
    @Excel(name = " å°±è¯Šè®°å½•ç¼–号 ", readConverterExp = "对=应“患者出院记录主键”、“患者门诊记录主键”")
    @ApiModelProperty(value = "就诊记录编号 ï¼ˆå¯¹åº”“患者出院记录主键”、“患者门诊记录主键”）")
    private Long recordid;

    /**
     * é‡æ‹¨æ€»æ•°
     */
    @Excel(name = " é‡æ‹¨æ€»æ•° ")
    @ApiModelProperty(value = "重拨总数")
    private Long recallcount;

    /**
     * å½“前重拨次数
     */
    @Excel(name = " å½“前重拨次数 ")
    @ApiModelProperty(value = "当前重拨次数")
    private Long exrecallcount;

    /**
     * æ‹‰å–时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " æ‹‰å–时间 ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "拉取时间")
    private Date pulltime;

    /**
     *
     */
    @Excel(name = "  ")
    @ApiModelProperty(value = "")
    private Long bqsms;

    /**
     *
     */
    @Excel(name = "  ")
    @ApiModelProperty(value = "")
    private Long bhsms;

    /**
     * éƒ¨é—¨code
     */
    @Excel(name = "  éƒ¨é—¨code")
    @ApiModelProperty(value = "部门code")
    private String deptcode;

    /**
     * æ ‡ç­¾çŠ¶æ€
     */
    @Excel(name = "  æ ‡ç­¾çŠ¶æ€")
    @ApiModelProperty(value = "标签状态")
    private Long labelstatus;

    /**
     * åˆ é™¤æ ‡è®°
     */
    @ApiModelProperty(value = "删除标记")
    private String delFlag;

    /**
     * ä¸Šä¼ æ ‡è®°
     */
    @Excel(name = " ä¸Šä¼ æ ‡è®° ")
    @ApiModelProperty(value = "上传标记")
    private Long isupload;

    /**
     * ä¸Šä¼ æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " ä¸Šä¼ æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "上传时间")
    private Date uploadTime;

    /**
     * æœºæž„ID
     */
    @Excel(name = " æœºæž„ID ")
    @ApiModelProperty(value = "机构ID")
    private String orgid;

    /**
     * çˆ¶ID
     */
    @Excel(name = "父ID")
    @ApiModelProperty(value = "父ID")
    private Long pid;

    /**
     * GUID
     */
    @Excel(name = "GUID")
    @ApiModelProperty(value = "GUID")
    private String guid;

    /**
     * æ–‡æœ¬å˜é‡å‚æ•°
     */
    @Excel(name = "文本变量参数")
    @ApiModelProperty(value = "文本变量参数")
    private String textParam;

    /**
     * 1,短信、2,线下、3,语音、4,视频、5,纸质  6.链接  7.钉钉   8.微信
     */
    @Excel(name = " 1,短信、2,线下、3,语音、4,视频、5,纸质  6.链接  7.钉钉   8.微信")
    @ApiModelProperty(value = "1,短信、2,线下、3,语音、4,视频、5,纸质  6.链接  7.钉钉   8.微信")
    private String serviceform;

    /**
     * åºŠå·
     */
    @Excel(name = "床号")
    @ApiModelProperty(value = "床号")
    private String badNo;

    /**
     * ç–¾ç—…名称
     */
    @Excel(name = "疾病名称")
    @ApiModelProperty(value = "疾病名称")
    private String icdName;

    /**
     * ç—…历号
     */
    @Excel(name = "病历号")
    @ApiModelProperty(value = "病历号")
    private String medicalRecordNo;

    /**
     * å®£æ•™å†…容
     */
    @Excel(name = "宣教内容")
    @ApiModelProperty(value = "宣教内容")
    private String preachcontent;

    /**
     * å‘送类型: 1 æ—¶é—´æ®µ   2 æ—¶é—´ç‚¹   3 å³åˆ»å‘送
     */
    @Excel(name = "发送类型: 1 æ—¶é—´æ®µ   2 æ—¶é—´ç‚¹   3 å³åˆ»å‘送")
    @ApiModelProperty(value = "发送类型: 1 æ—¶é—´æ®µ   2 æ—¶é—´ç‚¹   3 å³åˆ»å‘送")
    private Long sendType;

    /**
     * å‘送时间段
     */
    @Excel(name = "发送时间段")
    @ApiModelProperty(value = "发送时间段")
    private String sendTimeSlot;

    /**
     * ä»»åŠ¡åç§°
     */
    @Excel(name = "任务名称")
    @ApiModelProperty(value = "任务名称")
    private String taskName;

    /**
     * ä»»åŠ¡æè¿°
     */
    @Excel(name = "任务描述")
    @ApiModelProperty(value = "任务描述")
    private String taskDesc;

    /**
     * åˆ›å»ºäºº
     */
    @Excel(name = "创建人")
    @ApiModelProperty(value = "创建人")
    private String operator;

    /**
     * åˆ›å»ºäººç¼–号
     */
    @Excel(name = "创建人编号")
    @ApiModelProperty(value = "创建人编号")
    private String operatorNo;

    /**
     * å°±è¯Šç¼–号（对应的outhospno、inhospno）
     */
    @Excel(name = "就诊编号", readConverterExp = "对=应的outhospno、inhospno")
    @ApiModelProperty(value = "就诊编号")
    private String hospno;

    /**
     * å°±è¯Šç±»åž‹ï¼ˆ1门诊  2出院）
     */
    @Excel(name = "就诊类型", readConverterExp = "1=门诊,2=出院")
    @ApiModelProperty(value = "就诊类型（1门诊  2出院）")
    private String hospType;

    /**
     * å¾®ä¿¡
     */
    @Excel(name = "微信")
    @ApiModelProperty(value = "微信")
    private String wechat;

    /**
     * è¯Šæ–­åç§°
     */
    @Excel(name = "诊断名称")
    @ApiModelProperty(value = "诊断名称")
    private String diagname;

    /**
     * ç§‘室名称
     */
    @Excel(name = "科室名称")
    @ApiModelProperty(value = "科室名称")
    private String deptname;

    /**
     * å°±è¯Šæ—¥æœŸ
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "就诊日期", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "就诊日期")
    private Date admindate;

    /**
     * ç—…房号
     */
    @Excel(name = "病房号")
    @ApiModelProperty(value = "病房号")
    private String roomno;

    /**
     * ç—…床号
     */
    @Excel(name = "病床号")
    @ApiModelProperty(value = "病床号")
    private String bedno;


}

 smartor/src/main/java/com/smartor/domain/SvyTaskTemplateTargetoption.java

@@ -85,7 +85,7 @@
     * é€‰é¡¹æè¿°
     */
    @ApiModelProperty(value = "选项描述")
    private String optiondesc;
    private String optioncontent;

    /**
     * è¯­è¨€

 smartor/src/main/java/com/smartor/domain/SvyTaskVO.java

@@ -38,7 +38,13 @@
     */
    @Excel(name = "  ")
    @ApiModelProperty(value = "任务名称")
    private String taskname;
    private String taskName;
    /**
     *
     */
    @Excel(name = "  ")
    @ApiModelProperty(value = "任务描述")
    private String taskDesc;

    /**
     * æ¨¡æ¿ID
@@ -277,7 +283,7 @@
     */
    @Excel(name = "文本变量参数")
    @ApiModelProperty(value = "文本变量参数")
    private String textParam;
    private Map<String, Map<String, String>> textParam;

    /**
     * æš‚停状态 ï¼š çŠ¶æ€å¦‚果发生修改，值就加1
@@ -315,4 +321,26 @@
     */
    @Excel(name = "模板库模版ID")
    private String libtemplateid;


    /**
     * å·²å‘送
     */
    @Excel(name = " å·²å‘送 ")
    private Long yfs;

    /**
     * æœªå‘送
     */
    @Excel(name = " æœªå‘送 ")
    private Long wfs;

    /**
     * æ˜¯å¦å‘送 ï¼š 0 æš‚停发送  1 å®šæ—¶å‘送  2 ç«‹å³å‘送
     */
    @Excel(name = "是否发送 ï¼š 0 æš‚停发送  1 å®šæ—¶å‘送  2 ç«‹å³å‘送  ")
    @ApiModelProperty(value = "是否发送 ï¼š 0 æš‚停发送  1 å®šæ—¶å‘送  2 ç«‹å³å‘送")
    private Long sendType;


}

 smartor/src/main/java/com/smartor/mapper/Icd10AssociationMapper.java

@@ -6,58 +6,58 @@
import java.util.List;

/**
 * ç–¾ç—…关联Mapper接口
 * æŒ‡æ ‡ç–¾ç—…Mapper接口
 *
 * @author ruoyi
 * @date 2023-06-26
 * @date 2023-12-20
 */
@Mapper
public interface Icd10AssociationMapper {
    /**
     * æŸ¥è¯¢ç–¾ç—…关联
     * æŸ¥è¯¢æŒ‡æ ‡ç–¾ç—…
     *
     * @param icd10code ç–¾ç—…关联主键
     * @return ç–¾ç—…关联
     * @param id æŒ‡æ ‡ç–¾ç—…主键
     * @return æŒ‡æ ‡ç–¾ç—…
     */
    public Icd10Association selectIcd10AssociationByIcd10code(String icd10code);
    public Icd10Association selectIcd10AssociationById(Long id);

    /**
     * æŸ¥è¯¢ç–¾ç—…关联列表
     * æŸ¥è¯¢æŒ‡æ ‡ç–¾ç—…列表
     *
     * @param icd10Association ç–¾ç—…关联
     * @return ç–¾ç—…关联集合
     * @param icd10Association æŒ‡æ ‡ç–¾ç—…
     * @return æŒ‡æ ‡ç–¾ç—…集合
     */
    public List<Icd10Association> selectIcd10AssociationList(Icd10Association icd10Association);

    /**
     * æ–°å¢žç–¾ç—…关联
     * æ–°å¢žæŒ‡æ ‡ç–¾ç—…
     *
     * @param icd10Association ç–¾ç—…关联
     * @param icd10Association æŒ‡æ ‡ç–¾ç—…
     * @return ç»“æžœ
     */
    public int insertIcd10Association(Icd10Association icd10Association);

    /**
     * ä¿®æ”¹ç–¾ç—…关联
     * ä¿®æ”¹æŒ‡æ ‡ç–¾ç—…
     *
     * @param icd10Association ç–¾ç—…关联
     * @param icd10Association æŒ‡æ ‡ç–¾ç—…
     * @return ç»“æžœ
     */
    public int updateIcd10Association(Icd10Association icd10Association);

    /**
     * åˆ é™¤ç–¾ç—…关联
     * åˆ é™¤æŒ‡æ ‡ç–¾ç—…
     *
     * @param icd10code ç–¾ç—…关联主键
     * @param id æŒ‡æ ‡ç–¾ç—…主键
     * @return ç»“æžœ
     */
    public int deleteIcd10AssociationByIcd10code(String icd10code);
    public int deleteIcd10AssociationById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤ç–¾ç—…关联
     * æ‰¹é‡åˆ é™¤æŒ‡æ ‡ç–¾ç—…
     *
     * @param icd10codes éœ€è¦åˆ é™¤çš„数据主键集合
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteIcd10AssociationByIcd10codes(String[] icd10codes);
    public int deleteIcd10AssociationByIds(Long[] ids);
}

 smartor/src/main/java/com/smartor/mapper/IvrLibaOutIcd10Mapper.java

ÎļþÒÑɾ³ý

 smartor/src/main/java/com/smartor/service/IIcd10AssociationService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.smartor.service;

import com.smartor.domain.Icd10Association;
import com.smartor.domain.Icd10Association;

import java.util.List;

/**
 * æŒ‡æ ‡ç–¾ç—…Service接口
 *
 * @author ruoyi
 * @date 2023-12-20
 */
public interface IIcd10AssociationService
{
    /**
     * æŸ¥è¯¢æŒ‡æ ‡ç–¾ç—…
     *
     * @param id æŒ‡æ ‡ç–¾ç—…主键
     * @return æŒ‡æ ‡ç–¾ç—…
     */
    public Icd10Association selectIcd10AssociationById(Long id);

    /**
     * æŸ¥è¯¢æŒ‡æ ‡ç–¾ç—…列表
     *
     * @param icd10Association æŒ‡æ ‡ç–¾ç—…
     * @return æŒ‡æ ‡ç–¾ç—…集合
     */
    public List<Icd10Association> selectIcd10AssociationList(Icd10Association icd10Association);

    /**
     * æ–°å¢žæŒ‡æ ‡ç–¾ç—…
     *
     * @param icd10Association æŒ‡æ ‡ç–¾ç—…
     * @return ç»“æžœ
     */
    public int insertIcd10Association(Icd10Association icd10Association);

    /**
     * ä¿®æ”¹æŒ‡æ ‡ç–¾ç—…
     *
     * @param icd10Association æŒ‡æ ‡ç–¾ç—…
     * @return ç»“æžœ
     */
    public int updateIcd10Association(Icd10Association icd10Association);

    /**
     * æ‰¹é‡åˆ é™¤æŒ‡æ ‡ç–¾ç—…
     *
     * @param ids éœ€è¦åˆ é™¤çš„指标疾病主键集合
     * @return ç»“æžœ
     */
    public int deleteIcd10AssociationByIds(Long[] ids);

    /**
     * åˆ é™¤æŒ‡æ ‡ç–¾ç—…信息
     *
     * @param id æŒ‡æ ‡ç–¾ç—…主键
     * @return ç»“æžœ
     */
    public int deleteIcd10AssociationById(Long id);
}

 smartor/src/main/java/com/smartor/service/IIvrLibaOutIcd10Service.java

ÎļþÒÑɾ³ý

 smartor/src/main/java/com/smartor/service/ISvyTaskSingleService.java

@@ -1,5 +1,7 @@
package com.smartor.service;

import com.smartor.domain.IvrTaskSingle;
import com.smartor.domain.IvrTaskVO;
import com.smartor.domain.SvyTaskSingle;
import com.smartor.domain.SvyTaskVO;

@@ -11,8 +13,7 @@
 * @author ruoyi
 * @date 2024-06-12
 */
public interface ISvyTaskSingleService
{
public interface ISvyTaskSingleService {
    /**
     * æŸ¥è¯¢å•ä¸€ä»»åŠ¡ï¼ˆé—®å·ï¼‰
     *
@@ -65,4 +66,6 @@
     * æ–°å¢žæˆ–修改删除问卷任务
     */
    public int insertOrUpdateSvyTask(SvyTaskVO svyTaskVO);

    public SvyTaskVO queryTaskByCondition(SvyTaskSingle svyTaskSingle);
}

 smartor/src/main/java/com/smartor/service/impl/Icd10AssociationServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,97 @@
package com.smartor.service.impl;

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.Icd10Association;
import com.smartor.mapper.Icd10AssociationMapper;
import com.smartor.service.IIcd10AssociationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æŒ‡æ ‡ç–¾ç—…Service业务层处理
 *
 * @author ruoyi
 * @date 2023-12-20
 */
@Service
public class Icd10AssociationServiceImpl implements IIcd10AssociationService
{
    @Autowired
    private Icd10AssociationMapper icd10AssociationMapper;

    /**
     * æŸ¥è¯¢æŒ‡æ ‡ç–¾ç—…
     *
     * @param id æŒ‡æ ‡ç–¾ç—…主键
     * @return æŒ‡æ ‡ç–¾ç—…
     */
    @Override
    public Icd10Association selectIcd10AssociationById(Long id)
    {
        return icd10AssociationMapper.selectIcd10AssociationById(id);
    }

    /**
     * æŸ¥è¯¢æŒ‡æ ‡ç–¾ç—…列表
     *
     * @param icd10Association æŒ‡æ ‡ç–¾ç—…
     * @return æŒ‡æ ‡ç–¾ç—…
     */
    @Override
    public List<Icd10Association> selectIcd10AssociationList(Icd10Association icd10Association)
    {
        return icd10AssociationMapper.selectIcd10AssociationList(icd10Association);
    }

    /**
     * æ–°å¢žæŒ‡æ ‡ç–¾ç—…
     *
     * @param icd10Association æŒ‡æ ‡ç–¾ç—…
     * @return ç»“æžœ
     */
    @Override
    public int insertIcd10Association(Icd10Association icd10Association)
    {
        icd10Association.setCreateTime(DateUtils.getNowDate());
        return icd10AssociationMapper.insertIcd10Association(icd10Association);
    }

    /**
     * ä¿®æ”¹æŒ‡æ ‡ç–¾ç—…
     *
     * @param icd10Association æŒ‡æ ‡ç–¾ç—…
     * @return ç»“æžœ
     */
    @Override
    public int updateIcd10Association(Icd10Association icd10Association)
    {
        icd10Association.setUpdateTime(DateUtils.getNowDate());
        return icd10AssociationMapper.updateIcd10Association(icd10Association);
    }

    /**
     * æ‰¹é‡åˆ é™¤æŒ‡æ ‡ç–¾ç—…
     *
     * @param ids éœ€è¦åˆ é™¤çš„指标疾病主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteIcd10AssociationByIds(Long[] ids)
    {
        return icd10AssociationMapper.deleteIcd10AssociationByIds(ids);
    }

    /**
     * åˆ é™¤æŒ‡æ ‡ç–¾ç—…信息
     *
     * @param id æŒ‡æ ‡ç–¾ç—…主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteIcd10AssociationById(Long id)
    {
        return icd10AssociationMapper.deleteIcd10AssociationById(id);
    }
}

 smartor/src/main/java/com/smartor/service/impl/IvrLibaOutIcd10ServiceImpl.java

ÎļþÒÑɾ³ý

 smartor/src/main/java/com/smartor/service/impl/IvrTaskSingleServiceImpl.java

@@ -229,7 +229,7 @@
                    ivrTaskcall.setAddr(patTaskRelevance.getAddr());
                    ivrTaskcall.setPatid(patTaskRelevance.getPatid());
                    ivrTaskcall.setCreateTime(DateUtils.getNowDate());
                    ivrTaskcall.setCreateTime(DateUtils.getNowDate());
                    ivrTaskcall.setSendstate(1L);
                    ivrTaskcall.setType(ivrTaskVO.getHospType());
                    ivrTaskSingleMapper.insertIvrTaskcall(ivrTaskcall);
                    integer = ivrTaskcall.getId().intValue();
@@ -258,11 +258,15 @@
                    ivrTaskcall.setPatid(patTaskRelevance.getPatid());
                    ivrTaskcall.setType(ivrTaskVO.getHospType());
                    ivrTaskcall.setCreateTime(DateUtils.getNowDate());

                    ivrTaskcall.setTextParam(new Gson().toJson(ivrTaskVO.getTextParam()));
                    if (patTaskRelevance.getIsoperation() != null) {
                        if (patTaskRelevance.getIsoperation() == 2)
                            ivrTaskSingleMapper.updateIvrTaskcallByCondition(ivrTaskcall);
                        if (patTaskRelevance.getIsoperation() == 1) ivrTaskSingleMapper.insertIvrTaskcall(ivrTaskcall);
                        if (patTaskRelevance.getIsoperation() == 1) {
                            ivrTaskcall.setSendstate(1L);
                            ivrTaskSingleMapper.insertIvrTaskcall(ivrTaskcall);
                        }
                        if (patTaskRelevance.getIsoperation() == 3)
                            //  é€šè¿‡taskid和patid去删除该条数据
                            ivrTaskSingleMapper.deleteIvrTaskcallByCondition(ivrTaskVO.getTaskid(), patTaskRelevance.getPatid());

 smartor/src/main/java/com/smartor/service/impl/SvyLibTemplateServiceImpl.java

@@ -149,59 +149,43 @@
        if (svyLibTemplate.getIsoperation() != null && svyLibTemplate.getIsoperation() == 1) {
            //新增
            svyLibTemplate.setCreateTime(DateUtils.getNowDate());
            i = svyLibTemplateMapper.insertSvyLibTemplate(svyLibTemplate);
            svyLibTemplateMapper.insertSvyLibTemplate(svyLibTemplate);
        } else if (svyLibTemplate.getIsoperation() != null && svyLibTemplate.getIsoperation() == 2) {
            //修改
            svyLibTemplate.setUpdateTime(DateUtils.getNowDate());
            i = svyLibTemplateMapper.updateSvyLibTemplate(svyLibTemplate);
            svyLibTemplateMapper.updateSvyLibTemplate(svyLibTemplate);
        } else if (svyLibTemplate.getIsoperation() != null && svyLibTemplate.getIsoperation() == 3) {
            //删除
            i = svyLibTemplateMapper.deleteSvyLibTemplateBySvyid(svyLibTemplate.getSvyid());

            svyLibTemplateMapper.deleteSvyLibTemplateBySvyid(svyLibTemplate.getSvyid());
        }
        i = svyLibTemplate.getSvyid().intValue();

        //处理题目
        if (CollectionUtils.isNotEmpty(svyLibTemplate.getSvyLibScripts())) {
            for (SvyLibTemplateScript svyLibScript : svyLibTemplate.getSvyLibScripts()) {
//                SvyLibTemplateScript svyLibTemplateScript = DtoConversionUtils.sourceToTarget(svyLibScript, SvyLibTemplateScript.class);
                //对题目进行处理
                if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 1) {
                    //新增
                    svyLibScript.setSvyid(svyLibTemplate.getSvyid());
                    svyLibScript.setId(null);
                    svyLibScript.setCreateTime(new Date());
                    svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibScript);

                } else if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 2) {
                    //修改
                    svyLibScript.setSvyid(svyLibTemplate.getSvyid());
                    svyLibScript.setUpdateTime(new Date());
                    svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibScript);
                } else if (svyLibScript.getIsoperation() != null && svyLibScript.getIsoperation() == 3) {
                    svyLibTemplateScriptMapper.deleteSvyLibTemplateScriptByTopicid(svyLibScript.getId());
                if (svyLibScript.getIsoperation() != null) {
                    //问题的操作不为空
                    scriptHandle(svyLibTemplate.getSvyid(), svyLibScript, svyLibScript.getIsoperation());
                } else if (svyLibScript.getIsoperation() == null && svyLibTemplate.getIsoperation() != null) {
                    //模板的操作不为空
                    scriptHandle(svyLibTemplate.getSvyid(), svyLibScript, svyLibTemplate.getIsoperation());
                }

                //对题目选项进行处理
                if (CollectionUtils.isNotEmpty(svyLibScript.getSvyLibTemplateTargetoptions())) {
                    for (SvyLibTemplateTargetoption svyLibTemplateTargetoption : svyLibScript.getSvyLibTemplateTargetoptions()) {
                        if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 1) {
                            //新增
                            svyLibTemplateTargetoption.setScriptid(svyLibScript.getId());
                            svyLibTemplateTargetoption.setCreateTime(new Date());
                            svyLibTemplateTargetoptionMapper.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
                        } else if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 2) {
                            //修改
                            svyLibTemplateTargetoption.setScriptid(svyLibScript.getId());
                            svyLibTemplateTargetoption.setUpdateTime(new Date());
                            svyLibTemplateTargetoptionMapper.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
                        } else if (svyLibTemplateTargetoption.getIsoperation() != null && svyLibTemplateTargetoption.getIsoperation() == 3) {
                            //删除
                            svyLibTemplateTargetoptionMapper.deleteSvyLibTemplateTargetoptionById(svyLibTemplateTargetoption.getId());
                        if (svyLibTemplateTargetoption.getIsoperation() != null) {
                            //选选项的操作不为空
                            optionHandle(svyLibTemplateTargetoption, svyLibScript.getId(), svyLibTemplateTargetoption.getIsoperation());
                        } else if (svyLibTemplateTargetoption.getIsoperation() == null && svyLibScript.getIsoperation() != null) {
                            //问题的操作不为空
                            optionHandle(svyLibTemplateTargetoption, svyLibScript.getId(), svyLibScript.getIsoperation());
                        } else if (svyLibTemplateTargetoption.getIsoperation() == null && svyLibScript.getIsoperation() == null && svyLibTemplate.getIsoperation() != null) {
                            //模板的操作不为空
                            optionHandle(svyLibTemplateTargetoption, svyLibScript.getId(), svyLibTemplate.getIsoperation());
                        }
                    }

                }

            }
        }

@@ -254,4 +238,39 @@
    public int deleteSvyLibTemplateBySvyid(Long svyid) {
        return svyLibTemplateMapper.deleteSvyLibTemplateBySvyid(svyid);
    }

    private void scriptHandle(Long svyid, SvyLibTemplateScript svyLibScript, Integer isoperation) {
        if (isoperation == 1) {
            //新增
            svyLibScript.setSvyid(svyid);
            svyLibScript.setId(null);
            svyLibScript.setCreateTime(new Date());
            svyLibTemplateScriptMapper.insertSvyLibTemplateScript(svyLibScript);

        } else if (isoperation == 2) {
            //修改
            svyLibScript.setSvyid(svyid);
            svyLibScript.setUpdateTime(new Date());
            svyLibTemplateScriptMapper.updateSvyLibTemplateScript(svyLibScript);
        } else if (isoperation == 3) {
            svyLibTemplateScriptMapper.deleteSvyLibTemplateScriptByTopicid(svyLibScript.getId());
        }
    }

    private void optionHandle(SvyLibTemplateTargetoption svyLibTemplateTargetoption, Long scriptId, Integer isoperation) {
        if (isoperation == 1) {
            //新增
            svyLibTemplateTargetoption.setScriptid(scriptId);
            svyLibTemplateTargetoption.setCreateTime(new Date());
            svyLibTemplateTargetoptionMapper.insertSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
        } else if (isoperation == 2) {
            //修改
            svyLibTemplateTargetoption.setScriptid(scriptId);
            svyLibTemplateTargetoption.setUpdateTime(new Date());
            svyLibTemplateTargetoptionMapper.updateSvyLibTemplateTargetoption(svyLibTemplateTargetoption);
        } else if (isoperation == 3) {
            //删除
            svyLibTemplateTargetoptionMapper.deleteSvyLibTemplateTargetoptionById(svyLibTemplateTargetoption.getId());
        }
    }
}

 smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java

@@ -1,14 +1,13 @@
package com.smartor.service.impl;

import com.alibaba.fastjson2.JSON;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.smartor.domain.PatTaskRelevance;
import com.smartor.domain.SvyTask;
import com.smartor.domain.SvyTaskSingle;
import com.smartor.domain.SvyTaskVO;
import com.smartor.domain.*;
import com.smartor.mapper.SvyTaskSingleMapper;
import com.smartor.service.ISvyTaskService;
import com.smartor.service.ISvyTaskSingleService;
@@ -18,7 +17,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * å•ä¸€ä»»åŠ¡ï¼ˆé—®å·ï¼‰Service业务层处理
@@ -133,7 +135,7 @@
                    svyTaskSingle.setPhone(patTaskRelevance.getPhone());
                    svyTaskSingle.setAddr(patTaskRelevance.getAddr());
                    svyTaskSingle.setPatid(patTaskRelevance.getPatid());
                    svyTaskSingle.setCreateTime(DateUtils.getNowDate());
                    svyTaskSingle.setSendstate(1L);
                    svyTaskSingle.setCreateTime(DateUtils.getNowDate());
                    svyTaskSingleMapper.insertSvyTaskSingle(svyTaskSingle);
                    integer = svyTaskSingle.getId().intValue();
@@ -163,20 +165,89 @@
                    svyTaskSingle.setCreateTime(DateUtils.getNowDate());
                    svyTaskSingle.setTextParam(new Gson().toJson(svyTaskVO.getTextParamMap()));
                    if (patTaskRelevance.getIsoperation() != null) {
                        if (patTaskRelevance.getIsoperation() == 2)
                            svyTaskSingleMapper.updateSvyTaskSingle(svyTaskSingle);
                        if (patTaskRelevance.getIsoperation() == 1)
                            svyTaskSingleMapper.insertSvyTaskSingle(svyTaskSingle);
                        if (patTaskRelevance.getIsoperation() == 3)
                            //  é€šè¿‡taskid和patid去删除该条数据
                            svyTaskSingleMapper.deleteSvyTaskcallByCondition(svyTaskVO.getTaskid(), patTaskRelevance.getPatid());
                        optionHandle(svyTaskSingle, svyTaskVO.getTaskid(), patTaskRelevance.getIsoperation(), patTaskRelevance.getPatid());
                    } else if (patTaskRelevance.getIsoperation() == null) {
                        optionHandle(svyTaskSingle, svyTaskVO.getTaskid(), svyTaskVO.getIsoperation(), patTaskRelevance.getPatid());
                    }
                    integer = svyTaskSingle.getTaskid().intValue();
                }
            }
        }


        return integer;
    }

    @Override
    public SvyTaskVO queryTaskByCondition(SvyTaskSingle svyTaskSingle) {
        //定义患者与单一任务关联表集合
        List<PatTaskRelevance> patTaskRelevances = new ArrayList<>();
        List<SvyTaskSingle> list = selectSvyTaskSingleList(svyTaskSingle);
        if (CollectionUtils.isEmpty(list) || list.size() == 0) {
            return new SvyTaskVO();
        }
        SvyTask svyTask = svyTaskService.selectSvyTaskByTaskid(svyTaskSingle.getTaskid());
        //将查出来的数据倒入ivrTasksingleVO中
        SvyTaskVO svyTaskVO = DtoConversionUtils.sourceToTarget(list.get(0), SvyTaskVO.class);
        svyTaskVO.setShowDate(svyTask.getShowDate());
        svyTaskVO.setShowTimeMorn(svyTask.getShowTimeMorn());
        svyTaskVO.setShowTimeNoon(svyTask.getShowTimeNoon());
        svyTaskVO.setShowTimeNight(svyTask.getShowTimeNight());
        svyTaskVO.setPreachform(svyTask.getPreachform());
        String sendTimeSlot = svyTask.getSendTimeSlot();
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            //获取到发送时间的集合
            if (com.ruoyi.common.utils.StringUtils.isNotEmpty(sendTimeSlot)) {
                List<TaskSendTimeVO> taskSendTimeVOList = objectMapper.readValue(sendTimeSlot, List.class);
                svyTaskVO.setSendTimeSlot(taskSendTimeVOList);
                svyTaskVO.setSendType(svyTask.getSendType());
            }
            //文本变量参数
            if (com.ruoyi.common.utils.StringUtils.isNotEmpty(svyTask.getTextParam())) {
                Map<String, Map<String, String>> textParam = objectMapper.readValue(svyTask.getTextParam(), Map.class);
                svyTaskVO.setTextParam(textParam);
            }
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }

        for (SvyTaskSingle svyTaskSingle1 : list) {
            PatTaskRelevance patTaskRelevance = new PatTaskRelevance();
            if (!svyTaskSingle1.getHospType().equals("2")) {
                log.info("随访查询不为出院，{}", svyTaskSingle1.getHospType());
                //获取到患者信息，并放入到集合中
                patTaskRelevance.setName(svyTaskSingle1.getSendname());
                patTaskRelevance.setAge(svyTaskSingle1.getAge());
                patTaskRelevance.setSfzh(svyTaskSingle1.getSfzh());
                patTaskRelevance.setPhone(svyTaskSingle1.getPhone());
                patTaskRelevance.setAddr(svyTaskSingle1.getAddr());
                patTaskRelevance.setDiagname(svyTaskSingle1.getDiagname());
                patTaskRelevance.setPatid(svyTaskSingle1.getPatid());
                patTaskRelevances.add(patTaskRelevance);
            }
            if (svyTaskSingle1.getHospType().equals("2")) {
                log.info("随访查询为出院，{}", svyTaskSingle1.getHospType());
                patTaskRelevance.setName(svyTaskSingle1.getSendname());
                patTaskRelevance.setAge(svyTaskSingle1.getAge());
                patTaskRelevance.setSfzh(svyTaskSingle1.getSfzh());
                patTaskRelevance.setPhone(svyTaskSingle1.getPhone());
                patTaskRelevance.setAddr(svyTaskSingle1.getAddr());
                patTaskRelevance.setDeptName(svyTaskSingle1.getDeptname());
                patTaskRelevance.setBedNo(svyTaskSingle1.getBedno());
                patTaskRelevance.setDiagname(svyTaskSingle1.getDiagname());
                patTaskRelevance.setPatid(svyTaskSingle1.getPatid());
                patTaskRelevances.add(patTaskRelevance);
            }
        }

        svyTaskVO.setPatTaskRelevances(patTaskRelevances);
        return svyTaskVO;
    }

    private void optionHandle(SvyTaskSingle svyTaskSingle, Long taskId, Integer isoperation, Long patid) {
        if (isoperation == 1) {
            svyTaskSingle.setSendstate(1L);
            svyTaskSingleMapper.insertSvyTaskSingle(svyTaskSingle);
        } else if (isoperation == 2) svyTaskSingleMapper.updateSvyTaskSingle(svyTaskSingle);
        else if (isoperation == 3) svyTaskSingleMapper.deleteSvyTaskcallByCondition(taskId, patid);
    }
}

 smartor/src/main/resources/mapper/smartor/Icd10AssociationMapper.xml

@@ -1,69 +1,138 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.Icd10AssociationMapper">
    

    <resultMap type="com.smartor.domain.Icd10Association" id="Icd10AssociationResult">
        <result property="icd10code"    column="icd10code"    />
        <result property="icd10name"    column="icd10name"    />
        <result property="svyid"    column="svyid"    />
        <result property="updatetime"    column="updatetime"    />
        <result property="id" column="id"/>
        <result property="icd10id" column="icd10id"/>
        <result property="icd10code" column="icd10code"/>
        <result property="icd10name" column="icd10name"/>
        <result property="orgid" column="orgid"/>
        <result property="delFlag" column="del_flag"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="isupload" column="isupload"/>
        <result property="uploadTime" column="upload_time"/>
        <result property="outid" column="outid"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
    </resultMap>

    <sql id="selectIcd10AssociationVo">
        select icd10code, icd10name, svyid, updatetime from icd10_association
        select id,
               icd10id,
               icd10code,
               icd10name,
               orgid,
               del_flag,
               update_by,
               update_time,
               create_by,
               create_time,
               isupload,
               upload_time,
               type,
               outid,
               pid,
               guid
        from icd10_association
    </sql>

    <select id="selectIcd10AssociationList" parameterType="com.smartor.domain.Icd10Association" resultMap="Icd10AssociationResult">
    <select id="selectIcd10AssociationList" parameterType="com.smartor.domain.Icd10Association"
            resultMap="Icd10AssociationResult">
        <include refid="selectIcd10AssociationVo"/>
        <where>  
            <if test="icd10code != null  and icd10code != ''"> and icd10code = #{icd10code}</if>
            <if test="icd10name != null  and icd10name != ''"> and icd10name like concat('%', #{icd10name}, '%')</if>
            <if test="svyid != null "> and svyid = #{svyid}</if>
            <if test="updatetime != null "> and updatetime = #{updatetime}</if>
        <where>
            <if test="icd10id != null ">and icd10id = #{icd10id}</if>
            <if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
            <if test="isupload != null ">and isupload = #{isupload}</if>
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
            <if test="outid != null ">and outid = #{outid}</if>
            <if test="type != null ">and type = #{type}</if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
        </where>
    </select>
    
    <select id="selectIcd10AssociationByIcd10code" parameterType="String" resultMap="Icd10AssociationResult">

    <select id="selectIcd10AssociationById" parameterType="Long" resultMap="Icd10AssociationResult">
        <include refid="selectIcd10AssociationVo"/>
        where icd10code = #{icd10code}
        where id = #{id}
    </select>
        
    <insert id="insertIcd10Association" parameterType="com.smartor.domain.Icd10Association">

    <insert id="insertIcd10Association" parameterType="com.smartor.domain.Icd10Association" useGeneratedKeys="true"
            keyProperty="id">
        insert into icd10_association
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="icd10code != null and icd10code != ''">icd10code,</if>
            <if test="icd10id != null">icd10id,</if>
            <if test="icd10code != null">icd10code,</if>
            <if test="icd10name != null">icd10name,</if>
            <if test="svyid != null">svyid,</if>
            <if test="updatetime != null">updatetime,</if>
         </trim>
            <if test="orgid != null">orgid,</if>
            <if test="delFlag != null and delFlag != ''">del_flag,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="outid != null">outid,</if>
            <if test="type != null">type,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="icd10code != null and icd10code != ''">#{icd10code},</if>
            <if test="icd10id != null">#{icd10id},</if>
            <if test="icd10code != null">#{icd10code},</if>
            <if test="icd10name != null">#{icd10name},</if>
            <if test="svyid != null">#{svyid},</if>
            <if test="updatetime != null">#{updatetime},</if>
         </trim>
            <if test="orgid != null">#{orgid},</if>
            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="outid != null">#{outid},</if>
            <if test="type != null">#{type},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
        </trim>
    </insert>

    <update id="updateIcd10Association" parameterType="Icd10Association">
    <update id="updateIcd10Association" parameterType="com.smartor.domain.Icd10Association">
        update icd10_association
        <trim prefix="SET" suffixOverrides=",">
            <if test="icd10name != null">icd10name = #{icd10name},</if>
            <if test="svyid != null">svyid = #{svyid},</if>
            <if test="updatetime != null">updatetime = #{updatetime},</if>
            <if test="icd10id != null">icd10id = #{icd10id},</if>
            <if test="icd10code != null">icd10code = #{icd10code},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="outid != null">outid = #{outid},</if>
            <if test="type != null">type = #{type},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
        </trim>
        where icd10code = #{icd10code}
        where id = #{id}
    </update>

    <delete id="deleteIcd10AssociationByIcd10code" parameterType="String">
        delete from icd10_association where icd10code = #{icd10code}
    <delete id="deleteIcd10AssociationById" parameterType="Long">
        delete
        from icd10_association
        where id = #{id}
    </delete>

    <delete id="deleteIcd10AssociationByIcd10codes" parameterType="String">
        delete from icd10_association where icd10code in 
        <foreach item="icd10code" collection="array" open="(" separator="," close=")">
            #{icd10code}
    <delete id="deleteIcd10AssociationByIds" parameterType="String">
        delete from icd10_association where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>
</mapper>

 smartor/src/main/resources/mapper/smartor/IvrLibaOutIcd10Mapper.xml

ÎļþÒÑɾ³ý

 smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml

@@ -73,16 +73,46 @@

    <select id="selectSvyLibTemplateList" parameterType="com.smartor.domain.SvyLibTemplateReq"
            resultMap="SvyLibTemplateResult">
        select a.svyid, a.categoryid, a.svycode, a.svyname, a.description, a.introduce,a.submitprompt, a.templateid,
        a.version,a.centerlibrarycode, a.centerlibraryid, a.islocal, a.isenable, a.orgid, a.del_flag, a.create_by,
        a.create_time, a.update_by, a.update_time, a.isupload,
        a.upload_time,a.dept_names,a.value_type,a.label_info,a.reply,
        a.campus,a.suitway,a.script_score,a.score_type,a.otherdata
        ,c.icdname from svy_lib_template
        a,icd10_association b,icd10 c
        SELECT
        a.svyid,
        a.categoryid,
        a.svycode,
        a.svyname,
        a.description,
        a.introduce,
        a.submitprompt,
        a.templateid,
        a.version,
        a.centerlibrarycode,
        a.centerlibraryid,
        a.islocal,
        a.isenable,
        a.orgid,
        a.del_flag,
        a.create_by,
        a.create_time,
        a.update_by,
        a.update_time,
        a.isupload,
        a.upload_time,
        a.dept_names,
        a.value_type,
        a.label_info,
        a.reply,
        a.campus,
        a.suitway,
        a.script_score,
        a.score_type,
        a.otherdata,
        b.icd10code,
        b.icd10name
        FROM
        svy_lib_template a
        JOIN (select outid,GROUP_CONCAT(icd10code) as icd10code,GROUP_CONCAT(icd10name) as icd10name from
        icd10_association group by outid) b ON a.del_flag = 0
        AND a.svyid = b.outid
        <where>
            a.del_flag=0 and
            a.svyid=b.SVYID and b.ICD10CODE=c.icdcode
            a.del_flag=0
            <if test="categoryid != null ">and a.categoryid = #{categoryid}</if>
            <if test="svyid != null ">and a.svyid = #{svyid}</if>
            <if test="svyname != null  and svyname != ''">and a.svyname like concat('%', #{svyname}, '%')</if>

 smartor/src/main/resources/mapper/smartor/SvyLibTemplateTargetoptionMapper.xml

@@ -21,7 +21,7 @@
        <result property="targetregex2" column="targetregex2"/>
        <result property="dynamiccruxsJson" column="dynamiccruxs"/>
        <result property="nodynamiccruxsJson" column="nodynamiccruxs"/>
        <result property="optiondesc" column="optiondesc"/>
        <result property="optioncontent" column="optioncontent"/>
        <result property="nextQuestion" column="next_question"/>
        <result property="language" column="language"/>
        <result property="version" column="version"/>
@@ -36,11 +36,13 @@
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
        <result property="picturePath" column="picture_path"/>
        <result property="score" column="score"/>
    </resultMap>

    <sql id="selectSvyLibTemplateTargetoptionVo">
        select id,
               groupid,
               score,
               categoryName,
               scriptid,
               templateID,
@@ -55,7 +57,7 @@
               targetregex2,
               dynamiccruxs,
               nodynamiccruxs,
               optiondesc,
               optioncontent,
               next_question, language, version, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, picture_path
        from svy_lib_template_targetoption
    </sql>
@@ -84,7 +86,7 @@
            <if test="nodynamiccruxsJson != null  and nodynamiccruxsJson != ''">and nodynamiccruxs =
                #{nodynamiccruxsJson}
            </if>
            <if test="optiondesc != null  and optiondesc != ''">and optiondesc = #{optiondesc}</if>
            <if test="optioncontent != null  and optioncontent != ''">and optioncontent = #{optioncontent}</if>
            <if test="nextQuestion != null ">and next_question = #{nextQuestion}</if>
            <if test="language != null  and language != ''">and language = #{language}</if>
            <if test="version != null  and version != ''">and version = #{version}</if>
@@ -93,6 +95,7 @@
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="score != null  and score != ''">and score = #{score}</if>
            <if test="picturePath != null  and picturePath != ''">and picture_path = #{picturePath}</if>
        </where>
    </select>
@@ -121,7 +124,7 @@
            <if test="targetregex2 != null">targetregex2,</if>
            <if test="dynamiccruxs != null">dynamiccruxs,</if>
            <if test="nodynamiccruxs != null">nodynamiccruxs,</if>
            <if test="optiondesc != null">optiondesc,</if>
            <if test="optioncontent != null">optioncontent,</if>
            <if test="nextQuestion != null">next_question,</if>
            <if test="language != null">language,</if>
            <if test="version != null">version,</if>
@@ -136,6 +139,7 @@
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="picturePath != null">picture_path,</if>
            <if test="score != null">score,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="groupid != null">#{groupid},</if>
@@ -153,7 +157,7 @@
            <if test="targetregex2 != null">#{targetregex2},</if>
            <if test="dynamiccruxs != null">#{dynamiccruxsJson},</if>
            <if test="nodynamiccruxs != null">#{nodynamiccruxsJson},</if>
            <if test="optiondesc != null">#{optiondesc},</if>
            <if test="optioncontent != null">#{optioncontent},</if>
            <if test="nextQuestion != null">#{nextQuestion},</if>
            <if test="language != null">#{language},</if>
            <if test="version != null">#{version},</if>
@@ -168,6 +172,7 @@
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="picturePath != null">#{picturePath},</if>
            <if test="score != null">#{score},</if>
        </trim>
    </insert>

@@ -189,7 +194,7 @@
            <if test="targetregex2 != null">targetregex2 = #{targetregex2},</if>
            <if test="dynamiccruxs != null">dynamiccruxs = #{dynamiccruxsJson},</if>
            <if test="nodynamiccruxs != null">nodynamiccruxs = #{nodynamiccruxsJson},</if>
            <if test="optiondesc != null">optiondesc = #{optiondesc},</if>
            <if test="optioncontent != null">optioncontent = #{optioncontent},</if>
            <if test="nextQuestion != null">next_question = #{nextQuestion},</if>
            <if test="language != null">language = #{language},</if>
            <if test="version != null">version = #{version},</if>
@@ -204,6 +209,7 @@
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="picturePath != null">picture_path = #{picturePath},</if>
            <if test="score != null">score = #{score},</if>
        </trim>
        where id = #{id}
    </update>

 smartor/src/main/resources/mapper/smartor/SvyTaskMapper.xml

@@ -7,7 +7,7 @@
    <resultMap type="com.smartor.domain.SvyTask" id="SvyTaskResult">
        <result property="taskid" column="taskid"/>
        <result property="svrtaskid" column="svrtaskid"/>
        <result property="taskname" column="taskname"/>
        <result property="taskName" column="task_name"/>
        <result property="templateid" column="templateid"/>
        <result property="templatename" column="templatename"/>
        <result property="labelinfo" column="labelinfo"/>
@@ -51,6 +51,7 @@
        <result property="sendTimeSlot" column="send_time_slot"/>
        <result property="libtemplateid" column="libtemplateid"/>
        <result property="libtemplatename" column="libtemplatename"/>
        <result property="taskDesc" column="task_desc"/>
    </resultMap>

    <sql id="selectSvyTaskVo">
@@ -59,13 +60,14 @@
               libtemplateid,
               libtemplatename,
               show_date,
               task_desc,
               show_time_morn,
               show_time_noon,
               show_time_night,
               stop_state,
               svrtaskid,
               text_param,
               taskname,
               task_name,
               templateid,
               templatename,
               labelinfo,
@@ -107,7 +109,7 @@
        <include refid="selectSvyTaskVo"/>
        <where>
            <if test="svrtaskid != null ">and svrtaskid = #{svrtaskid}</if>
            <if test="taskname != null  and taskname != ''">and taskname like concat('%', #{taskname}, '%')</if>
            <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
            <if test="templateid != null  and templateid != ''">and templateid = #{templateid}</if>
            <if test="templatename != null  and templatename != ''">and templatename like concat('%', #{templatename},
                '%')
@@ -160,7 +162,7 @@
        insert into svy_task
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="svrtaskid != null">svrtaskid,</if>
            <if test="taskname != null">taskname,</if>
            <if test="taskName != null">task_name,</if>
            <if test="templateid != null">templateid,</if>
            <if test="templatename != null">templatename,</if>
            <if test="labelinfo != null">labelinfo,</if>
@@ -204,10 +206,11 @@
            <if test="showTimeMorn != null and showTimeMorn != ''">show_time_morn,</if>
            <if test="libtemplateid != null ">libtemplateid,</if>
            <if test="libtemplatename != null  and libtemplatename != ''">libtemplatename,</if>
            <if test="taskDesc != null  and taskDesc != ''">task_desc,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="svrtaskid != null">#{svrtaskid},</if>
            <if test="taskname != null">#{taskname},</if>
            <if test="taskName != null">#{taskName},</if>
            <if test="templateid != null">#{templateid},</if>
            <if test="templatename != null">#{templatename},</if>
            <if test="labelinfo != null">#{labelinfo},</if>
@@ -251,6 +254,7 @@
            <if test="showTimeMorn != null and showTimeMorn != ''">#{showTimeMorn},</if>
            <if test="libtemplateid != null ">#{libtemplateid},</if>
            <if test="libtemplatename != null  and libtemplatename != ''">#{libtemplatename},</if>
            <if test="taskDesc != null  and taskDesc != ''">#{taskDesc},</if>
        </trim>
    </insert>

@@ -258,7 +262,7 @@
        update svy_task
        <trim prefix="SET" suffixOverrides=",">
            <if test="svrtaskid != null">svrtaskid = #{svrtaskid},</if>
            <if test="taskname != null">taskname = #{taskname},</if>
            <if test="taskName != null">task_name = #{taskName},</if>
            <if test="templateid != null">templateid = #{templateid},</if>
            <if test="templatename != null">templatename = #{templatename},</if>
            <if test="labelinfo != null">labelinfo = #{labelinfo},</if>
@@ -302,6 +306,7 @@
            <if test="showTimeMorn != null and showTimeMorn != ''">show_time_morn=#{showTimeMorn},</if>
            <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
            <if test="libtemplatename != null  and libtemplatename != ''">libtemplatename = #{libtemplatename},</if>
            <if test="taskDesc != null  and taskDesc != ''">task_desc=#{taskDesc},</if>
        </trim>
        where taskid = #{taskid}
    </update>

 smartor/src/main/resources/mapper/smartor/SvyTaskSingleMapper.xml

@@ -192,7 +192,7 @@
            <if test="medicalRecordNo != null  and medicalRecordNo != ''">and medical_record_no = #{medicalRecordNo}
            </if>
            <if test="preachcontent != null  and preachcontent != ''">and preachcontent = #{preachcontent}</if>
            <if test="sendType != null  and sendType != ''">and send_type = #{sendType}</if>
            <if test="sendType != null ">and send_type = #{sendType}</if>
            <if test="sendTimeSlot != null  and sendTimeSlot != ''">and send_time_slot = #{sendTimeSlot}</if>
            <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
            <if test="taskDesc != null  and taskDesc != ''">and task_desc = #{taskDesc}</if>
@@ -420,7 +420,7 @@
            <if test="bedno != null">bedno = #{bedno},</if>
            <if test="patid != null">patid = #{patid},</if>
        </trim>
        where id = #{id}
        where  patid = #{patid} and taskid = #{taskid}
    </update>

    <delete id="deleteSvyTaskSingleById" parameterType="Long">

 smartor/src/main/resources/mapper/smartor/SvyTaskTemplateTargetoptionMapper.xml

@@ -15,7 +15,7 @@
        <result property="targetvalue"    column="targetvalue"    />
        <result property="targetregex2"    column="targetregex2"    />
        <result property="targetregex"    column="targetregex"    />
        <result property="optiondesc"    column="optiondesc"    />
        <result property="optioncontent"    column="optioncontent"    />
        <result property="language"    column="language"    />
        <result property="version"    column="version"    />
        <result property="groupid"    column="groupid"    />
@@ -40,10 +40,10 @@
    </resultMap>

    <sql id="selectSvyTaskTemplateTargetoptionVo">
        select id, taskid, templateID, targetid, targetname, targettype, categoryName, targetvalue, targetregex2, targetregex, optiondesc, language, version, groupid, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, scriptid, nodynamiccruxs, dynamiccruxs, next_question, picture_path from svy_task_template_targetoption
        select id, taskid, templateID, targetid, targetname, targettype, categoryName, targetvalue, targetregex2, targetregex, optioncontent, language, version, groupid, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, scriptid, nodynamiccruxs, dynamiccruxs, next_question, picture_path from svy_task_template_targetoption
    </sql>

    <select id="selectSvyTaskTemplateTargetoptionList" parameterType="SvyTaskTemplateTargetoption" resultMap="SvyTaskTemplateTargetoptionResult">
    <select id="selectSvyTaskTemplateTargetoptionList" parameterType="com.smartor.domain.SvyTaskTemplateTargetoption" resultMap="SvyTaskTemplateTargetoptionResult">
        <include refid="selectSvyTaskTemplateTargetoptionVo"/>
        <where>
            <if test="taskid != null "> and taskid = #{taskid}</if>
@@ -55,7 +55,7 @@
            <if test="targetvalue != null  and targetvalue != ''"> and targetvalue = #{targetvalue}</if>
            <if test="targetregex2 != null  and targetregex2 != ''"> and targetregex2 = #{targetregex2}</if>
            <if test="targetregex != null  and targetregex != ''"> and targetregex = #{targetregex}</if>
            <if test="optiondesc != null  and optiondesc != ''"> and optiondesc = #{optiondesc}</if>
            <if test="optioncontent != null  and optioncontent != ''"> and optioncontent = #{optioncontent}</if>
            <if test="language != null  and language != ''"> and language = #{language}</if>
            <if test="version != null  and version != ''"> and version = #{version}</if>
            <if test="groupid != null  and groupid != ''"> and groupid = #{groupid}</if>
@@ -92,7 +92,7 @@
            <if test="targetvalue != null">targetvalue,</if>
            <if test="targetregex2 != null">targetregex2,</if>
            <if test="targetregex != null">targetregex,</if>
            <if test="optiondesc != null">optiondesc,</if>
            <if test="optioncontent != null">optioncontent,</if>
            <if test="language != null">language,</if>
            <if test="version != null">version,</if>
            <if test="groupid != null">groupid,</if>
@@ -125,7 +125,7 @@
            <if test="targetvalue != null">#{targetvalue},</if>
            <if test="targetregex2 != null">#{targetregex2},</if>
            <if test="targetregex != null">#{targetregex},</if>
            <if test="optiondesc != null">#{optiondesc},</if>
            <if test="optioncontent != null">#{optioncontent},</if>
            <if test="language != null">#{language},</if>
            <if test="version != null">#{version},</if>
            <if test="groupid != null">#{groupid},</if>
@@ -162,7 +162,7 @@
            <if test="targetvalue != null">targetvalue = #{targetvalue},</if>
            <if test="targetregex2 != null">targetregex2 = #{targetregex2},</if>
            <if test="targetregex != null">targetregex = #{targetregex},</if>
            <if test="optiondesc != null">optiondesc = #{optiondesc},</if>
            <if test="optioncontent != null">optioncontent = #{optioncontent},</if>
            <if test="language != null">language = #{language},</if>
            <if test="version != null">version = #{version},</if>
            <if test="groupid != null">groupid = #{groupid},</if>