代码提交

liusheng

2024-03-06 c92523467edf0306bad25f141faa5fcb56da8806

代码提交

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

@@ -9,7 +9,7 @@
import com.smartor.domain.HeTask;
import com.smartor.domain.HeTaskVO;
import com.smartor.domain.PatArchiveReq;
import com.smartor.domain.PatHetaskRelevanceVO;
import com.smartor.domain.PatTaskRelevanceVO;
import com.smartor.service.IHeTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -38,9 +38,9 @@
    @ApiOperation("查询患者宣教任务列表")
    @PreAuthorize("@ss.hasPermi('system:task:list')")
    @PostMapping("/getPatHeTaskList")
    public TableDataInfo getPatHeTaskList(@RequestBody PatHetaskRelevanceVO patHetaskRelevanceVO) {
    public TableDataInfo getPatHeTaskList(@RequestBody PatTaskRelevanceVO PatTaskRelevanceVO) {
        startPage();
        List<PatHetaskRelevanceVO> list = heTaskService.selectHeTaskList(patHetaskRelevanceVO);
        List<PatTaskRelevanceVO> list = heTaskService.selectHeTaskList(PatTaskRelevanceVO);
        return getDataTable(list);
    }


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

@@ -102,7 +102,7 @@
    }

    /**
     * æ–°å¢žæˆ–修改问题详情
     * æ–°å¢žæˆ–修改随访模板库详情
     */
    @ApiOperation("新增或修改随访模板库详情")
    @PreAuthorize("@ss.hasPermi('smartor:script:list')")

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

@@ -1,36 +1,29 @@
package com.smartor.controller;

import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
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.poi.ExcelUtil;
import com.smartor.domain.IvrTask;
import com.smartor.service.IIvrTaskService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
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;

/**
 * è¯­éŸ³ä»»åŠ¡Controller
 * 
 * éšè®¿ä»»åŠ¡Controller
 *
 * @author smartor
 * @date 2023-03-24
 */
