代码提交

liusheng

2025-02-25 1468abbfadd8ba623c85e0c871aade69607ce085

代码提交

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

@@ -15,7 +15,10 @@
import com.smartor.domain.*;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.mapper.ServiceTaskMapper;
import com.smartor.service.*;
import com.smartor.service.IBaseSmsaccountService;
import com.smartor.service.IServiceOutPathService;
import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.ISvyTaskTemplateService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,9 +28,6 @@
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.stereotype.Component;

import java.math.BigInteger;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;

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

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

import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.smartor.domain.ServiceCheck;
import com.smartor.service.IServiceCheckService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;

/**
 * éšè®¿æœåŠ¡å‘送判断Controller
 *
 * @author lihu
 * @date 2025-02-25
 */
@Api("随访服务发送判断")
@RestController
@RequestMapping("/smartor/check")
public class ServiceCheckController extends BaseController
{
    @Autowired
    private IServiceCheckService serviceCheckService;

    /**
     * æŸ¥è¯¢éšè®¿æœåŠ¡å‘送判断列表
     */
    @ApiOperation("查询随访服务发送判断列表")
    //@PreAuthorize("@ss.hasPermi('smartor:check:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceCheck serviceCheck)
    {
        startPage();
        List<ServiceCheck> list = serviceCheckService.selectServiceCheckList(serviceCheck);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºéšè®¿æœåŠ¡å‘送判断列表
     */
    @ApiOperation("导出随访服务发送判断列表")
    //@PreAuthorize("@ss.hasPermi('smartor:check:export')")
    @Log(title = "随访服务发送判断", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ServiceCheck serviceCheck)
    {
        List<ServiceCheck> list = serviceCheckService.selectServiceCheckList(serviceCheck);
        ExcelUtil<ServiceCheck> util = new ExcelUtil<ServiceCheck>(ServiceCheck.class);
        util.exportExcel(response, list, "随访服务发送判断数据");
    }

    /**
     * èŽ·å–随访服务发送判断详细信息
     */
    @ApiOperation("获取随访服务发送判断详细信息")
    //@PreAuthorize("@ss.hasPermi('smartor:check:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(serviceCheckService.selectServiceCheckById(id));
    }

    /**
     * æ–°å¢žéšè®¿æœåŠ¡å‘送判断
     */
    @ApiOperation("新增随访服务发送判断")
    //@PreAuthorize("@ss.hasPermi('smartor:check:add')")
    @Log(title = "随访服务发送判断", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody ServiceCheck serviceCheck)
    {
        return toAjax(serviceCheckService.insertServiceCheck(serviceCheck));
    }

    /**
     * ä¿®æ”¹éšè®¿æœåŠ¡å‘送判断
     */
    @ApiOperation("修改随访服务发送判断")
    //@PreAuthorize("@ss.hasPermi('smartor:check:edit')")
    @Log(title = "随访服务发送判断", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ServiceCheck serviceCheck)
    {
        return toAjax(serviceCheckService.updateServiceCheck(serviceCheck));
    }

    /**
     * åˆ é™¤éšè®¿æœåŠ¡å‘送判断
     */
    @ApiOperation("删除随访服务发送判断")
    //@PreAuthorize("@ss.hasPermi('smartor:check:remove')")
    @Log(title = "随访服务发送判断", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceCheckService.deleteServiceCheckByIds(ids));
    }
}

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

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

import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.smartor.domain.ServiceTaskdiag;
import com.smartor.service.IServiceTaskdiagService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;

/**
 * æ¨¡æ¿ç§‘室关联Controller
 *
 * @author lihu
 * @date 2025-02-24
 */
@Api("模板科室关联")
@RestController
@RequestMapping("/smartor/taskdiag")
public class ServiceTaskdiagController extends BaseController
{
    @Autowired
    private IServiceTaskdiagService serviceTaskdiagService;

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     */
    @ApiOperation("查询模板科室关联列表")
    //@PreAuthorize("@ss.hasPermi('smartor:taskdiag:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceTaskdiag serviceTaskdiag)
    {
        startPage();
        List<ServiceTaskdiag> list = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ¨¡æ¿ç§‘室关联列表
     */
    @ApiOperation("导出模板科室关联列表")
    //@PreAuthorize("@ss.hasPermi('smartor:taskdiag:export')")
    @Log(title = "模板科室关联", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ServiceTaskdiag serviceTaskdiag)
    {
        List<ServiceTaskdiag> list = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag);
        ExcelUtil<ServiceTaskdiag> util = new ExcelUtil<ServiceTaskdiag>(ServiceTaskdiag.class);
        util.exportExcel(response, list, "模板科室关联数据");
    }

    /**
     * èŽ·å–模板科室关联详细信息
     */
    @ApiOperation("获取模板科室关联详细信息")
    //@PreAuthorize("@ss.hasPermi('smartor:taskdiag:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(serviceTaskdiagService.selectServiceTaskdiagById(id));
    }

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     */
    @ApiOperation("新增模板科室关联")
    //@PreAuthorize("@ss.hasPermi('smartor:taskdiag:add')")
    @Log(title = "模板科室关联", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody ServiceTaskdiag serviceTaskdiag)
    {
        return toAjax(serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag));
    }

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     */
    @ApiOperation("修改模板科室关联")
    //@PreAuthorize("@ss.hasPermi('smartor:taskdiag:edit')")
    @Log(title = "模板科室关联", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ServiceTaskdiag serviceTaskdiag)
    {
        return toAjax(serviceTaskdiagService.updateServiceTaskdiag(serviceTaskdiag));
    }

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联
     */
    @ApiOperation("删除模板科室关联")
    //@PreAuthorize("@ss.hasPermi('smartor:taskdiag:remove')")
    @Log(title = "模板科室关联", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceTaskdiagService.deleteServiceTaskdiagByIds(ids));
    }
}

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

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

import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.smartor.domain.ServiceTaskoper;
import com.smartor.service.IServiceTaskoperService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;

/**
 * æ¨¡æ¿ç§‘室关联Controller
 *
 * @author lihu
 * @date 2025-02-24
 */
@Api("模板科室关联")
@RestController
@RequestMapping("/smartor/taskoper")
public class ServiceTaskoperController extends BaseController
{
    @Autowired
    private IServiceTaskoperService serviceTaskoperService;

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     */
    @ApiOperation("查询模板科室关联列表")
    //@PreAuthorize("@ss.hasPermi('smartor:taskoper:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceTaskoper serviceTaskoper)
    {
        startPage();
        List<ServiceTaskoper> list = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ¨¡æ¿ç§‘室关联列表
     */
    @ApiOperation("导出模板科室关联列表")
    //@PreAuthorize("@ss.hasPermi('smartor:taskoper:export')")
    @Log(title = "模板科室关联", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ServiceTaskoper serviceTaskoper)
    {
        List<ServiceTaskoper> list = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper);
        ExcelUtil<ServiceTaskoper> util = new ExcelUtil<ServiceTaskoper>(ServiceTaskoper.class);
        util.exportExcel(response, list, "模板科室关联数据");
    }

    /**
     * èŽ·å–模板科室关联详细信息
     */
    @ApiOperation("获取模板科室关联详细信息")
    //@PreAuthorize("@ss.hasPermi('smartor:taskoper:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(serviceTaskoperService.selectServiceTaskoperById(id));
    }

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     */
    @ApiOperation("新增模板科室关联")
    //@PreAuthorize("@ss.hasPermi('smartor:taskoper:add')")
    @Log(title = "模板科室关联", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody ServiceTaskoper serviceTaskoper)
    {
        return toAjax(serviceTaskoperService.insertServiceTaskoper(serviceTaskoper));
    }

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     */
    @ApiOperation("修改模板科室关联")
    //@PreAuthorize("@ss.hasPermi('smartor:taskoper:edit')")
    @Log(title = "模板科室关联", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ServiceTaskoper serviceTaskoper)
    {
        return toAjax(serviceTaskoperService.updateServiceTaskoper(serviceTaskoper));
    }

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联
     */
    @ApiOperation("删除模板科室关联")
    //@PreAuthorize("@ss.hasPermi('smartor:taskoper:remove')")
    @Log(title = "模板科室关联", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(serviceTaskoperService.deleteServiceTaskoperByIds(ids));
    }
}

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,30 +6,28 @@
    druid:
      # ä¸»åº“数据源
      master:
        # ä¹‰ä¹ŒäºŒé™¢
        # url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        # username: root
        # password: 123456

        # å…¬å¸
        # url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        # ä¸½æ°´
        # url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        # username: smartor
        # password: Smartor.2023
        # driverClassName: com.mysql.cj.jdbc.Driver

        # æ–°åŽ
        # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        # username: smartor
        # password: Smartor.2023
        # driverClassName: com.mysql.cj.jdbc.Driver

        # å…¬å¸äº‘
        url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: hxsoft
        password: Hxerp2000
        #        ä¹‰ä¹ŒäºŒé™¢
        #        url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        username: root
        #        password: 123456
        #        å…¬å¸
        #        url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        ä¸½æ°´
        url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023
        driverClassName: com.mysql.cj.jdbc.Driver
        # æ–°åŽ
