Merge remote-tracking branch 'origin/master' into smartor_ls_261012

liusheng

2026-11-03 7191c6d38f03f2e1baf39f959227ce9c038e4e96

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

@@ -18,14 +18,12 @@
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
import com.smartor.domain.entity.ServiceSubtaskEntity;
import com.smartor.mapper.*;
import com.smartor.service.IBaseSmsaccountService;
import com.smartor.service.IServiceOutPathService;
import com.smartor.service.IServiceSubtaskRecordService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.connection.Message;
@@ -39,6 +37,22 @@
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

import com.ruoyi.template.domain.HeLibrary;
import com.ruoyi.template.api.TemplateFacade;
import com.ruoyi.common.core.domain.entity.PatArchive;
import com.ruoyi.task.domain.entity.ServiceSubtaskEntity;
import com.ruoyi.task.domain.ServiceSubtask;
import com.ruoyi.task.domain.ServiceSubtaskRecord;
import com.ruoyi.task.domain.ServiceTask;
import com.ruoyi.task.mapper.ServiceSubtaskMapper;
import com.ruoyi.task.mapper.ServiceTaskMapper;
import com.ruoyi.task.domain.ServiceOutPath;
import com.ruoyi.task.service.IServiceOutPathService;
import com.ruoyi.task.domain.ServiceSubtaskPreachform;
import com.ruoyi.task.domain.SendMagParam;
import com.ruoyi.task.service.IServiceSubtaskRecordService;
import com.ruoyi.task.mapper.ServiceSubtaskPreachformMapper;
import com.ruoyi.patarchive.mapper.PatArchiveMapper;
@Slf4j
@Component//监听此队列
public class RedisMqReceiver extends KeyExpirationEventMessageListener {
@@ -58,12 +72,26 @@
    @Autowired
    private IServiceOutPathService iServiceOutPathService;

    /**
     * 模板数据一律经 ruoyi-template 的门面取用（跨模块数据访问原则）。
     */
    @Autowired
    private TemplateFacade templateFacade;

    /**
     * 宣教模块的<b>常驻门面</b>，用于判 {@code sys_config: publicity.enabled}。
     * <p>
     * ⚠️ 2025 修复：本类原本<b>完全没读宣教开关</b> ——
     * {@code tsakHandle} 的公众号 {@code type == 3} 分支（L518「//宣教」）
     * 照常拼宣教链接并发送，所以关掉 {@code publicity.enabled} 也拦不住这条路。
     */
    @Autowired
    private com.ruoyi.publicity.api.PublicityFacade publicityFacade;

    @Autowired
    private ServiceSubtaskMapper ivrTaskcallMapper;


    @Autowired
    private HeLibraryMapper heLibraryMapper;

