代码提交

liusheng

2024-04-17 69123c8bf13ccb27539b0475e626c6c95c0ea6bb

代码提交

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,112 @@
package com.ruoyi.web.controller.smartor;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
import com.smartor.service.IHeTaskService;
import com.smartor.service.IHeTaskSingleService;
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 ruoyi
 * @date 2024-04-16
 */
@Api(description = "宣教单一任务")
@RestController
@RequestMapping("/smartor/heTaskSingle")
public class HeTaskSingleController extends BaseController {
    @Autowired
    private IHeTaskSingleService heTaskSingleService;

//    /**
//     * æŸ¥è¯¢å®£æ•™å•ä¸€ä»»åŠ¡åˆ—表
//     */
//    @ApiOperation("查询宣教单一任务列表")
//    @PreAuthorize("@ss.hasPermi('system:single:list')")
//    @GetMapping("/list")
//    public TableDataInfo list(HeTaskSingle heTaskSingle) {
//        startPage();
//        List<HeTaskSingle> list = heTaskSingleService.selectHeTaskSingleList(heTaskSingle);
//        return getDataTable(list);
//    }

    /**
     * å¯¼å‡ºå®£æ•™å•ä¸€ä»»åŠ¡åˆ—表
     */
    @ApiOperation("导出宣教单一任务列表")
    @PreAuthorize("@ss.hasPermi('system:single:export')")
    @Log(title = "宣教单一任务", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, HeTaskSingle heTaskSingle) {
        List<HeTaskSingle> list = heTaskSingleService.selectHeTaskSingleList(heTaskSingle);
        ExcelUtil<HeTaskSingle> util = new ExcelUtil<HeTaskSingle>(HeTaskSingle.class);
        util.exportExcel(response, list, "宣教单一任务数据");
    }

    /**
     * èŽ·å–宣教单一任务详细信息
     */
    @ApiOperation("获取宣教单一任务详细信息")
    @PreAuthorize("@ss.hasPermi('system:single:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return success(heTaskSingleService.selectHeTaskSingleById(id));
    }

    /**
     * æ–°å¢žå®£æ•™å•ä¸€ä»»åŠ¡
     */
    @ApiOperation("新增宣教单一任务")
    @PreAuthorize("@ss.hasPermi('system:single:add')")
    @Log(title = "宣教单一任务", businessType = BusinessType.INSERT)
    @PostMapping("/addOrUpdateHeTaskSinle")
    public AjaxResult addOrUpdateHeTaskSinle(@RequestBody HeTaskSingleVO heTaskSingleVO) {
        return toAjax(heTaskSingleService.addOrUpdateHeTaskSinle(heTaskSingleVO));
    }

//    /**
//     * ä¿®æ”¹å®£æ•™å•ä¸€ä»»åŠ¡
//     */
//    @PreAuthorize("@ss.hasPermi('system:single:edit')")
//    @Log(title = "宣教单一任务", businessType = BusinessType.UPDATE)
//    @PostMapping("/edit")
//    public AjaxResult edit(@RequestBody HeTaskSingle heTaskSingle) {
//        return toAjax(heTaskSingleService.updateHeTaskSingle(heTaskSingle));
//    }

    /**
     * åˆ é™¤å®£æ•™å•ä¸€ä»»åŠ¡
     */
    @ApiOperation("删除宣教单一任务")
    @PreAuthorize("@ss.hasPermi('system:single:remove')")
    @Log(title = "宣教单一任务", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(heTaskSingleService.deleteHeTaskSingleByIds(ids));
    }


    /**
     * æ ¹æ®æ¡ä»¶æŸ¥è¯¢ä»»åŠ¡ä¿¡æ¯
     */
    @ApiOperation("根据条件查询任务信息")
    @PostMapping("/queryHeTaskByCondition")
    public AjaxResult queryHeTaskByCondition(@RequestBody HeTaskSingle heTaskSingle) {

        return success(heTaskSingleService.queryHeTaskByCondition(heTaskSingle));
    }
}

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