#        url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        #        username: smartor
        #        password: Smartor.2023
        #        driverClassName: com.mysql.cj.jdbc.Driver

        #        å…¬å¸äº‘
#        url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
#        username: hxsoft
#        password: Hxerp2000
#        driverClassName: com.mysql.cj.jdbc.Driver

      # ä»Žåº“数据源
      slave:
@@ -213,3 +211,9 @@
phoneUpEveryHour: 12
#电话每天结束时间
phoneEndHour: 20

#新员工默认密码
defaultPwd: 123456

#是否需要根据疾病建立出院患者随访
createIcd10Visit: false

 ruoyi-admin/src/main/resources/application.yml

@@ -72,9 +72,9 @@
  # redis é…ç½®
  redis:
    #    # åœ°å€ï¼ˆä¸½æ°´ï¼‰
    #    host: 127.0.0.1
    host: 127.0.0.1
    # åœ°å€ï¼ˆå…¬å¸ï¼‰
    host: 116.62.18.175
    #    host: 116.62.18.175
    port: 6020

    # æ•°æ®åº“索引

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

@@ -26,6 +26,9 @@
    @ApiModelProperty(value = "用户 ID")
    private String YongHuID;

    @ApiModelProperty(value = "用户登录码")
    private String YongHuDLM;

    @ApiModelProperty(value = "用户姓名")
    private String YongHuXM;


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

@@ -284,7 +284,7 @@
    /**
     * é•¿æœŸä»»åŠ¡ï¼Œæ˜¯å¦å¤„理：0未处理   1处理
     */
    @ApiModelProperty(value = "长期任务，是否处理：0未处理   1处理成功    2处理失败")
    @ApiModelProperty(value = "长期任务，是否处理：0未处理   1处理成功    2处理科室失败  3处理疾病失败")
    private String checkFlag;

    /**

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

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

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;

/**
 * éšè®¿æœåŠ¡å‘送判断对象 service_check
 *
 * @author lihu
 * @date 2025-02-25
 */
@Data
@ApiModel("随访服务发送判断")
public class ServiceCheck extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    private Long id;

    /**
     * ç§‘室编码
     */
    @ApiModelProperty("科室编码")
    @Excel(name = "科室编码")
    private String deptCode;

    /**
     * ç—…区编码
     */
    @ApiModelProperty("病区编码")
    @Excel(name = "病区编码")
    private String districtCode;

    /**
     * 1,根据科室随访    2，根据第一诊断随访   3，两个都随访
     */
    @ApiModelProperty("1,根据科室随访    2，根据第一诊断随访   3，两个都随访")
    @Excel(name = "1,根据科室随访    2，根据第一诊断随访   3，两个都随访")
    private Long checkVisitFlag;

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

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    private String delFlag;

}


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

@@ -427,4 +427,11 @@
    @ApiModelProperty(value = "下一个任务名称")
    @Excel(name = " ä¸‹ä¸€ä¸ªä»»åŠ¡åç§°")
    private String nexttaskname;

    /**
     * é€‚用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型
     */
    @ApiModelProperty(value = "适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型")
    @Excel(name = "适用条件类型：1、按科室、2、按病区、3、按疾病诊断、4、按手术类型")
    private String appltype;
}

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

@@ -367,4 +367,25 @@
    @ApiModelProperty(value = "下一个任务名称")
    @Excel(name = " ä¸‹ä¸€ä¸ªä»»åŠ¡åç§°")
    private String nexttaskname;

    /**
     * ç§‘室id
     */
    @ApiModelProperty("科室id")
    @Excel(name = "科室id")
    private Long icd10id;

    /**
     * éƒ¨é—¨ç¼–码
     */
    @ApiModelProperty("部门编码")
    @Excel(name = "部门编码")
    private String icd10code;

    /**
     * éƒ¨é—¨åç§°
     */
    @ApiModelProperty("部门名称")
    @Excel(name = "部门名称")
    private String icd10name;
}

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

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

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;

/**
 * æ¨¡æ¿ç§‘室关联对象 service_taskdiag
 *
 * @author lihu
 * @date 2025-02-24
 */
@Data
@ApiModel("模板科室关联")
public class ServiceTaskdiag extends BaseEntity
        {
private static final long serialVersionUID = 1L;

    /** æ¨¡æ¿åº“和科室关联id */
    @ApiModelProperty("模板库和科室关联id")
        //数据库自增改成@TableId(type = IdType.AUTO)
    private Long id;

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

    /** æ˜¯å¦æ˜¯é•¿æœŸæ¨¡æ¿ï¼š  0：不是    1：是 */
    @ApiModelProperty("是否是长期模板：  0：不是    1：是")
            @Excel(name = "是否是长期模板：  0：不是    1：是")
    private Long longtask;

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

    /** æœåŠ¡ç±»åž‹(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知) */
    @ApiModelProperty("服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)")
            @Excel(name = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)")
    private String serviceType;

    /** ç§‘室id */
    @ApiModelProperty("科室id")
            @Excel(name = "科室id")
    private Long icd10id;

    /** éƒ¨é—¨ç¼–码 */
    @ApiModelProperty("部门编码")
            @Excel(name = "部门编码")
    private String icd10code;

    /** éƒ¨é—¨åç§° */
    @ApiModelProperty("部门名称")
            @Excel(name = "部门名称")
    private String icd10name;

    /** åˆ é™¤æ ‡å¿—（0：未删除 1：已删除） */
    @ApiModelProperty("删除标志（0：未删除 1：已删除）")
    private Integer delFlag;

    /** åŒ»é™¢æœºæž„ID */
    @ApiModelProperty("医院机构ID")
            @Excel(name = "医院机构ID")
    private String orgid;

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String guid;

    /** çˆ¶GUID */
    @ApiModelProperty("父GUID")
            @Excel(name = "父GUID")
    private String pguid;

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

        }


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

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

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;

/**
 * æ¨¡æ¿ç§‘室关联对象 service_taskoper
 *
 * @author lihu
 * @date 2025-02-24
 */
@Data
@ApiModel("模板科室关联")
public class ServiceTaskoper extends BaseEntity
        {
private static final long serialVersionUID = 1L;

    /** æ¨¡æ¿åº“和科室关联id */
    @ApiModelProperty("模板库和科室关联id")
        //数据库自增改成@TableId(type = IdType.AUTO)
    private Long id;

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

    /** æ˜¯å¦æ˜¯é•¿æœŸæ¨¡æ¿ï¼š  0：不是    1：是 */
    @ApiModelProperty("是否是长期模板：  0：不是    1：是")
            @Excel(name = "是否是长期模板：  0：不是    1：是")
    private Long longtask;

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

    /** æœåŠ¡ç±»åž‹(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知) */
    @ApiModelProperty("服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)")
            @Excel(name = "服务类型(1、监测评估；2、出院随访；3、门诊随访；4、宣教关怀；5、复诊通知；6、满意度调查；7、患者报告； 8、其他通知)")
    private String serviceType;

    /** ç§‘室id */
    @ApiModelProperty("科室id")
            @Excel(name = "科室id")
    private Long deptId;

    /** éƒ¨é—¨ç¼–码 */
    @ApiModelProperty("部门编码")
            @Excel(name = "部门编码")
    private String deptCode;

    /** éƒ¨é—¨åç§° */
    @ApiModelProperty("部门名称")
            @Excel(name = "部门名称")
    private String deptName;

    /** åˆ é™¤æ ‡å¿—（0：未删除 1：已删除） */
    @ApiModelProperty("删除标志（0：未删除 1：已删除）")
    private Integer delFlag;

    /** åŒ»é™¢æœºæž„ID */
    @ApiModelProperty("医院机构ID")
            @Excel(name = "医院机构ID")
    private String orgid;

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
            @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String guid;

    /** çˆ¶GUID */
    @ApiModelProperty("父GUID")
            @Excel(name = "父GUID")
    private String pguid;

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

        }


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

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

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

/**
 * éšè®¿æœåŠ¡å‘送判断Mapper接口
 *
 * @author lihu
 * @date 2025-02-25
 */
@Mapper
public interface ServiceCheckMapper
{
    /**
     * æŸ¥è¯¢éšè®¿æœåŠ¡å‘送判断
     *
     * @param id éšè®¿æœåŠ¡å‘送判断主键
     * @return éšè®¿æœåŠ¡å‘送判断
     */
    public ServiceCheck selectServiceCheckById(Long id);

    /**
     * æŸ¥è¯¢éšè®¿æœåŠ¡å‘送判断列表
     *
     * @param serviceCheck éšè®¿æœåŠ¡å‘送判断
     * @return éšè®¿æœåŠ¡å‘送判断集合
     */
    public List<ServiceCheck> selectServiceCheckList(ServiceCheck serviceCheck);