    @Autowired
    private ServiceTaskMapper ivrTaskMapper;
@@ -208,6 +236,22 @@
                continue;
            }
            String descByCode = ServiceFromEnum.getDescByCode(Integer.valueOf(sendPreachform));

            // ⚠️ 2025 修复（宣教开关失效）：type == 3 是**宣教/通知**（纯发送、无作答，
            // 见 setFailPreachForm 里「宣教或通知…直接改成 9」的判定），整条派发的所有通道
            // （电话/短信/公众号/人工）发的都是宣教内容。所以关掉 publicity.enabled 时
            // 应当**一个通道都不发**，而不是只拦其中一段。
            //
            // ⚠️ 刻意**不推进 subtask 状态、也不记失败**：关闭是"暂时不发"，
            // 不是"这个患者不需要宣教"。若标成失败/不需要，开关恢复后这条宣教就永远丢了。
            // 保持 sendstate=2 不动，开关打开后下一次派发会照常发出。
            // （本方法的调用方 onMessage 处理完即删 Redis 消息、不重投，所以不会造成重投风暴。）
            if (type != null && type == 3 && !publicityFacade.isEnabled()) {
                log.warn("【宣教】模块未启用（参数配置 publicity.enabled=false），跳过宣教发送。subtaskId={}, patid={}",
                        serviceSubtask.getId(), serviceSubtask.getPatid());
                continue;
            }

            if (descByCode.equals("电话")) {
                try {
                    ServiceTask ivrTask = ivrTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
@@ -293,9 +337,9 @@
                        serviceOutPath.setParam6(subId);
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
//                                sendMagParam.setUrl(ip + ":" + req_path + "/followvisit/particty?param1=" + taskId + "&param2=" + patid + "&param5=false");
@@ -331,9 +375,9 @@
                        serviceOutPath.setParam3(ivrTask1.getTaskName());
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                        String format = String.format("%03X", serviceOutPath.getId());
@@ -371,15 +415,18 @@
                        serviceOutPath.setParam3(ivrTask1.getTaskName());
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                        String url = "";
                        String format = String.format("%03X", serviceOutPath.getId());
                        //需要通过模板ID去判断要发的内容是宣教还是通知
                        HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid());
                        // ⚠️ 与 RyTask 同口径：**刻意不**为 TemplateModuleDisabledException 降级 ——
                        // 模板模块关闭时宣教内容取不到、短信确实发不出去，外层 try-catch 如实记失败
                        // 并走既有的通道升级机制。硬记成功等于用假记录掩盖"没发出去"。
                        HeLibrary heLibrary = templateFacade.findHeLibraryById(serviceSubtask.getLibtemplateid());
                        if (heLibrary.getHetype().equals("1")) {
                            sendMagParam.setPhone(serviceSubtask.getPhone());
                            url = StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/xj?p=" + format : ip + "/xj?p=" + format;
@@ -470,9 +517,9 @@
                        serviceOutPath.setParam6(subId);
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                        String format = String.format("%03X", serviceOutPath.getId());
@@ -490,9 +537,9 @@
                        serviceOutPath.setParam6(subId);
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                        String format = String.format("%03X", serviceOutPath.getId());
@@ -514,16 +561,16 @@
                        serviceOutPath.setParam3(ivrTask1.getTaskName());
                        serviceOutPath.setParam6(subId);
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setDeptCode(serviceSubtask.getDeptcode());
                        serviceOutPath.setDeptCode(serviceSubtask.getLeaveldeptcode());
                        serviceOutPath.setWardCode(serviceSubtask.getLeavehospitaldistrictcode());
                        serviceOutPath.setDeptName(serviceSubtask.getDeptname());
                        serviceOutPath.setDeptName(serviceSubtask.getLeaveldeptname());
                        serviceOutPath.setWardName(serviceSubtask.getLeavehospitaldistrictname());
                        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                        String format = String.format("%03X", serviceOutPath.getId());

                        //需要通过模板ID去判断要发的内容是宣教还是通知
//                        HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(serviceSubtask.getLibtemplateid());
//                        HeLibrary heLibrary = templateFacade.findHeLibraryById(serviceSubtask.getLibtemplateid());
//                        if (heLibrary.getHetype().equals("1")) {
//                            sendMagParam.setPhone(serviceSubtask.getPhone());
//                            sendMagParam.setUrl(ip + ":" + req_path + "/xj?p=" + format);
@@ -586,10 +633,15 @@
                    continue;
                }
                //在子任务表里记录一下
                setFailPreachForm(serviceSubtask, sendPreachform, "公众号发送成功", "2");
                Boolean stateUpdated = setFailPreachForm(serviceSubtask, sendPreachform, "公众号发送成功", "2");
                if (!Boolean.TRUE.equals(stateUpdated)) {
                    log.error("公众号发送成功但更新子任务状态失败，subid：{}，preachform：{}", serviceSubtask.getId(), sendPreachform);
                    continue;
                }
                //任务发送记录
                ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
                serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
                serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
                serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
                serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
                serviceSubtaskRecord.setPreachform("5");
@@ -686,15 +738,15 @@
        List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);

        if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
            Optional<String> ct = serviceSubtaskPreachforms.stream().filter(item -> currentPreachform.equals(item.getPreachform())).map(ServiceSubtaskPreachform::getCompensateTime).findFirst();
            String compensateTime = "0";
            if (ct.isPresent()) compensateTime = ct.get();
            int hoursToAdd = Integer.valueOf(compensateTime) * 24;
            Optional<String> ct = serviceSubtaskPreachforms.stream()
                    .filter(item -> Objects.equals(currentPreachform, item.getPreachform()))
                    .map(ServiceSubtaskPreachform::getCompensateTime)
                    .findFirst();
            int daysToAdd = ct.map(value -> NumberUtils.toInt(value, 0)).orElse(0);
            Calendar calendar = Calendar.getInstance();
            calendar.setTime(visitTime);
            calendar.add(Calendar.HOUR_OF_DAY, hoursToAdd);
            Date newDate = calendar.getTime();
            return newDate;
            calendar.setTime(visitTime == null ? new Date() : visitTime);
            calendar.add(Calendar.HOUR_OF_DAY, daysToAdd * 24);
            return calendar.getTime();
        }
        return visitTime;
    }