@RestController
@RequestMapping("/smartor/ivrtask")
public class IvrTaskController extends BaseController
{
public class IvrTaskController extends BaseController {
    @Autowired
    private IIvrTaskService ivrTaskService;

@@ -38,9 +31,8 @@
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('smartor:ivrtask:list')")
   @PostMapping("/list")
    public TableDataInfo list(@RequestBody IvrTask ivrTask)
    {
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody IvrTask ivrTask) {
        startPage();
        List<IvrTask> list = ivrTaskService.selectIvrTaskList(ivrTask);
        return getDataTable(list);
@@ -52,8 +44,7 @@
    @PreAuthorize("@ss.hasPermi('smartor:ivrtask:export')")
    @Log(title = "语音任务", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, IvrTask ivrTask)
    {
    public void export(HttpServletResponse response, IvrTask ivrTask) {
        List<IvrTask> list = ivrTaskService.selectIvrTaskList(ivrTask);
        ExcelUtil<IvrTask> util = new ExcelUtil<IvrTask>(IvrTask.class);
        util.exportExcel(response, list, "语音任务数据");
@@ -64,8 +55,7 @@
     */
    @PreAuthorize("@ss.hasPermi('smartor:ivrtask:query')")
    @GetMapping(value = "/{taskid}")
    public AjaxResult getInfo(@PathVariable("taskid") Long taskid)
    {
    public AjaxResult getInfo(@PathVariable("taskid") Long taskid) {
        return success(ivrTaskService.selectIvrTaskByTaskid(taskid));
    }

@@ -75,8 +65,7 @@
    @PreAuthorize("@ss.hasPermi('smartor:ivrtask:add')")
    @Log(title = "语音任务", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody IvrTask ivrTask)
    {
    public AjaxResult add(@RequestBody IvrTask ivrTask) {
        return toAjax(ivrTaskService.insertIvrTask(ivrTask));
    }

@@ -86,8 +75,7 @@
    @PreAuthorize("@ss.hasPermi('smartor:ivrtask:edit')")
    @Log(title = "语音任务", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody IvrTask ivrTask)
    {
    public AjaxResult edit(@RequestBody IvrTask ivrTask) {
        return toAjax(ivrTaskService.updateIvrTask(ivrTask));
    }

@@ -96,9 +84,8 @@
     */
    @PreAuthorize("@ss.hasPermi('smartor:ivrtask:remove')")
    @Log(title = "语音任务", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{taskids}")
    public AjaxResult remove(@PathVariable Long[] taskids)
    {
    @GetMapping("/remove/{taskids}")
    public AjaxResult remove(@PathVariable Long[] taskids) {
        return toAjax(ivrTaskService.deleteIvrTaskByTaskids(taskids));
    }
}

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

@@ -1,104 +1,82 @@
package com.smartor.controller;
package com.ruoyi.web.controller.smartor;

import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.smartor.domain.IvrTaskcall;
import com.smartor.service.IIvrTaskcallService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.HeTaskVO;
import com.smartor.domain.IvrTaskcall;
import com.smartor.domain.IvrTaskcallVO;
import com.smartor.service.IIvrTaskcallService;
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.*;

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

/**
 * è¯­éŸ³ä»»åŠ¡å‘¼å«Controller
 * 
 * @author smartor
 * @date 2023-03-24
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰Controller
 *
 * @author ruoyi
 * @date 2024-02-02
 */
@Api(description = "单一任务（随访）")
@RestController
@RequestMapping("/smartor/ivrtaskcall")
public class IvrTaskcallController extends BaseController
{
@RequestMapping("/smartor/taskcall")
public class IvrTaskcallController extends BaseController {
    @Autowired
    private IIvrTaskcallService ivrTaskcallService;

    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«åˆ—表
     * æŸ¥è¯¢å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcall:list')")
   @PostMapping("/list")
    public TableDataInfo list(@RequestBody IvrTaskcall ivrTaskcall)
    {
        startPage();
    @ApiOperation("查询单一任务（随访）列表")
    @PreAuthorize("@ss.hasPermi('system:taskcall:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody IvrTaskcall ivrTaskcall) {
        PageUtils.startPageByPost(ivrTaskcall.getPageNum(), ivrTaskcall.getPageSize());
        List<IvrTaskcall> list = ivrTaskcallService.selectIvrTaskcallList(ivrTaskcall);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºè¯­éŸ³ä»»åŠ¡å‘¼å«åˆ—表
     * å¯¼å‡ºå•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰åˆ—表
     */
    @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcall:export')")
    @Log(title = "语音任务呼叫", businessType = BusinessType.EXPORT)
    @PreAuthorize("@ss.hasPermi('system:taskcall:export')")
    @Log(title = "单一任务（随访）", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, IvrTaskcall ivrTaskcall)
    {
    public void export(HttpServletResponse response, IvrTaskcall ivrTaskcall) {
        List<IvrTaskcall> list = ivrTaskcallService.selectIvrTaskcallList(ivrTaskcall);
        ExcelUtil<IvrTaskcall> util = new ExcelUtil<IvrTaskcall>(IvrTaskcall.class);
        util.exportExcel(response, list, "语音任务呼叫数据");
        util.exportExcel(response, list, "单一任务（随访）数据");
    }

    /**
     * èŽ·å–语音任务呼叫详细信息
     * èŽ·å–单一任务（随访）详细信息
     */
    @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcall:query')")
    @GetMapping(value = "/{callid}")
    public AjaxResult getInfo(@PathVariable("callid") Long callid)
    {
        return success(ivrTaskcallService.selectIvrTaskcallByCallid(callid));
    @PreAuthorize("@ss.hasPermi('system:taskcall:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(ivrTaskcallService.selectIvrTaskcallById(id));
    }

    /**
     * æ–°å¢žè¯­éŸ³ä»»åŠ¡å‘¼å«
     * æ–°å¢žæˆ–修改删除单一任务
     */
    @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcall:add')")
    @Log(title = "语音任务呼叫", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody IvrTaskcall ivrTaskcall)
    {
        return toAjax(ivrTaskcallService.insertIvrTaskcall(ivrTaskcall));
    @ApiOperation("新增或修改删除单一任务")
    @PreAuthorize("@ss.hasPermi('system:task:add')")
    @Log(title = "单一任务（随访）", businessType = BusinessType.INSERT)
    @PostMapping("/insertOrUpdateTask")
    public AjaxResult insertOrUpdateHeTask(@RequestBody IvrTaskcallVO ivrTaskcallVO) {
        return toAjax(ivrTaskcallService.insertOrUpdateTask(ivrTaskcallVO));
    }

    /**
     * ä¿®æ”¹è¯­éŸ³ä»»åŠ¡å‘¼å«
     */
    @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcall:edit')")
    @Log(title = "语音任务呼叫", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody IvrTaskcall ivrTaskcall)
    {
        return toAjax(ivrTaskcallService.updateIvrTaskcall(ivrTaskcall));
    }

    /**
     * åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«
     */
    @PreAuthorize("@ss.hasPermi('smartor:ivrtaskcall:remove')")
    @Log(title = "语音任务呼叫", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{callids}")
    public AjaxResult remove(@PathVariable Long[] callids)
    {
        return toAjax(ivrTaskcallService.deleteIvrTaskcallByCallids(callids));
    }

}

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

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatHetaskRelevanceController.java ÐÞ¸Ä
@@ -6,8 +6,9 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.PatHetaskRelevance;
import com.smartor.service.IPatHetaskRelevanceService;
import com.smartor.domain.PatTaskRelevance;
import com.smartor.domain.PatTaskRelevance;
import com.smartor.service.IPatTaskRelevanceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -22,21 +23,21 @@
 * @date 2024-01-07
 */
@RestController
@RequestMapping("/smartor/pathetaskrelevance")
public class PatHetaskRelevanceController extends BaseController
@RequestMapping("/smartor/patTaskRelevance")
public class PatTaskRelevanceController extends BaseController
{
    @Autowired
    private IPatHetaskRelevanceService patHetaskRelevanceService;
    private IPatTaskRelevanceService patTaskRelevanceService;

    /**
     * æŸ¥è¯¢æ‚£è€…与宣教任务关联列表
     */
    @PreAuthorize("@ss.hasPermi('system:relevance:list')")
    @GetMapping("/list")
    public TableDataInfo list(PatHetaskRelevance patHetaskRelevance)
    public TableDataInfo list(PatTaskRelevance PatTaskRelevance)
    {
        startPage();
        List<PatHetaskRelevance> list = patHetaskRelevanceService.selectPatHetaskRelevanceList(patHetaskRelevance);
        List<PatTaskRelevance> list = patTaskRelevanceService.selectPatTaskRelevanceList(PatTaskRelevance);
        return getDataTable(list);
    }

@@ -46,10 +47,10 @@
    @PreAuthorize("@ss.hasPermi('system:relevance:export')")
    @Log(title = "患者与宣教任务关联", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, PatHetaskRelevance patHetaskRelevance)
    public void export(HttpServletResponse response, PatTaskRelevance PatTaskRelevance)
    {
        List<PatHetaskRelevance> list = patHetaskRelevanceService.selectPatHetaskRelevanceList(patHetaskRelevance);
        ExcelUtil<PatHetaskRelevance> util = new ExcelUtil<PatHetaskRelevance>(PatHetaskRelevance.class);
        List<PatTaskRelevance> list = patTaskRelevanceService.selectPatTaskRelevanceList(PatTaskRelevance);
        ExcelUtil<PatTaskRelevance> util = new ExcelUtil<PatTaskRelevance>(PatTaskRelevance.class);
        util.exportExcel(response, list, "患者与宣教任务关联数据");
    }

@@ -60,7 +61,7 @@
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(patHetaskRelevanceService.selectPatHetaskRelevanceById(id));
        return success(patTaskRelevanceService.selectPatTaskRelevanceById(id));
    }

    /**
@@ -69,9 +70,9 @@
    @PreAuthorize("@ss.hasPermi('system:relevance:add')")
    @Log(title = "患者与宣教任务关联", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody PatHetaskRelevance patHetaskRelevance)
    public AjaxResult add(@RequestBody PatTaskRelevance PatTaskRelevance)
    {
        return toAjax(patHetaskRelevanceService.insertPatHetaskRelevance(patHetaskRelevance));
        return toAjax(patTaskRelevanceService.insertPatTaskRelevance(PatTaskRelevance));
    }

    /**
@@ -80,9 +81,9 @@
    @PreAuthorize("@ss.hasPermi('system:relevance:edit')")
    @Log(title = "患者与宣教任务关联", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody PatHetaskRelevance patHetaskRelevance)
    public AjaxResult edit(@RequestBody PatTaskRelevance PatTaskRelevance)
    {
        return toAjax(patHetaskRelevanceService.updatePatHetaskRelevance(patHetaskRelevance));
        return toAjax(patTaskRelevanceService.updatePatTaskRelevance(PatTaskRelevance));
    }

    /**
@@ -93,6 +94,6 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(patHetaskRelevanceService.deletePatHetaskRelevanceByIds(ids));
        return toAjax(patTaskRelevanceService.deletePatTaskRelevanceByIds(ids));
    }
}

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java

@@ -2,6 +2,7 @@

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

import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,13 +30,12 @@

/**
 * è°ƒåº¦ä»»åŠ¡ä¿¡æ¯æ“ä½œå¤„理
 * 
 *
 * @author ruoyi
 */
@RestController
@RequestMapping("/monitor/job")
public class SysJobController extends BaseController
{
public class SysJobController extends BaseController {
    @Autowired
    private ISysJobService jobService;

@@ -44,8 +44,7 @@
     */
    @PreAuthorize("@ss.hasPermi('monitor:job:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysJob sysJob)
    {
    public TableDataInfo list(SysJob sysJob) {
        startPage();
        List<SysJob> list = jobService.selectJobList(sysJob);
        return getDataTable(list);
@@ -57,8 +56,7 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:export')")
    @Log(title = "定时任务", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, SysJob sysJob)
    {
    public void export(HttpServletResponse response, SysJob sysJob) {
        List<SysJob> list = jobService.selectJobList(sysJob);
        ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
        util.exportExcel(response, list, "定时任务");
@@ -69,8 +67,7 @@
     */
    @PreAuthorize("@ss.hasPermi('monitor:job:query')")
    @GetMapping(value = "/{jobId}")
    public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
    {
    public AjaxResult getInfo(@PathVariable("jobId") Long jobId) {
        return success(jobService.selectJobById(jobId));
    }

@@ -80,30 +77,18 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:add')")
    @Log(title = "定时任务", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
    {
        if (!CronUtils.isValid(job.getCronExpression()))
        {
    public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException {
        if (!CronUtils.isValid(job.getCronExpression())) {
            return error("新增任务'" + job.getJobName() + "'失败，Cron表达式不正确");
        }
        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
        {
        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用");
        }
        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
        {
        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) {
            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用");
        }
        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
        {
        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
        }
        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
        {
        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) {
            return error("新增任务'" + job.getJobName() + "'失败，目标字符串存在违规");
        }
        else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
        {
        } else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) {
            return error("新增任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
        }
        job.setCreateBy(getUsername());
@@ -115,31 +100,19 @@
     */
    @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
    {
        if (!CronUtils.isValid(job.getCronExpression()))
        {
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException {
        if (!CronUtils.isValid(job.getCronExpression())) {
            return error("修改任务'" + job.getJobName() + "'失败，Cron表达式不正确");
        }
        else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
        {
        } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'rmi'调用");
        }
        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
        {
        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) {
            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用");
        }
        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
        {
        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'http(s)'调用");
        }
        else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
        {
        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) {
            return error("修改任务'" + job.getJobName() + "'失败，目标字符串存在违规");
        }
        else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
        {
        } else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) {
            return error("修改任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
        }
        job.setUpdateBy(getUsername());
@@ -152,8 +125,7 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
    @PutMapping("/changeStatus")
    public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
    {
    public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException {
        SysJob newJob = jobService.selectJobById(job.getJobId());
        newJob.setStatus(job.getStatus());
        return toAjax(jobService.changeStatus(newJob));
@@ -165,8 +137,7 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
    @Log(title = "定时任务", businessType = BusinessType.UPDATE)
    @PutMapping("/run")
    public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
    {
    public AjaxResult run(@RequestBody SysJob job) throws SchedulerException {
        boolean result = jobService.run(job);
        return result ? success() : error("任务不存在或已过期！");
    }
@@ -177,8 +148,7 @@
    @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
    @Log(title = "定时任务", businessType = BusinessType.DELETE)
    @DeleteMapping("/{jobIds}")
    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
    {
    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException {
        jobService.deleteJobByIds(jobIds);
        return success();
    }

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

@@ -216,4 +216,11 @@
    @ApiModelProperty("其它数据（存储变量）")
    private String otherdata = "";

    /**
     * å¯Œæ–‡æœ¬
     */
    @Excel(name = "富文本")
    @ApiModelProperty("富文本")
    private String richText = "";

}

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

@@ -230,4 +230,10 @@
    @ApiModelProperty("其它数据（存储变量）")
    private String otherdata = "";

    /**
     * å¯Œæ–‡æœ¬
     */
    @Excel(name = "富文本")
    @ApiModelProperty("富文本")
    private String richText = "";
}

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

@@ -2,6 +2,8 @@

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

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -76,7 +78,7 @@
     */
    @Excel(name = " å®£æ•™å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉")
    @ApiModelProperty(value = " å®£æ•™å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉")
    private Long preachform;
    private String preachform;

    /**
     * ç»„织形式：1.单人宣教   2.多人宣教
@@ -205,4 +207,19 @@
    @ApiModelProperty(value = "发送状态：  0  å¤±è´¥   1成功")
    private Long sendState;

    /**
     * å¯Œæ–‡æœ¬
     */
    @Excel(name = "富文本")
    @ApiModelProperty(value = "富文本")
    private String richText;

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


}

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

@@ -10,6 +10,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * å®£æ•™ä»»åŠ¡å¯¹è±¡ he_task
@@ -75,7 +76,7 @@
     */
    @Excel(name = " å®£æ•™å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉")
    @ApiModelProperty(value = " å®£æ•™å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉")
    private Long preachform;
    private List<Long> preachform;

    /**
     * ç»„织形式：1.单人宣教   2.多人宣教
@@ -207,7 +208,7 @@
    /**
     * æ‚£è€…关联信息
     */
    private List<PatHetaskRelevance> patHetaskRelevances;
    private List<PatTaskRelevance> PatTaskRelevances;

    /**
     * å®£æ•™èµ„料库信息
@@ -221,4 +222,19 @@
    private Integer isoperation;


    /**
     * å¯Œæ–‡æœ¬
     */
    @Excel(name = "富文本")
    @ApiModelProperty(value = "富文本")
    private String richText;

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


}

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

@@ -40,7 +40,7 @@
     */
    @ApiModelProperty("话术内容")
    @Excel(name = "话术内容")
    private String questiontext;
    private String questionText;

    /**
     * è¯æœ¯è¯­éŸ³

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

@@ -1,8 +1,11 @@
package com.smartor.domain;

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

import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.gson.Gson;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +20,6 @@
 * @author ruoyi
 * @date 2023-12-21
 */
@Data
@ApiModel(value = "IvrLibaScriptTargetoption", description = "问题话术指标选项库对象")
public class IvrLibaScriptTargetoption extends BaseEntity {
    private static final long serialVersionUID = 1L;
@@ -76,6 +78,30 @@
    @ApiModelProperty("指标正则")
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String targetregex;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("指标正则2")
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String targetregex2;

    @Excel(name = "正则关键字集合(含)")
    private String nodynamiccruxsJson;


    @Excel(name = "正则关键字(不含)")
    private String dynamiccruxsJson;

    @ApiModelProperty(value = "正则关键字集合(含)")
    @Excel(name = "正则关键字(含)")
    @JsonFormat
    private List<String> nodynamiccruxs = new ArrayList<>();

    @ApiModelProperty(value = "正则关键字集合(不含)")
    @Excel(name = "正则关键字(不含)")
    @JsonFormat
    private List<String> dynamiccruxs = new ArrayList<>();

    /**
     * $column.columnComment
@@ -174,4 +200,227 @@
    @ApiModelProperty(value = "是否存在操作：1 æ–°å¢ž 2修改 3删除")
    private Integer isoperation;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getTargetid() {
        return targetid;
    }

    public void setTargetid(Long targetid) {
        this.targetid = targetid;
    }

    public String getTargetname() {
        return targetname;
    }

    public void setTargetname(String targetname) {
        this.targetname = targetname;
    }

    public Long getScriptid() {
        return scriptid;
    }

    public void setScriptid(Long scriptid) {
        this.scriptid = scriptid;
    }

    public String getTargettype() {
        return targettype;
    }

    public void setTargettype(String targettype) {
        this.targettype = targettype;
    }

    public String getCategoryName() {
        return categoryName;
    }

    public void setCategoryName(String categoryName) {
        this.categoryName = categoryName;
    }

    public String getTargetvalue() {
        return targetvalue;
    }

    public void setTargetvalue(String targetvalue) {
        this.targetvalue = targetvalue;
    }

    public String getTargetregex() {
        return targetregex;
    }

    public void setTargetregex(String targetregex) {
        this.targetregex = targetregex;
    }

    public String getTargetregex2() {
        return targetregex2;
    }

    public void setTargetregex2(String targetregex2) {
        this.targetregex2 = targetregex2;
    }

    public String getNodynamiccruxsJson() {
        return nodynamiccruxsJson;
    }

    public void setNodynamiccruxsJson(String nodynamiccruxsJson) {
        if (this.nodynamiccruxs != null) {
            this.nodynamiccruxsJson = new Gson().toJson(this.nodynamiccruxs);
        } else {
            this.nodynamiccruxsJson = nodynamiccruxsJson;
        }
    }

    public String getDynamiccruxsJson() {
        return dynamiccruxsJson;
    }

    public void setDynamiccruxsJson(String dynamiccruxsJson) {
        if (this.dynamiccruxs != null) {
            this.dynamiccruxsJson = new Gson().toJson(this.dynamiccruxs);
        } else {
            this.dynamiccruxsJson = dynamiccruxsJson;
        }
    }

    public List<String> getNodynamiccruxs() {
        return nodynamiccruxs;
    }

    public void setNodynamiccruxs(List<String> nodynamiccruxs) {
        this.nodynamiccruxs = nodynamiccruxs;
    }

    public List<String> getDynamiccruxs() {
        return dynamiccruxs;
    }

    public void setDynamiccruxs(List<String> dynamiccruxs) {
        this.dynamiccruxs = dynamiccruxs;
    }

    public String getOptiondesc() {
        return optiondesc;
    }

    public void setOptiondesc(String optiondesc) {
        this.optiondesc = optiondesc;
    }

    public String getLanguage() {
        return language;
    }

    public void setLanguage(String language) {
        this.language = language;
    }

    public Long getVersion() {
        return version;
    }

    public void setVersion(Long version) {
        this.version = version;
    }

    public String getGroupid() {
        return groupid;
    }

    public void setGroupid(String groupid) {
        this.groupid = groupid;
    }

    public Long getIsabnormal() {
        return isabnormal;
    }

    public void setIsabnormal(Long isabnormal) {
        this.isabnormal = isabnormal;
    }

    public Long getWarnup() {
        return warnup;
    }

    public void setWarnup(Long warnup) {
        this.warnup = warnup;
    }

    public Long getWarndown() {
        return warndown;
    }

    public void setWarndown(Long warndown) {
        this.warndown = warndown;
    }

    public String getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(String delFlag) {
        this.delFlag = delFlag;
    }

    public Long getIsupload() {
        return isupload;
    }

    public void setIsupload(Long isupload) {
        this.isupload = isupload;
    }

    public Date getUploadTime() {
        return uploadTime;
    }

    public void setUploadTime(Date uploadTime) {
        this.uploadTime = uploadTime;
    }

    public String getOrgid() {
        return orgid;
    }

    public void setOrgid(String orgid) {
        this.orgid = orgid;
    }

    public Long getPid() {
        return pid;
    }

    public void setPid(Long pid) {
        this.pid = pid;
    }

    public String getGuid() {
        return guid;
    }

    public void setGuid(String guid) {
        this.guid = guid;
    }

    public Integer getIsoperation() {
        return isoperation;
    }

    public void setIsoperation(Integer isoperation) {
        this.isoperation = isoperation;
    }
}

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

@@ -47,7 +47,7 @@
     */
    @ApiModelProperty("话术内容")
    @Excel(name = "话术内容")
    private String questiontext;
    private String questionText;

    /**
     * è¯æœ¯è¯­éŸ³

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

@@ -1,8 +1,12 @@
package com.smartor.domain;

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

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.google.gson.Gson;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +21,6 @@
 * @author ruoyi
 * @date 2023-12-14
 */
@Data
@ApiModel(value = "IvrLibaTargetoption", description = "指标选项库对象")
public class IvrLibaTargetoption extends BaseEntity {
    private static final long serialVersionUID = 1L;
@@ -47,9 +50,31 @@
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String targetvalue;

    @ApiModelProperty(value = "正则")
    @ApiModelProperty(value = "正则1")
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String targetregex;

    @ApiModelProperty(value = "正则2")
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String targetregex2;


    @Excel(name = "正则关键字集合(含)")
    private String nodynamiccruxsJson;


    @Excel(name = "正则关键字集合(不含)")
    private String dynamiccruxsJson;

    @ApiModelProperty(value = "正则关键字(含)")
    @Excel(name = "正则关键字(含)")
    @JsonFormat
    private List<String> nodynamiccruxs=new ArrayList<>();

    @ApiModelProperty(value = "正则关键字(不含)")
    @Excel(name = "正则关键字(不含)")
    @JsonFormat
    private List<String> dynamiccruxs=new ArrayList<>();

    @ApiModelProperty(value = "选项描述")
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
@@ -149,6 +174,238 @@
    @Excel(name = "pageSize")
    private Integer pageSize;

    public Long getTargetoptionid() {
        return targetoptionid;
    }

    public void setTargetoptionid(Long targetoptionid) {
        this.targetoptionid = targetoptionid;
    }

    public Long getTargetid() {
        return targetid;
    }

    public void setTargetid(Long targetid) {
        this.targetid = targetid;
    }

    public String getTargettype() {
        return targettype;
    }

    public void setTargettype(String targettype) {
        this.targettype = targettype;
    }

    public String getCategoryName() {
        return categoryName;
    }

    public void setCategoryName(String categoryName) {
        this.categoryName = categoryName;
    }

    public String getTargetvalue() {
        return targetvalue;
    }

    public void setTargetvalue(String targetvalue) {
        this.targetvalue = targetvalue;
    }

    public String getTargetregex() {
        return targetregex;
    }

    public void setTargetregex(String targetregex) {
        this.targetregex = targetregex;
    }

    public String getTargetregex2() {
        return targetregex2;
    }

    public void setTargetregex2(String targetregex2) {
        this.targetregex2 = targetregex2;
    }

    public String getNodynamiccruxsJson() {
        return nodynamiccruxsJson;
    }

    public void setNodynamiccruxsJson(String nodynamiccruxsJson) {
        if (this.nodynamiccruxs != null) {
            this.nodynamiccruxsJson = new Gson().toJson(this.nodynamiccruxs);
        } else {
            this.nodynamiccruxsJson = nodynamiccruxsJson;
        }
    }

    public String getDynamiccruxsJson() {
        return dynamiccruxsJson;
    }

    public void setDynamiccruxsJson(String dynamiccruxsJson) {
        if (this.dynamiccruxs != null) {
            this.dynamiccruxsJson = new Gson().toJson(this.dynamiccruxs);
        } else {
            this.dynamiccruxsJson = dynamiccruxsJson;
        }
    }

    public List<String> getNodynamiccruxs() {
        return nodynamiccruxs;
    }

    public void setNodynamiccruxs(List<String> nodynamiccruxs) {
        this.nodynamiccruxs = nodynamiccruxs;
    }

    public List<String> getDynamiccruxs() {
        return dynamiccruxs;
    }

    public void setDynamiccruxs(List<String> dynamiccruxs) {
        this.dynamiccruxs = dynamiccruxs;
    }

    public String getOptiondesc() {
        return optiondesc;
    }

    public void setOptiondesc(String optiondesc) {
        this.optiondesc = optiondesc;
    }

    public String getLanguage() {
        return language;
    }

    public void setLanguage(String language) {
        this.language = language;
    }

    public Long getVersion() {
        return version;
    }

    public void setVersion(Long version) {
        this.version = version;
    }

    public String getGroupid() {
        return groupid;
    }

    public void setGroupid(String groupid) {
        this.groupid = groupid;
    }

    public Long getIsabnormal() {
        return isabnormal;
    }

    public void setIsabnormal(Long isabnormal) {
        this.isabnormal = isabnormal;
    }

    public Long getWarnup() {
        return warnup;
    }

    public void setWarnup(Long warnup) {
        this.warnup = warnup;
    }

    public Long getWarndown() {
        return warndown;
    }

    public void setWarndown(Long warndown) {
        this.warndown = warndown;
    }

    public String getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(String delFlag) {
        this.delFlag = delFlag;
    }

    public Long getIsupload() {
        return isupload;
    }

    public void setIsupload(Long isupload) {
        this.isupload = isupload;
    }

    public Date getUploadTime() {
        return uploadTime;
    }

    public void setUploadTime(Date uploadTime) {
        this.uploadTime = uploadTime;
    }

    public String getOrgid() {
        return orgid;
    }

    public void setOrgid(String orgid) {
        this.orgid = orgid;
    }

    public Long getPid() {
        return pid;
    }

    public void setPid(Long pid) {
        this.pid = pid;
    }

    public String getGuid() {
        return guid;
    }

    public void setGuid(String guid) {
        this.guid = guid;
    }

    public Integer getIsoperation() {
        return isoperation;
    }

    public void setIsoperation(Integer isoperation) {
        this.isoperation = isoperation;
    }

    public Integer getAllitems() {
        return allitems;
    }

    public void setAllitems(Integer allitems) {
        this.allitems = allitems;
    }

    public Integer getPageNum() {
        return pageNum;
    }

    public void setPageNum(Integer pageNum) {
        this.pageNum = pageNum;
    }

    public Integer getPageSize() {
        return pageSize;
    }

    public void setPageSize(Integer pageSize) {
        this.pageSize = pageSize;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("targetoptionid", getTargetoptionid()).append("targetid", getTargetid()).append("targettype", getTargettype()).append("categoryName", getCategoryName()).append("targetvalue", getTargetvalue()).append("targetregex", getTargetregex()).append("optiondesc", getOptiondesc()).append("language", getLanguage()).append("version", getVersion()).append("groupid", getGroupid()).append("isabnormal", getIsabnormal()).append("warnup", getWarnup()).append("warndown", getWarndown()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("orgid", getOrgid()).append("pid", getPid()).append("guid", getGuid()).toString();

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

@@ -241,6 +241,13 @@
    private Long pid;

    /**
     * æ— åŒ¹é…æ¬¡æ•°
     */
    @Excel(name = "无匹配次数")
    @ApiModelProperty(value = "无匹配次数")
    private Long mateNum;

    /**
     * GUID
     */
    @Excel(name = "GUID")
@@ -305,4 +312,18 @@
    @ApiModelProperty(value = "其它数据（存储变量）")
    private String otherdata;

    /**
     * éšè®¿å‰
     */
    @Excel(name = "随访前")
    @ApiModelProperty(value = "随访前")
    private String revisitBefore;

    /**
     * éšè®¿åŽ
     */
    @Excel(name = "随访后")
    @ApiModelProperty(value = "随访后")
    private String revisitAfter;

}

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

@@ -203,6 +203,13 @@
    private String guid;

    /**
     * æ ‡é¢˜
     */
    @Excel(name = "标题")
    @ApiModelProperty(value = "标题")
    private String questiontitle;

    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除
     */
    @ApiModelProperty(value = "是否存在操作：1 æ–°å¢ž 2修改 3删除")
@@ -211,19 +218,19 @@
    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除
     */
    @ApiModelProperty(value = "是否存在操作：1 æ–°å¢ž 2修改 3删除")
    @ApiModelProperty(value = "指标类型")
    private Integer targettype;

    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除
     */
    @ApiModelProperty(value = "是否存在操作：1 æ–°å¢ž 2修改 3删除")
    @ApiModelProperty(value = "指标ID")
    private Long targetid;


    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除
     */
    @ApiModelProperty(value = "是否存在操作：1 æ–°å¢ž 2修改 3删除")
    @ApiModelProperty(value = "指标值")
    private Integer targetvalue;
}

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

@@ -228,8 +228,15 @@
    private Integer targetValue;

    /**
     * æ ‡é¢˜
     */
    @Excel(name = "标题")
    @ApiModelProperty(value = "标题")
    private String questiontitle;

    /**
     * è¯æœ¯é€‰é¡¹
     */
    @ApiModelProperty(value = "话术选项")
    private List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptionList = new ArrayList<>();
    private List<IvrLibaTemplateTargetoption> ivrLibaScriptTargetoptionList = new ArrayList<>();
}

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

@@ -99,10 +99,10 @@
    private String guid;

    /**
     * GUID
     * æ ‡ç­¾å
     */
    @Excel(name = "GUID")
    @ApiModelProperty(value = "GUID")
    @Excel(name = "标签名")
    @ApiModelProperty(value = "标签名")
    private String tagname;

    /**

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

@@ -1,8 +1,11 @@
package com.smartor.domain;

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

import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.gson.Gson;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,7 +20,6 @@
 * @author ruoyi
 * @date 2023-12-23
 */
@Data
@ApiModel(value = "IvrLibaTemplateTargetoption", description = "模板指标选项库对象")
public class IvrLibaTemplateTargetoption extends BaseEntity {
    private static final long serialVersionUID = 1L;
@@ -68,7 +70,7 @@
     */
    @Excel(name = "类别名称")
    @ApiModelProperty(value = "类别名称")
    private String categoryName;
    private String categoryName = null;

    /**
     * æ¨¡æ¿æŒ‡æ ‡å€¼
@@ -83,6 +85,27 @@
    @Excel(name = "模板指标正则")
    @ApiModelProperty(value = "模板指标正则")
    private String targetregex;

    /**
     * æ¨¡æ¿æŒ‡æ ‡æ­£åˆ™
     */
    @Excel(name = "模板指标正则2")
    @ApiModelProperty(value = "模板指标正则2")
    private String targetregex2;

    @Excel(name = "正则关键字集合(含)")
    private String nodynamiccruxsJson;

    @Excel(name = "正则关键字集合(不含)")
    private String dynamiccruxsJson;

    @ApiModelProperty(value = "正则关键字(含)")
    @Excel(name = "正则关键字(含)")
    private List<String> nodynamiccruxs = new ArrayList<>();

    @ApiModelProperty(value = "正则关键字(不含)")
    @Excel(name = "正则关键字(不含)")
    private List<String> dynamiccruxs = new ArrayList<>();

    /**
     * é€‰é¡¹æè¿°
@@ -180,4 +203,236 @@
     */
    @ApiModelProperty(value = "是否存在操作：1 æ–°å¢ž 2修改 3删除")
    private Integer isoperation;

    public Long getId() {
        return id;
    }

    public void setId(Long id) {
        this.id = id;
    }

    public Long getTargetid() {
        return targetid;
    }

    public void setTargetid(Long targetid) {
        this.targetid = targetid;
    }

    public String getTargetname() {
        return targetname;
    }

    public void setTargetname(String targetname) {
        this.targetname = targetname;
    }

    public Long getTemplateID() {
        return templateID;
    }

    public void setTemplateID(Long templateID) {
        this.templateID = templateID;
    }

    public Long getScriptid() {
        return scriptid;
    }

    public void setScriptid(Long scriptid) {
        this.scriptid = scriptid;
    }

    public String getTargettype() {
        return targettype;
    }

    public void setTargettype(String targettype) {
        this.targettype = targettype;
    }

    public String getCategoryName() {
        return categoryName;
    }

    public void setCategoryName(String categoryName) {
        this.categoryName = categoryName;
    }

    public String getTargetvalue() {
        return targetvalue;
    }

    public void setTargetvalue(String targetvalue) {
        this.targetvalue = targetvalue;
    }

    public String getTargetregex() {
        return targetregex;
    }

    public void setTargetregex(String targetregex) {
        this.targetregex = targetregex;
    }

    public String getTargetregex2() {
        return targetregex2;
    }

    public void setTargetregex2(String targetregex2) {
        this.targetregex2 = targetregex2;
    }

    public String getNodynamiccruxsJson() {
        return nodynamiccruxsJson;
    }

    public void setNodynamiccruxsJson(String nodynamiccruxsJson) {
        if (this.nodynamiccruxs != null) {
            this.nodynamiccruxsJson = new Gson().toJson(this.nodynamiccruxs);
        } else {
            this.nodynamiccruxsJson = nodynamiccruxsJson;
        }
    }

    public String getDynamiccruxsJson() {
        return dynamiccruxsJson;
    }

    public void setDynamiccruxsJson(String dynamiccruxsJson) {
        if (this.dynamiccruxs != null) {
            this.dynamiccruxsJson = new Gson().toJson(this.dynamiccruxs);
        } else {
            this.dynamiccruxsJson = dynamiccruxsJson;
        }
    }

    public List<String> getNodynamiccruxs() {
        return nodynamiccruxs;
    }

    public void setNodynamiccruxs(List<String> nodynamiccruxs) {
        this.nodynamiccruxs = nodynamiccruxs;
    }

    public List<String> getDynamiccruxs() {
        return dynamiccruxs;
    }

    public void setDynamiccruxs(List<String> dynamiccruxs) {
        this.dynamiccruxs = dynamiccruxs;
    }

    public String getOptiondesc() {
        return optiondesc;
    }

    public void setOptiondesc(String optiondesc) {
        this.optiondesc = optiondesc;
    }

    public String getLanguage() {
        return language;
    }

    public void setLanguage(String language) {
        this.language = language;
    }

    public String getVersion() {
        return version;
    }

    public void setVersion(String version) {
        this.version = version;
    }

    public String getGroupid() {
        return groupid;
    }

    public void setGroupid(String groupid) {
        this.groupid = groupid;
    }

    public Long getIsabnormal() {
        return isabnormal;
    }

    public void setIsabnormal(Long isabnormal) {
        this.isabnormal = isabnormal;
    }

    public Long getWarnup() {
        return warnup;
    }

    public void setWarnup(Long warnup) {
        this.warnup = warnup;
    }

    public Long getWarndown() {
        return warndown;
    }

    public void setWarndown(Long warndown) {
        this.warndown = warndown;
    }

    public String getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(String delFlag) {
        this.delFlag = delFlag;
    }

    public Long getIsupload() {
        return isupload;
    }

    public void setIsupload(Long isupload) {
        this.isupload = isupload;
    }

    public Date getUploadTime() {
        return uploadTime;
    }

    public void setUploadTime(Date uploadTime) {
        this.uploadTime = uploadTime;
    }

    public String getOrgid() {
        return orgid;
    }

    public void setOrgid(String orgid) {
        this.orgid = orgid;
    }

    public Long getPid() {
        return pid;
    }

    public void setPid(Long pid) {
        this.pid = pid;
    }

    public String getGuid() {
        return guid;
    }

    public void setGuid(String guid) {
        this.guid = guid;
    }

    public Integer getIsoperation() {
        return isoperation;
    }

    public void setIsoperation(Integer isoperation) {
        this.isoperation = isoperation;
    }
}

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

@@ -241,6 +241,13 @@
    private Long pid;

    /**
     * æ— åŒ¹é…æ¬¡æ•°
     */
    @Excel(name = "无匹配次数")
    @ApiModelProperty(value = "无匹配次数")
    private Long mateNum;

    /**
     * GUID
     */
    @Excel(name = "GUID")
@@ -290,6 +297,20 @@
    private String tag;

    /**
     * éšè®¿å‰
     */
    @Excel(name = "随访前")
    @ApiModelProperty(value = "随访前")
    private String revisitBefore;

    /**
     * éšè®¿åŽ
     */
    @Excel(name = "随访后")
    @ApiModelProperty(value = "随访后")
    private String revisitAfter;

    /**
     * é€‚用方式：调查表1，智能语音2、人工3
     */
    @Excel(name = "适用方式：调查表1，智能语音2、人工3")

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

@@ -1,571 +1,356 @@
package com.smartor.domain;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * è¯­éŸ³ä»»åŠ¡å‘¼å«å¯¹è±¡ ivr_taskcall
 * 
 * @author smartor
 * @date 2023-03-24
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰å¯¹è±¡ ivr_taskcall
 *
 * @author ruoyi
 * @date 2024-02-02
 */
public class IvrTaskcall extends BaseEntity
{
@Data
public class IvrTaskcall extends BaseEntity {
    @ApiModelProperty(value = "拉取时间")
    private static final long serialVersionUID = 1L;

    /**    */
    private Long callid;
    /**
     *
     */
    @ApiModelProperty(value = "主键")
    private Long id;

    /**  å‘送人  */
    @Excel(name = " å‘送人 ")
    /**
     * å‘送人
     */
    @Excel(name = " å‘送人（患者） ")
    @ApiModelProperty(value = "发送人（患者）")
    private String sendname;

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

    /**    */
    @Excel(name = "  ")
    /**
     * æ€§åˆ«
     */
    @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 = "  ")
    /**
     * å‘送人详情
     */
    @Excel(name = "  å‘送人详情")
    @ApiModelProperty(value = "发送人详情")
    private String senderdetail;

    /**    */
    @Excel(name = "  ")
    private String inserttype;
    /**
     * ä»»åŠ¡ç±»åž‹(门诊，住院，复诊…)
     */
    @Excel(name = "任务类型(门诊，住院，复诊…)")
    @ApiModelProperty(value = "任务类型(门诊，住院，复诊…)")
    private String type;

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

    /**    */
    @Excel(name = "  ")
    /**
     * æ¨¡æ¿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;

    /**  å‘送状态  */
    /**
     * å‘送状态
     */
    @Excel(name = " å‘送状态 ")
    @ApiModelProperty(value = "发送状态")
    private Long sendstate;

    /**  å‘送UUID  */
    /**
     * å‘送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  */
    /**
     * ç”¨æˆ·ID
     */
    @Excel(name = " ç”¨æˆ·ID ")
    @ApiModelProperty(value = "用户ID")
    private String userid;

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

    /**  æ·»åŠ æ—¶é—´  */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " æ·»åŠ æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    private Date addtime;

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

    /**  å°±è¯Šè®°å½•ç¼–号  */
    /**
     * å°±è¯Šè®°å½•ç¼–号
     */
    @Excel(name = " å°±è¯Šè®°å½•ç¼–号 ")
    @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 = "  ")
    /**
     * bqsms
     */
    @Excel(name = " bqsms ")
    @ApiModelProperty(value = "bqsms")
    private Long bqsms;

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

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

    /**    */
    @Excel(name = "  ")
    /**
     * æ ‡ç­¾çŠ¶æ€
     */
    @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  */
    /**
     * æœºæž„ID
     */
    @Excel(name = " æœºæž„ID ")
    @ApiModelProperty(value = "机构ID")
    private String orgid;

    public void setCallid(Long callid) 
    {
        this.callid = callid;
    }
    /**
     * çˆ¶ID
     */
    @Excel(name = "父ID")
    @ApiModelProperty(value = "父ID")
    private Long pid;

    public Long getCallid() 
    {
        return callid;
    }
    public void setSendname(String sendname) 
    {
        this.sendname = sendname;
    }
    /**
     * GUID
     */
    @Excel(name = "GUID")
    @ApiModelProperty(value = "GUID")
    private String guid;

    public String getSendname() 
    {
        return sendname;
    }
    public void setPhone(String phone) 
    {
        this.phone = phone;
    }
    /**
     * æ–‡æœ¬å˜é‡å‚æ•°
     */
    @Excel(name = "文本变量参数")
    @ApiModelProperty(value = "文本变量参数")
    private String textParam;

    public String getPhone() 
    {
        return phone;
    }
    public void setSex(String sex) 
    {
        this.sex = sex;
    }
    /**
     * å®£æ•™å½¢å¼ :文本、图片、语音、视频、混合
     */
    @Excel(name = " å®£æ•™å½¢å¼ :文本、图片、语音、视频、混合")
    @ApiModelProperty("宣教形式 : 1,文本、2,图片、3,语音、4,视频、5,混合")
    private String serviceform;

    public String getSex() 
    {
        return sex;
    }
    public void setAge(Long age) 
    {
        this.age = age;
    }
    /**
     * åºŠå·
     */
    @Excel(name = "床号")
    @ApiModelProperty(value = "床号")
    private Long badNo;

    public Long getAge() 
    {
        return age;
    }
    public void setSfzh(String sfzh) 
    {
        this.sfzh = sfzh;
    }
    /**
     * ç–¾ç—…名称
     */
    @Excel(name = "疾病名称")
    @ApiModelProperty(value = "疾病名称")
    private String icdName;

    public String getSfzh() 
    {
        return sfzh;
    }
    public void setAddr(String addr) 
    {
        this.addr = addr;
    }
    /**
     * ç—…历号
     */
    @Excel(name = "病历号")
    @ApiModelProperty(value = "病历号")
    private String medicalRecordNo;

    public String getAddr() 
    {
        return addr;
    }
    public void setSenderdetail(String senderdetail) 
    {
        this.senderdetail = senderdetail;
    }
    /**
     * å®£æ•™å†…容
     */
    @Excel(name = "宣教内容")
    @ApiModelProperty(value = "宣教内容")
    private String preachcontent;

    public String getSenderdetail() 
    {
        return senderdetail;
    }
    public void setInserttype(String inserttype) 
    {
        this.inserttype = inserttype;
    }
    /**
     * pageNum
     */
    @Excel(name = "pageNum")
    @ApiModelProperty(value = "pageNum")
    private Integer pageNum;

    public String getInserttype() 
    {
        return inserttype;
    }
    public void setTaskid(Long taskid) 
    {
        this.taskid = taskid;
    }
    /**
     * pageSize
     */
    @Excel(name = "pageSize")
    @ApiModelProperty(value = "pageSize")
    private Integer pageSize;

    public Long getTaskid() 
    {
        return taskid;
    }
    public void setTemplateid(String templateid) 
    {
        this.templateid = templateid;
    }

    public String getTemplateid() 
    {
        return templateid;
    }
    public void setTemplatename(String templatename) 
    {
        this.templatename = templatename;
    }

    public String getTemplatename() 
    {
        return templatename;
    }
    public void setSenddate(Date senddate) 
    {
        this.senddate = senddate;
    }

    public Date getSenddate() 
    {
        return senddate;
    }
    public void setSendlimitabegin(String sendlimitabegin) 
    {
        this.sendlimitabegin = sendlimitabegin;
    }

    public String getSendlimitabegin() 
    {
        return sendlimitabegin;
    }
    public void setSendlimitaend(String sendlimitaend) 
    {
        this.sendlimitaend = sendlimitaend;
    }

    public String getSendlimitaend() 
    {
        return sendlimitaend;
    }
    public void setSendlimitpbegin(String sendlimitpbegin) 
    {
        this.sendlimitpbegin = sendlimitpbegin;
    }

    public String getSendlimitpbegin() 
    {
        return sendlimitpbegin;
    }
    public void setSendlimitpend(String sendlimitpend) 
    {
        this.sendlimitpend = sendlimitpend;
    }

    public String getSendlimitpend() 
    {
        return sendlimitpend;
    }
    public void setSendlimitnbegin(String sendlimitnbegin) 
    {
        this.sendlimitnbegin = sendlimitnbegin;
    }

    public String getSendlimitnbegin() 
    {
        return sendlimitnbegin;
    }
    public void setSendlimitnend(String sendlimitnend) 
    {
        this.sendlimitnend = sendlimitnend;
    }

    public String getSendlimitnend() 
    {
        return sendlimitnend;
    }
    public void setSendstate(Long sendstate) 
    {
        this.sendstate = sendstate;
    }

    public Long getSendstate() 
    {
        return sendstate;
    }
    public void setSenduuid(String senduuid) 
    {
        this.senduuid = senduuid;
    }

    public String getSenduuid() 
    {
        return senduuid;
    }
    public void setResult(String result) 
    {
        this.result = result;
    }

    public String getResult() 
    {
        return result;
    }
    public void setFinishtime(Date finishtime) 
    {
        this.finishtime = finishtime;
    }

    public Date getFinishtime() 
    {
        return finishtime;
    }
    public void setUserid(String userid) 
    {
        this.userid = userid;
    }

    public String getUserid() 
    {
        return userid;
    }
    public void setUsername(String username) 
    {
        this.username = username;
    }

    public String getUsername() 
    {
        return username;
    }

    public void setOutbounduuid(String outbounduuid) 
    {
        this.outbounduuid = outbounduuid;
    }

    public String getOutbounduuid() 
    {
        return outbounduuid;
    }
    public void setRecordid(Long recordid) 
    {
        this.recordid = recordid;
    }

    public Long getRecordid() 
    {
        return recordid;
    }
    public void setRecallcount(Long recallcount) 
    {
        this.recallcount = recallcount;
    }

    public Long getRecallcount() 
    {
        return recallcount;
    }
    public void setExrecallcount(Long exrecallcount) 
    {
        this.exrecallcount = exrecallcount;
    }

    public Long getExrecallcount() 
    {
        return exrecallcount;
    }
    public void setPulltime(Date pulltime) 
    {
        this.pulltime = pulltime;
    }

    public Date getPulltime() 
    {
        return pulltime;
    }
    public void setBqsms(Long bqsms) 
    {
        this.bqsms = bqsms;
    }

    public Long getBqsms() 
    {
        return bqsms;
    }
    public void setBhsms(Long bhsms) 
    {
        this.bhsms = bhsms;
    }

    public Long getBhsms() 
    {
        return bhsms;
    }
    public void setDeptcode(String deptcode) 
    {
        this.deptcode = deptcode;
    }

    public String getDeptcode() 
    {
        return deptcode;
    }
    public void setLabelstatus(Long labelstatus) 
    {
        this.labelstatus = labelstatus;
    }

    public Long getLabelstatus() 
    {
        return labelstatus;
    }
    public void setDelFlag(String delFlag) 
    {
        this.delFlag = delFlag;
    }

    public String getDelFlag() 
    {
        return delFlag;
    }
    public void setIsupload(Long isupload) 
    {
        this.isupload = isupload;
    }

    public Long getIsupload() 
    {
        return isupload;
    }
    public void setUploadTime(Date uploadTime) 
    {
        this.uploadTime = uploadTime;
    }

    public Date getUploadTime() 
    {
        return uploadTime;
    }
    public void setOrgid(String orgid) 
    {
        this.orgid = orgid;
    }

    public String getOrgid() 
    {
        return orgid;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("callid", getCallid())
            .append("sendname", getSendname())
            .append("phone", getPhone())
            .append("sex", getSex())
            .append("age", getAge())
            .append("sfzh", getSfzh())
            .append("addr", getAddr())
            .append("senderdetail", getSenderdetail())
            .append("inserttype", getInserttype())
            .append("taskid", getTaskid())
            .append("templateid", getTemplateid())
            .append("templatename", getTemplatename())
            .append("senddate", getSenddate())
            .append("sendlimitabegin", getSendlimitabegin())
            .append("sendlimitaend", getSendlimitaend())
            .append("sendlimitpbegin", getSendlimitpbegin())
            .append("sendlimitpend", getSendlimitpend())
            .append("sendlimitnbegin", getSendlimitnbegin())
            .append("sendlimitnend", getSendlimitnend())
            .append("sendstate", getSendstate())
            .append("senduuid", getSenduuid())
            .append("result", getResult())
            .append("finishtime", getFinishtime())
            .append("userid", getUserid())
            .append("username", getUsername())
            .append("outbounduuid", getOutbounduuid())
            .append("recordid", getRecordid())
            .append("recallcount", getRecallcount())
            .append("exrecallcount", getExrecallcount())
            .append("pulltime", getPulltime())
            .append("bqsms", getBqsms())
            .append("bhsms", getBhsms())
            .append("deptcode", getDeptcode())
            .append("labelstatus", getLabelstatus())
            .append("delFlag", getDelFlag())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("isupload", getIsupload())
            .append("uploadTime", getUploadTime())
            .append("orgid", getOrgid())
            .toString();
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,368 @@
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 org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;

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

/**
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰å¯¹è±¡ ivr_taskcall
 *
 * @author ruoyi
 * @date 2024-02-02
 */
@Data
public class IvrTaskcallVO extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     *
     */
    @ApiModelProperty(value = "主键id")
    private Long id;

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

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

    /**
     * æ€§åˆ«
     */
    @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;

    /**
     * ä»»åŠ¡ç±»åž‹(门诊，住院，复诊…)
     */
    @Excel(name = "任务类型(门诊，住院，复诊…)")
    @ApiModelProperty(value = "任务类型(门诊，住院，复诊…)")
    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;

    /**
     * å‘送状态
     */
    @Excel(name = " å‘送状态 ")
    @ApiModelProperty(value = "发送状态")
    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;

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

    /**
     * å°±è¯Šè®°å½•ç¼–号
     */
    @Excel(name = " å°±è¯Šè®°å½•ç¼–号 ")
    @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 = " bqsms ")
    @ApiModelProperty(value = "bqsms")
    private Long bqsms;

    /**
     * bhsms
     */
    @Excel(name = " bhsms ")
    @ApiModelProperty(value = "bhsms")
    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;

    /**
     * æ˜¯å¦å­˜åœ¨æ“ä½œï¼š1 æ–°å¢ž 2修改 3删除
     */
    @ApiModelProperty(value = "是否存在操作：1 æ–°å¢ž 2修改 3删除")
    private Integer isoperation;

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


    /**
     * å®£æ•™å½¢å¼ :文本、图片、语音、视频、混合
     */
    @Excel(name = " å®£æ•™å½¢å¼ :文本、图片、语音、视频、混合")
    @ApiModelProperty(value = "宣教形式 : 1,文本、2,图片、3,语音、4,视频、5,混合")
    private String serviceform;

    /**
     * æ‚£è€…与单一任务关联表集合
     */
    @Excel(name = " å®£æ‚£è€…与单一任务关联表集合")
    @ApiModelProperty(value = "患者与单一任务关联表集合")
    private List<PatTaskRelevance> patTaskRelevances;

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

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

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

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


    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("id", getId()).append("sendname", getSendname()).append("phone", getPhone()).append("sex", getSex()).append("age", getAge()).append("sfzh", getSfzh()).append("addr", getAddr()).append("senderdetail", getSenderdetail()).append("type", getType()).append("taskid", getTaskid()).append("templateid", getTemplateid()).append("templatename", getTemplatename()).append("senddate", getSenddate()).append("sendlimitabegin", getSendlimitabegin()).append("sendlimitaend", getSendlimitaend()).append("sendlimitpbegin", getSendlimitpbegin()).append("sendlimitpend", getSendlimitpend()).append("sendlimitnbegin", getSendlimitnbegin()).append("sendlimitnend", getSendlimitnend()).append("sendstate", getSendstate()).append("senduuid", getSenduuid()).append("result", getResult()).append("finishtime", getFinishtime()).append("userid", getUserid()).append("username", getUsername()).append("outbounduuid", getOutbounduuid()).append("recordid", getRecordid()).append("recallcount", getRecallcount()).append("exrecallcount", getExrecallcount()).append("pulltime", getPulltime()).append("bqsms", getBqsms()).append("bhsms", getBhsms()).append("deptcode", getDeptcode()).append("labelstatus", getLabelstatus()).append("delFlag", getDelFlag()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("isupload", getIsupload()).append("uploadTime", getUploadTime()).append("orgid", getOrgid()).append("pid", getPid()).append("guid", getGuid()).append("textParam", getTextParam()).toString();
    }
}

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

ÎļþÃû´Ó smartor/src/main/java/com/smartor/domain/PatHetaskRelevance.java ÐÞ¸Ä
@@ -17,8 +17,8 @@
 * @date 2024-01-07
 */
@Data
@ApiModel(value = "PatHetaskRelevance", description = "患者与宣教任务关联对象")
public class PatHetaskRelevance extends BaseEntity {
@ApiModel(value = "PatTaskRelevance", description = "患者与宣教任务关联对象")
public class PatTaskRelevance extends BaseEntity {

    private static final long serialVersionUID = 1L;

@@ -40,7 +40,7 @@
     */
    @Excel(name = "宣教任务ID")
    @ApiModelProperty("宣教任务ID")
    private Long heTaskId;
    private Long taskId;

    /**
     * åˆ é™¤æ ‡è®°
@@ -54,6 +54,13 @@
    @Excel(name = "姓名")
    @ApiModelProperty("姓名")
    private String name;

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

    /**
     * å¹´é¾„
@@ -82,6 +89,13 @@
    @Excel(name = "科室")
    @ApiModelProperty("科室")
    private String dept;

    /**
     * ç§‘室
     */
    @Excel(name = "地址")
    @ApiModelProperty("地址")
    private String addr;

    /**
     * ç–¾ç—…名称
@@ -119,6 +133,13 @@
    @ApiModelProperty("发送时间")
    private Date sendTime;

    /**
     * å‘送时间
     */
    @Excel(name = "就诊时间")
    @ApiModelProperty("就诊时间")
    private Date visitTime;


    /**
     * æ“ä½œäºº

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

ÎļþÃû´Ó smartor/src/main/java/com/smartor/domain/PatHetaskRelevanceVO.java ÐÞ¸Ä
@@ -6,6 +6,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * æ‚£è€…与宣教任务关联对象参数 pat_hetask_relevance
 *
@@ -13,8 +15,8 @@
 * @date 2024-01-07
 */
@Data
@ApiModel(value = "PatHetaskRelevanceVO", description = "患者与宣教任务关联对象参数")
public class PatHetaskRelevanceVO extends BaseEntity {
@ApiModel(value = "PatTaskRelevanceVO", description = "患者与宣教任务关联对象参数")
public class PatTaskRelevanceVO extends BaseEntity {

    private static final long serialVersionUID = 1L;

@@ -36,7 +38,7 @@
     */
    @Excel(name = "宣教任务ID")
    @ApiModelProperty("宣教任务ID")
    private Long heTaskId;
    private Long taskId;

    /**
     * åˆ é™¤ï¼š0不删除  1删除
@@ -101,6 +103,35 @@
    private String medicalRecordNo;

    /**
     * æ“ä½œäºº
     */
    @Excel(name = "操作人")
    @ApiModelProperty("操作人(宣教人)")
    private String operatePerson;


    /**
     * æŽ¥æ”¶æ—¶é—´
     */
    @Excel(name = "接收时间（宣教时间）")
    @ApiModelProperty("接收时间")
    private String receiveTime;

    /**
     * ç—…历号
     */
    @Excel(name = "发送状态")
    @ApiModelProperty("发送状态（宣教状态）")
    private Integer sendStatus;

    /**
     * å‘送时间
     */
    @Excel(name = "就诊时间")
    @ApiModelProperty("就诊时间")
    private Date visitTime;

    /**
     * å®£æ•™ä»»åŠ¡
     */
    @ApiModelProperty("宣教任务")

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

@@ -1,61 +1,56 @@
package com.smartor.mapper;

import java.util.List;
import com.smartor.domain.IvrTaskcall;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * è¯­éŸ³ä»»åŠ¡å‘¼å«Mapper接口
 * 
 * @author smartor
 * @date 2023-03-24
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰Mapper接口
 *
 * @author ruoyi
 * @date 2024-02-02
 */
public interface IvrTaskcallMapper 
{
@Mapper
public interface IvrTaskcallMapper {
    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param callid è¯­éŸ³ä»»åŠ¡å‘¼å«ä¸»é”®
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«
     * æŸ¥è¯¢å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param id å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰ä¸»é”®
     * @return å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     */
    public IvrTaskcall selectIvrTaskcallByCallid(Long callid);
    public IvrTaskcall selectIvrTaskcallById(Long id);

    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«åˆ—表
     * 
     * @param ivrTaskcall è¯­éŸ³ä»»åŠ¡å‘¼å«
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«é›†åˆ
     * æŸ¥è¯¢å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰åˆ—表
     *
     * @param ivrTaskcall å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     * @return å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰é›†åˆ
     */
    public List<IvrTaskcall> selectIvrTaskcallList(IvrTaskcall ivrTaskcall);

    /**
     * æ–°å¢žè¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param ivrTaskcall è¯­éŸ³ä»»åŠ¡å‘¼å«
     * æ–°å¢žå•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param ivrTaskcall å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     * @return ç»“æžœ
     */
    public int insertIvrTaskcall(IvrTaskcall ivrTaskcall);

    /**
     * ä¿®æ”¹è¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param ivrTaskcall è¯­éŸ³ä»»åŠ¡å‘¼å«
     * ä¿®æ”¹å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param ivrTaskcall å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     * @return ç»“æžœ
     */
    public int updateIvrTaskcall(IvrTaskcall ivrTaskcall);

    /**
     * åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param callid è¯­éŸ³ä»»åŠ¡å‘¼å«ä¸»é”®
     * åˆ é™¤å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param id å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteIvrTaskcallByCallid(Long callid);
    public int deleteIvrTaskcallById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param callids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteIvrTaskcallByCallids(Long[] callids);
}

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

ÎļþÒÑɾ³ý

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

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

import com.smartor.domain.PatTaskRelevance;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * æ‚£è€…与宣教任务关联Mapper接口
 * 
 * @author ruoyi
 * @date 2024-01-07
 */
@Mapper
public interface PatTaskRelevanceMapper 
{
    /**
     * æŸ¥è¯¢æ‚£è€…与宣教任务关联
     * 
     * @param id æ‚£è€…与宣教任务关联主键
     * @return æ‚£è€…与宣教任务关联
     */
    public PatTaskRelevance selectPatTaskRelevanceById(Long id);

    /**
     * æŸ¥è¯¢æ‚£è€…与宣教任务关联列表
     * 
     * @param patTaskRelevance æ‚£è€…与宣教任务关联
     * @return æ‚£è€…与宣教任务关联集合
     */
    public List<PatTaskRelevance> selectPatTaskRelevanceList(PatTaskRelevance patTaskRelevance);

    /**
     * æ–°å¢žæ‚£è€…与宣教任务关联
     * 
     * @param patTaskRelevance æ‚£è€…与宣教任务关联
     * @return ç»“æžœ
     */
    public int insertPatTaskRelevance(PatTaskRelevance patTaskRelevance);

    /**
     * ä¿®æ”¹æ‚£è€…与宣教任务关联
     * 
     * @param patTaskRelevance æ‚£è€…与宣教任务关联
     * @return ç»“æžœ
     */
    public int updatePatTaskRelevance(PatTaskRelevance patTaskRelevance);

    /**
     * åˆ é™¤æ‚£è€…与宣教任务关联
     * 
     * @param id æ‚£è€…与宣教任务关联主键
     * @return ç»“æžœ
     */
    public int deletePatTaskRelevanceById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤æ‚£è€…与宣教任务关联
     * 
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deletePatTaskRelevanceByIds(Long[] ids);
}

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

@@ -25,7 +25,7 @@
     * @param heTask å®£æ•™ä»»åŠ¡
     * @return å®£æ•™ä»»åŠ¡é›†åˆ
     */
    public List<PatHetaskRelevanceVO> selectHeTaskList(PatHetaskRelevanceVO patHetaskRelevanceVO);
    public List<PatTaskRelevanceVO> selectHeTaskList(PatTaskRelevanceVO PatTaskRelevanceVO);

    /**
     * æ–°å¢žå®£æ•™ä»»åŠ¡
@@ -63,7 +63,7 @@
     * èŽ·å–患者信息
     *
     * @param patArchiveReq
     * @return PatHetaskRelevance
     * @return PatTaskRelevance
     */
    public List<PatHetaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq);
    public List<PatTaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq);
}

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

@@ -1,61 +1,64 @@
package com.smartor.service;

import java.util.List;
import com.smartor.domain.HeTaskVO;
import com.smartor.domain.IvrTaskcall;
import com.smartor.domain.IvrTaskcallVO;

import java.util.List;

/**
 * è¯­éŸ³ä»»åŠ¡å‘¼å«Service接口
 * 
 * @author smartor
 * @date 2023-03-24
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰Service接口
 *
 * @author ruoyi
 * @date 2024-02-02
 */
public interface IIvrTaskcallService 
{
public interface IIvrTaskcallService {
    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param callid è¯­éŸ³ä»»åŠ¡å‘¼å«ä¸»é”®
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«
     * æŸ¥è¯¢å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param id å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰ä¸»é”®
     * @return å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     */
    public IvrTaskcall selectIvrTaskcallByCallid(Long callid);
    public IvrTaskcall selectIvrTaskcallById(Long id);

    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«åˆ—表
     * 
     * @param ivrTaskcall è¯­éŸ³ä»»åŠ¡å‘¼å«
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«é›†åˆ
     * æŸ¥è¯¢å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰åˆ—表
     *
     * @param ivrTaskcall å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     * @return å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰é›†åˆ
     */
    public List<IvrTaskcall> selectIvrTaskcallList(IvrTaskcall ivrTaskcall);

    /**
     * æ–°å¢žè¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param ivrTaskcall è¯­éŸ³ä»»åŠ¡å‘¼å«
     * æ–°å¢žå•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param ivrTaskcall å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     * @return ç»“æžœ
     */
    public int insertIvrTaskcall(IvrTaskcall ivrTaskcall);

    /**
     * ä¿®æ”¹è¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param ivrTaskcall è¯­éŸ³ä»»åŠ¡å‘¼å«
     * ä¿®æ”¹å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param ivrTaskcall å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     * @return ç»“æžœ
     */
    public int updateIvrTaskcall(IvrTaskcall ivrTaskcall);

    /**
     * æ‰¹é‡åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param callids éœ€è¦åˆ é™¤çš„语音任务呼叫主键集合
     * æ‰¹é‡åˆ é™¤å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param ids éœ€è¦åˆ é™¤çš„单一任务（随访）主键集合
     * @return ç»“æžœ
     */
    public int deleteIvrTaskcallByCallids(Long[] callids);
    public int deleteIvrTaskcallByIds(Long[] ids);

    /**
     * åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«ä¿¡æ¯
     * 
     * @param callid è¯­éŸ³ä»»åŠ¡å‘¼å«ä¸»é”®
     * æ–°å¢žå®£æ•™ä»»åŠ¡
     *
     * @param ivrTaskcallVO å•ä¸€ä»»åŠ¡
     * @return ç»“æžœ
     */
    public int deleteIvrTaskcallByCallid(Long callid);
    public int insertOrUpdateTask(IvrTaskcallVO ivrTaskcallVO);

}

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

ÎļþÒÑɾ³ý

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

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

import com.smartor.domain.PatTaskRelevance;

import java.util.List;

/**
 * æ‚£è€…与宣教任务关联Service接口
 *
 * @author ruoyi
 * @date 2024-01-07
 */
public interface IPatTaskRelevanceService {
    /**
     * æŸ¥è¯¢æ‚£è€…与宣教任务关联
     *
     * @param id æ‚£è€…与宣教任务关联主键
     * @return æ‚£è€…与宣教任务关联
     */
    public PatTaskRelevance selectPatTaskRelevanceById(Long id);

    /**
     * æŸ¥è¯¢æ‚£è€…与宣教任务关联列表
     *
     * @param patTaskRelevance æ‚£è€…与宣教任务关联
     * @return æ‚£è€…与宣教任务关联集合
     */
    public List<PatTaskRelevance> selectPatTaskRelevanceList(PatTaskRelevance patTaskRelevance);

    /**
     * æ–°å¢žæ‚£è€…与宣教任务关联
     *
     * @param patTaskRelevance æ‚£è€…与宣教任务关联
     * @return ç»“æžœ
     */
    public int insertPatTaskRelevance(PatTaskRelevance patTaskRelevance);

    /**
     * ä¿®æ”¹æ‚£è€…与宣教任务关联
     *
     * @param patTaskRelevance æ‚£è€…与宣教任务关联
     * @return ç»“æžœ
     */
    public int updatePatTaskRelevance(PatTaskRelevance patTaskRelevance);

    /**
     * æ‰¹é‡åˆ é™¤æ‚£è€…与宣教任务关联
     *
     * @param ids éœ€è¦åˆ é™¤çš„患者与宣教任务关联主键集合
     * @return ç»“æžœ
     */
    public int deletePatTaskRelevanceByIds(Long[] ids);

    /**
     * åˆ é™¤æ‚£è€…与宣教任务关联信息
     *
     * @param id æ‚£è€…与宣教任务关联主键
     * @return ç»“æžœ
     */
    public int deletePatTaskRelevanceById(Long id);
}

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

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

import com.ruoyi.common.enums.SendTypeEnum;
import com.google.gson.Gson;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
@@ -8,7 +8,7 @@
import com.smartor.domain.*;
import com.smartor.mapper.HeTaskMapper;
import com.smartor.mapper.PatArchiveMapper;
import com.smartor.mapper.PatHetaskRelevanceMapper;
import com.smartor.mapper.PatTaskRelevanceMapper;
import com.smartor.service.IHeTaskService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -19,8 +19,6 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;

/**
 * å®£æ•™ä»»åŠ¡Service业务层处理
@@ -44,7 +42,7 @@
    private HeLibraryServiceImpl heLibraryService;

    @Autowired
    private PatHetaskRelevanceMapper patHetaskRelevanceMapper;
    private PatTaskRelevanceMapper PatTaskRelevanceMapper;

    @Autowired
    private SendService sendService;
@@ -85,19 +83,19 @@
    /**
     * æŸ¥è¯¢å®£æ•™ä»»åŠ¡åˆ—表
     *
     * @param patHetaskRelevanceVO å®£æ•™ä»»åŠ¡
     * @param patTaskRelevanceVO å®£æ•™ä»»åŠ¡
     * @return å®£æ•™ä»»åŠ¡
     */
    @Override
    public List<PatHetaskRelevanceVO> selectHeTaskList(PatHetaskRelevanceVO patHetaskRelevanceVO) {
        PatHetaskRelevance patHetaskRelevance = new PatHetaskRelevance();
        List<PatHetaskRelevance> patHetaskRelevances = patHetaskRelevanceMapper.selectPatHetaskRelevanceList(patHetaskRelevance);
        List<PatHetaskRelevanceVO> patHetaskRelevanceVOS = DtoConversionUtils.sourceToTarget(patHetaskRelevances, PatHetaskRelevanceVO.class);
        for (PatHetaskRelevanceVO patHetaskRelevanceVO1 : patHetaskRelevanceVOS) {
            HeTask heTask1 = heTaskMapper.selectHeTaskById(patHetaskRelevanceVO1.getHeTaskId());
            patHetaskRelevanceVO1.setHeTask(heTask1);
    public List<PatTaskRelevanceVO> selectHeTaskList(PatTaskRelevanceVO patTaskRelevanceVO) {
        PatTaskRelevance patTaskRelevance = new PatTaskRelevance();
        List<PatTaskRelevance> patTaskRelevances = PatTaskRelevanceMapper.selectPatTaskRelevanceList(patTaskRelevance);
        List<PatTaskRelevanceVO> PatTaskRelevanceVOS = DtoConversionUtils.sourceToTarget(patTaskRelevances, PatTaskRelevanceVO.class);
        for (PatTaskRelevanceVO patTaskRelevanceVO1 : PatTaskRelevanceVOS) {
            HeTask heTask1 = heTaskMapper.selectHeTaskById(patTaskRelevanceVO1.getTaskId());
            patTaskRelevanceVO1.setHeTask(heTask1);
        }
        return patHetaskRelevanceVOS;
        return PatTaskRelevanceVOS;
    }

    /**
@@ -115,11 +113,11 @@
//        if (heTaskVO.getIsSend() == 2) {
//            //发送方式
//            String sendtype = SendTypeEnum.getDescByCode(heTaskVO.getPreachform().intValue());
//            for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
//            for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
//                //开始发送
//                SendMagParam sendMagParam = new SendMagParam();
//                sendMagParam.setType(sendtype);
//                sendMagParam.setPhone(patHetaskRelevance.getPhone());
//                sendMagParam.setPhone(PatTaskRelevance.getPhone());
//                //这里的模板ID不确定，先这样写
//                sendMagParam.setTmpCode("SMS_461860582");
//                sendMagParam.setContent("Test发送数据");
@@ -129,7 +127,7 @@
//                }
//
//                //必须全部成功，才能修改发送状态
//                if (heTaskVO.getPatHetaskRelevances().size() == integer) {
//                if (heTaskVO.getPatTaskRelevances().size() == integer) {
//                    //如果发送成功
//                    heTaskVO.setSendState(1L);
//                }
@@ -141,10 +139,10 @@
//
//            //将任务与患者关联
//            Integer i = null;
//            if (ObjectUtils.isNotEmpty(heTaskVO.getPatHetaskRelevances())) {
//                for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
//                    patHetaskRelevance.setHeTaskId(heTask.getId());
//                    i = patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
//            if (ObjectUtils.isNotEmpty(heTaskVO.getPatTaskRelevances())) {
//                for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
//                    PatTaskRelevance.setHeTaskId(heTask.getId());
//                    i = PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance);
//                }
//
//            }
@@ -156,11 +154,11 @@
//                @Override
//                public void run() {
//                    Integer integer = 0;
//                    for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
//                    for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
//                        String sendtype = SendTypeEnum.getDescByCode(heTaskVO.getPreachform().intValue());
//                        SendMagParam sendMagParam = new SendMagParam();
//                        sendMagParam.setType(sendtype);
//                        sendMagParam.setPhone(patHetaskRelevance.getPhone());
//                        sendMagParam.setPhone(PatTaskRelevance.getPhone());
//                        //这里的模板ID不确定，先这样写
//                        sendMagParam.setTmpCode("SMS_461860582");
//                        sendMagParam.setContent("Test发送数据");
@@ -170,7 +168,7 @@
//                        }
//                    }
//                    //必须全部成功，才能修改发送状态
//                    if (heTaskVO.getPatHetaskRelevances().size() == integer) {
//                    if (heTaskVO.getPatTaskRelevances().size() == integer) {
//                        //如果发送成功
//                        heTaskVO.setSendState(1L);
//                    }
@@ -178,10 +176,10 @@
//                    heTask.setCreateTime(DateUtils.getNowDate());
//                    heTaskMapper.insertHeTask(heTask);
//
//                    if (ObjectUtils.isNotEmpty(heTaskVO.getPatHetaskRelevances())) {
//                        for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
//                            patHetaskRelevance.setHeTaskId(heTask.getId());
//                            patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
//                    if (ObjectUtils.isNotEmpty(heTaskVO.getPatTaskRelevances())) {
//                        for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
//                            PatTaskRelevance.setHeTaskId(heTask.getId());
//                            PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance);
//                        }
//
//                    }
@@ -210,13 +208,18 @@

            //将任务信息新增到宣教任务表中
            HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskVO, HeTask.class);

            heTask.setCreateTime(DateUtils.getNowDate());
            heTask.setPreachform(new Gson().toJson(heTaskVO.getPreachform()));
            heTask.setTextParam(new Gson().toJson(heTaskVO.getTextParam()));
            heTaskMapper.insertHeTask(heTask);
            integer = heTask.getId().intValue();
            //新增
            for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
                patHetaskRelevance.setHeTaskId(heTask.getId());
                patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
            if (CollectionUtils.isNotEmpty(heTaskVO.getPatTaskRelevances())) {
                for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
                    PatTaskRelevance.setTaskId(heTask.getId());
                    PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance);
                }
            }

        } else if (heTaskVO.getIsoperation() != null && heTaskVO.getIsoperation() == 2) {
@@ -224,14 +227,14 @@
            heTask.setUpdateTime(DateUtils.getNowDate());
            heTaskMapper.updateHeTask(heTask);
            //新增、删除、修改患者信息
            for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
                if (patHetaskRelevance.getIsoperation() != null && patHetaskRelevance.getIsoperation() == 1) {
                    patHetaskRelevanceMapper.insertPatHetaskRelevance(patHetaskRelevance);
                } else if (patHetaskRelevance.getIsoperation() != null && patHetaskRelevance.getIsoperation() == 2) {
                    patHetaskRelevance.setHeTaskId(heTask.getId());
                    patHetaskRelevanceMapper.updatePatHetaskRelevance(patHetaskRelevance);
                } else if (patHetaskRelevance.getIsoperation() != null && patHetaskRelevance.getIsoperation() == 3) {
                    patHetaskRelevanceMapper.deletePatHetaskRelevanceById(patHetaskRelevance.getId());
            for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
                if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 1) {
                    PatTaskRelevanceMapper.insertPatTaskRelevance(PatTaskRelevance);
                } else if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 2) {
                    PatTaskRelevance.setTaskId(heTask.getId());
                    PatTaskRelevanceMapper.updatePatTaskRelevance(PatTaskRelevance);
                } else if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 3) {
                    PatTaskRelevanceMapper.deletePatTaskRelevanceById(PatTaskRelevance.getId());
                }
            }
            integer = heTask.getId().intValue();
@@ -239,9 +242,9 @@
            heTaskMapper.deleteHeTaskById(heTaskVO.getId());

            //删除患者信息
            for (PatHetaskRelevance patHetaskRelevance : heTaskVO.getPatHetaskRelevances()) {
                if (patHetaskRelevance.getIsoperation() != null && patHetaskRelevance.getIsoperation() == 3) {
                    patHetaskRelevanceMapper.deletePatHetaskRelevanceById(patHetaskRelevance.getId());
            for (PatTaskRelevance PatTaskRelevance : heTaskVO.getPatTaskRelevances()) {
                if (PatTaskRelevance.getIsoperation() != null && PatTaskRelevance.getIsoperation() == 3) {
                    PatTaskRelevanceMapper.deletePatTaskRelevanceById(PatTaskRelevance.getId());
                }
            }
            integer = heTaskVO.getId().intValue();
@@ -295,8 +298,8 @@
     * @return
     */
    @Override
    public List<PatHetaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq) {
        List<PatHetaskRelevance> patHetaskRelevances = new ArrayList<>();
    public List<PatTaskRelevance> getPatientInfo(PatArchiveReq patArchiveReq) {
        List<PatTaskRelevance> PatTaskRelevances = new ArrayList<>();

        List<PatArchive> patArchiveList = new ArrayList<>();
        if (patArchiveReq.getAllhosp() != null && patArchiveReq.getAllhosp() == 1) {
@@ -319,13 +322,13 @@
            }
        }
        for (PatArchive patArchive : patArchiveList) {
            PatHetaskRelevance patHetaskRelevance = DtoConversionUtils.sourceToTarget(patArchive, PatHetaskRelevance.class);
            patHetaskRelevance.setCreateTime(patArchive.getCreateTime());
            patHetaskRelevance.setCreateBy(patArchive.getCreateBy());
            patHetaskRelevances.add(patHetaskRelevance);
            PatTaskRelevance PatTaskRelevance = DtoConversionUtils.sourceToTarget(patArchive, PatTaskRelevance.class);
            PatTaskRelevance.setCreateTime(patArchive.getCreateTime());
            PatTaskRelevance.setCreateBy(patArchive.getCreateBy());
            PatTaskRelevances.add(PatTaskRelevance);
        }

        return patHetaskRelevances;
        return PatTaskRelevances;
    }

}

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

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

import cn.hutool.json.JSONArray;
import com.google.gson.Gson;
import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.IvrLibaTargetoption;
import com.smartor.mapper.IvrLibaTargetoptionMapper;
@@ -11,87 +13,82 @@

/**
 * æŒ‡æ ‡é€‰é¡¹åº“Service业务层处理
 * 
 *
 * @author ruoyi
 * @date 2023-12-14
 */
@Service
public class IvrLibaTargetoptionServiceImpl implements IIvrLibaTargetoptionService
{
public class IvrLibaTargetoptionServiceImpl implements IIvrLibaTargetoptionService {
    @Autowired
    private IvrLibaTargetoptionMapper ivrLibaTargetoptionMapper;

    /**
     * æŸ¥è¯¢æŒ‡æ ‡é€‰é¡¹åº“
     * 
     *
     * @param targetoptionid æŒ‡æ ‡é€‰é¡¹åº“主键
     * @return æŒ‡æ ‡é€‰é¡¹åº“
     */
    @Override
    public IvrLibaTargetoption selectIvrLibaTargetoptionByTargetoptionid(Long targetoptionid)
    {
    public IvrLibaTargetoption selectIvrLibaTargetoptionByTargetoptionid(Long targetoptionid) {
        return ivrLibaTargetoptionMapper.selectIvrLibaTargetoptionByTargetoptionid(targetoptionid);
    }

    /**
     * æŸ¥è¯¢æŒ‡æ ‡é€‰é¡¹åº“列表
     * 
     *
     * @param ivrLibaTargetoption æŒ‡æ ‡é€‰é¡¹åº“
     * @return æŒ‡æ ‡é€‰é¡¹åº“
     */
    @Override
    public List<IvrLibaTargetoption> selectIvrLibaTargetoptionList(IvrLibaTargetoption ivrLibaTargetoption)
    {
    public List<IvrLibaTargetoption> selectIvrLibaTargetoptionList(IvrLibaTargetoption ivrLibaTargetoption) {
        return ivrLibaTargetoptionMapper.selectIvrLibaTargetoptionList(ivrLibaTargetoption);
    }

    /**
     * æ–°å¢žæŒ‡æ ‡é€‰é¡¹åº“
     * 
     *
     * @param ivrLibaTargetoption æŒ‡æ ‡é€‰é¡¹åº“
     * @return ç»“æžœ
     */
    @Override
    public int insertIvrLibaTargetoption(IvrLibaTargetoption ivrLibaTargetoption)
    {
    public int insertIvrLibaTargetoption(IvrLibaTargetoption ivrLibaTargetoption) {
        ivrLibaTargetoption.setCreateTime(DateUtils.getNowDate());
        ivrLibaTargetoption.setDynamiccruxsJson(new Gson().toJson(ivrLibaTargetoption.getDynamiccruxs()));
        ivrLibaTargetoption.setNodynamiccruxsJson(new Gson().toJson(ivrLibaTargetoption.getNodynamiccruxs()));
        return ivrLibaTargetoptionMapper.insertIvrLibaTargetoption(ivrLibaTargetoption);
    }

    /**
     * ä¿®æ”¹æŒ‡æ ‡é€‰é¡¹åº“
     * 
     *
     * @param ivrLibaTargetoption æŒ‡æ ‡é€‰é¡¹åº“
     * @return ç»“æžœ
     */
    @Override
    public int updateIvrLibaTargetoption(IvrLibaTargetoption ivrLibaTargetoption)
    {
    public int updateIvrLibaTargetoption(IvrLibaTargetoption ivrLibaTargetoption) {
        ivrLibaTargetoption.setUpdateTime(DateUtils.getNowDate());
        return ivrLibaTargetoptionMapper.updateIvrLibaTargetoption(ivrLibaTargetoption);
    }

    /**
     * æ‰¹é‡åˆ é™¤æŒ‡æ ‡é€‰é¡¹åº“
     * 
     *
     * @param targetoptionids éœ€è¦åˆ é™¤çš„指标选项库主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteIvrLibaTargetoptionByTargetoptionids(Long[] targetoptionids)
    {
    public int deleteIvrLibaTargetoptionByTargetoptionids(Long[] targetoptionids) {
        return ivrLibaTargetoptionMapper.deleteIvrLibaTargetoptionByTargetoptionids(targetoptionids);
    }

    /**
     * åˆ é™¤æŒ‡æ ‡é€‰é¡¹åº“信息
     * 
     *
     * @param targetoptionid æŒ‡æ ‡é€‰é¡¹åº“主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteIvrLibaTargetoptionByTargetoptionid(Long targetoptionid)
    {
    public int deleteIvrLibaTargetoptionByTargetoptionid(Long targetoptionid) {
        return ivrLibaTargetoptionMapper.deleteIvrLibaTargetoptionByTargetoptionid(targetoptionid);
    }
}

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

@@ -171,7 +171,7 @@
                    ivrLibaTemplateScript.setCreateTime(new Date());
                    ivrLibaTemplateScriptMapper.insertIvrLibaTemplateScript(ivrLibaTemplateScript);
                    //对选项目进行处理
                    dealOption(ivrLibaTemplateScriptVO.getIvrLibaTemplateTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID());
                    dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID());

                } else if (ivrLibaTemplateScriptVO.getIsoperation() != null && ivrLibaTemplateScriptVO.getIsoperation() == 2) {
                    //修改
@@ -180,7 +180,7 @@
                    ivrLibaTemplateScript.setUpdateTime(new Date());
                    ivrLibaTemplateScriptMapper.updateIvrLibaTemplateScript(ivrLibaTemplateScript);
                    //对选项目进行处理
                    dealOption(ivrLibaTemplateScriptVO.getIvrLibaTemplateTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID());
                    dealOption(ivrLibaTemplateScriptVO.getIvrLibaScriptTargetoptionList(), ivrLibaTemplateScript, ivrLibaTemplate.getID());

                } else if (ivrLibaTemplateScriptVO.getIsoperation() != null && ivrLibaTemplateScriptVO.getIsoperation() == 3) {
                    //删除
@@ -188,7 +188,7 @@
                        log.info("删除失败,模板话术id为空");
                    } else {
                        ivrLibaTemplateScriptVO.setUpdateTime(new Date());
                        ivrLibaTemplateTagMapper.deleteIvrLibaTemplateTagById(ivrLibaTemplateScriptVO.getID());
                        ivrLibaTemplateScriptMapper.deleteIvrLibaTemplateScriptByID(ivrLibaTemplateScriptVO.getID());
                    }
                }
            }
@@ -219,20 +219,19 @@
     * @param tmpID
     */
    private void dealOption(List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptionList, IvrLibaTemplateScript ivrLibaTemplateScript, Long tmpID) {
        log.info("ivrLibaTemplateScript的值为：{}", ivrLibaTemplateScript);
        //对模板指标选项进行处理
        if (CollectionUtils.isNotEmpty(ivrLibaTemplateTargetoptionList)) {
            for (IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption : ivrLibaTemplateTargetoptionList) {
                if (ivrLibaTemplateTargetoption.getIsoperation() != null && ivrLibaTemplateTargetoption.getIsoperation() == 1) {
                    //新增
                    ivrLibaTemplateTargetoption.setTemplateID(tmpID);
                    ivrLibaTemplateTargetoption.setTargetid(ivrLibaTemplateScript.getTargetid());
                    ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getScriptid());
                    ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getID());
                    ivrLibaTemplateTargetOptionMapper.insertIvrLibaTemplateTargetoption(ivrLibaTemplateTargetoption);
                } else if (ivrLibaTemplateTargetoption.getIsoperation() != null && ivrLibaTemplateTargetoption.getIsoperation() == 2) {
                    //修改
                    ivrLibaTemplateTargetoption.setTemplateID(tmpID);
                    ivrLibaTemplateTargetoption.setTargetid(ivrLibaTemplateScript.getTargetid());
                    ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getScriptid());
                    ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScript.getID());
                    ivrLibaTemplateTargetOptionMapper.updateIvrLibaTemplateTargetoption(ivrLibaTemplateTargetoption);
                } else if (ivrLibaTemplateTargetoption.getIsoperation() != null && ivrLibaTemplateTargetoption.getIsoperation() == 3) {
                    //删除
@@ -281,7 +280,7 @@
            IvrLibaTemplateTargetoption ivrLibaTemplateTargetoption = new IvrLibaTemplateTargetoption();
            ivrLibaTemplateTargetoption.setScriptid(ivrLibaTemplateScriptVO.getID());
            List<IvrLibaTemplateTargetoption> ivrLibaTemplateTargetoptions = ivrLibaTemplateTargetOptionMapper.selectIvrLibaTemplateTargetoptionList(ivrLibaTemplateTargetoption);
            ivrLibaTemplateScriptVO.setIvrLibaTemplateTargetoptionList(ivrLibaTemplateTargetoptions);
            ivrLibaTemplateScriptVO.setIvrLibaScriptTargetoptionList(ivrLibaTemplateTargetoptions);
        }

        //数据组装

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

@@ -1,96 +1,153 @@
package com.smartor.service.impl;

import java.util.List;
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.*;
import com.smartor.mapper.IvrTaskcallMapper;
import com.smartor.mapper.PatTaskRelevanceMapper;
import com.smartor.service.IIvrTaskcallService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.smartor.mapper.IvrTaskcallMapper;
import com.smartor.domain.IvrTaskcall;
import com.smartor.service.IIvrTaskcallService;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

/**
 * è¯­éŸ³ä»»åŠ¡å‘¼å«Service业务层处理
 * 
 * @author smartor
 * @date 2023-03-24
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰Service业务层处理
 *
 * @author ruoyi
 * @date 2024-02-02
 */
@Slf4j
@Service
public class IvrTaskcallServiceImpl implements IIvrTaskcallService 
{
public class IvrTaskcallServiceImpl implements IIvrTaskcallService {
    @Autowired
    private IvrTaskcallMapper ivrTaskcallMapper;

    @Autowired
    private PatTaskRelevanceMapper patTaskRelevanceMapper;

    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param callid è¯­éŸ³ä»»åŠ¡å‘¼å«ä¸»é”®
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«
     * æŸ¥è¯¢å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param id å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰ä¸»é”®
     * @return å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     */
    @Override
    public IvrTaskcall selectIvrTaskcallByCallid(Long callid)
    {
        return ivrTaskcallMapper.selectIvrTaskcallByCallid(callid);
    public IvrTaskcall selectIvrTaskcallById(Long id) {
        return ivrTaskcallMapper.selectIvrTaskcallById(id);
    }

    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡å‘¼å«åˆ—表
     * 
     * @param ivrTaskcall è¯­éŸ³ä»»åŠ¡å‘¼å«
     * @return è¯­éŸ³ä»»åŠ¡å‘¼å«
     * æŸ¥è¯¢å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰åˆ—表
     *
     * @param ivrTaskcall å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     * @return å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     */
    @Override
    public List<IvrTaskcall> selectIvrTaskcallList(IvrTaskcall ivrTaskcall)
    {
    public List<IvrTaskcall> selectIvrTaskcallList(IvrTaskcall ivrTaskcall) {
        return ivrTaskcallMapper.selectIvrTaskcallList(ivrTaskcall);
    }

    /**
     * æ–°å¢žè¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param ivrTaskcall è¯­éŸ³ä»»åŠ¡å‘¼å«
     * æ–°å¢žå•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param ivrTaskcall å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     * @return ç»“æžœ
     */
    @Override
    public int insertIvrTaskcall(IvrTaskcall ivrTaskcall)
    {
    public int insertIvrTaskcall(IvrTaskcall ivrTaskcall) {
        ivrTaskcall.setCreateTime(DateUtils.getNowDate());
        return ivrTaskcallMapper.insertIvrTaskcall(ivrTaskcall);
    }

    /**
     * ä¿®æ”¹è¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param ivrTaskcall è¯­éŸ³ä»»åŠ¡å‘¼å«
     * ä¿®æ”¹å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param ivrTaskcall å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     * @return ç»“æžœ
     */
    @Override
    public int updateIvrTaskcall(IvrTaskcall ivrTaskcall)
    {
    public int updateIvrTaskcall(IvrTaskcall ivrTaskcall) {
        ivrTaskcall.setUpdateTime(DateUtils.getNowDate());
        return ivrTaskcallMapper.updateIvrTaskcall(ivrTaskcall);
    }

    /**
     * æ‰¹é‡åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«
     * 
     * @param callids éœ€è¦åˆ é™¤çš„语音任务呼叫主键
     * æ‰¹é‡åˆ é™¤å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param ids éœ€è¦åˆ é™¤çš„单一任务（随访）主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteIvrTaskcallByCallids(Long[] callids)
    {
        return ivrTaskcallMapper.deleteIvrTaskcallByCallids(callids);
    public int deleteIvrTaskcallByIds(Long[] ids) {
        Integer i = 0;
        for (Long id : ids) {
            i = ivrTaskcallMapper.deleteIvrTaskcallById(id);
        }
        return i;
    }

    /**
     * åˆ é™¤è¯­éŸ³ä»»åŠ¡å‘¼å«ä¿¡æ¯
     * 
     * @param callid è¯­éŸ³ä»»åŠ¡å‘¼å«ä¸»é”®
     * å•ä¸€ä»»åŠ¡
     *
     * @param ivrTaskcallVO å•ä¸€ä»»åŠ¡
     * @return ç»“æžœ
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public int deleteIvrTaskcallByCallid(Long callid)
    {
        return ivrTaskcallMapper.deleteIvrTaskcallByCallid(callid);
    public int insertOrUpdateTask(IvrTaskcallVO ivrTaskcallVO) {
        if (ObjectUtils.isEmpty(ivrTaskcallVO)) {
            log.info("宣教任务入参为空，请检查入参");
            throw new BaseException("宣教任务入参为空，请检查入参");
        }
        Integer integer = 0;
        if (ivrTaskcallVO.getIsoperation() != null && ivrTaskcallVO.getIsoperation() == 1) {
            //新增
            if (CollectionUtils.isNotEmpty(ivrTaskcallVO.getPatTaskRelevances())) {
                for (PatTaskRelevance patTaskRelevance : ivrTaskcallVO.getPatTaskRelevances()) {
                    //将任务信息新增到宣教任务表中
                    IvrTaskcall ivrTaskcall = DtoConversionUtils.sourceToTarget(ivrTaskcallVO, IvrTaskcall.class);
                    ivrTaskcall.setSendname(patTaskRelevance.getName());
                    ivrTaskcall.setAge(patTaskRelevance.getAge());
                    ivrTaskcall.setSfzh(patTaskRelevance.getSfzh());
                    ivrTaskcall.setPhone(patTaskRelevance.getPhone());
                    ivrTaskcall.setAddr(patTaskRelevance.getAddr());
                    ivrTaskcall.setCreateTime(DateUtils.getNowDate());
                    ivrTaskcall.setTextParam(new Gson().toJson(ivrTaskcallVO.getTextParam()));
                    ivrTaskcallMapper.insertIvrTaskcall(ivrTaskcall);
                    integer = ivrTaskcall.getId().intValue();
                }
            }

        } else if (ivrTaskcallVO.getIsoperation() != null && ivrTaskcallVO.getIsoperation() == 2) {
            if (CollectionUtils.isNotEmpty(ivrTaskcallVO.getPatTaskRelevances())) {
                for (PatTaskRelevance patTaskRelevance : ivrTaskcallVO.getPatTaskRelevances()) {
                    IvrTaskcall ivrTaskcall = DtoConversionUtils.sourceToTarget(ivrTaskcallVO, IvrTaskcall.class);
                    ivrTaskcall.setSendname(patTaskRelevance.getName());
                    ivrTaskcall.setAge(patTaskRelevance.getAge());
                    ivrTaskcall.setSfzh(patTaskRelevance.getSfzh());
                    ivrTaskcall.setPhone(patTaskRelevance.getPhone());
                    ivrTaskcall.setAddr(patTaskRelevance.getAddr());
                    ivrTaskcall.setCreateTime(DateUtils.getNowDate());
                    ivrTaskcall.setTextParam(new Gson().toJson(ivrTaskcallVO.getTextParam()));

                    ivrTaskcallMapper.updateIvrTaskcall(ivrTaskcall);
                    integer = ivrTaskcall.getId().intValue();
                }
            }

        } else if (ivrTaskcallVO.getIsoperation() != null && ivrTaskcallVO.getIsoperation() == 3) {
            ivrTaskcallMapper.deleteIvrTaskcallById(ivrTaskcallVO.getId());

            integer = ivrTaskcallVO.getId().intValue();
        }
        return integer;
    }

}

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

ÎļþÒÑɾ³ý

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

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

import com.ruoyi.common.utils.DateUtils;
import com.smartor.domain.PatTaskRelevance;
import com.smartor.mapper.PatTaskRelevanceMapper;
import com.smartor.service.IPatTaskRelevanceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æ‚£è€…与宣教任务关联Service业务层处理
 *
 * @author ruoyi
 * @date 2024-01-07
 */
@Service
public class PatTaskRelevanceServiceImpl implements IPatTaskRelevanceService {
    @Autowired
    private PatTaskRelevanceMapper patTaskRelevanceMapper;

    /**
     * æŸ¥è¯¢æ‚£è€…与宣教任务关联
     *
     * @param id æ‚£è€…与宣教任务关联主键
     * @return æ‚£è€…与宣教任务关联
     */
    @Override
    public PatTaskRelevance selectPatTaskRelevanceById(Long id) {
        return patTaskRelevanceMapper.selectPatTaskRelevanceById(id);
    }

    /**
     * æŸ¥è¯¢æ‚£è€…与宣教任务关联列表
     *
     * @param patTaskRelevance æ‚£è€…与宣教任务关联
     * @return æ‚£è€…与宣教任务关联
     */
    @Override
    public List<PatTaskRelevance> selectPatTaskRelevanceList(PatTaskRelevance patTaskRelevance) {
        return patTaskRelevanceMapper.selectPatTaskRelevanceList(patTaskRelevance);
    }

    /**
     * æ–°å¢žæ‚£è€…与宣教任务关联
     *
     * @param patTaskRelevance æ‚£è€…与宣教任务关联
     * @return ç»“æžœ
     */
    @Override
    public int insertPatTaskRelevance(PatTaskRelevance patTaskRelevance) {
        patTaskRelevance.setCreateTime(DateUtils.getNowDate());
        return patTaskRelevanceMapper.insertPatTaskRelevance(patTaskRelevance);
    }

    /**
     * ä¿®æ”¹æ‚£è€…与宣教任务关联
     *
     * @param patTaskRelevance æ‚£è€…与宣教任务关联
     * @return ç»“æžœ
     */
    @Override
    public int updatePatTaskRelevance(PatTaskRelevance patTaskRelevance) {
        patTaskRelevance.setUpdateTime(DateUtils.getNowDate());
        return patTaskRelevanceMapper.updatePatTaskRelevance(patTaskRelevance);
    }

    /**
     * æ‰¹é‡åˆ é™¤æ‚£è€…与宣教任务关联
     *
     * @param ids éœ€è¦åˆ é™¤çš„患者与宣教任务关联主键
     * @return ç»“æžœ
     */
    @Override
    public int deletePatTaskRelevanceByIds(Long[] ids) {
        return patTaskRelevanceMapper.deletePatTaskRelevanceByIds(ids);
    }

    /**
     * åˆ é™¤æ‚£è€…与宣教任务关联信息
     *
     * @param id æ‚£è€…与宣教任务关联主键
     * @return ç»“æžœ
     */
    @Override
    public int deletePatTaskRelevanceById(Long id) {
        return patTaskRelevanceMapper.deletePatTaskRelevanceById(id);
    }
}

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

@@ -10,12 +10,17 @@
import com.smartor.service.IHospitalRecordService;
import com.smartor.service.IHospitalUserinfoService;
import com.smartor.service.IServiceThirdDataService;
import com.smartor.yiwudataanalysis.ADT_A01;
import com.smartor.yiwudataanalysis.ADT_A03;
import lombok.extern.log4j.Log4j;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;


@@ -25,7 +30,7 @@
 * @author ruoyi
 * @date 2023-10-10
 */
@Log4j
@Slf4j
@Service
public class ServiceThirdDataServiceImpl implements IServiceThirdDataService {

@@ -40,7 +45,9 @@
    @Override
    public List<ServiceThirdData> queryList(ServiceThirdData serviceThirdData) {

        log.info("------serviceThirdData的入参：{}", serviceThirdData);
        List<ServiceThirdData> serviceThirdDataList = serviceThirdDataMapper.selectServiceThirdDataList(serviceThirdData);
        log.info("------serviceThirdDataList获取数据的数量：{}", serviceThirdDataList.size());
        for (ServiceThirdData std : serviceThirdDataList) {
            PipeParser parser = new PipeParser();
            Message message = null;
@@ -49,13 +56,24 @@
                dataInfo = dataInfo.replaceAll("\n", "");
                dataInfo = dataInfo.substring(0, dataInfo.length() - 1);
                message = parser.parse(dataInfo);
                ADT_A03 adt_a03 = new ADT_A03();
                List<Object> objectList = new ArrayList<>();
                if (serviceThirdData.getDataType().equals("ADT^A03")) {
                    ADT_A03 adt_a03 = new ADT_A03();
                    objectList = adt_a03.explainPID(message, dataInfo);
                } else if (serviceThirdData.getDataType().equals("ADT^A01")) {
                    ADT_A01 adt_a01 = new ADT_A01();
                    objectList = adt_a01.explainPID(message, dataInfo);
                }

                List<Object> objectList = adt_a03.explainPID(message, dataInfo);
                HospitalRecord hospitalRecord = (HospitalRecord) objectList.get(0);
                log.info("hospitalRecord的值为：{}", hospitalRecord);
                iHospitalRecordService.insertHospitalRecord(hospitalRecord);

                HospitalUserinfo hospitalUserinfo = (HospitalUserinfo) objectList.get(1);
                Date currentTime = new Date();
                SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                String formattedDate = formatter.format(currentTime);
                hospitalUserinfo.setCreateTime(formattedDate);
                iHospitalUserinfoService.insertHospitalUserinfo(hospitalUserinfo);

                int ii = serviceThirdDataMapper.updateIsDeal(std.getId());

 smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A01.java

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

import ca.uhn.hl7v2.HL7Exception;
import ca.uhn.hl7v2.model.Message;
import ca.uhn.hl7v2.model.Structure;
import ca.uhn.hl7v2.model.v24.datatype.*;
import ca.uhn.hl7v2.model.v24.segment.DG1;
import ca.uhn.hl7v2.model.v24.segment.PID;
import ca.uhn.hl7v2.model.v24.segment.PV1;
import ca.uhn.hl7v2.model.v24.segment.PV2;
import com.ruoyi.common.enums.AdmTypeEnum;
import com.ruoyi.common.enums.LevelHospEnum;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.HospitalRecord;
import com.smartor.domain.HospitalUserinfo;
import org.apache.commons.lang3.ObjectUtils;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Year;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

//出院数据
public class ADT_A01 {
    //解析PID
    public List<Object> explainPID(Message message, String dataInfo) throws HL7Exception {
        //解析PID（患者基本信息）
        PID pid = (PID) message.get("PID");

        //患者主索引信息
        CX pid2_patientID = pid.getPid2_PatientID();
        //患者全院唯一标识（患者主索引/ID）
        String patientID = pid2_patientID.getID().encode();
        //VIP-先诊疗后付费标志（0/1）
        String cd = pid2_patientID.getCheckDigit().encode();

        //患者相关 ID^^^授权机构
        CX[] pid3_patientIdentifierList = pid.getPid3_PatientIdentifierList();
        if (pid3_patientIdentifierList != null && pid3_patientIdentifierList.length > 0) {
            for (CX cx : pid3_patientIdentifierList) {
                //患者相关ID
                String hzxgID = cx.getID().encode();
                //分配患者 ID æœºæž„
                String patiendOrgan = cx.getAssigningAuthority().encode();
            }
        }

        //门诊不填，住院必填
        CX[] pid4_alternatePatientIDPID = pid.getPid4_AlternatePatientIDPID();
        if (pid4_alternatePatientIDPID != null && pid4_alternatePatientIDPID.length > 0) {
            for (CX cx : pid4_alternatePatientIDPID) {
                //非婴儿 0 å©´å„¿ 1
                String s = cx.getID().encode();
                //  0/空-不需要保密； 1-保密
                String s1 = cx.getIdentifierTypeCode().encode();
            }
        }

        //患者姓名
        XPN[] pid5_patientName = pid.getPid5_PatientName();
        String patientName = "";
        String pinyin = "";
        if (pid5_patientName != null && pid5_patientName.length > 0) {
            for (XPN xpn : pid5_patientName) {
                //拼音
                pinyin = xpn.getFamilyName().encode();
                //患者姓名
                patientName = xpn.getGivenName().encode();
            }
        }


        //出生日期
        String birthday = pid.getPid7_DateTimeOfBirth().encode();
        SimpleDateFormat inputFormatt = new SimpleDateFormat("yyyyMMddHHmmss"); // è¾“入日期格式
        Date date = null; // è§£æžä¸ºDate对象
        try {
            date = inputFormatt.parse(birthday);
        } catch (ParseException e) {
            e.printStackTrace();
        }
        SimpleDateFormat outputFormatt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // è¾“出日期格式
        String birthdatTime = outputFormatt.format(date);


        //性别 1男  2女
        String xb = pid.getPid8_AdministrativeSex().encode();

        //血型信息
        CE[] pid10_race = pid.getPid10_Race();
        String xxdm = "";
        String xxmc = "";
        String rhxxdm = "";
        String rhxxmc = "";
        if (pid10_race != null && pid10_race.length > 0) {
            for (CE ce : pid10_race) {
                //血型代码
                xxdm = ce.getCe1_Identifier().encode();
                //血型名称
                xxmc = ce.getCe2_Text().encode();
                //rh血型代码
                rhxxdm = ce.getCe4_AlternateIdentifier().encode();
                //rh血型名称
                rhxxmc = ce.getCe5_AlternateText().encode();
            }
        }
        //地址信息
        XAD[] pid11_patientAddress = pid.getPid11_PatientAddress();
        String xxdzxx = null;
        String streetName = null;
        String dwellingNumber = null;
        String otherDesignation = null;
        String city = null;
        String province = null;
        if (pid11_patientAddress != null && pid11_patientAddress.length > 0) {
            for (XAD xad : pid11_patientAddress) {
                //详细地址信息
                xxdzxx = xad.getXad1_StreetAddress().getSad1_StreetOrMailingAddress().encode();
                //街道信息（村/街/道）
                streetName = xad.getXad1_StreetAddress().getStreetName().encode();
                //门牌号码
                dwellingNumber = xad.getXad1_StreetAddress().getDwellingNumber().encode();
                //县地区（县)
                otherDesignation = xad.getXad2_OtherDesignation().encode();
                //城市（市）
                city = xad.getXad3_City().encode();
                //省
                province = xad.getXad4_StateOrProvince().encode();
                //地址类型（参考字典）
                String addressType = xad.getXad7_AddressType().encode();
                //乡镇信息
                String designation = xad.getXad8_OtherGeographicDesignation().encode();
                //县地区编码
                String parishCode = xad.getXad9_CountyParishCode().encode();
                //街道标准编码（保留）
                String censusTract = xad.getXad10_CensusTract().encode();
            }
        }

        //个人电话
        XTN[] pid13_phoneNumberHome = pid.getPid13_PhoneNumberHome();
        String phone = null;
        if (pid13_phoneNumberHome != null && pid13_phoneNumberHome.length > 0) {
            for (XTN xtn : pid13_phoneNumberHome) {
                //电话类型代码（参考字典）
                String lxdm = xtn.getTelecommunicationEquipmentType().encode();
                //电话号码
                phone = xtn.getPhoneNumber().encode();
            }
        }

        //工作电话
        XTN[] pid14_phoneNumberBusiness = pid.getPid14_PhoneNumberBusiness();
        String phoneNumberWork = "";
        if (pid14_phoneNumberBusiness != null && pid14_phoneNumberBusiness.length > 0) {
            for (XTN xtn : pid14_phoneNumberBusiness) {
                //工作电话
                phoneNumberWork = xtn.getPhoneNumber().encode();
            }
        }

        //婚姻状况代码
        String identifier = pid.getPid16_MaritalStatus().getIdentifier().encode();
        //婚姻状况名称
        String text = pid.getPid16_MaritalStatus().getText().encode();

        //证件号码
        String id = pid.getPid18_PatientAccountNumber().getID().encode();
        //证件类型（参考字典）
        String assigningAuthority = pid.getPid18_PatientAccountNumber().getAssigningAuthority().encode();
        //证件不详原因
        HD assigningFacility = pid.getPid18_PatientAccountNumber().getAssigningFacility();
        //原因代码
        String namespaceID = assigningFacility.getNamespaceID().encode();
        //原因名称
        String universalID = assigningFacility.getUniversalID().encode();

        //身份证号
        String SSNNumberPatient = pid.getPid19_SSNNumberPatient().encode();

        CX[] pid21_motherSIdentifier = pid.getPid21_MotherSIdentifier();
        String mqid = "";
        if (pid21_motherSIdentifier != null && pid21_motherSIdentifier.length > 0) {
            for (CX cx : pid21_motherSIdentifier) {
                //母亲住院 ID(门诊不填，住院必填)
                mqid = cx.getID().encode();
            }
        }

        //民族
        CE[] pid22_ethnicGroup = pid.getPid22_EthnicGroup();
        String mztext = null;
        if (pid22_ethnicGroup != null && pid22_ethnicGroup.length > 0) {
            for (CE ce : pid22_ethnicGroup) {
                //民族 ID
                String Identifier = ce.getIdentifier().encode();
                //民族名称
                mztext = ce.getText().encode();
            }
        }

        //出生地
        String encode = pid.getPid23_BirthPlace().encode();

        //职业
        CE[] citizenship = pid.getPid26_Citizenship();
        String zytext = "";
        String Identifier = "";
        if (citizenship != null && citizenship.length > 0) {
            for (CE ce : citizenship) {
                //职业代码
                Identifier = ce.getIdentifier().encode();
                //职业名称
                zytext = ce.getText().encode();
            }
        }

        //国籍代码
        String Identifier2 = pid.getPid28_Nationality().getIdentifier().encode();
        //国籍名称
        String gjtext = pid.getPid28_Nationality().getText().encode();

        //死胎标志 é»˜è®¤æ˜¯ 0/空，1-死胎
        String patientDeathIndicator = pid.getPid30_PatientDeathIndicator().encode();

        //黑名单病人
        IS[] pid32_identityReliabilityCode = pid.getPid32_IdentityReliabilityCode();

        //患者属性 (参考字典)
        //格式如：0101000
        //说明：由多位组成，第一
        //位表示属性 1 çš„值，
        // ç¬¬äºŒä½è¡¨ç¤ºå±žæ€§ 2 çš„值。
        String hzIdentifier = pid.getPid38_ProductionClassCode().getIdentifier().encode();

        //--------------------------------------------------------------
        //解析 PV1（患者访问信息）
        PV1 pv1 = (PV1) message.get("PV1");

        //挂号序号或住院次数
        String xh = pv1.getPv11_SetIDPV1().encode();

        //患者分类   E：急诊； I：住院；    O：门诊；T：体检
        String patientClass = pv1.getPv12_PatientClass().encode();

        //患者位置信息
        PL pv13_assignedPatientLocation = pv1.getPv13_AssignedPatientLocation();
        //当前病区
        String bq = pv13_assignedPatientLocation.getPointOfCare().encode();
        //当前病房
        String room = pv13_assignedPatientLocation.getRoom().encode();
        //当前病床
        String bad = pv13_assignedPatientLocation.getBed().encode();
        //当前科室 ID
        String namespaceID1 = pv13_assignedPatientLocation.getFacility().getNamespaceID().encode();
        //当前科室名称
        String ksuniversalID = pv13_assignedPatientLocation.getFacility().getUniversalID().encode();
        //当前床位名称
        String locationStatus = pv13_assignedPatientLocation.getLocationStatus().encode();
        //当前病区名称
        String personLocationType = pv13_assignedPatientLocation.getPersonLocationType().encode();

        //入院类型  R:常规  E:紧急  W:留观  å…¶ä½™è§ HL7 çº¦å®š
        String admissionType = pv1.getPv14_AdmissionType().encode();

        //转前位置信息
        //转前病区
        String pointOfCare = pv1.getPv16_PriorPatientLocation().getPointOfCare().encode();
        //转前病房
        String room1 = pv1.getPv16_PriorPatientLocation().getRoom().encode();
        //转前病床
        String bed = pv1.getPv16_PriorPatientLocation().getBed().encode();
        //转前科室
        HD facility = pv1.getPv16_PriorPatientLocation().getFacility();
        //转前科室 ID
        String namespaceID2 = facility.getNamespaceID().encode();
        //转前科室名称
        String universalID1 = facility.getUniversalID().encode();
        //转前床位名称
        String locationStatus1 = pv1.getPv16_PriorPatientLocation().getLocationStatus().encode();
        //转前病区名称
        String personLocationType1 = pv1.getPv16_PriorPatientLocation().getPersonLocationType().encode();

        //门诊为就诊医生
        XCN[] pv17_attendingDoctor = pv1.getPv17_AttendingDoctor();
        String IDNumber = null;
        String givenName = null;
        if (pv17_attendingDoctor != null && pv17_attendingDoctor.length > 0) {
            for (XCN xcn : pv17_attendingDoctor) {
                //主治医生 ID
                IDNumber = xcn.getIDNumber().encode();
                //主治医生姓名
                givenName = xcn.getGivenName().encode();
                //医疗组信息
                HD xcn14_assigningFacility = xcn.getXcn14_AssigningFacility();
                //医疗组名称
                String universalID2 = xcn14_assigningFacility.getNamespaceID().encode();
                //收治医生 ID
                String universalID3 = xcn14_assigningFacility.getUniversalID().encode();
            }
        }

        //挂号类别  1-普通；2-急诊  4-专家；6-老教授
        String pv110_hospitalService = pv1.getPv110_HospitalService().encode();

        //预收入院检验标识  é»˜è®¤ä¸ºç©º 0-否；1-是
        String pv112_preadmitTestIndicator = pv1.getPv112_PreadmitTestIndicator().encode();

        //再次入院标志 é»˜è®¤ä¸ºç©ºï¼Œ â€œR”表示再入院
        String pv113_reAdmissionIndicator = pv1.getPv113_ReAdmissionIndicator().encode();

        //入院途径
        String pv114_admitSource = pv1.getPv114_AdmitSource().encode();

        //入院医生
        XCN[] pv117_admittingDoctor = pv1.getPv117_AdmittingDoctor();
        if (pv117_admittingDoctor != null && pv117_admittingDoctor.length > 0) {
            for (XCN xcn : pv117_admittingDoctor) {
                //员工号
                String idNumber = xcn.getIDNumber().encode();
                //姓名
                String givenName2 = xcn.getGivenName().encode();
            }
        }

        //费用类别
        String pv118_patientType = pv1.getPv118_PatientType().encode();

        //就诊 ID æˆ–者患者住院 ID
        String id1 = pv1.getPv119_VisitNumber().getID().encode();

        //优惠类别
        FC[] pv120_financialClass = pv1.getPv120_FinancialClass();
        String financialClass = "";
        if (pv120_financialClass != null && pv120_financialClass.length > 0) {
            for (FC fc : pv120_financialClass) {
                financialClass = fc.getFinancialClass().encode();
            }
        }

        //费用性质
        String pv121_chargePriceIndicator = pv1.getPv121_ChargePriceIndicator().encode();

        //入科日期
        DT[] pv125_contractEffectiveDate = pv1.getPv125_ContractEffectiveDate();
        String rkdate = null;
        if (pv125_contractEffectiveDate != null && pv125_contractEffectiveDate.length > 0) {
            for (DT dt : pv125_contractEffectiveDate) {

                SimpleDateFormat inputFormattt = new SimpleDateFormat("yyyyMMdd"); // è¾“入日期格式
                Date date22 = null; // è§£æžä¸ºDate对象
                try {
                    date22 = inputFormattt.parse(dt.encode());
                } catch (ParseException e) {
                    e.printStackTrace();
                }
                SimpleDateFormat outputFormat2 = new SimpleDateFormat("yyyy-MM-dd"); // è¾“出日期格式
                rkdate = outputFormat2.format(date22);
            }
        }

        //账户冻结建议
        String pv128_interestCode = pv1.getPv128_InterestCode().encode();

        //欠费冻结标识  é»˜è®¤æ˜¯ 0/空  1：冻结；2：永不冻结
        String pv129_transferToBadDebtCode = pv1.getPv129_TransferToBadDebtCode().encode();

        //冻结日期
        String pv130_transferToBadDebtDate = pv1.getPv130_TransferToBadDebtDate().encode();

        //解冻日期
        String pv135_deleteAccountDate = pv1.getPv135_DeleteAccountDate().encode();

        //离院去向/转归
        String pv136_dischargeDisposition = pv1.getPv136_DischargeDisposition().encode();

        //离院去往位置
        String pv137_dischargedToLocation = pv1.getPv137_DischargedToLocation().getDischargeLocation().encode();

        //饮食类型ID
        String identifier1 = pv1.getPv138_DietType().getIdentifier().encode();
        //饮食类型名称
        String text1 = pv1.getPv138_DietType().getText().encode();

        //挂号的上下午标志   0-上午；1-下午；2-晚上
        String pv139_servicingFacility = pv1.getPv139_ServicingFacility().encode();

        //科室 ID^^^院区 ID
        PL pv142_pendingLocation = pv1.getPv142_PendingLocation();
        //门诊就诊科室 ID
        String mzpointOfCare = pv142_pendingLocation.getPointOfCare().encode();
        //住院院区 ID
        String namespaceID3 = pv142_pendingLocation.getFacility().getNamespaceID().encode();
        //应用 ID
        String universalIDType = pv142_pendingLocation.getFacility().getUniversalIDType().encode();
        //医疗机构代码
        String personLocationType2 = pv142_pendingLocation.getPersonLocationType().encode();
        //医疗机构名称
        String building = pv142_pendingLocation.getBuilding().encode();

        //就诊/住院时间
        String pv144_admitDateTime = pv1.getPv144_AdmitDateTime().encode();

        //出院时间  A03 æ¶ˆæ¯å¿…å¡«
        TS[] pv145_dischargeDateTime = pv1.getPv145_DischargeDateTime();
        String dischargeDateTime = null;
        if (pv145_dischargeDateTime != null && pv145_dischargeDateTime.length > 0) {
            TS ts = pv145_dischargeDateTime[0];
//        Date date2 = new Date(Long.valueOf(ts.encode()));
//        SimpleDateFormat sdff = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//        String dischargeDateTime = sdff.format(date2);

            SimpleDateFormat inputFormat = new SimpleDateFormat("yyyyMMddHHmmss"); // è¾“入日期格式
            Date date2 = null; // è§£æžä¸ºDate对象
            try {
                date2 = inputFormat.parse(ts.encode());
            } catch (ParseException e) {
                e.printStackTrace();
            }
            SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // è¾“出日期格式
            dischargeDateTime = outputFormat.format(date2);
        }
        //访问标示
        String visitIndicator = pv1.getPv151_VisitIndicator().encode();

        //操作人信息
        XCN[] pv152_otherHealthcareProvider = pv1.getPv152_OtherHealthcareProvider();
        if (pv152_otherHealthcareProvider != null && pv152_otherHealthcareProvider.length > 0) {
            for (XCN xcn : pv152_otherHealthcareProvider) {
                //员工号
                String IDNumber2 = xcn.getIDNumber().encode();
                //姓名
                String givenName3 = xcn.getGivenName().encode();
            }
        }
        //-----------------------------
        PV2 pv2 = (PV2) message.get("PV2");
        //实际住院天数
        String pv211_actualLengthOfInpatientStay = pv2.getPv211_ActualLengthOfInpatientStay().encode();

        //------------------------------------------
        Structure[] dg1s = message.getAll("DG1");
        String dg12_diagnosisCodingMethod = null;
        String dg14_diagnosisDescription = null;
        if (dg1s != null && dg1s.length > 0) {
            for (Structure structure : dg1s) {
                DG1 dg11 = (DG1) structure;
                //序号
                String dg1xh = dg11.getDg11_SetIDDG1().encode();
                //诊断代码
                dg12_diagnosisCodingMethod = dg11.getDg12_DiagnosisCodingMethod().encode();
                //诊断名称
                dg14_diagnosisDescription = dg11.getDg14_DiagnosisDescription().encode();
                //诊断类型
                String dg16_diagnosisType = dg11.getDg16_DiagnosisType().encode();
                System.out.println(dg11);

            }
        }

        //数据入库
        HospitalRecord hospitalRecord = new HospitalRecord();
        hospitalRecord.setCreateTime(new Date());
        hospitalRecord.setPatientID(patientID);
        hospitalRecord.setOpreationTime(new Date());
        //就诊号
        hospitalRecord.setOutMedNO(id1);
        //就诊类型描述（门诊、住院...）
        hospitalRecord.setAdmTypeDesc(AdmTypeEnum.getDescByCode(patientClass));
        //入院状态（就诊中、结束就诊...）
        hospitalRecord.setAdmStatus(LevelHospEnum.getDescByCode(pv136_dischargeDisposition));
        hospitalRecord.setAdmDate(dischargeDateTime);
        hospitalRecord.setEncPatName(patientName);
        if (StringUtils.isNotEmpty(xb)) {
            hospitalRecord.setEncPatGender(xb.equals(1) ? "男" : "女");
        }
        hospitalRecord.setEncPatBirthDate(birthdatTime);
        //获取年龄
        int currentYear = Year.now().getValue();
        Integer integer = Integer.valueOf(birthdatTime.substring(0, 4));
        Integer age = currentYear - integer;
        hospitalRecord.setEncAgeValue(age.toString());

        //主治医生编号
        hospitalRecord.setDirectorCode(IDNumber);
        //主治医生姓名
        hospitalRecord.setDirectorName(givenName);
        hospitalRecord.setEncAdmLocCode(namespaceID1);
        hospitalRecord.setEncAdmLocName(ksuniversalID);
        hospitalRecord.setEncDiagnosisCode(dg12_diagnosisCodingMethod);
        hospitalRecord.setEncDiagnosisDesc(dg14_diagnosisDescription);

        List<Object> objectList = new ArrayList<>();
//        objectList.add(hospitalRecord);

        HospitalUserinfo hospitalUserinfo = new HospitalUserinfo();
//        hospitalUserinfo.setCreateTime(null);
        hospitalUserinfo.setPatientID(patientID);
        hospitalUserinfo.setRegDate(rkdate);
        hospitalUserinfo.setIdentityID(SSNNumberPatient);
        hospitalUserinfo.setPatName(patientName);
        hospitalUserinfo.setPhone(phone);
        if (StringUtils.isNotEmpty(xb)) {
            hospitalUserinfo.setPatSex(xb.equals(1) ? "男" : "女");
        }
        hospitalUserinfo.setBirthDate(birthdatTime);
        hospitalUserinfo.setAddress(xxdzxx);
        hospitalUserinfo.setAddProvince(province);
        hospitalUserinfo.setAddCity(city);
        hospitalUserinfo.setAddCounty(otherDesignation);
        hospitalUserinfo.setAddTown(streetName);
        hospitalUserinfo.setCountry(gjtext);
        hospitalUserinfo.setNation(mztext);
        hospitalUserinfo.setConPerPhone(phone);
        hospitalUserinfo.setRegOrgDesc("义乌市第二人民医院");
        hospitalUserinfo.setEncAdmSource(AdmTypeEnum.getDescByCode(patientClass));
        objectList.add(hospitalRecord);
        objectList.add(hospitalUserinfo);

        return objectList;

    }
}

 smartor/src/main/java/com/smartor/yiwudataanalysis/ADT_A03.java

@@ -37,7 +37,7 @@

        //患者相关 ID^^^授权机构
        CX[] pid3_patientIdentifierList = pid.getPid3_PatientIdentifierList();
        if (pid3_patientIdentifierList != null || pid3_patientIdentifierList.length > 0) {
        if (pid3_patientIdentifierList != null && pid3_patientIdentifierList.length > 0) {
            for (CX cx : pid3_patientIdentifierList) {
                //患者相关ID
                String hzxgID = cx.getID().encode();
@@ -48,7 +48,7 @@

        //门诊不填，住院必填
        CX[] pid4_alternatePatientIDPID = pid.getPid4_AlternatePatientIDPID();
        if (pid4_alternatePatientIDPID != null || pid4_alternatePatientIDPID.length > 0) {
        if (pid4_alternatePatientIDPID != null && pid4_alternatePatientIDPID.length > 0) {
            for (CX cx : pid4_alternatePatientIDPID) {
                //非婴儿 0 å©´å„¿ 1
                String s = cx.getID().encode();
@@ -313,18 +313,21 @@

        //入科日期
        DT[] pv125_contractEffectiveDate = pv1.getPv125_ContractEffectiveDate();
        DT dt = pv125_contractEffectiveDate[0];

        SimpleDateFormat inputFormattt = new SimpleDateFormat("yyyyMMdd"); // è¾“入日期格式
        Date date22 = null; // è§£æžä¸ºDate对象
        try {
            date22 = inputFormattt.parse(dt.encode());
        } catch (ParseException e) {
            e.printStackTrace();
        if (pv125_contractEffectiveDate != null && pv125_contractEffectiveDate.length > 0) {
            DT dt = pv125_contractEffectiveDate[0];

            SimpleDateFormat inputFormattt = new SimpleDateFormat("yyyyMMdd"); // è¾“入日期格式

            try {
                date22 = inputFormattt.parse(dt.encode());
            } catch (ParseException e) {
                e.printStackTrace();
            }
        }
        SimpleDateFormat outputFormat2 = new SimpleDateFormat("yyyy-MM-dd"); // è¾“出日期格式
        String rkdate = outputFormat2.format(date22);

        String rkdate =null;
        if(date22!=null) rkdate = outputFormat2.format(date22);

        //账户冻结建议
        String pv128_interestCode = pv1.getPv128_InterestCode().encode();

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

@@ -119,7 +119,7 @@
    <update id="deleteHeLibraryAssortById" parameterType="Long">
        update he_library_assort
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
           del_flag = 1
        </trim>
        where id = #{id}
    </update>

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

@@ -37,6 +37,7 @@
        <result property="labelInfo" column="label_info"/>
        <result property="campus" column="campus"/>
        <result property="otherdata" column="otherdata"/>
        <result property="richText" column="rich_text"/>
    </resultMap>

    <sql id="selectHeLibraryVo">
@@ -71,7 +72,8 @@
               dept_names,
               label_info,
               campus,
               otherdata
               otherdata,
               rich_text
        from he_library
    </sql>

@@ -109,6 +111,7 @@
            <if test="deptNames != null  and deptNames != ''">and dept_names = #{deptNames}</if>
            <if test="labelInfo != null  and labelInfo != ''">and label_info = #{labelInfo}</if>
            <if test="campus != null  and campus != ''">and campus = #{campus}</if>
            <if test="richText != null  and richText != ''">and rich_text = #{richText}</if>
        </where>
    </select>

@@ -151,6 +154,7 @@
            <if test="labelInfo != null">label_info,</if>
            <if test="campus != null">campus,</if>
            <if test="otherdata != null">otherdata,</if>
            <if test="richText != null  and richText != ''">rich_text,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="classification != null">#{classification},</if>
@@ -184,6 +188,7 @@
            <if test="labelInfo != null">#{labelInfo},</if>
            <if test="campus != null">#{campus},</if>
            <if test="otherdata != null">#{otherdata},</if>
            <if test="richText != null  and richText != ''">#{richText},</if>
        </trim>
    </insert>

@@ -221,6 +226,7 @@
            <if test="labelInfo != null ">label_info = #{labelInfo},</if>
            <if test="campus != null">campus = #{campus},</if>
            <if test="otherdata != null">otherdata = #{otherdata},</if>
            <if test="richText != null  and richText != ''">rich_text = #{richText},</if>
        </trim>
        where id = #{id}
    </update>

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

@@ -123,7 +123,7 @@
    <update id="deleteHeLibraryTagById" parameterType="Long">
        update he_library_tag
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
            del_flag = 1
        </trim>
        where id = #{id}
    </update>

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

@@ -35,6 +35,8 @@
        <result property="sendTime" column="send_time"/>
        <result property="isSend" column="is_send"/>
        <result property="sendState" column="send_state"/>
        <result property="richText" column="rich_text"/>
        <result property="textParam" column="text_param"/>
    </resultMap>

    <sql id="selectHeTaskVo">
@@ -67,7 +69,9 @@
               guid,
               send_time,
               is_send,
               send_state
               send_state,
               rich_text,
               text_param
        from he_task
    </sql>

@@ -103,6 +107,8 @@
            <if test="sendTime != null ">and send_time = #{sendTime}</if>
            <if test="isSend != null ">and is_send = #{isSend}</if>
            <if test="sendState != null ">and send_state = #{sendState}</if>
            <if test="richText != null ">and rich_text = #{richText}</if>
            <if test="textParam != null ">and text_param = #{textParam}</if>
        </where>
    </select>

@@ -143,6 +149,8 @@
            <if test="sendTime != null">send_time,</if>
            <if test="isSend != null">is_send,</if>
            <if test="sendState != null">send_state,</if>
            <if test="richText != null ">rich_text,</if>
            <if test="textParam != null ">text_param</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="svrtaskid != null">#{svrtaskid},</if>
@@ -174,6 +182,8 @@
            <if test="sendTime != null">#{sendTime},</if>
            <if test="isSend != null">#{isSend},</if>
            <if test="sendState != null">#{sendState},</if>
            <if test="richText != null ">#{richText},</if>
            <if test="textParam != null ">#{textParam},</if>
        </trim>
    </insert>

@@ -209,6 +219,8 @@
            <if test="sendTime != null">send_time = #{sendTime},</if>
            <if test="isSend != null">is_send = #{isSend},</if>
            <if test="sendState != null">send_state = #{sendState},</if>
            <if test="richText != null ">rich_text = #{richText},</if>
            <if test="textParam != null ">text_param = #{textParam},</if>
        </trim>
        where id = #{id}
    </update>

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

@@ -220,7 +220,6 @@
    <insert id="insertHospitalRecord" parameterType="com.smartor.domain.HospitalRecord">
        insert into hospital_record
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="ID != null">ID,</if>
            <if test="sourceSystem != null">SourceSystem,</if>
            <if test="messageID != null">MessageID,</if>
            <if test="createTime != null">CreateTime,</if>
@@ -280,7 +279,6 @@
            <if test="taskStatus != null">taskStatus,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="ID != null">#{ID},</if>
            <if test="sourceSystem != null">#{sourceSystem},</if>
            <if test="messageID != null">#{messageID},</if>
            <if test="createTime != null">#{createTime},</if>

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

@@ -122,7 +122,7 @@
    <update id="deleteIvrLibaExtemplateCategoryByIntertcatid" parameterType="Long">
        update ivr_liba_extemplate_category
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
            del_flag = 1
        </trim>
        where intertcatid = #{intertcatid}
    </update>

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

@@ -53,7 +53,8 @@
        where ID = #{ID}
    </select>

    <insert id="insertIvrLibaExtemplate" parameterType="com.smartor.domain.IvrLibaExtemplate">
    <insert id="insertIvrLibaExtemplate" parameterType="com.smartor.domain.IvrLibaExtemplate" useGeneratedKeys="true"
            keyProperty="ID">
        insert into ivr_liba_extemplate
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="ID != null">ID,</if>

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

@@ -68,7 +68,8 @@
        where ID = #{ID}
    </select>

    <insert id="insertIvrLibaExtemplatescript" parameterType="com.smartor.domain.IvrLibaExtemplatescript">
    <insert id="insertIvrLibaExtemplatescript" parameterType="com.smartor.domain.IvrLibaExtemplatescript" useGeneratedKeys="true"
            keyProperty="ID">
        insert into ivr_liba_extemplatescript
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="ID != null">ID,</if>

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

@@ -80,7 +80,7 @@
    <update id="deleteIvrLibaScriptAssortById" parameterType="Long">
        update ivr_liba_script_assort
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = 1,</if>
           del_flag = 1
        </trim>
        where id = #{id}
    </update>

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

@@ -7,7 +7,7 @@
    <resultMap type="com.smartor.domain.IvrLibaScript" id="IvrLibaScriptResult">
        <result property="id" column="id"/>
        <result property="questiontitle" column="questiontitle"/>
        <result property="questiontext" column="questiontext"/>
        <result property="questionText" column="questionText"/>
        <result property="questionvoice" column="questionvoice"/>
        <result property="nomatchtext" column="nomatchtext"/>
        <result property="nomatchvoice" column="nomatchvoice"/>
@@ -58,7 +58,7 @@
               questiontitle,
               isenable,
               isAvailable,
               questiontext,
               questionText,
               questionvoice,
               nomatchtext,
               nomatchvoice,
@@ -89,7 +89,7 @@
            <if test="suitway != null  and suitway != ''">and suitway = #{suitway}</if>
            <if test="isAvailable != null  and isAvailable != ''">and isAvailable = #{isAvailable}</if>
            <if test="isenable != null ">and isenable = #{isenable}</if>
            <if test="questiontext != null  and questiontext != ''">and questiontext = #{questiontext}</if>
            <if test="questionText != null  and questionText != ''">and questionText = #{questionText}</if>
            <if test="questionvoice != null  and questionvoice != ''">and questionvoice = #{questionvoice}</if>
            <if test="nomatchtext != null  and nomatchtext != ''">and nomatchtext = #{nomatchtext}</if>
            <if test="nomatchvoice != null  and nomatchvoice != ''">and nomatchvoice = #{nomatchvoice}</if>
@@ -137,7 +137,7 @@
            <if test="tag != null">tag,</if>
            <if test="isAvailable != null">isAvailable,</if>
            <if test="isenable != null">isenable,</if>
            <if test="questiontext != null">questiontext,</if>
            <if test="questionText != null">questionText,</if>
            <if test="questionvoice != null">questionvoice,</if>
            <if test="nomatchtext != null">nomatchtext,</if>
            <if test="nomatchvoice != null">nomatchvoice,</if>
@@ -181,7 +181,7 @@
            <if test="tag != null">#{tag},</if>
            <if test="isAvailable != null">#{isAvailable},</if>
            <if test="isenable != null">#{isenable},</if>
            <if test="questiontext != null">#{questiontext},</if>
            <if test="questionText != null">#{questionText},</if>
            <if test="questionvoice != null">#{questionvoice},</if>
            <if test="nomatchtext != null">#{nomatchtext},</if>
            <if test="nomatchvoice != null">#{nomatchvoice},</if>
@@ -225,7 +225,7 @@
            <if test="suitway != null">suitway = #{suitway},</if>
            <if test="isAvailable != null">isAvailable = #{isAvailable},</if>
            <if test="isenable != null">isenable = #{isenable},</if>
            <if test="questiontext != null">questiontext = #{questiontext},</if>
            <if test="questionText != null">questionText = #{questionText},</if>
            <if test="questionvoice != null">questionvoice = #{questionvoice},</if>
            <if test="nomatchtext != null">nomatchtext = #{nomatchtext},</if>
            <if test="nomatchvoice != null">nomatchvoice = #{nomatchvoice},</if>
@@ -270,7 +270,7 @@
    <update id="deleteIvrLibaScriptByQuestionid" parameterType="Integer">
        update ivr_liba_script
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
            del_flag = 1
        </trim>
        where id = #{id}
    </update>

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

@@ -128,7 +128,7 @@
    <delete id="deleteIvrLibaScriptTagById" parameterType="Long">
        update ivr_liba_script_tag
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
           del_flag = 1
        </trim>
        where id = #{id}
    </delete>

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

@@ -173,7 +173,7 @@
    <delete id="deleteIvrLibaScriptTargetByQuestionTargetID" parameterType="Long">
        update ivr_liba_script_target
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1</if>
            del_flag = 1
        </trim>
        where id = #{id}
    </delete>

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

@@ -13,6 +13,7 @@
        <result property="categoryName" column="categoryName"/>
        <result property="targetvalue" column="targetvalue"/>
        <result property="targetregex" column="targetregex"/>
        <result property="targetregex2" column="targetregex2"/>
        <result property="optiondesc" column="optiondesc"/>
        <result property="language" column="language"/>
        <result property="version" column="version"/>
@@ -30,6 +31,8 @@
        <result property="orgid" column="orgid"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
        <result property="nodynamiccruxsJson" column="nodynamiccruxs"/>
        <result property="dynamiccruxsJson" column="dynamiccruxs"/>
    </resultMap>

    <sql id="selectIvrLibaScriptTargetoptionVo">
@@ -41,6 +44,9 @@
               categoryName,
               targetvalue,
               targetregex,
               targetregex2,
               nodynamiccruxs,
               dynamiccruxs,
               optiondesc, language, version, groupid, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid
        from ivr_liba_script_targetoption
    </sql>
@@ -58,6 +64,7 @@
            </if>
            <if test="targetvalue != null  and targetvalue != ''">and targetvalue = #{targetvalue}</if>
            <if test="targetregex != null  and targetregex != ''">and targetregex = #{targetregex}</if>
            <if test="targetregex2 != null  and targetregex2 != ''">and targetregex2 = #{targetregex2}</if>
            <if test="optiondesc != null  and optiondesc != ''">and optiondesc = #{optiondesc}</if>
            <if test="language != null  and language != ''">and language = #{language}</if>
            <if test="version != null ">and version = #{version}</if>
@@ -70,6 +77,8 @@
            <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="nodynamiccruxsJson != null ">and nodynamiccruxs = #{nodynamiccruxsJson}</if>
            <if test="dynamiccruxsJson != null ">and dynamiccruxs = #{dynamiccruxsJson}</if>
        </where>
    </select>

@@ -90,6 +99,7 @@
            <if test="categoryName != null and categoryName != ''">categoryName,</if>
            <if test="targetvalue != null">targetvalue,</if>
            <if test="targetregex != null">targetregex,</if>
            <if test="targetregex2 != null">targetregex2,</if>
            <if test="optiondesc != null">optiondesc,</if>
            <if test="language != null and language != ''">language,</if>
            <if test="version != null">version,</if>
@@ -107,6 +117,8 @@
            <if test="orgid != null">orgid,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="nodynamiccruxsJson != null ">nodynamiccruxs,</if>
            <if test="dynamiccruxsJson != null ">dynamiccruxs,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -117,6 +129,7 @@
            <if test="categoryName != null and categoryName != ''">#{categoryName},</if>
            <if test="targetvalue != null">#{targetvalue},</if>
            <if test="targetregex != null">#{targetregex},</if>
            <if test="targetregex2 != null">#{targetregex2},</if>
            <if test="optiondesc != null">#{optiondesc},</if>
            <if test="language != null and language != ''">#{language},</if>
            <if test="version != null">#{version},</if>
@@ -134,6 +147,8 @@
            <if test="orgid != null">#{orgid},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="nodynamiccruxsJson != null ">#{nodynamiccruxsJson},</if>
            <if test="dynamiccruxsJson != null ">#{dynamiccruxsJson},</if>
        </trim>
    </insert>

@@ -147,6 +162,7 @@
            <if test="categoryName != null and categoryName != ''">categoryName = #{categoryName},</if>
            <if test="targetvalue != null">targetvalue = #{targetvalue},</if>
            <if test="targetregex != null">targetregex = #{targetregex},</if>
            <if test="targetregex2 != null">targetregex2 = #{targetregex2},</if>
            <if test="optiondesc != null">optiondesc = #{optiondesc},</if>
            <if test="language != null and language != ''">language = #{language},</if>
            <if test="version != null">version = #{version},</if>
@@ -164,6 +180,8 @@
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="nodynamiccruxsJson != null ">nodynamiccruxs = #{nodynamiccruxsJson},</if>
            <if test="dynamiccruxsJson != null ">dynamiccruxs = #{dynamiccruxsJson},</if>
        </trim>
        where id = #{id}
    </update>
@@ -171,7 +189,7 @@
    <delete id="deleteIvrLibaScriptTargetoptionByTargetoptionid" parameterType="Long">
        update ivr_liba_script_targetoption
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1</if>
            del_flag = 1
        </trim>
        where id = #{id}
    </delete>

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

@@ -74,7 +74,7 @@
    <update id="deleteIvrLibaTargetAssortById" parameterType="Long">
        update ivr_liba_target_assort
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = 1,</if>
            del_flag = 1
        </trim>
        where id = #{id}
    </update>

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

@@ -11,6 +11,9 @@
        <result property="categoryName" column="categoryName"/>
        <result property="targetvalue" column="targetvalue"/>
        <result property="targetregex" column="targetregex"/>
        <result property="targetregex2" column="targetregex2"/>
        <result property="nodynamiccruxsJson" column="nodynamiccruxs"/>
        <result property="dynamiccruxsJson" column="dynamiccruxs"/>
        <result property="optiondesc" column="optiondesc"/>
        <result property="language" column="language"/>
        <result property="version" column="version"/>
@@ -37,6 +40,9 @@
               categoryName,
               targetvalue,
               targetregex,
               targetregex2,
               nodynamiccruxs,
               dynamiccruxs,
               optiondesc, language, version, groupid, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid
        from ivr_liba_targetoption
    </sql>
@@ -53,6 +59,7 @@
            </if>
            <if test="targetvalue != null  and targetvalue != ''">and targetvalue = #{targetvalue}</if>
            <if test="targetregex != null  and targetregex != ''">and targetregex = #{targetregex}</if>
            <if test="targetregex2 != null  and targetregex2 != ''">and targetregex2 = #{targetregex2}</if>
            <if test="optiondesc != null  and optiondesc != ''">and optiondesc = #{optiondesc}</if>
            <if test="language != null  and language != ''">and language = #{language}</if>
            <if test="version != null ">and version = #{version}</if>
@@ -65,6 +72,8 @@
            <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="nodynamiccruxsJson != null">and nodynamiccruxs = #{nodynamiccruxsJson}</if>
            <if test="dynamiccruxsJson != null">and dynamiccruxs = #{dynamiccruxsJson}</if>

        </where>
        order by guid asc
@@ -84,6 +93,7 @@
            <if test="categoryName != null and categoryName != ''">categoryName,</if>
            <if test="targetvalue != null">targetvalue,</if>
            <if test="targetregex != null">targetregex,</if>
            <if test="targetregex2 != null">targetregex2,</if>
            <if test="optiondesc != null">optiondesc,</if>
            <if test="language != null and language != ''">language,</if>
            <if test="version != null">version,</if>
@@ -101,6 +111,8 @@
            <if test="orgid != null">orgid,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="nodynamiccruxsJson != null">nodynamiccruxs,</if>
            <if test="dynamiccruxsJson != null">dynamiccruxs,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="targetid != null">#{targetid},</if>
@@ -108,6 +120,7 @@
            <if test="categoryName != null and categoryName != ''">#{categoryName},</if>
            <if test="targetvalue != null">#{targetvalue},</if>
            <if test="targetregex != null">#{targetregex},</if>
            <if test="targetregex2 != null">#{targetregex2},</if>
            <if test="optiondesc != null">#{optiondesc},</if>
            <if test="language != null and language != ''">#{language},</if>
            <if test="version != null">#{version},</if>
@@ -125,6 +138,8 @@
            <if test="orgid != null">#{orgid},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="nodynamiccruxsJson != null">#{nodynamiccruxsJson},</if>
            <if test="dynamiccruxsJson != null">#{dynamiccruxsJson},</if>
        </trim>
    </insert>

@@ -136,6 +151,7 @@
            <if test="categoryName != null and categoryName != ''">categoryName = #{categoryName},</if>
            <if test="targetvalue != null">targetvalue = #{targetvalue},</if>
            <if test="targetregex != null">targetregex = #{targetregex},</if>
            <if test="targetregex2 != null">targetregex2 = #{targetregex2},</if>
            <if test="optiondesc != null">optiondesc = #{optiondesc},</if>
            <if test="language != null and language != ''">language = #{language},</if>
            <if test="version != null">version = #{version},</if>
@@ -153,6 +169,8 @@
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="nodynamiccruxsJson != null">nodynamiccruxs = #{nodynamiccruxsJson},</if>
            <if test="dynamiccruxsJson != null">dynamiccruxs = #{dynamiccruxsJson},</if>
        </trim>
        where targetoptionid = #{targetoptionid}
    </update>

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

@@ -74,7 +74,7 @@
    <update id="deleteIvrLibaTemplateAssortById" parameterType="Long">
        update ivr_liba_template_assort
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = 1,</if>
            del_flag = 1
        </trim>
        where id = #{id}
    </update>

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

@@ -49,11 +49,16 @@
        <result property="tag" column="tag"/>
        <result property="suitway" column="suitway"/>
        <result property="otherdata" column="otherdata"/>
        <result property="mateNum" column="mate_num"/>
        <result property="revisitBefore" column="revisit_before"/>
        <result property="revisitAfter" column="revisit_after"/>
    </resultMap>

    <sql id="selectIvrLibaTemplateVo">
        select ID,
               targetid,
               revisit_before,
               revisit_after,
               targetname,
               templateName,
               silencetime,
@@ -66,6 +71,7 @@
               tag,
               otherdata,
               suitway,
               mate_num,
               submodule, language, note, isEnable, addUserID, addTime, modifyUserID, modifyTime, groupID, label_info, submoduleID, playType, icd10code, icd10codename, atuoTaskDayOffset, deptIds, dept_names, F_KSDM, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid, assortid, parameter
        from ivr_liba_template
    </sql>
@@ -79,6 +85,9 @@
                '%')
            </if>
            <if test="targetid != null ">and targetid = #{targetid}</if>
            <if test="revisitAfter != null ">and revisit_after = #{revisitAfter}</if>
            <if test="revisitBefore != null ">and revisit_before = #{revisitBefore}</if>
            <if test="mateNum != null ">and mate_num = #{mateNum}</if>
            <if test="suitway != null ">and suitway = #{suitway}</if>
            <if test="targetname != null and targetname !='' ">and targetname = #{targetname}</if>
            <if test="version != null and version !='' ">and version = #{version}</if>
@@ -173,6 +182,9 @@
            <if test="tag != null">tag,</if>
            <if test="suitway != null">suitway,</if>
            <if test="otherdata != null">otherdata,</if>
            <if test="mateNum != null ">mate_num</if>
            <if test="revisitAfter != null ">revisit_after</if>
            <if test="revisitBefore != null ">revisit_before</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="templateName != null and templateName != ''">#{templateName},</if>
@@ -218,6 +230,9 @@
            <if test="tag != null">#{tag},</if>
            <if test="suitway != null">#{suitway},</if>
            <if test="otherdata != null">#{otherdata},</if>
            <if test="mateNum != null ">#{mateNum}</if>
            <if test="revisitAfter != null ">#{revisitAfter}</if>
            <if test="revisitBefore != null ">#{revisitBefore}</if>
        </trim>
    </insert>

@@ -267,6 +282,9 @@
            <if test="tag != null">tag = #{tag},</if>
            <if test="suitway != null">suitway = #{suitway},</if>
            <if test="otherdata != null">otherdata = #{otherdata},</if>
            <if test="mateNum != null ">mate_num = #{mateNum}</if>
            <if test="revisitAfter != null ">revisit_after = #{revisitAfter}</if>
            <if test="revisitBefore != null ">revisit_before = #{revisitBefore}</if>
        </trim>
        where ID = #{ID}
    </update>
@@ -274,7 +292,7 @@
    <update id="deleteIvrLibaTemplateByID" parameterType="Long">
        update ivr_liba_template
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
            del_flag = 1
        </trim>
        where ID = #{ID}
    </update>

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

@@ -38,6 +38,7 @@
        <result property="targetid" column="targetid"/>
        <result property="targettype" column="targettype"/>
        <result property="targetvalue" column="targettalue"/>
        <result property="questiontitle" column="questiontitle"/>
    </resultMap>

    <sql id="selectIvrLibaTemplateScriptVo">
@@ -60,6 +61,7 @@
               targetid,
               targettype,
               targetvalue,
               questiontitle,
               targetOptions, language, playWavOnly, isEnable, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid
        from ivr_liba_template_script
    </sql>
@@ -82,6 +84,7 @@
            <if test="submoduleVoice != null  and submoduleVoice != ''">and submoduleVoice = #{submoduleVoice}</if>
            <if test="noClearlyText != null  and noClearlyText != ''">and noClearlyText = #{noClearlyText}</if>
            <if test="noClearlyVoice != null  and noClearlyVoice != ''">and noClearlyVoice = #{noClearlyVoice}</if>
            <if test="questiontitle != null  and questiontitle != ''">and questiontitle = #{questiontitle}</if>
            <if test="categoryName != null  and categoryName != ''">and categoryName like concat('%', #{categoryName},
                '%')
            </if>
@@ -105,7 +108,9 @@
        where ID = #{ID}
    </select>

    <insert id="insertIvrLibaTemplateScript" parameterType="com.smartor.domain.IvrLibaTemplateScript">
    <insert id="insertIvrLibaTemplateScript" parameterType="com.smartor.domain.IvrLibaTemplateScript"
            useGeneratedKeys="true"
            keyProperty="ID">
        insert into ivr_liba_template_script
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="templateQuestionNum != null">templateQuestionNum,</if>
@@ -140,6 +145,7 @@
            <if test="targetvalue != null">targetvalue,</if>
            <if test="targettype != null">targettype,</if>
            <if test="targetid != null">targetid,</if>
            <if test="questiontitle != null">questiontitle,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="templateQuestionNum != null">#{templateQuestionNum},</if>
@@ -174,6 +180,7 @@
            <if test="targetvalue != null">#{targetvalue},</if>
            <if test="targettype != null">#{targettype},</if>
            <if test="targetid != null">#{targetid},</if>
            <if test="questiontitle != null">#{questiontitle},</if>
        </trim>
    </insert>

@@ -212,6 +219,7 @@
            <if test="targetvalue != null">targetvalue = #{targetvalue},</if>
            <if test="targettype != null">targettype = #{targettype},</if>
            <if test="targetid != null">targetid = #{targetid},</if>
            <if test="questiontitle != null">questiontitle = #{questiontitle},</if>
        </trim>
        where ID = #{ID}
    </update>
@@ -219,8 +227,7 @@
    <update id="deleteIvrLibaTemplateScriptByID" parameterType="Long">
        update ivr_liba_template_script
        <trim prefix="SET" suffixOverrides=",">

            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
            del_flag = 1
        </trim>
        where ID = #{ID}
    </update>

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

@@ -129,7 +129,7 @@
    <delete id="deleteIvrLibaTemplateTagById" parameterType="Long">
        update ivr_liba_template_tag
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
           del_flag = 1
        </trim>
        where id = #{id}
    </delete>

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

@@ -102,7 +102,8 @@
        where id = #{id}
    </select>

    <insert id="insertIvrLibaTemplateTarget" parameterType="com.smartor.domain.IvrLibaTemplateTarget">
    <insert id="insertIvrLibaTemplateTarget" parameterType="com.smartor.domain.IvrLibaTemplateTarget" useGeneratedKeys="true"
            keyProperty="ID">
        insert into ivr_liba_template_target
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="templateQuestionID != null">templateQuestionID,</if>
@@ -210,7 +211,7 @@
    <update id="deleteIvrLibaTemplateTargetByID" parameterType="Long">
        update ivr_liba_template_target
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
           del_flag = 1
        </trim>
        where id = #{id}
    </update>

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

@@ -13,6 +13,9 @@
        <result property="categoryName" column="categoryName"/>
        <result property="targetvalue" column="targetvalue"/>
        <result property="targetregex" column="targetregex"/>
        <result property="targetregex2" column="targetregex2"/>
        <result property="nodynamiccruxsJson" column="nodynamiccruxs"/>
        <result property="dynamiccruxsJson" column="dynamiccruxs"/>
        <result property="optiondesc" column="optiondesc"/>
        <result property="language" column="language"/>
        <result property="version" column="version"/>
@@ -43,6 +46,9 @@
               categoryName,
               targetvalue,
               targetregex,
               targetregex2,
               nodynamiccruxs,
               dynamiccruxs,
               optiondesc, language, version, groupid, isabnormal, warnup, warndown, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pid, guid
        from ivr_liba_template_targetoption
    </sql>
@@ -62,6 +68,7 @@
            </if>
            <if test="targetvalue != null  and targetvalue != ''">and targetvalue = #{targetvalue}</if>
            <if test="targetregex != null  and targetregex != ''">and targetregex = #{targetregex}</if>
            <if test="targetregex2 != null  and targetregex2 != ''">and targetregex2 = #{targetregex2}</if>
            <if test="optiondesc != null  and optiondesc != ''">and optiondesc = #{optiondesc}</if>
            <if test="language != null  and language != ''">and language = #{language}</if>
            <if test="version != null  and version != ''">and version = #{version}</if>
@@ -74,6 +81,8 @@
            <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="nodynamiccruxsJson != null ">and nodynamiccruxs = #{nodynamiccruxsJson}</if>
            <if test="dynamiccruxsJson != null ">and dynamiccruxs = #{dynamiccruxsJson}</if>
        </where>
    </select>

@@ -95,6 +104,7 @@
            <if test="categoryName != null and categoryName != ''">categoryName,</if>
            <if test="targetvalue != null">targetvalue,</if>
            <if test="targetregex != null">targetregex,</if>
            <if test="targetregex2 != null">targetregex2,</if>
            <if test="optiondesc != null">optiondesc,</if>
            <if test="language != null and language != ''">language,</if>
            <if test="version != null and version != ''">version,</if>
@@ -112,6 +122,8 @@
            <if test="orgid != null">orgid,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="nodynamiccruxsJson != null ">nodynamiccruxs,</if>
            <if test="dynamiccruxsJson != null ">dynamiccruxs,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="targetid != null">#{targetid},</if>
@@ -122,6 +134,7 @@
            <if test="categoryName != null and categoryName != ''">#{categoryName},</if>
            <if test="targetvalue != null">#{targetvalue},</if>
            <if test="targetregex != null">#{targetregex},</if>
            <if test="targetregex2 != null">#{targetregex2},</if>
            <if test="optiondesc != null">#{optiondesc},</if>
            <if test="language != null and language != ''">#{language},</if>
            <if test="version != null and version != ''">#{version},</if>
@@ -139,6 +152,8 @@
            <if test="orgid != null">#{orgid},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="nodynamiccruxsJson != null ">#{nodynamiccruxsJson},</if>
            <if test="dynamiccruxsJson != null ">#{dynamiccruxsJson},</if>
        </trim>
    </insert>

@@ -153,6 +168,7 @@
            <if test="categoryName != null and categoryName != ''">categoryName = #{categoryName},</if>
            <if test="targetvalue != null">targetvalue = #{targetvalue},</if>
            <if test="targetregex != null">targetregex = #{targetregex},</if>
            <if test="targetregex2 != null">targetregex2 = #{targetregex2},</if>
            <if test="optiondesc != null">optiondesc = #{optiondesc},</if>
            <if test="language != null and language != ''">language = #{language},</if>
            <if test="version != null and version != ''">version = #{version},</if>
@@ -170,6 +186,8 @@
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="nodynamiccruxsJson != null ">nodynamiccruxs = #{nodynamiccruxsJson},</if>
            <if test="dynamiccruxsJson != null ">dynamiccruxs = #{dynamiccruxsJson},</if>
        </trim>
        where id = #{id}
    </update>
@@ -177,7 +195,7 @@
    <update id="deleteIvrLibaTemplateTargetoptionById" parameterType="Long">
        update ivr_liba_template_targetoption
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
            del_flag = 1
        </trim>
        where id = #{id}
    </update>

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

@@ -1,113 +1,177 @@
<?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.IvrTaskcallMapper">
    
    <resultMap type="IvrTaskcall" id="IvrTaskcallResult">
        <result property="callid"    column="callid"    />
        <result property="sendname"    column="sendname"    />
        <result property="phone"    column="phone"    />
        <result property="sex"    column="sex"    />
        <result property="age"    column="age"    />
        <result property="sfzh"    column="sfzh"    />
        <result property="addr"    column="addr"    />
        <result property="senderdetail"    column="senderdetail"    />
        <result property="inserttype"    column="inserttype"    />
        <result property="taskid"    column="taskid"    />
        <result property="templateid"    column="templateid"    />
        <result property="templatename"    column="templatename"    />
        <result property="senddate"    column="senddate"    />
        <result property="sendlimitabegin"    column="sendlimitabegin"    />
        <result property="sendlimitaend"    column="sendlimitaend"    />
        <result property="sendlimitpbegin"    column="sendlimitpbegin"    />
        <result property="sendlimitpend"    column="sendlimitpend"    />
        <result property="sendlimitnbegin"    column="sendlimitnbegin"    />
        <result property="sendlimitnend"    column="sendlimitnend"    />
        <result property="sendstate"    column="sendstate"    />
        <result property="senduuid"    column="senduuid"    />
        <result property="result"    column="result"    />
        <result property="finishtime"    column="finishtime"    />
        <result property="userid"    column="userid"    />
        <result property="username"    column="username"    />
        <result property="addtime"    column="addtime"    />
        <result property="updatetime"    column="updatetime"    />
        <result property="outbounduuid"    column="outbounduuid"    />
        <result property="recordid"    column="recordid"    />
        <result property="recallcount"    column="recallcount"    />
        <result property="exrecallcount"    column="exrecallcount"    />
        <result property="pulltime"    column="pulltime"    />
        <result property="bqsms"    column="bqsms"    />
        <result property="bhsms"    column="bhsms"    />
        <result property="deptcode"    column="deptcode"    />
        <result property="labelstatus"    column="labelstatus"    />
        <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="orgid"    column="orgid"    />

    <resultMap type="com.smartor.domain.IvrTaskcall" id="IvrTaskcallResult">
        <result property="id" column="id"/>
        <result property="sendname" column="sendname"/>
        <result property="phone" column="phone"/>
        <result property="sex" column="sex"/>
        <result property="age" column="age"/>
        <result property="sfzh" column="sfzh"/>
        <result property="addr" column="addr"/>
        <result property="senderdetail" column="senderdetail"/>
        <result property="type" column="type"/>
        <result property="taskid" column="taskid"/>
        <result property="templateid" column="templateid"/>
        <result property="templatename" column="templatename"/>
        <result property="senddate" column="senddate"/>
        <result property="sendlimitabegin" column="sendlimitabegin"/>
        <result property="sendlimitaend" column="sendlimitaend"/>
        <result property="sendlimitpbegin" column="sendlimitpbegin"/>
        <result property="sendlimitpend" column="sendlimitpend"/>
        <result property="sendlimitnbegin" column="sendlimitnbegin"/>
        <result property="sendlimitnend" column="sendlimitnend"/>
        <result property="sendstate" column="sendstate"/>
        <result property="senduuid" column="senduuid"/>
        <result property="result" column="result"/>
        <result property="finishtime" column="finishtime"/>
        <result property="userid" column="userid"/>
        <result property="username" column="username"/>
        <result property="outbounduuid" column="outbounduuid"/>
        <result property="recordid" column="recordid"/>
        <result property="recallcount" column="recallcount"/>
        <result property="exrecallcount" column="exrecallcount"/>
        <result property="pulltime" column="pulltime"/>
        <result property="bqsms" column="bqsms"/>
        <result property="bhsms" column="bhsms"/>
        <result property="deptcode" column="deptcode"/>
        <result property="labelstatus" column="labelstatus"/>
        <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="orgid" column="orgid"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
        <result property="textParam" column="text_param"/>
        <result property="serviceform" column="serviceform"/>
        <result property="badNo" column="bad_no"/>
        <result property="icdName" column="icd_name"/>
        <result property="medicalRecordNo" column="medical_record_no"/>
        <result property="preachcontent" column="preachcontent"/>
    </resultMap>

    <sql id="selectIvrTaskcallVo">
        select callid, sendname, phone, sex, age, sfzh, addr, senderdetail, inserttype, taskid, templateid, templatename, senddate, sendlimitabegin, sendlimitaend, sendlimitpbegin, sendlimitpend, sendlimitnbegin, sendlimitnend, sendstate, senduuid, result, finishtime, userid, username, addtime, updatetime, outbounduuid, recordid, recallcount, exrecallcount, pulltime, bqsms, bhsms, deptcode, labelstatus, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid from ivr_taskcall
        select id,
               sendname,
               phone,
               sex,
               age,
               sfzh,
               addr,
               senderdetail,
               type,
               taskid,
               templateid,
               templatename,
               senddate,
               sendlimitabegin,
               sendlimitaend,
               sendlimitpbegin,
               sendlimitpend,
               sendlimitnbegin,
               sendlimitnend,
               sendstate,
               senduuid,
               result,
               finishtime,
               userid,
               username,
               outbounduuid,
               recordid,
               recallcount,
               exrecallcount,
               pulltime,
               bqsms,
               bhsms,
               deptcode,
               labelstatus,
               del_flag,
               update_by,
               update_time,
               create_by,
               create_time,
               isupload,
               upload_time,
               orgid,
               pid,
               guid,
               text_param,
               serviceform,
               badNo,
               icdName,
               medicalRecordNo,
               preachcontent
        from ivr_taskcall
    </sql>

    <select id="selectIvrTaskcallList" parameterType="IvrTaskcall" resultMap="IvrTaskcallResult">
    <select id="selectIvrTaskcallList" parameterType="com.smartor.domain.IvrTaskcall" resultMap="IvrTaskcallResult">
        <include refid="selectIvrTaskcallVo"/>
        <where>  
            <if test="sendname != null  and sendname != ''"> and sendname like concat('%', #{sendname}, '%')</if>
            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
            <if test="age != null "> and age = #{age}</if>
            <if test="sfzh != null  and sfzh != ''"> and sfzh = #{sfzh}</if>
            <if test="addr != null  and addr != ''"> and addr = #{addr}</if>
            <if test="senderdetail != null  and senderdetail != ''"> and senderdetail = #{senderdetail}</if>
            <if test="inserttype != null  and inserttype != ''"> and inserttype = #{inserttype}</if>
            <if test="taskid != null "> and taskid = #{taskid}</if>
            <if test="templateid != null  and templateid != ''"> and templateid = #{templateid}</if>
            <if test="templatename != null  and templatename != ''"> and templatename like concat('%', #{templatename}, '%')</if>
            <if test="senddate != null "> and senddate = #{senddate}</if>
            <if test="sendlimitabegin != null  and sendlimitabegin != ''"> and sendlimitabegin = #{sendlimitabegin}</if>
            <if test="sendlimitaend != null  and sendlimitaend != ''"> and sendlimitaend = #{sendlimitaend}</if>
            <if test="sendlimitpbegin != null  and sendlimitpbegin != ''"> and sendlimitpbegin = #{sendlimitpbegin}</if>
            <if test="sendlimitpend != null  and sendlimitpend != ''"> and sendlimitpend = #{sendlimitpend}</if>
            <if test="sendlimitnbegin != null  and sendlimitnbegin != ''"> and sendlimitnbegin = #{sendlimitnbegin}</if>
            <if test="sendlimitnend != null  and sendlimitnend != ''"> and sendlimitnend = #{sendlimitnend}</if>
            <if test="sendstate != null "> and sendstate = #{sendstate}</if>
            <if test="senduuid != null  and senduuid != ''"> and senduuid = #{senduuid}</if>
            <if test="result != null  and result != ''"> and result = #{result}</if>
            <if test="finishtime != null "> and finishtime = #{finishtime}</if>
            <if test="userid != null  and userid != ''"> and userid = #{userid}</if>
            <if test="username != null  and username != ''"> and username like concat('%', #{username}, '%')</if>
            <if test="addtime != null "> and addtime = #{addtime}</if>
            <if test="updatetime != null "> and updatetime = #{updatetime}</if>
            <if test="outbounduuid != null  and outbounduuid != ''"> and outbounduuid = #{outbounduuid}</if>
            <if test="recordid != null "> and recordid = #{recordid}</if>
            <if test="recallcount != null "> and recallcount = #{recallcount}</if>
            <if test="exrecallcount != null "> and exrecallcount = #{exrecallcount}</if>
            <if test="pulltime != null "> and pulltime = #{pulltime}</if>
            <if test="bqsms != null "> and bqsms = #{bqsms}</if>
            <if test="bhsms != null "> and bhsms = #{bhsms}</if>
            <if test="deptcode != null  and deptcode != ''"> and deptcode = #{deptcode}</if>
            <if test="labelstatus != null "> and labelstatus = #{labelstatus}</if>
            <if test="isupload != null "> and isupload = #{isupload}</if>
            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
        <where>
            <if test="sendname != null  and sendname != ''">and sendname like concat('%', #{sendname}, '%')</if>
            <if test="phone != null  and phone != ''">and phone = #{phone}</if>
            <if test="sex != null  and sex != ''">and sex = #{sex}</if>
            <if test="age != null ">and age = #{age}</if>
            <if test="sfzh != null  and sfzh != ''">and sfzh = #{sfzh}</if>
            <if test="addr != null  and addr != ''">and addr = #{addr}</if>
            <if test="senderdetail != null  and senderdetail != ''">and senderdetail = #{senderdetail}</if>
            <if test="type != null  and type != ''">and type = #{type}</if>
            <if test="taskid != null ">and taskid = #{taskid}</if>
            <if test="templateid != null  and templateid != ''">and templateid = #{templateid}</if>
            <if test="templatename != null  and templatename != ''">and templatename like concat('%', #{templatename},
                '%')
            </if>
            <if test="senddate != null ">and senddate = #{senddate}</if>
            <if test="sendlimitabegin != null  and sendlimitabegin != ''">and sendlimitabegin = #{sendlimitabegin}</if>
            <if test="sendlimitaend != null  and sendlimitaend != ''">and sendlimitaend = #{sendlimitaend}</if>
            <if test="sendlimitpbegin != null  and sendlimitpbegin != ''">and sendlimitpbegin = #{sendlimitpbegin}</if>
            <if test="sendlimitpend != null  and sendlimitpend != ''">and sendlimitpend = #{sendlimitpend}</if>
            <if test="sendlimitnbegin != null  and sendlimitnbegin != ''">and sendlimitnbegin = #{sendlimitnbegin}</if>
            <if test="sendlimitnend != null  and sendlimitnend != ''">and sendlimitnend = #{sendlimitnend}</if>
            <if test="sendstate != null ">and sendstate = #{sendstate}</if>
            <if test="senduuid != null  and senduuid != ''">and senduuid = #{senduuid}</if>
            <if test="result != null  and result != ''">and result = #{result}</if>
            <if test="finishtime != null ">and finishtime = #{finishtime}</if>
            <if test="userid != null  and userid != ''">and userid = #{userid}</if>
            <if test="username != null  and username != ''">and username like concat('%', #{username}, '%')</if>
            <if test="outbounduuid != null  and outbounduuid != ''">and outbounduuid = #{outbounduuid}</if>
            <if test="recordid != null ">and recordid = #{recordid}</if>
            <if test="recallcount != null ">and recallcount = #{recallcount}</if>
            <if test="exrecallcount != null ">and exrecallcount = #{exrecallcount}</if>
            <if test="pulltime != null ">and pulltime = #{pulltime}</if>
            <if test="bqsms != null ">and bqsms = #{bqsms}</if>
            <if test="bhsms != null ">and bhsms = #{bhsms}</if>
            <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
            <if test="labelstatus != null ">and labelstatus = #{labelstatus}</if>
            <if test="isupload != null ">and isupload = #{isupload}</if>
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="piserviceformd != null ">and serviceform = #{serviceform}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="textParam != null  and textParam != ''">and text_param = #{textParam}</if>
            <if test="badNo != null">and bad_no = #{badNo}</if>
            <if test="icdName != null  and icdName != ''">and icd_name = #{icdName}</if>
            <if test="medicalRecordNo != null  and medicalRecordNo != ''">and medical_record_no = #{medicalRecordNo}</if>
            <if test="preachcontent != null  and preachcontent != ''">and preachcontent = #{preachcontent}</if>
        </where>
    </select>
    
    <select id="selectIvrTaskcallByCallid" parameterType="Long" resultMap="IvrTaskcallResult">

    <select id="selectIvrTaskcallById" parameterType="Long" resultMap="IvrTaskcallResult">
        <include refid="selectIvrTaskcallVo"/>
        where callid = #{callid}
        where id = #{id}
    </select>
        
    <insert id="insertIvrTaskcall" parameterType="IvrTaskcall">

    <insert id="insertIvrTaskcall" parameterType="com.smartor.domain.IvrTaskcall">
        insert into ivr_taskcall
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="callid != null">callid,</if>
            <if test="id != null">id,</if>
            <if test="sendname != null">sendname,</if>
            <if test="phone != null">phone,</if>
            <if test="sex != null">sex,</if>
@@ -115,7 +179,7 @@
            <if test="sfzh != null">sfzh,</if>
            <if test="addr != null">addr,</if>
            <if test="senderdetail != null">senderdetail,</if>
            <if test="inserttype != null">inserttype,</if>
            <if test="type != null">type,</if>
            <if test="taskid != null">taskid,</if>
            <if test="templateid != null">templateid,</if>
            <if test="templatename != null">templatename,</if>
@@ -132,8 +196,6 @@
            <if test="finishtime != null">finishtime,</if>
            <if test="userid != null">userid,</if>
            <if test="username != null">username,</if>
            <if test="addtime != null">addtime,</if>
            <if test="updatetime != null">updatetime,</if>
            <if test="outbounduuid != null">outbounduuid,</if>
            <if test="recordid != null">recordid,</if>
            <if test="recallcount != null">recallcount,</if>
@@ -151,9 +213,17 @@
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="orgid != null">orgid,</if>
         </trim>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="textParam != null">text_param,</if>
            <if test="serviceform != null">serviceform,</if>
            <if test="badNo != null">bad_no,</if>
            <if test="icdName != null  and icdName != ''">icd_name,</if>
            <if test="medicalRecordNo != null  and medicalRecordNo != ''">medical_record_no,</if>
            <if test="preachcontent != null  and preachcontent != ''">preachcontent,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="callid != null">#{callid},</if>
            <if test="id != null">#{id},</if>
            <if test="sendname != null">#{sendname},</if>
            <if test="phone != null">#{phone},</if>
            <if test="sex != null">#{sex},</if>
@@ -161,7 +231,7 @@
            <if test="sfzh != null">#{sfzh},</if>
            <if test="addr != null">#{addr},</if>
            <if test="senderdetail != null">#{senderdetail},</if>
            <if test="inserttype != null">#{inserttype},</if>
            <if test="type != null">#{type},</if>
            <if test="taskid != null">#{taskid},</if>
            <if test="templateid != null">#{templateid},</if>
            <if test="templatename != null">#{templatename},</if>
@@ -178,8 +248,6 @@
            <if test="finishtime != null">#{finishtime},</if>
            <if test="userid != null">#{userid},</if>
            <if test="username != null">#{username},</if>
            <if test="addtime != null">#{addtime},</if>
            <if test="updatetime != null">#{updatetime},</if>
            <if test="outbounduuid != null">#{outbounduuid},</if>
            <if test="recordid != null">#{recordid},</if>
            <if test="recallcount != null">#{recallcount},</if>
@@ -197,10 +265,18 @@
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="orgid != null">#{orgid},</if>
         </trim>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="textParam != null">#{textParam},</if>
            <if test="serviceform != null">#{serviceform},</if>
            <if test="badNo != null">#{badNo},</if>
            <if test="icdName != null  and icdName != ''">#{icdName},</if>
            <if test="medicalRecordNo != null  and medicalRecordNo != ''">#{medicalRecordNo},</if>
            <if test="preachcontent != null  and preachcontent != ''">#{preachcontent},</if>
        </trim>
    </insert>

    <update id="updateIvrTaskcall" parameterType="IvrTaskcall">
    <update id="updateIvrTaskcall" parameterType="com.smartor.domain.IvrTaskcall">
        update ivr_taskcall
        <trim prefix="SET" suffixOverrides=",">
            <if test="sendname != null">sendname = #{sendname},</if>
@@ -210,7 +286,7 @@
            <if test="sfzh != null">sfzh = #{sfzh},</if>
            <if test="addr != null">addr = #{addr},</if>
            <if test="senderdetail != null">senderdetail = #{senderdetail},</if>
            <if test="inserttype != null">inserttype = #{inserttype},</if>
            <if test="type != null">type = #{type},</if>
            <if test="taskid != null">taskid = #{taskid},</if>
            <if test="templateid != null">templateid = #{templateid},</if>
            <if test="templatename != null">templatename = #{templatename},</if>
@@ -227,8 +303,6 @@
            <if test="finishtime != null">finishtime = #{finishtime},</if>
            <if test="userid != null">userid = #{userid},</if>
            <if test="username != null">username = #{username},</if>
            <if test="addtime != null">addtime = #{addtime},</if>
            <if test="updatetime != null">updatetime = #{updatetime},</if>
            <if test="outbounduuid != null">outbounduuid = #{outbounduuid},</if>
            <if test="recordid != null">recordid = #{recordid},</if>
            <if test="recallcount != null">recallcount = #{recallcount},</if>
@@ -246,18 +320,24 @@
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <if test="textParam != null">text_param = #{textParam},</if>
            <if test="serviceform != null">serviceform = #{serviceform},</if>
            <if test="badNo != null">bad_no = #{badNo},</if>
            <if test="icdName != null  and icdName != ''">icd_name = #{icdName},</if>
            <if test="medicalRecordNo != null  and medicalRecordNo != ''">medical_record_no = #{medicalRecordNo},</if>
            <if test="preachcontent != null  and preachcontent != ''">preachcontent = #{preachcontent},</if>
        </trim>
        where callid = #{callid}
        where id = #{id}
    </update>

    <delete id="deleteIvrTaskcallByCallid" parameterType="Long">
        delete from ivr_taskcall where callid = #{callid}
    </delete>
    <update id="deleteIvrTaskcallById" parameterType="Long">
        update ivr_taskcall
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteIvrTaskcallByCallids" parameterType="String">
        delete from ivr_taskcall where callid in 
        <foreach item="callid" collection="array" open="(" separator="," close=")">
            #{callid}
        </foreach>
    </delete>
</mapper>

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

@@ -2,12 +2,12 @@
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.PatHetaskRelevanceMapper">
<mapper namespace="com.smartor.mapper.PatTaskRelevanceMapper">

    <resultMap type="com.smartor.domain.PatHetaskRelevance" id="PatHetaskRelevanceResult">
    <resultMap type="com.smartor.domain.PatTaskRelevance" id="PatTaskRelevanceResult">
        <result property="id" column="id"/>
        <result property="patid" column="pat_id"/>
        <result property="heTaskId" column="he_task_id"/>
        <result property="taskId" column="task_id"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
@@ -24,12 +24,13 @@
        <result property="sendTime" column="send_time"/>
        <result property="operatePerson" column="operate_person"/>
        <result property="receiveTime" column="receive_time"/>
        <result property="visitTime" column="visit_time"/>
    </resultMap>

    <sql id="selectPatHetaskRelevanceVo">
    <sql id="selectPatTaskRelevanceVo">
        select id,
               pat_id,
               he_task_id,
               task_id,
               del_flag,
               create_time,
               update_time,
@@ -45,17 +46,18 @@
               send_status,
               send_time,
               operate_person,
               visit_time,
               receive_time
        from pat_hetask_relevance
        from pat_task_relevance
    </sql>

    <select id="selectPatHetaskRelevanceList" parameterType="com.smartor.domain.PatHetaskRelevance"
            resultMap="PatHetaskRelevanceResult">
        <include refid="selectPatHetaskRelevanceVo"/>
    <select id="selectPatTaskRelevanceList" parameterType="com.smartor.domain.PatTaskRelevance"
            resultMap="PatTaskRelevanceResult">
        <include refid="selectPatTaskRelevanceVo"/>
        <where>
            del_flag=0
            <if test="patid != null ">and pat_id = #{patid}</if>
            <if test="heTaskId != null ">and he_task_id = #{heTaskId}</if>
            <if test="taskId != null ">and task_id = #{taskId}</if>
            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
            <if test="age != null ">and age = #{age}</if>
            <if test="sex != null ">and sex = #{sex}</if>
@@ -67,21 +69,22 @@
            <if test="icdName != null  and icdName != ''">and icd_name like concat('%', #{icdName}, '%')</if>
            <if test="sendStatus != null ">and send_status = #{sendStatus}</if>
            <if test="sendTime != null ">and send_time = #{sendTime}</if>
            <if test="visitTime != null ">and visit_time = #{visitTime}</if>
            <if test="receiveTime != null ">and receive_time = #{receiveTime}</if>
            <if test="operatePerson != null   and operatePerson != ''">and operate_person = #{operatePerson}</if>
        </where>
    </select>

    <select id="selectPatHetaskRelevanceById" parameterType="Long" resultMap="PatHetaskRelevanceResult">
        <include refid="selectPatHetaskRelevanceVo"/>
    <select id="selectPatTaskRelevanceById" parameterType="Long" resultMap="PatTaskRelevanceResult">
        <include refid="selectPatTaskRelevanceVo"/>
        where id = #{id}
    </select>

    <insert id="insertPatHetaskRelevance" parameterType="com.smartor.domain.PatHetaskRelevance">
        insert into pat_hetask_relevance
    <insert id="insertPatTaskRelevance" parameterType="com.smartor.domain.PatTaskRelevance">
        insert into pat_task_relevance
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="patid != null">pat_id,</if>
            <if test="heTaskId != null">he_task_id,</if>
            <if test="taskId != null">task_id,</if>
            <if test="delFlag != null">del_flag,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateTime != null">update_time,</if>
@@ -97,11 +100,12 @@
            <if test="sendStatus != null">send_status,</if>
            <if test="sendTime != null">send_time,</if>
            <if test="receiveTime != null">receive_time,</if>
            <if test="visitTime != null">visit_time,</if>
            <if test="operatePerson != null and operatePerson != ''">operate_person,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="patid != null">#{patid},</if>
            <if test="heTaskId != null">#{heTaskId},</if>
            <if test="taskId != null">#{taskId},</if>
            <if test="delFlag != null">#{delFlag},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
@@ -117,15 +121,16 @@
            <if test="sendStatus != null">#{sendStatus},</if>
            <if test="sendTime != null">#{sendTime},</if>
            <if test="receiveTime != null">#{receiveTime},</if>
            <if test="visitTime != null">#{visitTime},</if>
            <if test="operatePerson != null and operatePerson != ''">#{operatePerson},</if>
        </trim>
    </insert>

    <update id="updatePatHetaskRelevance" parameterType="com.smartor.domain.PatHetaskRelevance">
        update pat_hetask_relevance
    <update id="updatePatTaskRelevance" parameterType="com.smartor.domain.PatTaskRelevance">
        update pat_task_relevance
        <trim prefix="SET" suffixOverrides=",">
            <if test="patid != null">pat_id = #{patid},</if>
            <if test="heTaskId != null">he_task_id = #{heTaskId},</if>
            <if test="taskId != null">task_id = #{taskId},</if>
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
@@ -141,21 +146,22 @@
            <if test="sendStatus != null">send_status=#{sendStatus},</if>
            <if test="sendTime != null">send_time=#{sendTime},</if>
            <if test="receiveTime != null">receive_time=#{receiveTime},</if>
            <if test="visitTime != null">visit_time=#{visitTime},</if>
            <if test="operatePerson != null and operatePerson != ''">operate_person=#{operatePerson},</if>
        </trim>
        where id = #{id}
    </update>

    <update id="deletePatHetaskRelevanceById" parameterType="Long">
        update pat_hetask_relevance
    <update id="deletePatTaskRelevanceById" parameterType="Long">
        update pat_task_relevance
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag =1,</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deletePatHetaskRelevanceByIds" parameterType="String">
        delete from pat_hetask_relevance where id in
    <delete id="deletePatTaskRelevanceByIds" parameterType="String">
        delete from pat_task_relevance where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>

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

@@ -101,7 +101,7 @@
    <update id="deleteSvyLibTitleCategoryById" parameterType="Long">
        update svy_lib_title_category
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = 1,</if>
           del_flag = 1
        </trim>
        where id = #{id}
    </update>

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

@@ -220,7 +220,7 @@
    <update id="deleteSvyLibTopicoptionByOptionid" parameterType="Long">
        update svy_lib_topicoption
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null and delFlag != ''">del_flag = 1,</if>
           del_flag = 1
        </trim>
        where optionid = #{optionid}
    </update>