    /**
     * æ–°å¢žéšè®¿æœåŠ¡å‘送判断
     *
     * @param serviceCheck éšè®¿æœåŠ¡å‘送判断
     * @return ç»“æžœ
     */
    public int insertServiceCheck(ServiceCheck serviceCheck);

    /**
     * ä¿®æ”¹éšè®¿æœåŠ¡å‘送判断
     *
     * @param serviceCheck éšè®¿æœåŠ¡å‘送判断
     * @return ç»“æžœ
     */
    public int updateServiceCheck(ServiceCheck serviceCheck);

    /**
     * åˆ é™¤éšè®¿æœåŠ¡å‘送判断
     *
     * @param id éšè®¿æœåŠ¡å‘送判断主键
     * @return ç»“æžœ
     */
    public int deleteServiceCheckById(Long id);

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

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

@@ -47,11 +47,10 @@
     * @return ç»“æžœ
     */
    public Boolean updateServiceSubtask(ServiceSubtask ServiceSubtask);

    public Boolean updateServiceSubtaskByPatId(ServiceSubtask ServiceSubtask);

    public Boolean updateServiceSubtaskByCondition(ServiceSubtask ServiceSubtask);
    

    public Boolean updateServiceSubtaskByTaskGuid(ServiceSubtask ServiceSubtask);

    /**

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

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

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

/**
 * æ¨¡æ¿ç§‘室关联Mapper接口
 *
 * @author lihu
 * @date 2025-02-24
 */
@Mapper
public interface ServiceTaskdiagMapper
{
    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联
     *
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return æ¨¡æ¿ç§‘室关联
     */
    public ServiceTaskdiag selectServiceTaskdiagById(Long id);

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     *
     * @param serviceTaskdiag æ¨¡æ¿ç§‘室关联
     * @return æ¨¡æ¿ç§‘室关联集合
     */
    public List<ServiceTaskdiag> selectServiceTaskdiagList(ServiceTaskdiag serviceTaskdiag);

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     *
     * @param serviceTaskdiag æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int insertServiceTaskdiag(ServiceTaskdiag serviceTaskdiag);

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     *
     * @param serviceTaskdiag æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int updateServiceTaskdiag(ServiceTaskdiag serviceTaskdiag);

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联
     *
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return ç»“æžœ
     */
    public int deleteServiceTaskdiagById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿ç§‘室关联
     *
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteServiceTaskdiagByIds(Long[] ids);
}

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

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

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

/**
 * æ¨¡æ¿ç§‘室关联Mapper接口
 *
 * @author lihu
 * @date 2025-02-24
 */
@Mapper
public interface ServiceTaskoperMapper
{
    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联
     *
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return æ¨¡æ¿ç§‘室关联
     */
    public ServiceTaskoper selectServiceTaskoperById(Long id);

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     *
     * @param serviceTaskoper æ¨¡æ¿ç§‘室关联
     * @return æ¨¡æ¿ç§‘室关联集合
     */
    public List<ServiceTaskoper> selectServiceTaskoperList(ServiceTaskoper serviceTaskoper);

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     *
     * @param serviceTaskoper æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int insertServiceTaskoper(ServiceTaskoper serviceTaskoper);

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     *
     * @param serviceTaskoper æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int updateServiceTaskoper(ServiceTaskoper serviceTaskoper);

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联
     *
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return ç»“æžœ
     */
    public int deleteServiceTaskoperById(Long id);

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿ç§‘室关联
     *
     * @param ids éœ€è¦åˆ é™¤çš„数据主键集合
     * @return ç»“æžœ
     */
    public int deleteServiceTaskoperByIds(Long[] ids);
}

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

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

import java.util.List;
import com.smartor.domain.ServiceCheck;

/**
 * éšè®¿æœåŠ¡å‘送判断Service接口
 * 
 * @author lihu
 * @date 2025-02-25
 */
public interface IServiceCheckService 
{
    /**
     * æŸ¥è¯¢éšè®¿æœåŠ¡å‘送判断
     * 
     * @param id éšè®¿æœåŠ¡å‘送判断主键
     * @return éšè®¿æœåŠ¡å‘送判断
     */
    public ServiceCheck selectServiceCheckById(Long id);

    /**
     * æŸ¥è¯¢éšè®¿æœåŠ¡å‘送判断列表
     * 
     * @param serviceCheck éšè®¿æœåŠ¡å‘送判断
     * @return éšè®¿æœåŠ¡å‘送判断集合
     */
    public List<ServiceCheck> selectServiceCheckList(ServiceCheck serviceCheck);

    /**
     * æ–°å¢žéšè®¿æœåŠ¡å‘送判断
     * 
     * @param serviceCheck éšè®¿æœåŠ¡å‘送判断
     * @return ç»“æžœ
     */
    public int insertServiceCheck(ServiceCheck serviceCheck);

    /**
     * ä¿®æ”¹éšè®¿æœåŠ¡å‘送判断
     * 
     * @param serviceCheck éšè®¿æœåŠ¡å‘送判断
     * @return ç»“æžœ
     */
    public int updateServiceCheck(ServiceCheck serviceCheck);

    /**
     * æ‰¹é‡åˆ é™¤éšè®¿æœåŠ¡å‘送判断
     * 
     * @param ids éœ€è¦åˆ é™¤çš„随访服务发送判断主键集合
     * @return ç»“æžœ
     */
    public int deleteServiceCheckByIds(Long[] ids);

    /**
     * åˆ é™¤éšè®¿æœåŠ¡å‘送判断信息
     * 
     * @param id éšè®¿æœåŠ¡å‘送判断主键
     * @return ç»“æžœ
     */
    public int deleteServiceCheckById(Long id);
}

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

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

import java.util.List;
import com.smartor.domain.ServiceTaskdiag;

/**
 * æ¨¡æ¿ç§‘室关联Service接口
 * 
 * @author lihu
 * @date 2025-02-24
 */
public interface IServiceTaskdiagService 
{
    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联
     * 
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return æ¨¡æ¿ç§‘室关联
     */
    public ServiceTaskdiag selectServiceTaskdiagById(Long id);

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     * 
     * @param serviceTaskdiag æ¨¡æ¿ç§‘室关联
     * @return æ¨¡æ¿ç§‘室关联集合
     */
    public List<ServiceTaskdiag> selectServiceTaskdiagList(ServiceTaskdiag serviceTaskdiag);

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     * 
     * @param serviceTaskdiag æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int insertServiceTaskdiag(ServiceTaskdiag serviceTaskdiag);

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     * 
     * @param serviceTaskdiag æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int updateServiceTaskdiag(ServiceTaskdiag serviceTaskdiag);

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿ç§‘室关联
     * 
     * @param ids éœ€è¦åˆ é™¤çš„模板科室关联主键集合
     * @return ç»“æžœ
     */
    public int deleteServiceTaskdiagByIds(Long[] ids);

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联信息
     * 
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return ç»“æžœ
     */
    public int deleteServiceTaskdiagById(Long id);
}

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

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

import java.util.List;
import com.smartor.domain.ServiceTaskoper;

/**
 * æ¨¡æ¿ç§‘室关联Service接口
 * 
 * @author lihu
 * @date 2025-02-24
 */
public interface IServiceTaskoperService 
{
    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联
     * 
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return æ¨¡æ¿ç§‘室关联
     */
    public ServiceTaskoper selectServiceTaskoperById(Long id);

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     * 
     * @param serviceTaskoper æ¨¡æ¿ç§‘室关联
     * @return æ¨¡æ¿ç§‘室关联集合
     */
    public List<ServiceTaskoper> selectServiceTaskoperList(ServiceTaskoper serviceTaskoper);

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     * 
     * @param serviceTaskoper æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int insertServiceTaskoper(ServiceTaskoper serviceTaskoper);

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     * 
     * @param serviceTaskoper æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    public int updateServiceTaskoper(ServiceTaskoper serviceTaskoper);

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿ç§‘室关联
     * 
     * @param ids éœ€è¦åˆ é™¤çš„模板科室关联主键集合
     * @return ç»“æžœ
     */
    public int deleteServiceTaskoperByIds(Long[] ids);

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联信息
     * 
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return ç»“æžœ
     */
    public int deleteServiceTaskoperById(Long id);
}

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

@@ -10,6 +10,7 @@
import com.smartor.mapper.BaseTagMapper;
import com.smartor.mapper.PatArchiveMapper;
import com.smartor.mapper.PatArchivetagMapper;
import com.smartor.mapper.ServiceSubtaskMapper;
import com.smartor.service.IPatArchiveService;
import com.smartor.service.IPatMedInhospService;
import com.smartor.service.IPatMedOuthospService;
@@ -47,6 +48,9 @@
public class PatArchiveServiceImpl implements IPatArchiveService {
    @Autowired
    private PatArchiveMapper patArchiveMapper;

    @Autowired
    private ServiceSubtaskMapper serviceSubtaskMapper;