@@ -789,7 +841,7 @@
     */
    public Boolean setFailPreachForm(ServiceSubtask serviceSubtask, String preachform, String remark, String failSendstate) {
        log.info("^^^^^^^^^--------setFailPreachForm的入参为serviceSubtask：{}   ，preachform值为：{}，  failSendstate：{}", serviceSubtask, preachform, failSendstate);
        if (preachform.equals("-1")) {
        if ("-1".equals(preachform)) {
            //说明都不需要执行了
            ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
            serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
@@ -797,73 +849,142 @@
            serviceSubtaskPreachform.setOrgid(serviceSubtask.getOrgid());
            serviceSubtaskPreachform.setSendstate(failSendstate);
            serviceSubtaskPreachform.setCurrentSendTime(new Date());
            if (serviceSubtask.getType().equals("3") || serviceSubtask.getType().equals("4")) {
            if (isEducationOrNotice(serviceSubtask) && "2".equals(failSendstate)) {
                //如果是宣教或通知，并且发送成功，直接将发送状态改成9
                if (failSendstate.equals("2")) serviceSubtaskPreachform.setSendstate("9");
                serviceSubtaskPreachform.setSendstate("9");
            }
            serviceSubtaskPreachformMapper.updateSSPByCondition(serviceSubtaskPreachform);

            return true;
        }

        //将状态设置为失败
        ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
        serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
        serviceSubtaskPreachform.setTaskid(serviceSubtask.getTaskid());
        serviceSubtaskPreachform.setOrgid(serviceSubtask.getOrgid());
        //获取该患者的发送方式总数
        List<ServiceSubtaskPreachform> spSize = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
        log.error("-------spSize的值为：{}", spSize);
        serviceSubtaskPreachform.setPreachform(preachform);
        //1:未发送状态
        serviceSubtaskPreachform.setSendstate("1");
        log.info("---serviceSubtaskPreachform入参为：{}", serviceSubtaskPreachform);
        List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
        log.info("---serviceSubtaskPreachform返参为：{}", serviceSubtaskPreachforms);
        //电话的未发送状态，需要查2，因为，数据可能卡在队列里了(也有可能没有拉取，sendstate=1,所以如果是电话状态判断serviceSubtaskPreachforms是不是为空)
        if (preachform.equals("3") && CollectionUtils.isEmpty(serviceSubtaskPreachforms)) {
            serviceSubtaskPreachform.setSendstate("2");
            serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
        }
        if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
            ServiceSubtaskPreachform serviceSubtaskPreachform1 = serviceSubtaskPreachforms.get(0);
            serviceSubtaskPreachform1.setSendstate(failSendstate);
            if (serviceSubtask.getType().equals("3") || serviceSubtask.getType().equals("4")) {
                //如果是宣教或通知，并且发送成功，直接将发送状态改成9
                if (failSendstate.equals("2")) serviceSubtaskPreachform1.setSendstate("9");
            }
            serviceSubtaskPreachform1.setRemark(remark);
            serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(serviceSubtaskPreachform1);
            //如果当前的preachform已经是最后一个了,并且本次还是发送失败，那直接将serviceSubtask的sendstate状态改成5就行了(全失败了)
            if (CollectionUtils.isNotEmpty(spSize) && serviceSubtaskPreachform1.getSort() == spSize.size()
                    && isSubtaskDeadline(serviceSubtask, serviceSubtaskPreachforms)) {
                if (serviceSubtaskPreachform1.getSort() == spSize.size()) {
                    if (failSendstate.equals("4") || failSendstate.equals("5")) {
                        serviceSubtask.setCurrentPreachform(preachform);
                        serviceSubtask.setSendstate(7L);
                        serviceSubtask.setFinishtime(null);
                        serviceSubtask.setRemark("处理补偿任务,当前处理最后补偿，全部执行失败(超时)");
                        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                        return true;
                    }
                }
            }
        } else {
        // 查询该子任务的全部发送方式，不再只查 sendstate=1。
        // 第一次发送后该行可能已经变成 sendstate=2，重试时仍需要定位到同一行。
        ServiceSubtaskPreachform query = new ServiceSubtaskPreachform();
        query.setSubid(serviceSubtask.getId());
        query.setTaskid(serviceSubtask.getTaskid());
        query.setOrgid(serviceSubtask.getOrgid());
        List<ServiceSubtaskPreachform> allPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(query);
        log.info("---serviceSubtaskPreachform返参为：{}", allPreachforms);
        if (CollectionUtils.isEmpty(allPreachforms)) {
            log.error("【MQ中该患者没有查询到属于他的发送方式，subid：{},prechform:{},orgid:{}】", serviceSubtask.getId(), preachform, serviceSubtask.getOrgid());
            return false;
        }
        log.info("^^^^^^^^^--------preachform的值为：{}", preachform);

        // 按 getSendPreachform 的选择规则定位本次实际处理的发送方式行。
        ServiceSubtaskPreachform currentPreachformRow = findCurrentPreachformRow(allPreachforms, serviceSubtask, preachform);
        if (currentPreachformRow == null) {
            log.error("【MQ中该患者没有查询到当前发送方式，subid：{},prechform:{},orgid:{}】", serviceSubtask.getId(), preachform, serviceSubtask.getOrgid());
            return false;
        }

        // 先落库 service_subtask 状态，再更新发送方式明细。
        // 这样即使后续步骤异常，60 秒重试也不会再次选中并发送。
        serviceSubtask.setCurrentPreachform(preachform);
        serviceSubtask.setVisitTime(getNextVisitTime(serviceSubtask.getId(), serviceSubtask.getTaskid(), serviceSubtask.getVisitTime(), serviceSubtask.getCurrentPreachform()));
        serviceSubtask.setVisitTime(getNextVisitTime(serviceSubtask.getId(), serviceSubtask.getTaskid(), serviceSubtask.getVisitTime(), preachform));
        serviceSubtask.setSendstate(3L);
        if (serviceSubtask.getType().equals("3") || serviceSubtask.getType().equals("4")) {
        if (isEducationOrNotice(serviceSubtask) && "2".equals(failSendstate)) {
            //如果是宣教或通知，并且发送成功，则直接将serviceSubtask状态改成6L（这个患者是没有题做的，不会再触发接口进行状态修改）
            if (failSendstate.equals("2")) {
                serviceSubtask.setSendstate(6L);
            }
            serviceSubtask.setSendstate(6L);
        }
        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);

        // 更新当前发送方式明细；发送成功时允许当前行已经是 sendstate=2。
        currentPreachformRow.setSendstate(failSendstate);
        if (isEducationOrNotice(serviceSubtask) && "2".equals(failSendstate)) {
            currentPreachformRow.setSendstate("9");
        }
        currentPreachformRow.setRemark(remark);
        serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(currentPreachformRow);

        // 只有最后一步且发送失败（4/5）时才需要判断超时并置为 7。
        boolean lastStep = currentPreachformRow.getSort() != null
                && currentPreachformRow.getSort() == allPreachforms.size();
        if (lastStep && ("4".equals(failSendstate) || "5".equals(failSendstate))
                && isSubtaskDeadline(serviceSubtask, allPreachforms)) {
            serviceSubtask.setSendstate(7L);
            serviceSubtask.setFinishtime(null);
            serviceSubtask.setRemark("处理补偿任务,当前处理最后补偿，全部执行失败(超时)");
            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
        }
        return true;
    }

    /**
     * 判断是否为宣教或通知类型。
     */
    private boolean isEducationOrNotice(ServiceSubtask serviceSubtask) {
        return serviceSubtask != null
                && ("3".equals(serviceSubtask.getType()) || "4".equals(serviceSubtask.getType()));
    }

    /**
     * 定位本次实际处理的发送方式行。
     * 选择规则与 getSendPreachform 保持一致：
     * 1. current_preachform 为空时取 sort=1；
     * 2. current_preachform 不为空时取 current_preachform 对应 sort 的下一步；
     * 3. 兜底按发送方式匹配，优先取 current_send_time 最近的一行，再取 sort 较小的一行。
     */
    private ServiceSubtaskPreachform findCurrentPreachformRow(List<ServiceSubtaskPreachform> rows,
                                                              ServiceSubtask serviceSubtask,
                                                              String preachform) {
        if (StringUtils.isEmpty(serviceSubtask.getCurrentPreachform())) {
            for (ServiceSubtaskPreachform row : rows) {
                if (Objects.equals(preachform, row.getPreachform())
                        && row.getSort() != null && row.getSort() == 1L) {
                    return row;
                }
            }
        } else {
            Long currentSort = null;
            for (ServiceSubtaskPreachform row : rows) {
                if (Objects.equals(serviceSubtask.getCurrentPreachform(), row.getPreachform())) {
                    currentSort = row.getSort();
                    break;
                }
            }
            if (currentSort != null) {
                Long nextSort = currentSort + 1;
                for (ServiceSubtaskPreachform row : rows) {
                    if (Objects.equals(nextSort, row.getSort())
                            && Objects.equals(preachform, row.getPreachform())) {
                        return row;
                    }
                }
            }
        }

        ServiceSubtaskPreachform target = null;
        for (ServiceSubtaskPreachform row : rows) {
            if (!Objects.equals(preachform, row.getPreachform())) {
                continue;
            }
            if (target == null) {
                target = row;
                continue;
            }
            Date rowTime = row.getCurrentSendTime();
            Date targetTime = target.getCurrentSendTime();
            if (rowTime != null && (targetTime == null || rowTime.after(targetTime))) {
                target = row;
            } else if (Objects.equals(rowTime, targetTime) && comparePreachformSort(row, target) < 0) {
                target = row;
            }
        }
        return target;
    }

    private int comparePreachformSort(ServiceSubtaskPreachform row, ServiceSubtaskPreachform target) {
        if (row.getSort() == null && target.getSort() == null) {
            return 0;
        }
        if (row.getSort() == null) {
            return 1;
        }
        if (target.getSort() == null) {
            return -1;
        }
        return row.getSort().compareTo(target.getSort());
    }

    private String getKey() {
@@ -913,11 +1034,15 @@
            return false;
        }
        // 基准时刻：出院时间 + 发送日（sendDay 缺省按 1），并兜底避免 NPE/脏数据
        if (serviceSubtask.getEndtime() == null) {
            log.warn("【isSubtaskDeadline】subid：{} endtime为空，无法计算超时，按未超时处理", serviceSubtask.getId());
            return false;
        }
        ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
        int sendDay = serviceTask != null && serviceTask.getSendDay() != null ? serviceTask.getSendDay().intValue() : 1;
        Date deadline = DateUtils.addDays(serviceSubtask.getEndtime(), sendDay);
        int sumCompensateTime = CollectionUtils.isEmpty(serviceSubtaskPreachforms) ? 0 : serviceSubtaskPreachforms.stream()
                .mapToInt(x -> x.getCompensateTime() == null ? 0 : Integer.parseInt(x.getCompensateTime()))
                .mapToInt(x -> NumberUtils.toInt(x.getCompensateTime(), 0))
                .sum();
        sumCompensateTime = sumCompensateTime + 1;
        // 只补偿最后一步自身的补偿时间（天），脏值一律按 0 兜底