@@ -14,6 +14,7 @@
import com.smartor.service.IIvrTaskSingleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -41,25 +42,28 @@
    /**
     * æŸ¥è¯¢è¯­éŸ³ä»»åŠ¡åˆ—表
     */
    @ApiOperation("查询语音任务列表")
    @ApiOperation("查询任务列表")
    @PreAuthorize("@ss.hasPermi('smartor:ivrtask:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody IvrTask ivrTask) {
        startPage();
        List<IvrTask> list = ivrTaskService.selectIvrTaskList(ivrTask);
        List<IvrTaskVO> ivrTaskVOS = DtoConversionUtils.sourceToTarget(list, IvrTaskVO.class);
        for (IvrTaskVO ivrTaskVO : ivrTaskVOS) {
            IvrTaskSingle ivrTaskcall = new IvrTaskSingle();
            ivrTaskcall.setTaskid(ivrTaskVO.getTaskid());
            List<IvrTaskSingle> ivrTaskcalls = iIvrTaskCallService.selectIvrTaskcallList(ivrTaskcall);
            //已发送
            long yfs = ivrTaskcalls.stream().filter(ivrTaskcall1 -> ivrTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
            //未发送
            long wfs = ivrTaskcalls.stream().filter(ivrTaskcall1 -> ivrTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
            ivrTaskVO.setYfs(yfs);
            ivrTaskVO.setWfs(wfs);
        if (CollectionUtils.isNotEmpty(ivrTaskVOS)) {
            for (IvrTaskVO ivrTaskVO : ivrTaskVOS) {
                IvrTaskSingle ivrTaskcall = new IvrTaskSingle();
                ivrTaskcall.setTaskid(ivrTaskVO.getTaskid());
                List<IvrTaskSingle> ivrTaskcalls = iIvrTaskCallService.selectIvrTaskcallList(ivrTaskcall);
                if (CollectionUtils.isNotEmpty(ivrTaskcalls)) {
                    //已发送
                    long yfs = ivrTaskcalls.stream().filter(ivrTaskcall1 -> ivrTaskcall1.getSendstate() != null && ivrTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count();
                    //未发送
                    long wfs = ivrTaskcalls.stream().filter(ivrTaskcall1 -> ivrTaskcall1.getSendstate() != null && ivrTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count();
                    ivrTaskVO.setYfs(yfs);
                    ivrTaskVO.setWfs(wfs);
                }
            }
        }

        return getDataTable(ivrTaskVOS);
    }

@@ -130,9 +134,6 @@
    public AjaxResult removeTask(@PathVariable Long taskId) {
        return toAjax(ivrTaskService.deleteIvrTaskByTaskid(taskId));
    }





}

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

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskcallController.java ÐÞ¸Ä
@@ -1,7 +1,5 @@
package com.ruoyi.web.controller.smartor;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -9,7 +7,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.*;
import com.smartor.service.IIvrTaskSingleService;
@@ -20,9 +17,7 @@
import org.springframework.web.bind.annotation.*;

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

/**
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰Controller
@@ -33,7 +28,7 @@
@Api(description = "单一任务（随访宣教）")
@RestController
@RequestMapping("/smartor/tasksingle")
public class IvrTaskcallController extends BaseController {
public class IvrTaskSingleController extends BaseController {
    @Autowired
    private IIvrTaskSingleService ivrTaskcallService;

@@ -81,7 +76,6 @@
        return toAjax(ivrTaskcallService.insertOrUpdateTask(ivrTaskcallVO));
    }


    /**
     * æ ¹æ®æ¡ä»¶æŸ¥è¯¢ä»»åŠ¡ä¿¡æ¯
     */
@@ -90,43 +84,8 @@
    public AjaxResult queryTaskByCondition(@RequestBody IvrTaskSingleVO ivrTaskcallVO) {
        //根据入参查询信息
        IvrTaskSingle ivrTaskcall = DtoConversionUtils.sourceToTarget(ivrTaskcallVO, IvrTaskSingle.class);
        List<IvrTaskSingle> list = ivrTaskcallService.selectIvrTaskcallList(ivrTaskcall);

        //定义患者与单一任务关联表集合
        List<PatTaskRelevance> patTaskRelevances = new ArrayList<>();

        //将查出来的数据倒入IvrTaskcallVO中
        IvrTaskSingleVO ivrTaskcallVO2 = DtoConversionUtils.sourceToTarget(list.get(0), IvrTaskSingleVO.class);
        String sendTimeSlot = list.get(0).getSendTimeSlot();
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            //获取到发送时间的集合
            if (StringUtils.isNotEmpty(sendTimeSlot)) {
                List<TaskSendTimeVO> taskSendTimeVOList = objectMapper.readValue(sendTimeSlot, List.class);
                ivrTaskcallVO2.setSendTimeslot(taskSendTimeVOList);
            }
            //文本变量参数
            if (StringUtils.isNotEmpty(list.get(0).getTextParam())) {
                Map<String, Map<String, String>> textParam = objectMapper.readValue(list.get(0).getTextParam(), Map.class);
                ivrTaskcallVO2.setTextParam(textParam);
            }
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }

        for (IvrTaskSingle ivrTaskcall1 : list) {
            PatTaskRelevance patTaskRelevance = new PatTaskRelevance();
            //获取到患者信息，并放入到集合中
            patTaskRelevance.setName(ivrTaskcall1.getSendname());
            patTaskRelevance.setAge(ivrTaskcall1.getAge());
            patTaskRelevance.setSfzh(ivrTaskcall1.getSfzh());
            patTaskRelevance.setPhone(ivrTaskcall1.getPhone());
            patTaskRelevance.setAddr(ivrTaskcall1.getAddr());
            patTaskRelevances.add(patTaskRelevance);
        }

        ivrTaskcallVO2.setPatTaskRelevances(patTaskRelevances);
        return success(ivrTaskcallVO2);
        IvrTaskSingleVO ivrTaskSingleVO = ivrTaskcallService.queryTaskByCondition(ivrTaskcall);
        return success(ivrTaskSingleVO);
    }



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

@@ -1,32 +1,25 @@
package com.smartor.controller;

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

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.PatMedInhosp;
import com.smartor.service.IPatMedInhospService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
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-04
 */

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

@@ -222,4 +222,5 @@
    private String textParam;



}

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

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

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

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

/**
 * å®£æ•™å•ä¸€ä»»åŠ¡å¯¹è±¡ he_task_single
 *
 * @author ruoyi
 * @date 2024-04-16
 */
@ApiModel(value = "IvrTask", description = "宣教单一任务对象 ")
@Data
public class HeTaskSingle extends BaseEntity {
    private static final long serialVersionUID = 1L;

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

    /**
     * æ‚£è€…服务任务id
     */
    @Excel(name = "患者服务任务id")
    @ApiModelProperty(value = "患者服务任务id")
    private Long svrtaskid;

    /**
     * ç—…人id（作废，用主键与关联表进行关联）
     */
    @Excel(name = " ç—…人id", readConverterExp = "作=废，用主键与关联表进行关联")
    @ApiModelProperty(value = "病人id（作废，用主键与关联表进行关联）")
    private String patientid;

    /**
     * å®£æ•™åˆ†ç±»
     */
    @Excel(name = " å®£æ•™åˆ†ç±» ")
    @ApiModelProperty(value = "宣教分类")
    private String classification;

    /**
     * å®£æ•™id
     */
    @Excel(name = " å®£æ•™id")
    @ApiModelProperty(value = "宣教id")
    private Long preachcategoryid;

    /**
     * å®£æ•™åç§°
     */
    @Excel(name = " å®£æ•™åç§° ")
    @ApiModelProperty(value = "宣教名称")
    private String preachname;

    /**
     * ç‰ˆæœ¬
     */
    @Excel(name = " ç‰ˆæœ¬ ")
    @ApiModelProperty(value = "版本")
    private BigDecimal version;

    /**
     * å®£æ•™å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉
     */
    @Excel(name = " å®£æ•™å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉")
    @ApiModelProperty(value = "宣教形式 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉")
    private String preachform;

    /**
     * ç»„织形式：1.单人宣教   2.多人宣教
     */
    @Excel(name = "组织形式：1.单人宣教   2.多人宣教")
    @ApiModelProperty(value = "组织形式：1.单人宣教   2.多人宣教")
    private Long orgform;

    /**
     * å®£æ•™æè¿°
     */
    @Excel(name = " å®£æ•™æè¿° ")
    @ApiModelProperty(value = "宣教描述")
    private String preachdescription;

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

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

    /**
     * å®£æ•™ä»£ç 
     */
    @Excel(name = " å®£æ•™ä»£ç  ")
    @ApiModelProperty(value = "宣教代码")
    private String preachcode;

    /**
     * ä¸­å¿ƒåº“ID
     */
    @Excel(name = " ä¸­å¿ƒåº“ID ")
    @ApiModelProperty(value = "中心库ID")
    private Long centerlibraryid;

    /**
     * æ˜¯å¦å¯ç”¨
     */
    @Excel(name = " æ˜¯å¦å¯ç”¨ ")
    @ApiModelProperty(value = "是否启用")
    private Long isenable;

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

    /**
     * åˆ é™¤æ ‡è®°
     */
    @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;

    /**
     * æ˜¯å¦æœ¬åœ°
     */
    @Excel(name = " æ˜¯å¦æœ¬åœ° ")
    @ApiModelProperty(value = "是否本地")
    private Long islocal;

    /**
     * ä¸­å¿ƒåº“代码
     */
    @Excel(name = " ä¸­å¿ƒåº“代码 ")
    @ApiModelProperty(value = "中心库代码")
    private String centerlibrarycode;

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

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

    /**
     * ä»»åŠ¡å‘送时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "任务发送时间", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "任务发送时间")
    private Date sendTime;

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

    /**
     * å‘送状态：  0  å¤±è´¥   1成功
     */
    @Excel(name = "发送状态：  0  å¤±è´¥   1成功")
    @ApiModelProperty(value = "发送状态：  0  å¤±è´¥   1成功")
    private String sendState;

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

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

    /**
     * å‘送人 ï¼ˆæ‚£è€…）
     */
    @Excel(name = " å‘送人 ", readConverterExp = "患=者")
    @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 wechat;

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

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

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

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

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

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

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

    /**
     * ç±»åž‹ï¼ˆ1 å®£æ•™ã€2 åŒ»æŠ€ï¼‰
     */
    @Excel(name = "类型（1 å®£æ•™ã€2 åŒ»æŠ€ï¼‰")
    @ApiModelProperty(value = "类型（1 å®£æ•™ã€2 åŒ»æŠ€ï¼‰")
    private String type;
}

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

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

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

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

/**
 * å®£æ•™å•ä¸€ä»»åŠ¡å¯¹è±¡ he_task_single
 *
 * @author ruoyi
 * @date 2024-04-16
 */
@ApiModel(value = "IvrTask", description = "宣教单一任务对象 ")
@Data
public class HeTaskSingleVO extends BaseEntity {
    private static final long serialVersionUID = 1L;

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

    /**
     * æ‚£è€…服务任务id
     */
    @Excel(name = "患者服务任务id")
    @ApiModelProperty(value = "患者服务任务id")
    private Long svrtaskid;

    /**
     * ç—…人id（作废，用主键与关联表进行关联）
     */
    @Excel(name = " ç—…人id", readConverterExp = "作=废，用主键与关联表进行关联")
    @ApiModelProperty(value = "病人id（作废，用主键与关联表进行关联）")
    private String patientid;

    /**
     * å®£æ•™åˆ†ç±»
     */
    @Excel(name = " å®£æ•™åˆ†ç±» ")
    @ApiModelProperty(value = "宣教分类")
    private String classification;

    /**
     * å®£æ•™id
     */
    @Excel(name = " å®£æ•™id")
    @ApiModelProperty(value = "宣教id")
    private Long preachcategoryid;

    /**
     * å®£æ•™åç§°
     */
    @Excel(name = " å®£æ•™åç§° ")
    @ApiModelProperty(value = "宣教名称")
    private String preachname;

    /**
     * ç‰ˆæœ¬
     */
    @Excel(name = " ç‰ˆæœ¬ ")
    @ApiModelProperty(value = "版本")
    private BigDecimal version;

    /**
     * å®£æ•™å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉
     */
    @Excel(name = " å®£æ•™å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉")
    @ApiModelProperty(value = "宣教形式 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉")
    private String preachform;

    /**
     * ç»„织形式：1.单人宣教   2.多人宣教
     */
    @Excel(name = "组织形式：1.单人宣教   2.多人宣教")
    @ApiModelProperty(value = "组织形式：1.单人宣教   2.多人宣教")
    private Long orgform;

    /**
     * å®£æ•™æè¿°
     */
    @Excel(name = " å®£æ•™æè¿° ")
    @ApiModelProperty(value = "宣教描述")
    private String preachdescription;

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

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

    /**
     * å®£æ•™ä»£ç 
     */
    @Excel(name = " å®£æ•™ä»£ç  ")
    @ApiModelProperty(value = "宣教代码")
    private String preachcode;

    /**
     * ä¸­å¿ƒåº“ID
     */
    @Excel(name = " ä¸­å¿ƒåº“ID ")
    @ApiModelProperty(value = "中心库ID")
    private Long centerlibraryid;

    /**
     * æ˜¯å¦å¯ç”¨
     */
    @Excel(name = " æ˜¯å¦å¯ç”¨ ")
    @ApiModelProperty(value = "是否启用")
    private Long isenable;

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

    /**
     * åˆ é™¤æ ‡è®°
     */
    @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;

    /**
     * æ˜¯å¦æœ¬åœ°
     */
    @Excel(name = " æ˜¯å¦æœ¬åœ° ")
    @ApiModelProperty(value = "是否本地")
    private Long islocal;

    /**
     * ä¸­å¿ƒåº“代码
     */
    @Excel(name = " ä¸­å¿ƒåº“代码 ")
    @ApiModelProperty(value = "中心库代码")
    private String centerlibrarycode;

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

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

    /**
     * ä»»åŠ¡å‘送时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "任务发送时间", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "任务发送时间")
    private Date sendTime;

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

    /**
     * å‘送状态：  0  å¤±è´¥   1成功
     */
    @Excel(name = "发送状态：  0  å¤±è´¥   1成功")
    @ApiModelProperty(value = "发送状态：  0  å¤±è´¥   1成功")
    private String sendState;

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

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


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


    /**
     * å‘送时间段
     */
    @ApiModelProperty(value = "发送时间段 ")
    private List<TaskSendTimeVO> sendTimeslot;


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

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

    /**
     * ç±»åž‹ï¼ˆ1 å®£æ•™ã€2 åŒ»æŠ€ï¼‰
     */
    @Excel(name = "类型（1 å®£æ•™ã€2 åŒ»æŠ€ï¼‰")
    @ApiModelProperty(value = "类型（1 å®£æ•™ã€2 åŒ»æŠ€ï¼‰")
    private String type;

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

}

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

@@ -1,395 +1,248 @@
package com.smartor.domain;

import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
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;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * è¯­éŸ³ä»»åŠ¡å¯¹è±¡ ivr_task
 * 
 *
 * @author smartor
 * @date 2023-03-24
 */
public class IvrTask extends BaseEntity
{
@ApiModel(value = "IvrTask", description = "任务对象")
@Data
public class IvrTask extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**    */
    /**
     * ä¸»é”®
     */
    @ApiModelProperty(value = "主键")
    private Long taskid;

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

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

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

    /**    */
    @Excel(name = "  ")
    /**
     * æ ‡ç­¾ä¿¡æ¯
     */
    @Excel(name = "标签信息")
    @ApiModelProperty(value = "标签信息")
    private String labelinfo;

    /**    */
    @Excel(name = "  ")
    /**
     * çŠ¶æ€
     */
    @Excel(name = "状态")
    @ApiModelProperty(value = "状态")
    private Long state;

    /**    */
    @Excel(name = "  ")
    /**
     * æ•°é‡
     */
    @Excel(name = "数量")
    @ApiModelProperty(value = "数量")
    private Long count;

    /**    */
    @Excel(name = "  ")
    /**
     * æ‰§è¡Œ
     */
    @Excel(name = "执行")
    @ApiModelProperty(value = "执行")
    private Long executed;

    /**    */
    @Excel(name = "  ")
    /**
     * ä¸æ‰§è¡Œ
     */
    @Excel(name = "不执行")
    @ApiModelProperty(value = "不执行")
    private Long unexecuted;

    /**    */
    @Excel(name = "  ")
    /**
     * æ˜¯å¦å¤±è´¥
     */
    @Excel(name = "是否失败")
    @ApiModelProperty(value = "是否失败")
    private Long fail;

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

    /**    */
    @Excel(name = "  ")
    private String username;
    /**
     * æ‚£è€…姓名
     */
    @Excel(name = "患者姓名")
    @ApiModelProperty(value = "患者姓名")
    private String patientname;

    /**    */
    /**
     *
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "添加时间")
    private Date addtime;

    /**    */
    @Excel(name = "  ")
    /**
     * å®¡æ ¸äººid
     */
    @Excel(name = "审核人id")
    @ApiModelProperty(value = "审核人id")
    private String checkuserid;

    /**    */
    @Excel(name = "  ")
    /**
     * å®¡æ ¸äºº
     */
    @Excel(name = "审核人")
    @ApiModelProperty(value = "审核人")
    private String checkusername;

    /**    */
    /**
     * å®¡æ ¸äººæ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "  ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "审核人时间")
    private Date checktime;

    /**  1，出院随访；2，体检通知；3，满意度调查；4，宣教；  */
    /**
     * 1，出院随访；2，体检通知；3，满意度调查；4，宣教；
     */
    @Excel(name = " 1，出院随访；2，体检通知；3，满意度调查；4，宣教； ")
    @ApiModelProperty(value = "1，出院随访；2，体检通知；3，满意度调查；4，宣教；")
    private String type;

    /**    */
    @Excel(name = "  ")
    /**
     * ç±»åž‹åç§°
     */
    @Excel(name = "类型名称")
    @ApiModelProperty(value = "类型名称")
    private String typename;

    /**  0.不使用播前短信 1.使用播前短信  */
    /**
     * 0.不使用播前短信 1.使用播前短信
     */
    @Excel(name = " 0.不使用播前短信 1.使用播前短信 ")
    @ApiModelProperty(value = "科室名称")
    private Long usebqsms;

    /**  0.不使用播后短信 1.使用播前短信  */
    /**
     * 0.不使用播后短信 1.使用播前短信
     */
    @Excel(name = " 0.不使用播后短信 1.使用播前短信 ")
    @ApiModelProperty(value = "0.不使用播前短信 1.使用播前短信 ")
    private Long usebhsms;

    /**    */
    @Excel(name = "  ")
    /**
     * 0.不使用播后短信 1.使用播后短信
     */
    @Excel(name = " 0.不使用播后短信 1.使用播后短信 ")
    @ApiModelProperty(value = " 0.不使用播后短信 1.使用播后短信 ")
    private Long usesendsms;

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

    /**  åˆ é™¤æ ‡è®°  */
    /**
     * åˆ é™¤
     */
    @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 setTaskid(Long taskid) 
    {
        this.taskid = taskid;
    }
    /**
     * çˆ¶ID
     */
    @Excel(name = " çˆ¶ID ")
    @ApiModelProperty(value = "父ID ")
    private Integer pid;

    public Long getTaskid() 
    {
        return taskid;
    }
    public void setTaskname(String taskname) 
    {
        this.taskname = taskname;
    }
    /**
     * guid
     */
    @Excel(name = " guid ")
    @ApiModelProperty(value = "guid ")
    private String guid;

    public String getTaskname() 
    {
        return taskname;
    }
    public void setTemplateid(String templateid) 
    {
        this.templateid = templateid;
    }
    /**
     * ä»»åŠ¡å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉
     */
    @Excel(name = "  ä»»åŠ¡å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉 ")
    @ApiModelProperty(value = " ä»»åŠ¡å½¢å¼ 1,多媒体   2,纸质  3,电话  4,短信  5.微信公众号 6.微信小程序  7.支付宝  8.智能小程序  9.钉钉 ")
    private String preachform;

    public String getTemplateid() 
    {
        return templateid;
    }
    public void setTemplatename(String templatename) 
    {
        this.templatename = templatename;
    }
    /**
     * æ˜¯å¦å‘送 ï¼š 0 æš‚停发送  1 å®šæ—¶å‘送  2 ç«‹å³å‘送
     */
    @Excel(name = " æ˜¯å¦å‘送 ï¼š 0 æš‚停发送  1 å®šæ—¶å‘送  2 ç«‹å³å‘送 ")
    @ApiModelProperty(value = "是否发送 ï¼š 0 æš‚停发送  1 å®šæ—¶å‘送  2 ç«‹å³å‘送 ")
    private Integer isSend;

    public String getTemplatename() 
    {
        return templatename;
    }
    public void setLabelinfo(String labelinfo) 
    {
        this.labelinfo = labelinfo;
    }
    /**
     * å‘送状态：  0  å¤±è´¥   1成功
     */
    @Excel(name = " å‘送状态：  0  å¤±è´¥   1成功 ")
    @ApiModelProperty(value = "发送状态：  0  å¤±è´¥   1成功 ")
    private String sendState;

    public String getLabelinfo() 
    {
        return labelinfo;
    }
    public void setState(Long state) 
    {
        this.state = state;
    }
    /**
     * æ–‡æœ¬å˜é‡å‚æ•°
     */
    @Excel(name = " æ–‡æœ¬å˜é‡å‚æ•° ")
    @ApiModelProperty(value = "文本变量参数 ")
    private String param;

    public Long getState() 
    {
        return state;
    }
    public void setCount(Long count) 
    {
        this.count = count;
    }

    public Long getCount() 
    {
        return count;
    }
    public void setExecuted(Long executed) 
    {
        this.executed = executed;
    }

    public Long getExecuted() 
    {
        return executed;
    }
    public void setUnexecuted(Long unexecuted) 
    {
        this.unexecuted = unexecuted;
    }

    public Long getUnexecuted() 
    {
        return unexecuted;
    }
    public void setFail(Long fail) 
    {
        this.fail = fail;
    }

    public Long getFail() 
    {
        return fail;
    }
    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 setAddtime(Date addtime) 
    {
        this.addtime = addtime;
    }

    public Date getAddtime() 
    {
        return addtime;
    }
    public void setCheckuserid(String checkuserid) 
    {
        this.checkuserid = checkuserid;
    }

    public String getCheckuserid() 
    {
        return checkuserid;
    }
    public void setCheckusername(String checkusername) 
    {
        this.checkusername = checkusername;
    }

    public String getCheckusername() 
    {
        return checkusername;
    }
    public void setChecktime(Date checktime) 
    {
        this.checktime = checktime;
    }

    public Date getChecktime() 
    {
        return checktime;
    }
    public void setType(String type) 
    {
        this.type = type;
    }

    public String getType() 
    {
        return type;
    }
    public void setTypename(String typename) 
    {
        this.typename = typename;
    }

    public String getTypename() 
    {
        return typename;
    }
    public void setUsebqsms(Long usebqsms) 
    {
        this.usebqsms = usebqsms;
    }

    public Long getUsebqsms() 
    {
        return usebqsms;
    }
    public void setUsebhsms(Long usebhsms) 
    {
        this.usebhsms = usebhsms;
    }

    public Long getUsebhsms() 
    {
        return usebhsms;
    }
    public void setUsesendsms(Long usesendsms) 
    {
        this.usesendsms = usesendsms;
    }

    public Long getUsesendsms() 
    {
        return usesendsms;
    }
    public void setDeptcode(String deptcode) 
    {
        this.deptcode = deptcode;
    }

    public String getDeptcode() 
    {
        return deptcode;
    }
    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("taskid", getTaskid())
            .append("taskname", getTaskname())
            .append("templateid", getTemplateid())
            .append("templatename", getTemplatename())
            .append("labelinfo", getLabelinfo())
            .append("state", getState())
            .append("count", getCount())
            .append("executed", getExecuted())
            .append("unexecuted", getUnexecuted())
            .append("fail", getFail())
            .append("userid", getUserid())
            .append("username", getUsername())
            .append("addtime", getAddtime())
            .append("checkuserid", getCheckuserid())
            .append("checkusername", getCheckusername())
            .append("checktime", getChecktime())
            .append("type", getType())
            .append("typename", getTypename())
            .append("usebqsms", getUsebqsms())
            .append("usebhsms", getUsebhsms())
            .append("usesendsms", getUsesendsms())
            .append("deptcode", getDeptcode())
            .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/IvrTaskSingle.java

@@ -9,14 +9,14 @@
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰å¯¹è±¡ ivr_taskcall
 * å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰å¯¹è±¡ ivr_tasksingle
 *
 * @author ruoyi
 * @date 2024-02-02
 */
@Data
public class IvrTaskSingle extends BaseEntity {
    @ApiModelProperty(value = "拉取时间")
    @ApiModelProperty(value = "单一任务（随访）")
    private static final long serialVersionUID = 1L;

    /**
@@ -320,7 +320,7 @@
     */
    @Excel(name = "床号")
    @ApiModelProperty(value = "床号")
    private Long badNo;
    private String badNo;

    /**
     * ç–¾ç—…名称
@@ -414,4 +414,41 @@
    @Excel(name = "  å°±è¯Šç±»åž‹ï¼ˆ1门诊  2出院）")
    @ApiModelProperty(value = "就诊类型（1门诊  2出院）")
    private String hospType;


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

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

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

    /**
     * å°±è¯Šæ—¥æœŸ
     */
    @Excel(name = " å°±è¯Šæ—¥æœŸ")
    @ApiModelProperty(value = "就诊日期")
    private Date admindate;

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

}

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

@@ -417,6 +417,43 @@
    @ApiModelProperty(value = "就诊类型（1门诊  2出院）")
    private String hospType;

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


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

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

    /**
     * å°±è¯Šæ—¥æœŸ
     */
    @Excel(name = " å°±è¯Šæ—¥æœŸ")
    @ApiModelProperty(value = "就诊日期")
    private Date admindate;

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


    @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/PatMedInhosp.java

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -12,209 +13,235 @@

/**
 * æ‚£è€…住院记录对象 pat_med_inhosp
 * 
 *
 * @author smartor
 * @date 2023-03-04
 */
@ApiModel(value = "PatMedInhosp", description = "患者住院记录对象")
@Data
public class PatMedInhosp extends BaseEntity
{
public class PatMedInhosp extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**  è‡ªå¢žID  */
    /**
     * è‡ªå¢žID
     */
    @ApiModelProperty(value = "自增ID")
    private Long inhospid;

    /**  è‡ªå¢žID  */
    /**
     * è‡ªå¢žID
     */
    @ApiModelProperty(value = "自增ID")
    private String inhospno;

    /**  æµæ°´å·  */
    /**
     * æµæ°´å·
     */
    @ApiModelProperty(value = "流水号")
    private String serialnum;

    /**  åŒ»é™¢åç§°  */
    /**
     * åŒ»é™¢åç§°
     */
    @ApiModelProperty(value = "医院名称")
    @Excel(name = " åŒ»é™¢åç§° ")
    private String hospitalname;

    /**  åŒ»é™¢ç¼–号  */
    /**
     * åŒ»é™¢ç¼–号
     */
    @ApiModelProperty(value = "医院编号")
    private String hospitalcode;

    /**  é™¢åŒºç¼–号  */
    /**
     * é™¢åŒºç¼–号
     */
    @ApiModelProperty(value = "院区编号")
    private String hospitaldistrictcode;

    /**  é™¢åŒºåç§°  */
    /**
     * é™¢åŒºåç§°
     */
    @ApiModelProperty(value = "院区名称")
    @Excel(name = " é™¢åŒºåç§° ")
    private String hospitaldistrictname;

    /**  å…¥é™¢è¯Šæ–­ICD值  */
    /**
     * å…¥é™¢è¯Šæ–­ICD值
     */
    @ApiModelProperty(value = "入院诊断ICD值")
    private String icd10code;

    /**  å…¥é™¢è¯Šæ–­åç§°  */
    /**
     * å…¥é™¢è¯Šæ–­åç§°
     */
    @ApiModelProperty(value = "入院诊断名称")
    private String diagname;

    /**  å…¥é™¢æ—¶é—´  */
    /**
     * å…¥é™¢æ—¶é—´
     */
    @ApiModelProperty(value = "入院时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " å…¥é™¢æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    private Date starttime;

    /**  å‡ºé™¢æ—¶é—´  */
    /**
     * å‡ºé™¢æ—¶é—´
     */
    @ApiModelProperty(value = "出院时间")
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " å‡ºé™¢æ—¶é—´ ", width = 30, dateFormat = "yyyy-MM-dd")
    private Date endtime;

    /**  å…¥é™¢ç§‘室代码  */
    /**
     * å…¥é™¢ç§‘室代码
     */
    @ApiModelProperty(value = "入院科室代码")
    private String deptcode;

    /**  å…¥é™¢ç§‘室名称  */
    /**
     * å…¥é™¢ç§‘室名称
     */
    @ApiModelProperty(value = "入院科室名称")
    private String deptname;

    /**  æˆ¿é—´å·  */
    /**
     * æˆ¿é—´å·
     */
    @ApiModelProperty(value = "房间号")
    private String roomno;

    /**  åºŠä½å·  */
    /**
     * åºŠä½å·
     */
    @ApiModelProperty(value = "床位号")
    @Excel(name = " åºŠä½å· ")
    private String bedno;
    private String bedNo;

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

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

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

    /**  ä¸Šä¼ æ—¶é—´  */
    /**
     * ä¸Šä¼ æ—¶é—´
     */
    @ApiModelProperty(value = "上传时间")
    private Date uploadTime;

    /**  æ¡£æ¡ˆID  */
    /**
     * æ¡£æ¡ˆID
     */
    @ApiModelProperty(value = "档案ID")
    private Long patid;

    /**  å‡ºé™¢è¯Šæ–­  */
    /**
     * å‡ºé™¢è¯Šæ–­
     */
    @ApiModelProperty(value = "出院诊断")
    @Excel(name = " å‡ºé™¢è¯Šæ–­ ")
    private String leavediagname;

    /**  å‡ºé™¢è¯Šæ–­ICD值  */
    /**
     * å‡ºé™¢è¯Šæ–­ICD值
     */
    @ApiModelProperty(value = "出院诊断ICD值")
    private String leaveicd10code;

    /**  åŒ»ç”Ÿå·¥å·  */
    /**
     * åŒ»ç”Ÿå·¥å·
     */
    @ApiModelProperty(value = "医生工号")
    private String drcode;

    /**  åŒ»ç”Ÿåç§°  */
    /**
     * åŒ»ç”Ÿåç§°
     */
    @ApiModelProperty(value = "医生名称")
    @Excel(name = " åŒ»ç”Ÿåç§° ")
    private String drname;

    /**  æ˜¯å¦ç”Ÿæˆæ–¹æ¡ˆçŠ¶æ€;0未生成 1生成入院 2生成出院 9无匹配方案  */
    /**
     * æ˜¯å¦ç”Ÿæˆæ–¹æ¡ˆçŠ¶æ€;0未生成 1生成入院 2生成出院 9无匹配方案
     */
    @ApiModelProperty(value = "是否生成方案状态;0未生成 1生成入院 2生成出院 9无匹配方案")
    private Long schemestatus;

    /**  æ˜¯å¦ç”Ÿæˆé€šç”¨æ–¹æ¡ˆçŠ¶æ€;0未生成 1生成 9无匹配方案  */
    /**
     * æ˜¯å¦ç”Ÿæˆé€šç”¨æ–¹æ¡ˆçŠ¶æ€;0未生成 1生成 9无匹配方案
     */
    @ApiModelProperty(value = "是否生成通用方案状态;0未生成 1生成 9无匹配方案")
    private Long generalschemestatus;

    /**  å‡ºé™¢ç§‘室代码  */
    /**
     * å‡ºé™¢ç§‘室代码
     */
    @ApiModelProperty(value = "出院科室代码")
    private String leaveldeptcode;

    /**  å‡ºé™¢ç§‘室名称  */
    /**
     * å‡ºé™¢ç§‘室名称
     */
    @ApiModelProperty(value = "出院科室名称")
    @Excel(name = " å‡ºé™¢ç§‘室名称 ")
    private String leaveldeptname;

    /**  ç—…区ID  */
    /**
     * ç—…区ID
     */
    @ApiModelProperty(value = "病区ID")
    private Long hospitaldistrictid;

    /**  å‡ºé™¢ç—…区编号  */
    /**
     * å‡ºé™¢ç—…区编号
     */
    @ApiModelProperty(value = "出院病区编号")
    private String leavehospitaldistrictcode;

    /**  å‡ºé™¢ç—…区名称  */
    /**
     * å‡ºé™¢ç—…区名称
     */
    @ApiModelProperty(value = "出院病区名称")
    @Excel(name = " å‡ºé™¢ç—…区名称 ")
    private String leavehospitaldistrictname;

    /**  å‡ºé™¢ç—…区ID  */
    /**
     * å‡ºé™¢ç—…区ID
     */
    @ApiModelProperty(value = "出院病区ID")
    private Long leavehospitaldistrictid;

    /**  å…¥é™¢ç§‘室ID  */
    /**
     * å…¥é™¢ç§‘室ID
     */
    @ApiModelProperty(value = "入院科室ID")
    private Long deptid;

    /**  å‡ºé™¢ç§‘室ID  */
    /**
     * å‡ºé™¢ç§‘室ID
     */
    @ApiModelProperty(value = "出院科室ID")
    private Long leaveldeptid;

    /**  æ–¹æ¡ˆçŠ¶æ€æ“ä½œæ—¶é—´  */
    /**
     * æ–¹æ¡ˆçŠ¶æ€æ“ä½œæ—¶é—´
     */
    @ApiModelProperty(value = "方案状态操作时间")
    private Date schemetime;

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("inhospid", getInhospid())
            .append("serialnum", getSerialnum())
            .append("hospitalname", getHospitalname())
            .append("hospitalcode", getHospitalcode())
            .append("hospitaldistrictcode", getHospitaldistrictcode())
            .append("hospitaldistrictname", getHospitaldistrictname())
            .append("icd10code", getIcd10code())
            .append("diagname", getDiagname())
            .append("starttime", getStarttime())
            .append("endtime", getEndtime())
            .append("deptcode", getDeptcode())
            .append("deptname", getDeptname())
            .append("roomno", getRoomno())
            .append("bedno", getBedno())
            .append("orgid", getOrgid())
            .append("delFlag", getDelFlag())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("isupload", getIsupload())
            .append("uploadTime", getUploadTime())
            .append("patid", getPatid())
            .append("leavediagname", getLeavediagname())
            .append("leaveicd10code", getLeaveicd10code())
            .append("drcode", getDrcode())
            .append("drname", getDrname())
            .append("schemestatus", getSchemestatus())
            .append("generalschemestatus", getGeneralschemestatus())
            .append("leaveldeptcode", getLeaveldeptcode())
            .append("leaveldeptname", getLeaveldeptname())
            .append("hospitaldistrictid", getHospitaldistrictid())
            .append("leavehospitaldistrictcode", getLeavehospitaldistrictcode())
            .append("leavehospitaldistrictname", getLeavehospitaldistrictname())
            .append("leavehospitaldistrictid", getLeavehospitaldistrictid())
            .append("deptid", getDeptid())
            .append("leaveldeptid", getLeaveldeptid())
            .append("schemetime", getSchemetime())
            .toString();
    }
}

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

@@ -81,14 +81,14 @@
     */
    @Excel(name = "床号")
    @ApiModelProperty("床号")
    private Long bedno;
    private String bedNo;

    /**
     * ç§‘室
     */
    @Excel(name = "科室")
    @ApiModelProperty("科室")
    private String dept;
    private String deptName;

    /**
     * ç§‘室
@@ -157,9 +157,23 @@
    private String receiveTime;

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

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

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

}

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

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

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

import java.util.List;

/**
 * å®£æ•™å•ä¸€ä»»åŠ¡Mapper接口
 *
 * @author ruoyi
 * @date 2024-04-16
 */
@Mapper
public interface HeTaskSingleMapper {
    /**
     * æŸ¥è¯¢å®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param id å®£æ•™å•ä¸€ä»»åŠ¡ä¸»é”®
     * @return å®£æ•™å•ä¸€ä»»åŠ¡
     */
    public HeTaskSingle selectHeTaskSingleById(Long id);

    /**
     * æŸ¥è¯¢å®£æ•™å•ä¸€ä»»åŠ¡åˆ—表
     *
     * @param heTaskSingle å®£æ•™å•ä¸€ä»»åŠ¡
     * @return å®£æ•™å•ä¸€ä»»åŠ¡é›†åˆ
     */
    public List<HeTaskSingle> selectHeTaskSingleList(HeTaskSingle heTaskSingle);

    /**
     * æ–°å¢žå®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param heTaskSingle å®£æ•™å•ä¸€ä»»åŠ¡
     * @return ç»“æžœ
     */
    public int insertHeTaskSingle(HeTaskSingle heTaskSingle);

    /**
     * ä¿®æ”¹å®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param heTaskSingle å®£æ•™å•ä¸€ä»»åŠ¡
     * @return ç»“æžœ
     */
    public int updateHeTaskSingle(HeTaskSingle heTaskSingle);

    /**
     * åˆ é™¤å®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param id å®£æ•™å•ä¸€ä»»åŠ¡ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteHeTaskSingleById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤å®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteHeTaskSingleByIds(Long[] ids);
}

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

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

import com.ruoyi.common.core.domain.AjaxResult;
import com.smartor.domain.HeTaskSingle;
import com.smartor.domain.HeTaskSingleVO;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;

/**
 * å®£æ•™å•ä¸€ä»»åŠ¡Service接口
 *
 * @author ruoyi
 * @date 2024-04-16
 */
public interface IHeTaskSingleService {
    /**
     * æŸ¥è¯¢å®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param id å®£æ•™å•ä¸€ä»»åŠ¡ä¸»é”®
     * @return å®£æ•™å•ä¸€ä»»åŠ¡
     */
    public HeTaskSingle selectHeTaskSingleById(Long id);

    /**
     * æŸ¥è¯¢å®£æ•™å•ä¸€ä»»åŠ¡åˆ—表
     *
     * @param heTaskSingle å®£æ•™å•ä¸€ä»»åŠ¡
     * @return å®£æ•™å•ä¸€ä»»åŠ¡é›†åˆ
     */
    public List<HeTaskSingle> selectHeTaskSingleList(HeTaskSingle heTaskSingle);

    /**
     * æ–°å¢žå®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param heTaskSingle å®£æ•™å•ä¸€ä»»åŠ¡
     * @return ç»“æžœ
     */
    public int insertHeTaskSingle(HeTaskSingle heTaskSingle);

    public Integer addOrUpdateHeTaskSinle(HeTaskSingleVO heTaskSingleVO);

    /**
     * ä¿®æ”¹å®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param heTaskSingle å®£æ•™å•ä¸€ä»»åŠ¡
     * @return ç»“æžœ
     */
    public int updateHeTaskSingle(HeTaskSingle heTaskSingle);

    /**
     * æ‰¹é‡åˆ é™¤å®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param ids éœ€è¦åˆ é™¤çš„宣教单一任务主键集合
     * @return ç»“æžœ
     */
    public int deleteHeTaskSingleByIds(Long[] ids);

    /**
     * åˆ é™¤å®£æ•™å•ä¸€ä»»åŠ¡ä¿¡æ¯
     *
     * @param id å®£æ•™å•ä¸€ä»»åŠ¡ä¸»é”®
     * @return ç»“æžœ
     */
    public int deleteHeTaskSingleById(Long id);

    public HeTaskSingleVO queryHeTaskByCondition(HeTaskSingle heTaskSingle);
}

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

@@ -28,9 +28,17 @@
    public List<IvrTaskSingle> selectIvrTaskcallList(IvrTaskSingle ivrTaskcall);

    /**
     * æ ¹æ®æ¡ä»¶æŸ¥è¯¢ä»»åŠ¡ä¿¡æ¯
     *
     * @param ivrTaskcall
     * @return
     */
    public IvrTaskSingleVO queryTaskByCondition(IvrTaskSingle ivrTaskcall);

    /**
     * æŸ¥è¯¢æ‚£è€…随访信息
     */
    public List<IvrVisitInfoVo> patItem(IvrTaskSingle ivrTaskcall);
    public List<IvrTaskSingle> patItem(IvrTaskSingle ivrTaskcall);

    /**
     * æ–°å¢žå•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰

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

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

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.smartor.domain.*;
import com.smartor.mapper.HeTaskMapper;
import com.smartor.mapper.HeTaskSingleMapper;
import com.smartor.service.IHeTaskSingleService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

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

/**
 * å®£æ•™å•ä¸€ä»»åŠ¡Service业务层处理
 *
 * @author ruoyi
 * @date 2024-04-16
 */
@Slf4j
@Service
public class HeTaskSingleServiceImpl implements IHeTaskSingleService {
    @Autowired
    private HeTaskSingleMapper heTaskSingleMapper;

    @Autowired
    private HeTaskMapper heTaskMapper;

    /**
     * æŸ¥è¯¢å®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param id å®£æ•™å•ä¸€ä»»åŠ¡ä¸»é”®
     * @return å®£æ•™å•ä¸€ä»»åŠ¡
     */
    @Override
    public HeTaskSingle selectHeTaskSingleById(Long id) {
        return heTaskSingleMapper.selectHeTaskSingleById(id);
    }

    /**
     * æŸ¥è¯¢å®£æ•™å•ä¸€ä»»åŠ¡åˆ—表
     *
     * @param heTaskSingle å®£æ•™å•ä¸€ä»»åŠ¡
     * @return å®£æ•™å•ä¸€ä»»åŠ¡
     */
    @Override
    public List<HeTaskSingle> selectHeTaskSingleList(HeTaskSingle heTaskSingle) {
        return heTaskSingleMapper.selectHeTaskSingleList(heTaskSingle);
    }

    /**
     * æ–°å¢žå®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param heTaskSingle å®£æ•™å•ä¸€ä»»åŠ¡
     * @return ç»“æžœ
     */
    @Override
    public int insertHeTaskSingle(HeTaskSingle heTaskSingle) {
        HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskSingle, HeTask.class);
        int heTaskId = heTaskMapper.insertHeTask(heTask);
        heTaskSingle.setSvrtaskid(Long.valueOf(heTaskId));
        heTaskSingle.setCreateTime(DateUtils.getNowDate());
        return heTaskSingleMapper.insertHeTaskSingle(heTaskSingle);
    }

    /**
     * æ–°å¢žæˆ–修改宣教单一任务
     *
     * @param heTaskSingleVO
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public Integer addOrUpdateHeTaskSinle(HeTaskSingleVO heTaskSingleVO) {
        if (ObjectUtils.isEmpty(heTaskSingleVO)) {
            log.info("宣教任务入参为空，请检查入参");
            throw new BaseException("宣教任务入参为空，请检查入参");
        }
        Integer integer = null;
        HeTask heTask = DtoConversionUtils.sourceToTarget(heTaskSingleVO, HeTask.class);
        if (heTaskSingleVO.getIsoperation() != null && heTaskSingleVO.getIsoperation() == 1) {
            //往任务表中，新增任务
            Integer taskId = heTaskMapper.insertHeTask(heTask);
            heTaskSingleVO.setSvrtaskid(taskId.longValue());
            //新增
            if (CollectionUtils.isNotEmpty(heTaskSingleVO.getPatTaskRelevances())) {
                for (PatTaskRelevance patTaskRelevance : heTaskSingleVO.getPatTaskRelevances()) {
                    //将任务信息新增到宣教任务表中
                    HeTaskSingle heTaskSingle = getHeTaskSingle(heTaskSingleVO, patTaskRelevance);
                    integer = heTaskSingleMapper.insertHeTaskSingle(heTaskSingle);
                }
            }
        } else if (heTaskSingleVO.getIsoperation() != null && heTaskSingleVO.getIsoperation() == 2) {
            //任务修改
            heTaskMapper.updateHeTask(heTask);

            if (CollectionUtils.isNotEmpty(heTaskSingleVO.getPatTaskRelevances())) {
                for (PatTaskRelevance patTaskRelevance : heTaskSingleVO.getPatTaskRelevances()) {
                    HeTaskSingle heTaskSingle = getHeTaskSingle(heTaskSingleVO, patTaskRelevance);
                    heTaskSingle.setTextParam(new Gson().toJson(heTaskSingleVO.getTextParam()));
                    if (patTaskRelevance.getIsoperation() == 2) heTaskSingleMapper.updateHeTaskSingle(heTaskSingle);
                    if (patTaskRelevance.getIsoperation() == 1) heTaskSingleMapper.insertHeTaskSingle(heTaskSingle);
                    integer = heTaskSingle.getId().intValue();
                }
            }
        } else if (heTaskSingleVO.getIsoperation() != null && heTaskSingleVO.getIsoperation() == 3) {
            heTaskSingleMapper.deleteHeTaskSingleById(heTaskSingleVO.getId());

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

    /**
     * ä¿®æ”¹å®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param heTaskSingle å®£æ•™å•ä¸€ä»»åŠ¡
     * @return ç»“æžœ
     */
    @Override
    public int updateHeTaskSingle(HeTaskSingle heTaskSingle) {
        heTaskSingle.setUpdateTime(DateUtils.getNowDate());
        return heTaskSingleMapper.updateHeTaskSingle(heTaskSingle);
    }

    /**
     * æ‰¹é‡åˆ é™¤å®£æ•™å•ä¸€ä»»åŠ¡
     *
     * @param ids éœ€è¦åˆ é™¤çš„宣教单一任务主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteHeTaskSingleByIds(Long[] ids) {
        return heTaskSingleMapper.deleteHeTaskSingleByIds(ids);
    }

    /**
     * åˆ é™¤å®£æ•™å•ä¸€ä»»åŠ¡ä¿¡æ¯
     *
     * @param id å®£æ•™å•ä¸€ä»»åŠ¡ä¸»é”®
     * @return ç»“æžœ
     */
    @Override
    public int deleteHeTaskSingleById(Long id) {
        return heTaskSingleMapper.deleteHeTaskSingleById(id);
    }

    @Override
    public HeTaskSingleVO queryHeTaskByCondition(HeTaskSingle heTaskSingle) {
        //定义患者与单一任务关联表集合
        List<PatTaskRelevance> patTaskRelevances = new ArrayList<>();
        List<HeTaskSingle> heTaskSingles = selectHeTaskSingleList(heTaskSingle);
        //将查出来的数据倒入IvrTaskcallVO中
        HeTaskSingleVO heTaskSingleVO = DtoConversionUtils.sourceToTarget(heTaskSingles.get(0), HeTaskSingleVO.class);
        String sendTimeSlot = heTaskSingles.get(0).getSendTimeSlot();
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            //获取到发送时间的集合
            if (StringUtils.isNotEmpty(sendTimeSlot)) {
                List<TaskSendTimeVO> taskSendTimeVOList = objectMapper.readValue(sendTimeSlot, List.class);
                heTaskSingleVO.setSendTimeslot(taskSendTimeVOList);
            }
            //文本变量参数
            if (com.ruoyi.common.utils.StringUtils.isNotEmpty(heTaskSingles.get(0).getTextParam())) {
                Map<String, Map<String, String>> textParam = objectMapper.readValue(heTaskSingles.get(0).getTextParam(), Map.class);
                heTaskSingleVO.setTextParam(textParam);
            }
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }

        for (HeTaskSingle heTaskSingle1 : heTaskSingles) {
            PatTaskRelevance patTaskRelevance = new PatTaskRelevance();
            if (!heTaskSingle1.getClassification().equals("2")) {
                //获取到患者信息，并放入到集合中
                log.info("宣教分类为：{}", heTaskSingle1.getClassification());
                patTaskRelevance.setName(heTaskSingle1.getSendname());
                patTaskRelevance.setAge(heTaskSingle1.getAge());
                patTaskRelevance.setSfzh(heTaskSingle1.getSfzh());
                patTaskRelevance.setPhone(heTaskSingle1.getPhone());
                patTaskRelevance.setAddr(heTaskSingle1.getAddr());
                patTaskRelevance.setDiagname(heTaskSingle1.getDiagname());
                patTaskRelevances.add(patTaskRelevance);
            } else if (heTaskSingle1.getClassification().equals("2")) {
                log.info("宣教分类为住院", heTaskSingle1.getClassification());
                patTaskRelevance.setName(heTaskSingle1.getSendname());
                patTaskRelevance.setAge(heTaskSingle1.getAge());
                patTaskRelevance.setSfzh(heTaskSingle1.getSfzh());
                patTaskRelevance.setPhone(heTaskSingle1.getPhone());
                patTaskRelevance.setAddr(heTaskSingle1.getAddr());
                patTaskRelevance.setDeptName(heTaskSingle1.getDeptname());
                patTaskRelevance.setBedNo(heTaskSingle1.getBedNo());
                patTaskRelevance.setDiagname(heTaskSingle1.getDiagname());
                patTaskRelevances.add(patTaskRelevance);
            }
        }

        heTaskSingleVO.setPatTaskRelevances(patTaskRelevances);
        return heTaskSingleVO;
    }


    private HeTaskSingle getHeTaskSingle(HeTaskSingleVO heTaskSingleVO, PatTaskRelevance patTaskRelevance) {

        HeTaskSingle heTaskSingle = DtoConversionUtils.sourceToTarget(heTaskSingleVO, HeTaskSingle.class);
        heTaskSingle.setSendname(patTaskRelevance.getName());
        heTaskSingle.setAge(patTaskRelevance.getAge());
        heTaskSingle.setSfzh(patTaskRelevance.getSfzh());
        heTaskSingle.setPhone(patTaskRelevance.getPhone());
        heTaskSingle.setAddr(patTaskRelevance.getAddr());
        heTaskSingle.setCreateTime(DateUtils.getNowDate());
        if (CollectionUtils.isNotEmpty(heTaskSingleVO.getSendTimeslot())) {
            heTaskSingle.setSendTimeSlot(heTaskSingleVO.getSendTimeslot().toString());
        }
        return heTaskSingle;
    }

}

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

@@ -191,8 +191,6 @@
                }
            }
        }


        return i;
    }


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