    @Autowired
    private BaseTagMapper baseTagMapper;
@@ -96,6 +100,7 @@
     * @param patArchive æ‚£è€…档案
     * @return ç»“æžœ
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public Integer insertPatArchive(PatArchive patArchive) {
        patArchive.setCreateTime(DateUtils.getNowDate());
@@ -103,11 +108,22 @@
        return patArchive.getId().intValue();
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public Boolean update(PatArchive patArchive) {
        int i = patArchiveMapper.updatePatArchive(patArchive);
        if (i != 1) {
            return false;
        } else {
            ServiceSubtask serviceSubtask = new ServiceSubtask();
            serviceSubtask.setPatid(patArchive.getId());
            serviceSubtask.setSendname(patArchive.getName());
            serviceSubtask.setPhone(patArchive.getTelcode());
            serviceSubtask.setSex(patArchive.getSex());
            serviceSubtask.setAge(patArchive.getAge());
            serviceSubtask.setSfzh(patArchive.getIdcardno());
            serviceSubtask.setAddr(patArchive.getPlaceOfResidence());
            serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
        }
        return true;
    }

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

@@ -28,9 +28,14 @@
public class PatMedInhospServiceImpl implements IPatMedInhospService {
    @Autowired
    private PatMedInhospMapper patMedInhospMapper;
    @Autowired
    private ServiceCheckMapper serviceCheckMapper;

    @Autowired
    private ServiceTaskdeptMapper serviceTaskdeptMapper;

    @Autowired
    private ServiceTaskdiagMapper serviceTaskdiagMapper;

    @Autowired
    private PatArchiveMapper patArchiveMapper;
@@ -50,6 +55,7 @@
    private ServiceSubtaskMapper serviceSubtaskMapper;
    @Autowired
    private SysUserDeptMapper sysUserDeptMapper;

    @Value("${createTaskServiceType}")
    private List<String> createTaskServiceType;

@@ -202,32 +208,66 @@
        log.error("dealOutHospInfo需要处理的出院患者信息：{}", patMedInhosps);

        for (PatMedInhosp patMedInhosp1 : patMedInhosps) {
            //先根据科室去service_check查询check_visit_flag是根据“科室”随访，还是根据“第一诊断”随访
            ServiceCheck serviceCheck = new ServiceCheck();
            serviceCheck.setDeptCode(patMedInhosp1.getDeptcode());
            serviceCheck.setOrgid(patMedInhosp1.getOrgid());
            List<ServiceCheck> serviceChecks = serviceCheckMapper.selectServiceCheckList(serviceCheck);
            //获取患者信息
            PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
            try {
                //根据患者所在科室，获取该科室的长期任务
                ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                serviceTaskdept.setLongtask(1L);
                serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
                serviceTaskdept.setServiceType("2");
                List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
                //如果部门模板为空（暂定，将出入院表的check_flag设置为2  ï¼Œlong_task_reason è®°å½•åŽŸå› ï¼‰
                if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
                    patMedInhosp1.setCheckFlag("2");
                    patMedInhosp1.setLongTaskReason("该患者所在科室，未配置长期任务");
                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                    continue;
                } else if (serviceTaskdepts.size() > 1) {
                    //如果查询出多个任务，那就取第一个，并在患者备注一下
                    List<Long> tempList = serviceTaskdepts.stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
                    patMedInhosp1.setLongTaskReason("该患者所在科室，有多个出院随访长期任务:" + tempList);
                    patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                    ServiceTaskdept serviceTaskdept1 = serviceTaskdepts.get(0);
                    serviceTaskdepts = new ArrayList<>();
                    serviceTaskdepts.add(serviceTaskdept1);
                if (CollectionUtils.isEmpty(serviceChecks) || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 1 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
                    //根据患者所在科室，获取该科室的长期任务
                    ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                    serviceTaskdept.setLongtask(1L);
                    serviceTaskdept.setDeptCode(patMedInhosp1.getLeaveldeptcode());
                    serviceTaskdept.setServiceType("2");
                    List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptMapper.selectServiceTaskdeptList(serviceTaskdept);
                    //如果部门模板为空（暂定，将出入院表的check_flag设置为2  ï¼Œlong_task_reason è®°å½•åŽŸå› ï¼‰
                    if (CollectionUtils.isEmpty(serviceTaskdepts) || serviceTaskdepts.size() == 0) {
                        patMedInhosp1.setCheckFlag("2");
                        patMedInhosp1.setLongTaskReason("该患者所在科室，未配置长期任务;");
                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                        continue;
                    } else if (serviceTaskdepts.size() > 1) {
                        //如果查询出多个任务，那就取第一个，并在患者备注一下
                        List<Long> tempList = serviceTaskdepts.stream().map(ServiceTaskdept::getTaskId).collect(Collectors.toList());
                        patMedInhosp1.setLongTaskReason("该患者所在科室，有多个出院随访长期任务:" + tempList);
                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                        ServiceTaskdept serviceTaskdept1 = serviceTaskdepts.get(0);
                        serviceTaskdepts = new ArrayList<>();
                        serviceTaskdepts.add(serviceTaskdept1);
                    }

                    writeInSubTask(serviceTaskdepts.get(0).getTaskId(), true, patMedInhosp1, patArchive);
                } else if (serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 2 || serviceChecks != null && serviceChecks.get(0).getCheckVisitFlag() == 3) {
                    //丽水需要根据离院疾病对该病人生成一次随访
                    String[] split = patMedInhosp1.getIcd10code().split(",");
                    ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
                    serviceTaskdiag.setLongtask(1L);
                    serviceTaskdiag.setIcd10code(split[0]);
                    serviceTaskdiag.setServiceType("2");
                    List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagMapper.selectServiceTaskdiagList(serviceTaskdiag);
                    PatMedInhosp patMedInhosp2 = patMedInhospMapper.selectPatMedInhospByInhospid(patMedInhosp1.getInhospid());
                    //如果疾病编码为空（暂定，将出入院表的check_flag设置为3  ï¼Œlong_task_reason è®°å½•åŽŸå› ï¼‰
                    if (CollectionUtils.isEmpty(serviceTaskdiags) || serviceTaskdiags.size() == 0) {
                        patMedInhosp1.setCheckFlag("3");
                        patMedInhosp1.setLongTaskReason(patMedInhosp2.getLongTaskReason() + "该患者的第一疾病编码，未配置长期任务;");
                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                        continue;
                    } else if (serviceTaskdiags.size() > 1) {
                        //如果查询出多个任务，那就取第一个，并在患者备注一下
                        List<Long> tempList = serviceTaskdiags.stream().map(ServiceTaskdiag::getTaskId).collect(Collectors.toList());
                        patMedInhosp1.setLongTaskReason(patMedInhosp2.getLongTaskReason() + "该患者的第一疾病编码，有多个出院随访长期任务:" + tempList);
                        patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                        ServiceTaskdiag serviceTaskdiag1 = serviceTaskdiags.get(0);
                        serviceTaskdiags = new ArrayList<>();
                        serviceTaskdiags.add(serviceTaskdiag1);
                    }
                    writeInSubTask(serviceTaskdiags.get(0).getTaskId(), false, patMedInhosp1, patArchive);
                }

                //获取患者信息
                PatArchive patArchive = patArchiveMapper.selectPatArchiveByPatid(patMedInhosp1.getPatid());
                writeInSubTask(serviceTaskdepts, patMedInhosp1, patArchive);

            } catch (Exception e) {
                e.printStackTrace();
                log.error("人员处理出异常了：{}", e.getMessage());
@@ -297,34 +337,35 @@
    }

    //将患者放到subtask中
    private void writeInSubTask(List<ServiceTaskdept> serviceTaskdepts, PatMedInhosp patMedInhosp1, PatArchive patArchive) {
    private void writeInSubTask(Long taskid, Boolean check, PatMedInhosp patMedInhosp1, PatArchive patArchive) {
        String longTaskReason = patMedInhosp1.getLongTaskReason();
        if (StringUtils.isEmpty(longTaskReason)) longTaskReason = "";
        for (ServiceTaskdept std : serviceTaskdepts) {
            Long taskid = std.getTaskId();
            ServiceTask st = new ServiceTask();
            st.setTaskid(taskid);
            st.setSendState(2L);
            List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
            if (CollectionUtils.isEmpty(serviceTasks)) {
                log.error("该患者出院随访长期任务不存在,任务ID为：{}", taskid);
                patMedInhosp1.setCheckFlag("2");
                patMedInhosp1.setLongTaskReason(longTaskReason + " & è¯¥æ‚£è€…出院随访长期任务不存在,任务ID为:" + taskid);
                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                continue;
            }
            ServiceTask serviceTask = serviceTasks.get(0);
            if (!createTaskServiceType.contains(serviceTask.getServiceType())) {
                //不是允许的服务类型，则continue
                log.error("该患者出院随访长期任务的服务类型不在自动生成的服务类型列表中,任务ID为：{}", taskid);
                patMedInhosp1.setCheckFlag("2");
                patMedInhosp1.setLongTaskReason(longTaskReason + " & è¯¥æ‚£è€…出院随访长期任务的服务类型不在自动生成的服务类型列表中,任务ID为：" + taskid);
                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
                continue;
            }
            //封装serviceSubtask
            ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive);
            Integer i = 0;
//            Long taskid = std.getTaskId();
        ServiceTask st = new ServiceTask();
        st.setTaskid(taskid);
        st.setSendState(2L);
        List<ServiceTask> serviceTasks = serviceTaskMapper.selectServiceTaskList(st);
        if (CollectionUtils.isEmpty(serviceTasks)) {
            log.error("该患者出院随访长期任务不存在,任务ID为：{}", taskid);
            patMedInhosp1.setCheckFlag("2");
            patMedInhosp1.setLongTaskReason(longTaskReason + " & è¯¥æ‚£è€…出院随访长期任务不存在,任务ID为:" + taskid);
            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
            return;
        }
        ServiceTask serviceTask = serviceTasks.get(0);
        if (!createTaskServiceType.contains(serviceTask.getServiceType())) {
            //不是允许的服务类型，则continue
            log.error("该患者出院随访长期任务的服务类型不在自动生成的服务类型列表中,任务ID为：{}", taskid);
            patMedInhosp1.setCheckFlag("2");
            patMedInhosp1.setLongTaskReason(longTaskReason + " & è¯¥æ‚£è€…出院随访长期任务的服务类型不在自动生成的服务类型列表中,任务ID为：" + taskid);
            patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
            return;
        }
        //封装serviceSubtask
        ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, patMedInhosp1, patArchive);
        Integer i = 0;
        //先判断一下，是否需要校验
        if (check) {
            //在新增之前，先通过患者ID，sendstate=2查询一下，在所有长期任务中，是不是还有该患者待执行的任务，有的话,比较之前的endtime是否小于当前的endtaime,如果之前的小于现在的，则直接将之前的停掉（原因再入院）
            ServiceSubtaskVO subtask = new ServiceSubtaskVO();
            subtask.setPatid(patArchive.getId());
@@ -351,25 +392,28 @@
                        serviceSubtask.setFinishtime(new Date());
                        serviceSubtask.setSendstate(4L);
                        serviceSubtask.setRemark("当前患者出院时间后有待执行的出院随访长期任务");
                        i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
                    }
                }
            }
        } else {
            i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
            if (i == 1) {
                //将check_flag改成1（已处理）
                PatMedInhosp patMedInhosp2 = new PatMedInhosp();
                patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
                patMedInhosp2.setCheckFlag("1");
                patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
            } else {
                //生成子任务失败，
                log.error("生成子任务失败serviceSubtask为：{}", serviceSubtask);
                PatMedInhosp patMedInhosp2 = new PatMedInhosp();
                patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
                patMedInhosp2.setRemark("生成子任务失败");
                patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
            }
        }
        if (i == 1) {
            //将check_flag改成1（已处理）
            PatMedInhosp patMedInhosp2 = new PatMedInhosp();
            patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
            patMedInhosp2.setCheckFlag("1");
            patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
        } else {
            //生成子任务失败，
            log.error("生成子任务失败serviceSubtask为：{}", serviceSubtask);
            PatMedInhosp patMedInhosp2 = new PatMedInhosp();
            patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
            patMedInhosp2.setRemark("生成子任务失败");
            patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
        }

    }

    //封装serviceSubtask

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

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

import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.smartor.mapper.ServiceCheckMapper;
import com.smartor.domain.ServiceCheck;
import com.smartor.service.IServiceCheckService;

/**
 * éšè®¿æœåŠ¡å‘送判断Service业务层处理
 * 
 * @author lihu
 * @date 2025-02-25
 */
@Service
public class ServiceCheckServiceImpl implements IServiceCheckService 
{
    @Autowired
    private ServiceCheckMapper serviceCheckMapper;

    /**
     * æŸ¥è¯¢éšè®¿æœåŠ¡å‘送判断
     * 
     * @param id éšè®¿æœåŠ¡å‘送判断主键
     * @return éšè®¿æœåŠ¡å‘送判断
     */
    @Override
    public ServiceCheck selectServiceCheckById(Long id)
    {
        return serviceCheckMapper.selectServiceCheckById(id);
    }

    /**
     * æŸ¥è¯¢éšè®¿æœåŠ¡å‘送判断列表
     * 
     * @param serviceCheck éšè®¿æœåŠ¡å‘送判断
     * @return éšè®¿æœåŠ¡å‘送判断
     */
    @Override
    public List<ServiceCheck> selectServiceCheckList(ServiceCheck serviceCheck)
    {
        return serviceCheckMapper.selectServiceCheckList(serviceCheck);
    }

    /**
     * æ–°å¢žéšè®¿æœåŠ¡å‘送判断
     * 
     * @param serviceCheck éšè®¿æœåŠ¡å‘送判断
     * @return ç»“æžœ
     */
    @Override
    public int insertServiceCheck(ServiceCheck serviceCheck)
    {
        return serviceCheckMapper.insertServiceCheck(serviceCheck);
    }

    /**
     * ä¿®æ”¹éšè®¿æœåŠ¡å‘送判断
     * 
     * @param serviceCheck éšè®¿æœåŠ¡å‘送判断
     * @return ç»“æžœ
     */
    @Override
    public int updateServiceCheck(ServiceCheck serviceCheck)
    {
        return serviceCheckMapper.updateServiceCheck(serviceCheck);
    }