@@ -88,41 +88,64 @@
    }

    @Override
    public List<IvrVisitInfoVo> patItem(IvrTaskSingle ivrTaskcall) {
        List<IvrTaskSingle> list = this.selectIvrTaskcallList(ivrTaskcall);
    public IvrTaskSingleVO queryTaskByCondition(IvrTaskSingle ivrTaskcall) {
        //定义患者与单一任务关联表集合
        List<PatTaskRelevance> patTaskRelevances = new ArrayList<>();
        List<IvrTaskSingle> list = selectIvrTaskcallList(ivrTaskcall);
        //将查出来的数据倒入IvrTaskcallVO中
        IvrTaskSingleVO ivrTaskcallVO2 = DtoConversionUtils.sourceToTarget(list.get(0), IvrTaskSingleVO.class);
        String sendTimeSlot = list.get(0).getSendTimeSlot();
        ObjectMapper objectMapper = new ObjectMapper();
        try {
            //获取到发送时间的集合
            if (com.ruoyi.common.utils.StringUtils.isNotEmpty(sendTimeSlot)) {
                List<TaskSendTimeVO> taskSendTimeVOList = objectMapper.readValue(sendTimeSlot, List.class);
                ivrTaskcallVO2.setSendTimeslot(taskSendTimeVOList);
            }
            //文本变量参数
            if (com.ruoyi.common.utils.StringUtils.isNotEmpty(list.get(0).getTextParam())) {
                Map<String, Map<String, String>> textParam = objectMapper.readValue(list.get(0).getTextParam(), Map.class);
                ivrTaskcallVO2.setTextParam(textParam);
            }
        } catch (JsonProcessingException e) {
            e.printStackTrace();
        }

        //定义返参数据
        List<IvrVisitInfoVo> visitInfoVos = new ArrayList<>();
        for (IvrTaskSingle ivrTaskcall1 : list) {
            IvrVisitInfoVo ivrVisitInfoVo = DtoConversionUtils.sourceToTarget(ivrTaskcall1, IvrVisitInfoVo.class);
            ivrVisitInfoVo.setPatientName(ivrTaskcall1.getSendname());
            if (ivrTaskcall.getRecordid() != null) {
                if (ivrTaskcall1.getHospType().equals("1")) {
                    //门诊随访
                    PatMedOuthosp patMedOuthosp = patMedOuthospMapper.selectPatMedOuthospById(ivrTaskcall.getRecordid());
                    ivrVisitInfoVo.setDiagname(patMedOuthosp.getDiagname());
                    ivrVisitInfoVo.setDeptname(patMedOuthosp.getDeptname());
                    ivrVisitInfoVo.setAdmitdate(patMedOuthosp.getAdmitdate());
                    ivrVisitInfoVo.setVisitTime(ivrTaskcall1.getSendTimeSlot());
                    ivrVisitInfoVo.setState(ivrTaskcall1.getSendstate());
                    ivrVisitInfoVo.setHospno(patMedOuthosp.getOuthospno());
                    visitInfoVos.add(ivrVisitInfoVo);
                } else if (ivrTaskcall1.getHospType().equals("2")) {
                    //出院
                    PatMedInhosp patMedInhosp = patMedInhospMapper.selectPatMedInhospByInhospid(ivrTaskcall.getRecordid());
                    ivrVisitInfoVo.setDiagname(patMedInhosp.getDiagname());
                    ivrVisitInfoVo.setDeptname(patMedInhosp.getDeptname());
                    ivrVisitInfoVo.setAdmitdate(patMedInhosp.getStarttime());
                    ivrVisitInfoVo.setVisitTime(ivrTaskcall1.getSendTimeSlot());
                    ivrVisitInfoVo.setState(ivrTaskcall1.getSendstate());
                    ivrVisitInfoVo.setHospno(patMedInhosp.getInhospno());
                    ivrVisitInfoVo.setRoomno(patMedInhosp.getRoomno());
                    ivrVisitInfoVo.setBedno(patMedInhosp.getBedno());
                    visitInfoVos.add(ivrVisitInfoVo);
                }
            PatTaskRelevance patTaskRelevance = new PatTaskRelevance();
            if (!ivrTaskcall1.getHospType().equals("2")) {
                log.info("随访查询不为出院，{}", ivrTaskcall1.getHospType());
                //获取到患者信息，并放入到集合中
                patTaskRelevance.setName(ivrTaskcall1.getSendname());
                patTaskRelevance.setAge(ivrTaskcall1.getAge());
                patTaskRelevance.setSfzh(ivrTaskcall1.getSfzh());
                patTaskRelevance.setPhone(ivrTaskcall1.getPhone());
                patTaskRelevance.setAddr(ivrTaskcall1.getAddr());
                patTaskRelevance.setDiagname(ivrTaskcall1.getDiagname());
                patTaskRelevances.add(patTaskRelevance);
            } else if (ivrTaskcall1.getHospType().equals("2")) {
                log.info("随访查询为出院，{}", ivrTaskcall1.getHospType());
                patTaskRelevance.setName(ivrTaskcall1.getSendname());
                patTaskRelevance.setAge(ivrTaskcall1.getAge());
                patTaskRelevance.setSfzh(ivrTaskcall1.getSfzh());
                patTaskRelevance.setPhone(ivrTaskcall1.getPhone());
                patTaskRelevance.setAddr(ivrTaskcall1.getAddr());
                patTaskRelevance.setDeptName(ivrTaskcall1.getDeptname());
                patTaskRelevance.setBedNo(ivrTaskcall1.getBadNo());
                patTaskRelevance.setDiagname(ivrTaskcall1.getDiagname());
                patTaskRelevances.add(patTaskRelevance);
            }
        }
        return visitInfoVos;

        ivrTaskcallVO2.setPatTaskRelevances(patTaskRelevances);
        return ivrTaskcallVO2;
    }

    @Override
    public List<IvrTaskSingle> patItem(IvrTaskSingle ivrTaskSingle) {


        return this.selectIvrTaskcallList(ivrTaskSingle);
    }

    /**
@@ -152,7 +175,6 @@
    /**
     * æ‰¹é‡åˆ é™¤å•ä¸€ä»»åŠ¡ï¼ˆéšè®¿ï¼‰
     *
     * @param ids éœ€è¦åˆ é™¤çš„单一任务（随访）主键
     * @return ç»“æžœ
     */
    @Override
@@ -167,7 +189,6 @@
    /**
     * å•ä¸€ä»»åŠ¡
     *
     * @param ivrTaskcallVO å•ä¸€ä»»åŠ¡
     * @return ç»“æžœ
     */
    @Transactional(rollbackFor = Exception.class)

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,336 @@
<?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">
<mapper namespace="com.smartor.mapper.HeTaskSingleMapper">

    <resultMap type="com.smartor.domain.HeTaskSingle" id="HeTaskSingleResult">
        <result property="id" column="id"/>
        <result property="svrtaskid" column="svrtaskid"/>
        <result property="patientid" column="patientid"/>
        <result property="classification" column="classification"/>
        <result property="preachcategoryid" column="preachcategoryid"/>
        <result property="preachname" column="preachname"/>
        <result property="version" column="version"/>
        <result property="preachform" column="preachform"/>
        <result property="orgform" column="orgform"/>
        <result property="preachdescription" column="preachdescription"/>
        <result property="preachcontent" column="preachcontent"/>
        <result property="templateid" column="templateid"/>
        <result property="preachcode" column="preachcode"/>
        <result property="centerlibraryid" column="centerlibraryid"/>
        <result property="isenable" column="isenable"/>
        <result property="orgid" column="orgid"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="delFlag" column="del_flag"/>
        <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="islocal" column="islocal"/>
        <result property="centerlibrarycode" column="centerlibrarycode"/>
        <result property="pid" column="pid"/>
        <result property="guid" column="guid"/>
        <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"/>
        <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="wechat" column="wechat"/>
        <result property="diagname" column="diagname"/>
        <result property="deptname" column="deptname"/>
        <result property="admindate" column="admindate"/>
        <result property="roomno" column="roomno"/>
        <result property="bedNo" column="bedno"/>
        <result property="type" column="type"/>
        <result property="sendType" column="send_type"/>
        <result property="sendTimeSlot" column="send_time_slot"/>
    </resultMap>

    <sql id="selectHeTaskSingleVo">
        select id,
               svrtaskid,
               patientid,
               classification,
               preachcategoryid,
               preachname,
               version,
               preachform,
               orgform,
               preachdescription,
               preachcontent,
               templateid,
               preachcode,
               centerlibraryid,
               isenable,
               orgid,
               update_by,
               update_time,
               del_flag,
               create_by,
               create_time,
               isupload,
               upload_time,
               islocal,
               centerlibrarycode,
               pid,
               guid,
               send_time,
               is_send,
               send_state,
               rich_text,
               text_param,
               sendname,
               phone,
               sex,
               age,
               sfzh,
               addr,
               senderdetail,
               wechat,
               diagname,
               deptname,
               admindate,
               roomno,
               bedno,
               send_type,
               type,
               send_time_slot
        from he_task_single
    </sql>

    <select id="selectHeTaskSingleList" parameterType="com.smartor.domain.HeTaskSingle" resultMap="HeTaskSingleResult">
        <include refid="selectHeTaskSingleVo"/>
        <where>
            <if test="svrtaskid != null ">and svrtaskid = #{svrtaskid}</if>
            <if test="patientid != null  and patientid != ''">and patientid = #{patientid}</if>
            <if test="classification != null  and classification != ''">and classification = #{classification}</if>
            <if test="preachcategoryid != null ">and preachcategoryid = #{preachcategoryid}</if>
            <if test="preachname != null  and preachname != ''">and preachname like concat('%', #{preachname}, '%')</if>
            <if test="version != null ">and version = #{version}</if>
            <if test="preachform != null  and preachform != ''">and preachform = #{preachform}</if>
            <if test="orgform != null ">and orgform = #{orgform}</if>
            <if test="preachdescription != null  and preachdescription != ''">and preachdescription =
                #{preachdescription}
            </if>
            <if test="preachcontent != null  and preachcontent != ''">and preachcontent = #{preachcontent}</if>
            <if test="templateid != null ">and templateid = #{templateid}</if>
            <if test="preachcode != null  and preachcode != ''">and preachcode = #{preachcode}</if>
            <if test="centerlibraryid != null ">and centerlibraryid = #{centerlibraryid}</if>
            <if test="isenable != null ">and isenable = #{isenable}</if>
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
            <if test="isupload != null ">and isupload = #{isupload}</if>
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
            <if test="islocal != null ">and islocal = #{islocal}</if>
            <if test="centerlibrarycode != null  and centerlibrarycode != ''">and centerlibrarycode =
                #{centerlibrarycode}
            </if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="sendTime != null ">and send_time = #{sendTime}</if>
            <if test="isSend != null ">and is_send = #{isSend}</if>
            <if test="sendState != null  and sendState != ''">and send_state = #{sendState}</if>
            <if test="richText != null  and richText != ''">and rich_text = #{richText}</if>
            <if test="textParam != null  and textParam != ''">and text_param = #{textParam}</if>
            <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="wechat != null  and wechat != ''">and wechat = #{wechat}</if>
            <if test="diagname != null  and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if>
            <if test="deptname != null  and deptname != ''">and deptname like concat('%', #{deptname}, '%')</if>
            <if test="admindate != null ">and admindate = #{admindate}</if>
            <if test="roomno != null  and roomno != ''">and roomno = #{roomno}</if>
            <if test="bedno != null  and bedno != ''">and bedno = #{bedno}</if>
            <if test="sendType != null  and sendType != ''">and send_type = #{sendType}</if>
            <if test="sendTimeSlot != null  and sendTimeSlot != ''">and send_time_slot = #{sendTimeSlot}</if>
            <if test="type != null  and type != ''">and type = #{type}</if>
        </where>
    </select>

    <select id="selectHeTaskSingleById" parameterType="Long" resultMap="HeTaskSingleResult">
        <include refid="selectHeTaskSingleVo"/>
        where id = #{id}
    </select>

    <insert id="insertHeTaskSingle" parameterType="com.smartor.domain.HeTaskSingle" useGeneratedKeys="true"
            keyProperty="id">
        insert into he_task_single
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="svrtaskid != null">svrtaskid,</if>
            <if test="patientid != null">patientid,</if>
            <if test="classification != null">classification,</if>
            <if test="preachcategoryid != null">preachcategoryid,</if>
            <if test="preachname != null">preachname,</if>
            <if test="version != null">version,</if>
            <if test="preachform != null">preachform,</if>
            <if test="orgform != null">orgform,</if>
            <if test="preachdescription != null">preachdescription,</if>
            <if test="preachcontent != null">preachcontent,</if>
            <if test="templateid != null">templateid,</if>
            <if test="preachcode != null">preachcode,</if>
            <if test="centerlibraryid != null">centerlibraryid,</if>
            <if test="isenable != null">isenable,</if>
            <if test="orgid != null">orgid,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="delFlag != null and delFlag != ''">del_flag,</if>
            <if test="createBy != null">create_by,</if>
            <if test="createTime != null">create_time,</if>
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="islocal != null">islocal,</if>
            <if test="centerlibrarycode != null">centerlibrarycode,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <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>
            <if test="sendname != null">sendname,</if>
            <if test="phone != null">phone,</if>
            <if test="sex != null">sex,</if>
            <if test="age != null">age,</if>
            <if test="sfzh != null">sfzh,</if>
            <if test="addr != null">addr,</if>
            <if test="senderdetail != null">senderdetail,</if>
            <if test="wechat != null">wechat,</if>
            <if test="diagname != null">diagname,</if>
            <if test="deptname != null">deptname,</if>
            <if test="admindate != null">admindate,</if>
            <if test="roomno != null">roomno,</if>
            <if test="bedno != null">bedno,</if>
            <if test="sendType != null">send_type,</if>
            <if test="sendTimeSlot != null">send_time_slot,</if>
            <if test="type != null">type,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="svrtaskid != null">#{svrtaskid},</if>
            <if test="patientid != null">#{patientid},</if>
            <if test="classification != null">#{classification},</if>
            <if test="preachcategoryid != null">#{preachcategoryid},</if>
            <if test="preachname != null">#{preachname},</if>
            <if test="version != null">#{version},</if>
            <if test="preachform != null">#{preachform},</if>
            <if test="orgform != null">#{orgform},</if>
            <if test="preachdescription != null">#{preachdescription},</if>
            <if test="preachcontent != null">#{preachcontent},</if>
            <if test="templateid != null">#{templateid},</if>
            <if test="preachcode != null">#{preachcode},</if>
            <if test="centerlibraryid != null">#{centerlibraryid},</if>
            <if test="isenable != null">#{isenable},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="islocal != null">#{islocal},</if>
            <if test="centerlibrarycode != null">#{centerlibrarycode},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <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>
            <if test="sendname != null">#{sendname},</if>
            <if test="phone != null">#{phone},</if>
            <if test="sex != null">#{sex},</if>
            <if test="age != null">#{age},</if>
            <if test="sfzh != null">#{sfzh},</if>
            <if test="addr != null">#{addr},</if>
            <if test="senderdetail != null">#{senderdetail},</if>
            <if test="wechat != null">#{wechat},</if>
            <if test="diagname != null">#{diagname},</if>
            <if test="deptname != null">#{deptname},</if>
            <if test="admindate != null">#{admindate},</if>
            <if test="roomno != null">#{roomno},</if>
            <if test="bedno != null">#{bedno},</if>
            <if test="sendType != null">#{sendType},</if>
            <if test="sendTimeSlot != null">#{sendTimeSlot},</if>
            <if test="type != null">#{type},</if>
        </trim>
    </insert>

    <update id="updateHeTaskSingle" parameterType="com.smartor.domain.HeTaskSingle">
        update he_task_single
        <trim prefix="SET" suffixOverrides=",">
            <if test="svrtaskid != null">svrtaskid = #{svrtaskid},</if>
            <if test="patientid != null">patientid = #{patientid},</if>
            <if test="classification != null">classification = #{classification},</if>
            <if test="preachcategoryid != null">preachcategoryid = #{preachcategoryid},</if>
            <if test="preachname != null">preachname = #{preachname},</if>
            <if test="version != null">version = #{version},</if>
            <if test="preachform != null">preachform = #{preachform},</if>
            <if test="orgform != null">orgform = #{orgform},</if>
            <if test="preachdescription != null">preachdescription = #{preachdescription},</if>
            <if test="preachcontent != null">preachcontent = #{preachcontent},</if>
            <if test="templateid != null">templateid = #{templateid},</if>
            <if test="preachcode != null">preachcode = #{preachcode},</if>
            <if test="centerlibraryid != null">centerlibraryid = #{centerlibraryid},</if>
            <if test="isenable != null">isenable = #{isenable},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="isupload != null">isupload = #{isupload},</if>
            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
            <if test="islocal != null">islocal = #{islocal},</if>
            <if test="centerlibrarycode != null">centerlibrarycode = #{centerlibrarycode},</if>
            <if test="pid != null">pid = #{pid},</if>
            <if test="guid != null">guid = #{guid},</if>
            <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>
            <if test="sendname != null">sendname = #{sendname},</if>
            <if test="phone != null">phone = #{phone},</if>
            <if test="sex != null">sex = #{sex},</if>
            <if test="age != null">age = #{age},</if>
            <if test="sfzh != null">sfzh = #{sfzh},</if>
            <if test="addr != null">addr = #{addr},</if>
            <if test="senderdetail != null">senderdetail = #{senderdetail},</if>
            <if test="wechat != null">wechat = #{wechat},</if>
            <if test="diagname != null">diagname = #{diagname},</if>
            <if test="deptname != null">deptname = #{deptname},</if>
            <if test="admindate != null">admindate = #{admindate},</if>
            <if test="roomno != null">roomno = #{roomno},</if>
            <if test="bedno != null">bedno = #{bedno},</if>
            <if test="sendType != null">send_type = #{sendType},</if>
            <if test="sendTimeSlot != null">send_time_slot = #{sendTimeSlot},</if>
            <if test="type != null">type = #{type},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteHeTaskSingleById" parameterType="Long">
        delete
        from he_task_single
        where id = #{id}
    </delete>

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

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

@@ -15,8 +15,6 @@
        <result property="executed" column="executed"/>
        <result property="unexecuted" column="unexecuted"/>
        <result property="fail" column="fail"/>
        <result property="userid" column="userid"/>
        <result property="username" column="username"/>
        <result property="addtime" column="addtime"/>
        <result property="checkuserid" column="checkuserid"/>
        <result property="checkusername" column="checkusername"/>
@@ -35,6 +33,12 @@
        <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="preachform" column="preachform"/>
        <result property="isSend" column="is_send"/>
        <result property="sendState" column="send_state"/>
        <result property="param" column="param"/>
    </resultMap>

    <sql id="selectIvrTaskVo">
@@ -48,8 +52,6 @@
               executed,
               unexecuted,
               fail,
               userid,
               username,
               addtime,
               checkuserid,
               checkusername,
@@ -67,6 +69,12 @@
               create_time,
               isupload,
               upload_time,
               pid,
               guid,
               preachform,
               is_send,
               send_state,
               param,
               orgid
        from ivr_task
    </sql>
@@ -85,8 +93,6 @@
            <if test="executed != null ">and executed = #{executed}</if>
            <if test="unexecuted != null ">and unexecuted = #{unexecuted}</if>
            <if test="fail != null ">and fail = #{fail}</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="checkuserid != null  and checkuserid != ''">and checkuserid = #{checkuserid}</if>
            <if test="checkusername != null  and checkusername != ''">and checkusername like concat('%',
@@ -103,7 +109,7 @@
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
        </where>
        order by upeate_time desc,taskid desc
        order by update_time desc,taskid desc
    </select>

    <select id="selectIvrTaskByTaskid" parameterType="Long" resultMap="IvrTaskResult">
@@ -115,7 +121,6 @@
            keyProperty="taskid">
        insert into ivr_task
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="taskid != null">taskid,</if>
            <if test="taskname != null">taskname,</if>
            <if test="templateid != null">templateid,</if>
            <if test="templatename != null">templatename,</if>
@@ -125,8 +130,6 @@
            <if test="executed != null">executed,</if>
            <if test="unexecuted != null">unexecuted,</if>
            <if test="fail != null">fail,</if>
            <if test="userid != null">userid,</if>
            <if test="username != null">username,</if>
            <if test="addtime != null">addtime,</if>
            <if test="checkuserid != null">checkuserid,</if>
            <if test="checkusername != null">checkusername,</if>
@@ -145,9 +148,14 @@
            <if test="isupload != null">isupload,</if>
            <if test="uploadTime != null">upload_time,</if>
            <if test="orgid != null">orgid,</if>
            <if test="pid != null">pid,</if>
            <if test="guid != null">guid,</if>
            <if test="preachform != null">preachform,</if>
            <if test="isSend != null">is_send,</if>
            <if test="sendState != null">send_state,</if>
            <if test="param != null">param,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="taskid != null">#{taskid},</if>
            <if test="taskname != null">#{taskname},</if>
            <if test="templateid != null">#{templateid},</if>
            <if test="templatename != null">#{templatename},</if>
@@ -157,8 +165,6 @@
            <if test="executed != null">#{executed},</if>
            <if test="unexecuted != null">#{unexecuted},</if>
            <if test="fail != null">#{fail},</if>
            <if test="userid != null">#{userid},</if>
            <if test="username != null">#{username},</if>
            <if test="addtime != null">#{addtime},</if>
            <if test="checkuserid != null">#{checkuserid},</if>
            <if test="checkusername != null">#{checkusername},</if>
@@ -177,6 +183,12 @@
            <if test="isupload != null">#{isupload},</if>
            <if test="uploadTime != null">#{uploadTime},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="pid != null">#{pid},</if>
            <if test="guid != null">#{guid},</if>
            <if test="preachform != null">#{preachform},</if>
            <if test="isSend != null">#{isSend},</if>
            <if test="sendState != null">#{sendState},</if>
            <if test="param != null">#{param},</if>
        </trim>
    </insert>

@@ -192,8 +204,6 @@
            <if test="executed != null">executed = #{executed},</if>
            <if test="unexecuted != null">unexecuted = #{unexecuted},</if>
            <if test="fail != null">fail = #{fail},</if>
            <if test="userid != null">userid = #{userid},</if>
            <if test="username != null">username = #{username},</if>
            <if test="addtime != null">addtime = #{addtime},</if>
            <if test="checkuserid != null">checkuserid = #{checkuserid},</if>
            <if test="checkusername != null">checkusername = #{checkusername},</if>
@@ -212,6 +222,12 @@
            <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="preachform != null">preachform = #{preachform},</if>
            <if test="isSend != null">is_send = #{isSend},</if>
            <if test="sendState != null">send_state = #{sendState},</if>
            <if test="param != null">param = #{param},</if>
        </trim>
        where taskid = #{taskid}
    </update>

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

@@ -63,11 +63,15 @@
        <result property="operatorNo" column="operator_no"/>
        <result property="hospno" column="hospno"/>
        <result property="hospType" column="hosp_type"/>
        <result property="wechat" column="wechat"/>
        <result property="diagname" column="diagname"/>
        <result property="deptname" column="deptname"/>
        <result property="admindate" column="admindate"/>
        <result property="roomno" column="roomno"/>
    </resultMap>

    <sql id="selectIvrTaskcallVo">
        select id,
               sendname,
               hosp_type,
               hospno,
               phone,
@@ -123,8 +127,14 @@
               task_desc,
               operator_no,
               operator,
               wechat,
               sendname,
               roomno,
               admindate,
               deptname,
               diagname,
               preachcontent
        from ivr_taskcall
        from ivr_task_single
    </sql>

    <select id="selectIvrTaskcallList" parameterType="com.smartor.domain.IvrTaskSingle" resultMap="IvrTaskcallResult">
@@ -180,6 +190,7 @@
            <if test="sendType != null  and sendType != ''">and send_type = #{sendType}</if>
            <if test="operator != null  and operator != ''">and operator = #{operator}</if>
            <if test="operatorNo != null  and operatorNo != ''">and operator_no = #{operatorNo}</if>
            <if test="wechat != null  and wechat != ''">and wechat = #{wechat}</if>
        </where>
        order by update_time desc,id desc
    </select>
@@ -191,7 +202,7 @@

    <insert id="insertIvrTaskcall" parameterType="com.smartor.domain.IvrTaskSingle" useGeneratedKeys="true"
            keyProperty="id">
        insert into ivr_taskcall
        insert into ivr_task_single
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="sendname != null">sendname,</if>
            <if test="phone != null">phone,</if>
@@ -249,6 +260,11 @@
            <if test="operatorNo != null  and operatorNo != ''">operator_no,</if>
            <if test="hospType != null  and hospType != ''">hosp_type,</if>
            <if test="hospno != null  and hospno != ''">hospno,</if>
            <if test="wechat != null  and wechat != ''">wechat,</if>
            <if test="roomno != null  and roomno != ''">roomno,</if>
            <if test="admindate != null  and admindate != ''">admindate,</if>
            <if test="deptname != null  and deptname != ''">deptname,</if>
            <if test="diagname != null  and diagname != ''">diagname,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="sendname != null">#{sendname},</if>
@@ -307,11 +323,16 @@
            <if test="operatorNo != null  and operatorNo != ''">#{operatorNo},</if>
            <if test="hospType != null  and hospType != ''">#{hospType},</if>
            <if test="hospno != null  and hospno != ''">#{hospno},</if>
            <if test="wechat != null  and wechat != ''">#{wechat},</if>
            <if test="roomno != null  and roomno != ''">#{roomno},</if>
            <if test="admindate != null  and admindate != ''">#{admindate},</if>
            <if test="deptname != null  and deptname != ''">#{deptname},</if>
            <if test="diagname != null  and diagname != ''">#{diagname},</if>
        </trim>
    </insert>

    <update id="updateIvrTaskcall" parameterType="com.smartor.domain.IvrTaskSingle">
        update ivr_taskcall
        update ivr_task_single
        <trim prefix="SET" suffixOverrides=",">
            <if test="sendname != null">sendname = #{sendname},</if>
            <if test="phone != null">phone = #{phone},</if>
@@ -369,12 +390,17 @@
            <if test="operator != null  and operator != ''">operator = #{operator},</if>
            <if test="hospType != null  and hospType != ''">hosp_type = #{hospType},</if>
            <if test="hospno != null  and hospno != ''">hospno = #{hospno},</if>
            <if test="wechat != null  and wechat != ''">wechat = #{wechat},</if>
            <if test="roomno != null  and roomno != ''">roomno = #{roomno},</if>
            <if test="admindate != null  and admindate != ''">admindate = #{admindate},</if>
            <if test="deptname != null  and deptname != ''">deptname = #{deptname},</if>
            <if test="diagname != null  and diagname != ''">diagname = #{diagname},</if>
        </trim>
        where id = #{id}
    </update>

    <update id="deleteIvrTaskcallById" parameterType="Long">
        update ivr_taskcall
        update ivr_task_single
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
@@ -440,8 +466,13 @@
               operator,
               hospno,
               hosp_type,
               wechat,
               roomno,
               admindate,
               deptname,
               diagname,
               send_time_slot
        FROM ivr_taskcall,
        FROM ivr_task_single,
             JSON_TABLE(send_time_slot, '$[*]' COLUMNS (
        begantime DATETIME PATH '$.begantime',
        endtime DATETIME PATH '$.endtime'

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

@@ -15,8 +15,8 @@
        <result property="name" column="name"/>
        <result property="age" column="age"/>
        <result property="sex" column="sex"/>
        <result property="bedno" column="bed_no"/>
        <result property="dept" column="dept"/>
        <result property="bedNo" column="bed_no"/>
        <result property="deptName" column="dept"/>
        <result property="icdName" column="icd_name"/>
        <result property="phone" column="phone"/>
        <result property="medicalRecordNo" column="medical_record_no"/>
@@ -61,8 +61,8 @@
            <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>
            <if test="bedno != null ">and bed_no = #{bedno}</if>
            <if test="dept != null  and dept != ''">and dept = #{dept}</if>
            <if test="bedNo != null ">and bed_no = #{bedNo}</if>
            <if test="deptName != null  and deptName != ''">and dept = #{deptName}</if>
            <if test="phone != null  and phone != ''">and phone = #{phone}</if>
            <if test="medicalRecordNo != null  and medicalRecordNo != ''">and medical_record_no = #{medicalRecordNo}
            </if>
@@ -92,8 +92,8 @@
            <if test="name != null">name,</if>
            <if test="age != null">age,</if>
            <if test="sex != null">sex,</if>
            <if test="bedno != null">bed_no,</if>
            <if test="dept != null">dept,</if>
            <if test="bedNo != null">bed_no,</if>
            <if test="deptName != null">dept,</if>
            <if test="icdName != null">icd_name,</if>
            <if test="phone != null">phone,</if>
            <if test="medicalRecordNo != null">medical_record_no,</if>
@@ -113,8 +113,8 @@
            <if test="name != null">#{name},</if>
            <if test="age != null">#{age},</if>
            <if test="sex != null">#{sex},</if>
            <if test="bedno != null">#{bedno},</if>
            <if test="dept != null">#{dept},</if>
            <if test="bedNo != null">#{bedNo},</if>
            <if test="deptName != null">#{deptName},</if>
            <if test="icdName != null">#{icdName},</if>
            <if test="phone != null">#{phone},</if>
            <if test="medicalRecordNo != null">#{medicalRecordNo},</if>
@@ -138,8 +138,8 @@
            <if test="name != null">name = #{name},</if>
            <if test="age != null">age = #{age},</if>
            <if test="sex != null">sex = #{sex},</if>
            <if test="bedno != null">bed_no = #{bedno},</if>
            <if test="dept != null">dept = #{dept},</if>
            <if test="bedNo != null">bed_no = #{bedNo},</if>
            <if test="deptName != null">dept = #{deptName},</if>
            <if test="icdName != null">icd_name = #{icdName},</if>
            <if test="phone != null">phone = #{phone},</if>
            <if test="medicalRecordNo != null">medical_record_no = #{medicalRecordNo},</if>
@@ -166,4 +166,4 @@
            #{id}
        </foreach>
    </delete>
</mapper>
</mapper>

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

@@ -19,7 +19,7 @@
        <result property="deptcode"    column="deptcode"    />
        <result property="deptname"    column="deptname"    />
        <result property="roomno"    column="roomno"    />
        <result property="bedno"    column="bedno"    />
        <result property="bedNo"    column="bed_no"    />
        <result property="orgid"    column="orgid"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="updateBy"    column="update_by"    />
@@ -47,7 +47,7 @@
    </resultMap>

    <sql id="selectPatMedInhospVo">
        select inhospid,inhospno, serialnum, hospitalname, hospitalcode, hospitaldistrictcode, hospitaldistrictname, icd10code, diagname, starttime, endtime, deptcode, deptname, roomno, bedno, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, patid, leavediagname, leaveicd10code, drcode, drname, schemestatus, generalschemestatus, leaveldeptcode, leaveldeptname, hospitaldistrictid, leavehospitaldistrictcode, leavehospitaldistrictname, leavehospitaldistrictid, deptid, leaveldeptid, schemetime from pat_med_inhosp
        select inhospid,inhospno, serialnum, hospitalname, hospitalcode, hospitaldistrictcode, hospitaldistrictname, icd10code, diagname, starttime, endtime, deptcode, deptname, roomno, bed_no, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, patid, leavediagname, leaveicd10code, drcode, drname, schemestatus, generalschemestatus, leaveldeptcode, leaveldeptname, hospitaldistrictid, leavehospitaldistrictcode, leavehospitaldistrictname, leavehospitaldistrictid, deptid, leaveldeptid, schemetime from pat_med_inhosp
    </sql>

    <select id="selectPatMedInhospList" parameterType="com.smartor.domain.PatMedInhosp" resultMap="PatMedInhospResult">
@@ -83,7 +83,7 @@
            <if test="deptcode != null">deptcode,</if>
            <if test="deptname != null">deptname,</if>
            <if test="roomno != null">roomno,</if>
            <if test="bedno != null">bedno,</if>
            <if test="bedNo != null">bed_no,</if>
            <if test="orgid != null">orgid,</if>
            <if test="delFlag != null and delFlag != ''">del_flag,</if>
            <if test="updateBy != null">update_by,</if>
@@ -122,7 +122,7 @@
            <if test="deptcode != null">#{deptcode},</if>
            <if test="deptname != null">#{deptname},</if>
            <if test="roomno != null">#{roomno},</if>
            <if test="bedno != null">#{bedno},</if>
            <if test="bedNo != null">#{bedNo},</if>
            <if test="orgid != null">#{orgid},</if>
            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
            <if test="updateBy != null">#{updateBy},</if>
@@ -165,7 +165,7 @@
            <if test="deptcode != null">deptcode = #{deptcode},</if>
            <if test="deptname != null">deptname = #{deptname},</if>
            <if test="roomno != null">roomno = #{roomno},</if>
            <if test="bedno != null">bedno = #{bedno},</if>
            <if test="bedNo != null">bed_no = #{bedNo},</if>
            <if test="orgid != null">orgid = #{orgid},</if>
            <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
@@ -204,4 +204,4 @@
            #{inhospid}
        </foreach>
    </delete>
</mapper>
</mapper>