    /**
     * æ‰¹é‡åˆ é™¤éšè®¿æœåŠ¡å‘送判断
     * 
     * @param ids éœ€è¦åˆ é™¤çš„随访服务发送判断主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceCheckByIds(Long[] ids)
    {
        return serviceCheckMapper.deleteServiceCheckByIds(ids);
    }

    /**
     * åˆ é™¤éšè®¿æœåŠ¡å‘送判断信息
     * 
     * @param id éšè®¿æœåŠ¡å‘送判断主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceCheckById(Long id)
    {
        return serviceCheckMapper.deleteServiceCheckById(id);
    }
}

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

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

import java.lang.reflect.Field;

import cn.hutool.core.bean.BeanUtil;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import com.smartor.domain.*;
import com.smartor.mapper.*;
import com.smartor.service.IServiceExternalService;
import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.IServiceSubtaskService;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Value;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.security.auth.login.CredentialNotFoundException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
@@ -54,9 +51,8 @@
    @Autowired
    private Icd10AssociationMapper icd10AssociationMapper;

    @Autowired
    private IServiceSubtaskService iServiceSubtaskService;

    @Value("${defaultPwd}")
    private String defaultPwd;

    public Boolean generalInterface(Map dataMap) {
        Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou");
@@ -117,11 +113,15 @@
        ExternalUserInfo externalUserInfo = BeanUtil.mapToBean(yongHuXX, ExternalUserInfo.class, true);
        SysUser sysUser = new SysUser();
        sysUser.setGuid(externalUserInfo.getZuZhiJGID());
        sysUser.setUserName(externalUserInfo.getYongHuID());
        sysUser.setUserName(externalUserInfo.getYongHuDLM());
        sysUser.setNickName(externalUserInfo.getYongHuXM());
        sysUser.setUserType("");
        sysUser.setDeptId(null);
        sysUser.setTitle(null);

        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
        sysUser.setPassword(passwordEncoder.encode(defaultPwd));

        sysUser.setHisUserId(externalUserInfo.getYongHuID());
        sysUser.setPhonenumber(externalUserInfo.getLianXiDH());
        sysUser.setJobPhone(externalUserInfo.getGongZuoDH());

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

@@ -66,6 +66,9 @@
    private IServiceTaskdeptService serviceTaskdeptService;

    @Autowired
    private IServiceTaskdiagService serviceTaskdiagService;

    @Autowired
    private RedisCache redisCache;

    @Autowired
@@ -377,39 +380,55 @@
            serviceTask.setTemplatename(tempName);
            serviceTask.setLeaveldeptcodes(serviceTaskVO.getLeaveldeptcodes());
            serviceTask.setLeavehospitaldistrictcode(serviceTask.getLeavehospitaldistrictcode());
            if (serviceTaskVO.getLongTask() == 1L) serviceTask.setSendState(2L);
            serviceTaskService.insertServiceTask(serviceTask);
            ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
            serviceTaskdept.setTaskId(serviceTask.getTaskid());
            serviceTaskdept.setTaskName(serviceTask.getTaskName());
            serviceTaskdept.setLongtask(0L);
            serviceTaskdept.setGuid(serviceTask.getGuid());
            serviceTaskdept.setOrgid(serviceTask.getOrgid());
            serviceTaskdept.setOrgid(serviceTask.getOrgid());
            if (serviceTaskVO.getLongTask() == 1) serviceTaskdept.setLongtask(1L);
            if (StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
                String[] deptcodes = serviceTaskVO.getDeptcode().split(",");
                for (String deptCode : deptcodes) {
                    serviceTaskdept.setDeptCode(deptCode);
                    serviceTaskdept.setDeptType("1");
                    serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                    serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
            if (serviceTaskVO.getLongTask() == 1L) {
                serviceTask.setSendState(2L);
                serviceTaskService.insertServiceTask(serviceTask);
                if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) {
                    ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                    serviceTaskdept.setTaskId(serviceTask.getTaskid());
                    serviceTaskdept.setTaskName(serviceTask.getTaskName());
                    serviceTaskdept.setLongtask(1L);
                    serviceTaskdept.setGuid(serviceTask.getGuid());
                    serviceTaskdept.setOrgid(serviceTask.getOrgid());
                    serviceTaskdept.setOrgid(serviceTask.getOrgid());
                    if (serviceTaskVO.getLongTask() == 1) serviceTaskdept.setLongtask(1L);
                    if (StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
                        String[] deptcodes = serviceTaskVO.getDeptcode().split(",");
                        for (String deptCode : deptcodes) {
                            serviceTaskdept.setDeptCode(deptCode);
                            serviceTaskdept.setDeptType("1");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                        }
                    }
                    if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
                        String[] leavehospitaldistrictcodes = serviceTaskVO.getLeavehospitaldistrictcode().split(",");
                        for (String districtcode : leavehospitaldistrictcodes) {
                            serviceTaskdept.setDeptCode(districtcode);
                            serviceTaskdept.setDeptType("2");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                        }
                    }

                } else {
                    ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
                    serviceTaskdiag.setTaskId(serviceTask.getTaskid());
                    serviceTaskdiag.setTaskName(serviceTask.getTaskName());
                    serviceTaskdiag.setLongtask(1L);
                    serviceTaskdiag.setGuid(serviceTask.getGuid());
                    serviceTaskdiag.setOrgid(serviceTask.getOrgid());
                    if (serviceTaskVO.getLongTask() == 1) serviceTaskdiag.setLongtask(1L);
                    serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);

                }
            }
            if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
                String[] leavehospitaldistrictcodes = serviceTaskVO.getLeavehospitaldistrictcode().split(",");
                for (String districtcode : leavehospitaldistrictcodes) {
                    serviceTaskdept.setDeptCode(districtcode);
                    serviceTaskdept.setDeptType("2");
                    serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                    serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1 && serviceTaskVO.getPatCycle() == 0L) {
                    Map<String, Integer> map = new HashMap<>();
                    map.put("taskId", serviceTask.getTaskid().intValue());
                    return map;
                }
            }
//
            if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1 && serviceTaskVO.getPatCycle() == 0L) {
                Map<String, Integer> map = new HashMap<>();
                map.put("taskId", serviceTask.getTaskid().intValue());
                return map;
            } else {
                serviceTaskService.insertServiceTask(serviceTask);
            }

            //将任务信息放到服务表中

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

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

import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.smartor.mapper.ServiceTaskdiagMapper;
import com.smartor.domain.ServiceTaskdiag;
import com.smartor.service.IServiceTaskdiagService;

/**
 * æ¨¡æ¿ç§‘室关联Service业务层处理
 * 
 * @author lihu
 * @date 2025-02-24
 */
@Service
public class ServiceTaskdiagServiceImpl implements IServiceTaskdiagService 
{
    @Autowired
    private ServiceTaskdiagMapper serviceTaskdiagMapper;

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联
     * 
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return æ¨¡æ¿ç§‘室关联
     */
    @Override
    public ServiceTaskdiag selectServiceTaskdiagById(Long id)
    {
        return serviceTaskdiagMapper.selectServiceTaskdiagById(id);
    }

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     * 
     * @param serviceTaskdiag æ¨¡æ¿ç§‘室关联
     * @return æ¨¡æ¿ç§‘室关联
     */
    @Override
    public List<ServiceTaskdiag> selectServiceTaskdiagList(ServiceTaskdiag serviceTaskdiag)
    {
        return serviceTaskdiagMapper.selectServiceTaskdiagList(serviceTaskdiag);
    }

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     * 
     * @param serviceTaskdiag æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    @Override
    public int insertServiceTaskdiag(ServiceTaskdiag serviceTaskdiag)
    {
        serviceTaskdiag.setCreateTime(DateUtils.getNowDate());
        return serviceTaskdiagMapper.insertServiceTaskdiag(serviceTaskdiag);
    }

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     * 
     * @param serviceTaskdiag æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    @Override
    public int updateServiceTaskdiag(ServiceTaskdiag serviceTaskdiag)
    {
        serviceTaskdiag.setUpdateTime(DateUtils.getNowDate());
        return serviceTaskdiagMapper.updateServiceTaskdiag(serviceTaskdiag);
    }

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿ç§‘室关联
     * 
     * @param ids éœ€è¦åˆ é™¤çš„模板科室关联主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceTaskdiagByIds(Long[] ids)
    {
        return serviceTaskdiagMapper.deleteServiceTaskdiagByIds(ids);
    }

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联信息
     * 
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceTaskdiagById(Long id)
    {
        return serviceTaskdiagMapper.deleteServiceTaskdiagById(id);
    }
}

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

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

import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.smartor.mapper.ServiceTaskoperMapper;
import com.smartor.domain.ServiceTaskoper;
import com.smartor.service.IServiceTaskoperService;

/**
 * æ¨¡æ¿ç§‘室关联Service业务层处理
 * 
 * @author lihu
 * @date 2025-02-24
 */
@Service
public class ServiceTaskoperServiceImpl implements IServiceTaskoperService 
{
    @Autowired
    private ServiceTaskoperMapper serviceTaskoperMapper;

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联
     * 
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return æ¨¡æ¿ç§‘室关联
     */
    @Override
    public ServiceTaskoper selectServiceTaskoperById(Long id)
    {
        return serviceTaskoperMapper.selectServiceTaskoperById(id);
    }

    /**
     * æŸ¥è¯¢æ¨¡æ¿ç§‘室关联列表
     * 
     * @param serviceTaskoper æ¨¡æ¿ç§‘室关联
     * @return æ¨¡æ¿ç§‘室关联
     */
    @Override
    public List<ServiceTaskoper> selectServiceTaskoperList(ServiceTaskoper serviceTaskoper)
    {
        return serviceTaskoperMapper.selectServiceTaskoperList(serviceTaskoper);
    }

    /**
     * æ–°å¢žæ¨¡æ¿ç§‘室关联
     * 
     * @param serviceTaskoper æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    @Override
    public int insertServiceTaskoper(ServiceTaskoper serviceTaskoper)
    {
        serviceTaskoper.setCreateTime(DateUtils.getNowDate());
        return serviceTaskoperMapper.insertServiceTaskoper(serviceTaskoper);
    }

    /**
     * ä¿®æ”¹æ¨¡æ¿ç§‘室关联
     * 
     * @param serviceTaskoper æ¨¡æ¿ç§‘室关联
     * @return ç»“æžœ
     */
    @Override
    public int updateServiceTaskoper(ServiceTaskoper serviceTaskoper)
    {
        serviceTaskoper.setUpdateTime(DateUtils.getNowDate());
        return serviceTaskoperMapper.updateServiceTaskoper(serviceTaskoper);
    }

    /**
     * æ‰¹é‡åˆ é™¤æ¨¡æ¿ç§‘室关联
     * 
     * @param ids éœ€è¦åˆ é™¤çš„模板科室关联主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceTaskoperByIds(Long[] ids)
    {
        return serviceTaskoperMapper.deleteServiceTaskoperByIds(ids);
    }

    /**
     * åˆ é™¤æ¨¡æ¿ç§‘室关联信息
     * 
     * @param id æ¨¡æ¿ç§‘室关联主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteServiceTaskoperById(Long id)
    {
        return serviceTaskoperMapper.deleteServiceTaskoperById(id);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,144 @@
<?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.ServiceCheckMapper">

    <resultMap type="com.smartor.domain.ServiceCheck" id="ServiceCheckResult">
        <result property="id" column="id"/>
        <result property="deptCode" column="dept_code"/>
        <result property="districtCode" column="district_code"/>
        <result property="checkVisitFlag" column="check_visit_flag"/>
        <result property="orgid" column="orgid"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
    </resultMap>

    <sql id="selectServiceCheckVo">
        select id,
               dept_code,
               district_code,
               check_visit_flag,
               orgid,
               del_flag,
               create_time,
               update_time
        from service_check
    </sql>

    <select id="selectServiceCheckList" parameterType="com.smartor.domain.ServiceCheck"
            resultMap="ServiceCheckResult">
        <include refid="selectServiceCheckVo"/>
        <where>
            del_flag=0
            <if test="deptCode != null  and deptCode != ''">
                and dept_code = #{deptCode}
            </if>
            <if test="districtCode != null  and districtCode != ''">
                and district_code = #{districtCode}
            </if>
            <if test="checkVisitFlag != null ">
                and check_visit_flag = #{checkVisitFlag}
            </if>
            <if test="orgid != null  and orgid != ''">
                and orgid = #{orgid}
            </if>
        </where>
    </select>

    <select id="selectServiceCheckById" parameterType="Long"
            resultMap="ServiceCheckResult">
        <include refid="selectServiceCheckVo"/>
        where id = #{id}
    </select>

    <insert id="insertServiceCheck" parameterType="com.smartor.domain.ServiceCheck">
        insert into service_check
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null">id,
            </if>
            <if test="deptCode != null">dept_code,
            </if>
            <if test="districtCode != null">district_code,
            </if>
            <if test="checkVisitFlag != null">check_visit_flag,
            </if>
            <if test="orgid != null">orgid,
            </if>
            <if test="delFlag != null">del_flag,
            </if>
            <if test="createTime != null">create_time,
            </if>
            <if test="updateTime != null">update_time,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},
            </if>
            <if test="deptCode != null">#{deptCode},
            </if>
            <if test="districtCode != null">#{districtCode},
            </if>
            <if test="checkVisitFlag != null">#{checkVisitFlag},
            </if>
            <if test="orgid != null">#{orgid},
            </if>
            <if test="delFlag != null">#{delFlag},
            </if>
            <if test="createTime != null">#{createTime},
            </if>
            <if test="updateTime != null">#{updateTime},
            </if>
        </trim>
    </insert>

    <update id="updateServiceCheck" parameterType="com.smartor.domain.ServiceCheck">
        update service_check
        <trim prefix="SET" suffixOverrides=",">
            <if test="deptCode != null">dept_code =
                #{deptCode},
            </if>
            <if test="districtCode != null">district_code =
                #{districtCode},
            </if>
            <if test="checkVisitFlag != null">check_visit_flag =
                #{checkVisitFlag},
            </if>
            <if test="orgid != null">orgid =
                #{orgid},
            </if>
            <if test="delFlag != null">del_flag =
                #{delFlag},
            </if>
            <if test="createTime != null">create_time =
                #{createTime},
            </if>
            <if test="updateTime != null">update_time =
                #{updateTime},
            </if>
        </trim>
        where id = #{id}
    </update>

    <update id="deleteServiceCheckById" parameterType="Long">
        update service_check
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where id = #{id}
    </update>

    <update id="deleteServiceCheckByIds" parameterType="String">
        update service_check
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>


</mapper>

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

@@ -575,7 +575,8 @@
            <if test="patfrom != null ">patfrom=#{patfrom},</if>
            <if test="taskGuid != null ">taskGuid=#{taskGuid},</if>
        </trim>
        where patid = #{patid} and taskid = #{taskid}
        <if test="patid != null ">and patid = #{patid}</if>
        <if test="taskid != null ">and taskid = #{taskid}</if>
    </update>

    <update id="updateServiceSubtaskByCondition" parameterType="com.smartor.domain.ServiceSubtask">

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

@@ -57,11 +57,13 @@
        <result property="nexttaskflag" column="nexttaskflag"/>
        <result property="nexttaskid" column="nexttaskid"/>
        <result property="nexttaskname" column="nexttaskname"/>
        <result property="appltype" column="appltype"/>
    </resultMap>

    <sql id="selectServiceTaskVo">
        select taskid,
               task_name,
               appltype,
               send_day,
               long_task,
               show_date,
@@ -163,6 +165,7 @@
            <if test="nexttaskflag != null  ">and nexttaskflag = #{nexttaskflag}</if>
            <if test="nexttaskid != null  ">and nexttaskid = #{nexttaskid}</if>
            <if test="nexttaskname != null  ">and nexttaskname = #{nexttaskname}</if>
            <if test="appltype != null  ">and appltype = #{appltype}</if>
            <if test="leavehospitaldistrictname != null  ">and leavehospitaldistrictname =
                #{leavehospitaldistrictname}
            </if>
@@ -192,6 +195,7 @@
            resultMap="ServiceTaskResult">
        select service_task.taskid,
        service_task.task_name,
        service_task.appltype,
        service_task.send_day,
        service_task.long_task,
        service_task.show_date,
@@ -312,6 +316,7 @@
            <if test="nexttaskflag != null  ">and nexttaskflag = #{nexttaskflag}</if>
            <if test="nexttaskid != null  ">and nexttaskid = #{nexttaskid}</if>
            <if test="nexttaskname != null  ">and nexttaskname = #{nexttaskname}</if>
            <if test="appltype != null  ">and appltype = #{appltype}</if>
            <if test="leavehospitaldistrictname != null  ">and service_task.leavehospitaldistrictname =
                #{leavehospitaldistrictname}
            </if>
@@ -379,6 +384,7 @@
            <if test="leavehospitaldistrictcode != null  ">leavehospitaldistrictcode,</if>
            <if test="compensateDate != null  and compensateDate != ''">compensate_date,</if>
            <if test="sendDay != null  ">send_day,</if>
            <if test="appltype != null  ">appltype,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="taskName != null">#{taskName},</if>
@@ -431,6 +437,7 @@
            <if test="leavehospitaldistrictcode != null  ">#{leavehospitaldistrictcode},</if>
            <if test="compensateDate != null  and compensateDate != ''">#{compensateDate}</if>
            <if test="sendDay != null  ">#{sendDay},</if>
            <if test="appltype != null  ">#{appltype},</if>
        </trim>
    </insert>

@@ -489,6 +496,7 @@
            </if>
            <if test="compensateDate != null  and compensateDate != ''">compensate_date = #{compensateDate}</if>
            <if test="sendDay != null  ">send_day = #{sendDay}</if>
            <if test="appltype != null  ">appltype = #{appltype}</if>
        </trim>
        where taskid = #{taskid}
    </update>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,211 @@
<?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.ServiceTaskdiagMapper">

    <resultMap type="com.smartor.domain.ServiceTaskdiag" id="ServiceTaskdiagResult">
            <result property="id" column="id"/>
            <result property="taskId" column="task_id"/>
            <result property="longtask" column="longtask"/>
            <result property="taskName" column="task_name"/>
            <result property="serviceType" column="service_type"/>
            <result property="icd10id" column="icd10id"/>
            <result property="icd10code" column="icd10code"/>
            <result property="icd10name" column="icd10name"/>
            <result property="delFlag" column="del_flag"/>
            <result property="createTime" column="create_time"/>
            <result property="updateTime" column="update_time"/>
            <result property="orgid" column="orgid"/>
            <result property="guid" column="guid"/>
            <result property="pguid" column="pguid"/>
            <result property="pid" column="pid"/>
    </resultMap>

    <sql id="selectServiceTaskdiagVo">
        select id, task_id, longtask, task_name, service_type, icd10id, icd10code, icd10name, del_flag, create_time, update_time, orgid, guid, pguid, pid
        from service_taskdiag
    </sql>

    <select id="selectServiceTaskdiagList" parameterType="com.smartor.domain.ServiceTaskdiag"
            resultMap="ServiceTaskdiagResult">
        <include refid="selectServiceTaskdiagVo"/>
        <where>
                        <if test="taskId != null ">
                            and task_id = #{taskId}
                        </if>
                        <if test="longtask != null ">
                            and longtask = #{longtask}
                        </if>
                        <if test="taskName != null  and taskName != ''">
                            and task_name like concat('%', #{taskName}, '%')
                        </if>
                        <if test="serviceType != null  and serviceType != ''">
                            and service_type = #{serviceType}
                        </if>
                        <if test="icd10id != null ">
                            and icd10id = #{icd10id}
                        </if>
                        <if test="icd10code != null  and icd10code != ''">
                            and icd10code = #{icd10code}
                        </if>
                        <if test="icd10name != null  and icd10name != ''">
                            and icd10name like concat('%', #{icd10name}, '%')
                        </if>
                        <if test="orgid != null  and orgid != ''">
                            and orgid = #{orgid}
                        </if>
                        <if test="guid != null  and guid != ''">
                            and guid = #{guid}
                        </if>
                        <if test="pguid != null  and pguid != ''">
                            and pguid = #{pguid}
                        </if>
                        <if test="pid != null ">
                            and pid = #{pid}
                        </if>
        </where>
    </select>

    <select id="selectServiceTaskdiagById" parameterType="Long"
            resultMap="ServiceTaskdiagResult">
            <include refid="selectServiceTaskdiagVo"/>
            where id = #{id}
    </select>

    <insert id="insertServiceTaskdiag" parameterType="com.smartor.domain.ServiceTaskdiag"            useGeneratedKeys="true" keyProperty="id">
        insert into service_taskdiag
        <trim prefix="(" suffix=")" suffixOverrides=",">
                    <if test="taskId != null">task_id,
                    </if>
                    <if test="longtask != null">longtask,
                    </if>
                    <if test="taskName != null">task_name,
                    </if>
                    <if test="serviceType != null">service_type,
                    </if>
                    <if test="icd10id != null">icd10id,
                    </if>
                    <if test="icd10code != null">icd10code,
                    </if>
                    <if test="icd10name != null">icd10name,
                    </if>
                    <if test="delFlag != null">del_flag,
                    </if>
                    <if test="createTime != null">create_time,
                    </if>
                    <if test="updateTime != null">update_time,
                    </if>
                    <if test="orgid != null">orgid,
                    </if>
                    <if test="guid != null">guid,
                    </if>
                    <if test="pguid != null">pguid,
                    </if>
                    <if test="pid != null">pid,
                    </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                    <if test="taskId != null">#{taskId},
                    </if>
                    <if test="longtask != null">#{longtask},
                    </if>
                    <if test="taskName != null">#{taskName},
                    </if>
                    <if test="serviceType != null">#{serviceType},
                    </if>
                    <if test="icd10id != null">#{icd10id},
                    </if>
                    <if test="icd10code != null">#{icd10code},
                    </if>
                    <if test="icd10name != null">#{icd10name},
                    </if>
                    <if test="delFlag != null">#{delFlag},
                    </if>
                    <if test="createTime != null">#{createTime},
                    </if>
                    <if test="updateTime != null">#{updateTime},
                    </if>
                    <if test="orgid != null">#{orgid},
                    </if>
                    <if test="guid != null">#{guid},
                    </if>
                    <if test="pguid != null">#{pguid},
                    </if>
                    <if test="pid != null">#{pid},
                    </if>
        </trim>
    </insert>

    <update id="updateServiceTaskdiag" parameterType="com.smartor.domain.ServiceTaskdiag">
        update service_taskdiag
        <trim prefix="SET" suffixOverrides=",">
                    <if test="taskId != null">task_id =
                        #{taskId},
                    </if>
                    <if test="longtask != null">longtask =
                        #{longtask},
                    </if>
                    <if test="taskName != null">task_name =
                        #{taskName},
                    </if>
                    <if test="serviceType != null">service_type =
                        #{serviceType},
                    </if>
                    <if test="icd10id != null">icd10id =
                        #{icd10id},
                    </if>
                    <if test="icd10code != null">icd10code =
                        #{icd10code},
                    </if>
                    <if test="icd10name != null">icd10name =
                        #{icd10name},
                    </if>
                    <if test="delFlag != null">del_flag =
                        #{delFlag},
                    </if>
                    <if test="createTime != null">create_time =
                        #{createTime},
                    </if>
                    <if test="updateTime != null">update_time =
                        #{updateTime},
                    </if>
                    <if test="orgid != null">orgid =
                        #{orgid},
                    </if>
                    <if test="guid != null">guid =
                        #{guid},
                    </if>
                    <if test="pguid != null">pguid =
                        #{pguid},
                    </if>
                    <if test="pid != null">pid =
                        #{pid},
                    </if>
        </trim>
        where id = #{id}
    </update>

                <update id="deleteServiceTaskdiagById" parameterType="Long">
        update service_taskdiag
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where  id = #{id}
    </update>

                            <update id="deleteServiceTaskdiagByIds" parameterType="String">
        update  service_taskdiag
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>




</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,211 @@
<?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.ServiceTaskoperMapper">

    <resultMap type="com.smartor.domain.ServiceTaskoper" id="ServiceTaskoperResult">
            <result property="id" column="id"/>
            <result property="taskId" column="task_id"/>
            <result property="longtask" column="longtask"/>
            <result property="taskName" column="task_name"/>
            <result property="serviceType" column="service_type"/>
            <result property="deptId" column="dept_id"/>
            <result property="deptCode" column="dept_code"/>
            <result property="deptName" column="dept_name"/>
            <result property="delFlag" column="del_flag"/>
            <result property="createTime" column="create_time"/>
            <result property="updateTime" column="update_time"/>
            <result property="orgid" column="orgid"/>
            <result property="guid" column="guid"/>
            <result property="pguid" column="pguid"/>
            <result property="pid" column="pid"/>
    </resultMap>

    <sql id="selectServiceTaskoperVo">
        select id, task_id, longtask, task_name, service_type, dept_id, dept_code, dept_name, del_flag, create_time, update_time, orgid, guid, pguid, pid
        from service_taskoper
    </sql>

    <select id="selectServiceTaskoperList" parameterType="com.smartor.domain.ServiceTaskoper"
            resultMap="ServiceTaskoperResult">
        <include refid="selectServiceTaskoperVo"/>
        <where>
                        <if test="taskId != null ">
                            and task_id = #{taskId}
                        </if>
                        <if test="longtask != null ">
                            and longtask = #{longtask}
                        </if>
                        <if test="taskName != null  and taskName != ''">
                            and task_name like concat('%', #{taskName}, '%')
                        </if>
                        <if test="serviceType != null  and serviceType != ''">
                            and service_type = #{serviceType}
                        </if>
                        <if test="deptId != null ">
                            and dept_id = #{deptId}
                        </if>
                        <if test="deptCode != null  and deptCode != ''">
                            and dept_code = #{deptCode}
                        </if>
                        <if test="deptName != null  and deptName != ''">
                            and dept_name like concat('%', #{deptName}, '%')
                        </if>
                        <if test="orgid != null  and orgid != ''">
                            and orgid = #{orgid}
                        </if>
                        <if test="guid != null  and guid != ''">
                            and guid = #{guid}
                        </if>
                        <if test="pguid != null  and pguid != ''">
                            and pguid = #{pguid}
                        </if>
                        <if test="pid != null ">
                            and pid = #{pid}
                        </if>
        </where>
    </select>

    <select id="selectServiceTaskoperById" parameterType="Long"
            resultMap="ServiceTaskoperResult">
            <include refid="selectServiceTaskoperVo"/>
            where id = #{id}
    </select>

    <insert id="insertServiceTaskoper" parameterType="com.smartor.domain.ServiceTaskoper"            useGeneratedKeys="true" keyProperty="id">
        insert into service_taskoper
        <trim prefix="(" suffix=")" suffixOverrides=",">
                    <if test="taskId != null">task_id,
                    </if>
                    <if test="longtask != null">longtask,
                    </if>
                    <if test="taskName != null">task_name,
                    </if>
                    <if test="serviceType != null">service_type,
                    </if>
                    <if test="deptId != null">dept_id,
                    </if>
                    <if test="deptCode != null">dept_code,
                    </if>
                    <if test="deptName != null">dept_name,
                    </if>
                    <if test="delFlag != null">del_flag,
                    </if>
                    <if test="createTime != null">create_time,
                    </if>
                    <if test="updateTime != null">update_time,
                    </if>
                    <if test="orgid != null">orgid,
                    </if>
                    <if test="guid != null">guid,
                    </if>
                    <if test="pguid != null">pguid,
                    </if>
                    <if test="pid != null">pid,
                    </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                    <if test="taskId != null">#{taskId},
                    </if>
                    <if test="longtask != null">#{longtask},
                    </if>
                    <if test="taskName != null">#{taskName},
                    </if>
                    <if test="serviceType != null">#{serviceType},
                    </if>
                    <if test="deptId != null">#{deptId},
                    </if>
                    <if test="deptCode != null">#{deptCode},
                    </if>
                    <if test="deptName != null">#{deptName},
                    </if>
                    <if test="delFlag != null">#{delFlag},
                    </if>
                    <if test="createTime != null">#{createTime},
                    </if>
                    <if test="updateTime != null">#{updateTime},
                    </if>
                    <if test="orgid != null">#{orgid},
                    </if>
                    <if test="guid != null">#{guid},
                    </if>
                    <if test="pguid != null">#{pguid},
                    </if>
                    <if test="pid != null">#{pid},
                    </if>
        </trim>
    </insert>

    <update id="updateServiceTaskoper" parameterType="com.smartor.domain.ServiceTaskoper">
        update service_taskoper
        <trim prefix="SET" suffixOverrides=",">
                    <if test="taskId != null">task_id =
                        #{taskId},
                    </if>
                    <if test="longtask != null">longtask =
                        #{longtask},
                    </if>
                    <if test="taskName != null">task_name =
                        #{taskName},
                    </if>
                    <if test="serviceType != null">service_type =
                        #{serviceType},
                    </if>
                    <if test="deptId != null">dept_id =
                        #{deptId},
                    </if>
                    <if test="deptCode != null">dept_code =
                        #{deptCode},
                    </if>
                    <if test="deptName != null">dept_name =
                        #{deptName},
                    </if>
                    <if test="delFlag != null">del_flag =
                        #{delFlag},
                    </if>
                    <if test="createTime != null">create_time =
                        #{createTime},
                    </if>
                    <if test="updateTime != null">update_time =
                        #{updateTime},
                    </if>
                    <if test="orgid != null">orgid =
                        #{orgid},
                    </if>
                    <if test="guid != null">guid =
                        #{guid},
                    </if>
                    <if test="pguid != null">pguid =
                        #{pguid},
                    </if>
                    <if test="pid != null">pid =
                        #{pid},
                    </if>
        </trim>
        where id = #{id}
    </update>

                <update id="deleteServiceTaskoperById" parameterType="Long">
        update service_taskoper
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where  id = #{id}
    </update>

                            <update id="deleteServiceTaskoperByIds" parameterType="String">
        update  service_taskoper
        <trim prefix="SET" suffixOverrides=",">
            del_flag =1
        </trim>
        where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>




</mapper>