已修改12个文件
283 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java 203 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskExportVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -31,6 +31,7 @@
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;
@@ -738,10 +739,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");
@@ -792,15 +798,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;
    }
@@ -895,7 +901,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());
@@ -903,73 +909,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() {
@@ -1114,11 +1189,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 兜底
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -797,6 +797,9 @@
            log.error(logInfo);
            return error(logInfo);
        }
        // 分类统计为汇总结果,不参与分页;同时避免 pageNum/pageSize 影响分组 key 的收集。
        serviceSubtaskCountReq.setPageNum(null);
        serviceSubtaskCountReq.setPageSize(null);
        List<ServiceSubtaskStatistic> serviceSubtaskStatistics = serviceSubtaskService.getSfStatisticsScript(serviceSubtaskCountReq);
        return success(serviceSubtaskStatistics);
    }
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -36,6 +36,7 @@
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.stereotype.Component;
@@ -1414,6 +1415,7 @@
                    //任务发送记录
                    ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
                    serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
                    serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
                    serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
                    serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
                    serviceSubtaskRecord.setPreachform("4");
@@ -1892,11 +1894,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 兜底
smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -178,10 +178,10 @@
    private String templatename;
    /**
     * 发处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID
     * 发处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID、6回院复诊复查
     */
    @Excel(name = " 处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访 ")
    @ApiModelProperty(value = "处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访")
    @Excel(name = " 处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访、6回院复诊复查 ")
    @ApiModelProperty(value = "处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访、6回院复诊复查")
    private String suggest;
    /**
smartor/src/main/java/com/smartor/domain/ServiceSubtaskCountReq.java
@@ -165,6 +165,12 @@
    private String excep;
    /**
     * 处理意见编码 - 超链接统计
     */
    @ApiModelProperty(value = "处理意见编码")
    private String suggest;
    /**
     * 完成时状态 - 超链接统计(1-正常完成 2-延期完成 3-超时完成)
     */
    @ApiModelProperty(value = "完成时状态:1正常完成 2延期完成 3超时完成")
smartor/src/main/java/com/smartor/domain/ServiceSubtaskExportVO.java
@@ -157,10 +157,10 @@
    private String templatename;
    /**
     * 发处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID
     * 发处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID、6回院复诊复查
     */
    @Excel(name = " 处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访 ")
    @ApiModelProperty(value = "处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访")
    @Excel(name = " 处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访、6回院复诊复查 ")
    @ApiModelProperty(value = "处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访、6回院复诊复查")
    private String suggest;
    /**
smartor/src/main/java/com/smartor/domain/ServiceSubtaskRes.java
@@ -190,10 +190,10 @@
    private String templatename;
    /**
     * 发处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID
     * 发处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID、6回院复诊复查
     */
    @Excel(name = " 处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访 ")
    @ApiModelProperty(value = "处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访")
    @Excel(name = " 处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访、6回院复诊复查 ")
    @ApiModelProperty(value = "处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访、6回院复诊复查")
    private String suggest;
    /**
smartor/src/main/java/com/smartor/domain/ServiceSubtaskStatistic.java
@@ -322,6 +322,10 @@
    @Excel(name = " 二次随访失败 ")
    private Long followUpFailAgain = 0L;
    @ApiModelProperty(value = "再次随访回院复诊复查(suggest=6)")
    @Excel(name = " 再次随访回院复诊复查 ")
    private Long suggest6CountAgain = 0L;
    @ApiModelProperty(value = "二次随访率")
    @Excel(name = " 二次随访率 ")
    private String followUpRateAgain;
smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java
@@ -79,10 +79,10 @@
    private String senduuid;
    /**
     * 发处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID
     * 发处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID、6回院复诊复查
     */
    @Excel(name = " 处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访 ")
    @ApiModelProperty(value = "处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访")
    @Excel(name = " 处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访、6回院复诊复查 ")
    @ApiModelProperty(value = "处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访、6回院复诊复查")
    private String suggest;
    /**
smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
@@ -84,10 +84,10 @@
    private String senduuid;
    /**
     * 发处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID
     * 发处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访送UUID、6回院复诊复查
     */
    @Excel(name = " 处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访 ")
    @ApiModelProperty(value = "处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访")
    @Excel(name = " 处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访、6回院复诊复查 ")
    @ApiModelProperty(value = "处理意见:1暂不处理、2通知就诊、3病情稳定、4人工随访、5失访、6回院复诊复查")
    private String suggest;
    /**
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -1221,7 +1221,8 @@
        sysDeptVo.setDeptType("1");
        sysDeptVo.setOrgid(orgid);
        sysDeptVo.setDeptCode(centerDept);
        List<SysDept> sysDepts = sysDeptService.selectDeptList(sysDeptVo);
        // 定时任务线程没有登录上下文,不能调用带 @DataScope 的 selectDeptList,否则会抛“获取用户信息异常”。
        List<SysDept> sysDepts = sysDeptService.selectSysDeptList(sysDeptVo);
        return CollectionUtils.isEmpty(sysDepts) ? null : sysDepts.get(0);
    }
@@ -4100,13 +4101,20 @@
    }
    /**
     * 市一统计口径:再次待随访、已发送及人工电话超时。
     * 再次随访附加统计:待随访、已发送、人工电话超时及回院复诊复查(suggest=6)。
     */
    private void applyAgainFollowUpExtraStatistics(ServiceSubtaskStatistic statistic, ServiceSubtask serviceSubtask) {
        if (serviceSubtask.getVisitCount() == null || serviceSubtask.getVisitCount() <= 1 || serviceSubtask.getSendstate() == null) {
        if (serviceSubtask.getVisitCount() == null || serviceSubtask.getVisitCount() <= 1) {
            return;
        }
        if (serviceSubtask.getSendstate() == null) {
            return;
        }
        Long sendstate = serviceSubtask.getSendstate();
        // 回院复诊复查:再次随访中按处理意见 suggest=6 统计
        if (StringUtils.equals("6", StringUtils.trim(serviceSubtask.getSuggest()))) {
            statistic.setSuggest6CountAgain(statistic.getSuggest6CountAgain() + 1L);
        }
        if (sendstate.equals(3L)) {
            statistic.setSentAgain(statistic.getSentAgain() + 1L);
        }
@@ -4912,6 +4920,7 @@
     * pendingFollowUpSentAgainInfo - visitCount > 1 && sendstate in (3,7)
     * sentInfo - visitCount = 1 && sendstate = 3
     * sentAgainInfo - visitCount > 1 && sendstate = 3
     * suggest6CountAgainInfo - visitCount > 1 && suggest = 6
     * filterCountList - taskSituation = 6 && sendstate = 4
     *
     */
@@ -4952,6 +4961,7 @@
        serviceSubtaskCountReq.setExcep(null);
        serviceSubtaskCountReq.setTaskSituation(null);
        serviceSubtaskCountReq.setFinishState(null);
        serviceSubtaskCountReq.setSuggest(null);
        switch (hyperLinkInfoType) {
            case "dischargeCountInfo":
@@ -5094,6 +5104,11 @@
            case "abnormalAgainInfo":
                serviceSubtaskCountReq.setVisitCount(2);
                serviceSubtaskCountReq.setExcep("1");
                break;
            case "suggest6CountAgainInfo":
                // 再次随访回院复诊复查:visitCount > 1 且 suggest = 6
                serviceSubtaskCountReq.setVisitCount(2);
                serviceSubtaskCountReq.setSuggest("6");
                break;
            case "taskSituation1Info":
                serviceSubtaskCountReq.setTaskSituation(1);
@@ -5535,6 +5550,7 @@
        total.setSentAgain(0L);
        total.setFollowUpSuccessAgain(0L);
        total.setFollowUpFailAgain(0L);
        total.setSuggest6CountAgain(0L);
        total.setManualAgain(0L);
        total.setSmsAgain(0L);
        total.setWeChatAgain(0L);
@@ -5579,6 +5595,7 @@
            total.setSentAgain(total.getSentAgain() + (stat.getSentAgain() != null ? stat.getSentAgain() : 0L));
            total.setFollowUpSuccessAgain(total.getFollowUpSuccessAgain() + (stat.getFollowUpSuccessAgain() != null ? stat.getFollowUpSuccessAgain() : 0L));
            total.setFollowUpFailAgain(total.getFollowUpFailAgain() + (stat.getFollowUpFailAgain() != null ? stat.getFollowUpFailAgain() : 0L));
            total.setSuggest6CountAgain(total.getSuggest6CountAgain() + (stat.getSuggest6CountAgain() != null ? stat.getSuggest6CountAgain() : 0L));
            total.setManualAgain(total.getManualAgain() + (stat.getManualAgain() != null ? stat.getManualAgain() : 0L));
            total.setSmsAgain(total.getSmsAgain() + (stat.getSmsAgain() != null ? stat.getSmsAgain() : 0L));
            total.setWeChatAgain(total.getWeChatAgain() + (stat.getWeChatAgain() != null ? stat.getWeChatAgain() : 0L));
smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -1970,9 +1970,6 @@
        <if test="groupKey != null and groupKey != ''">
            group by ${groupKey}
        </if>
        <if test="pageSize != null  and pageNum != null">
            limit ${pageSize} OFFSET ${pageNum}
        </if>
    </select>
    <select id="getSfStatisticsHyperlink" parameterType="com.smartor.domain.ServiceSubtaskCountReq"
@@ -2117,6 +2114,9 @@
        <if test="isManuallyCalled != null">
            AND is_manually_called = #{isManuallyCalled}
        </if>
        <if test="suggest != null and suggest != ''">
            AND TRIM(suggest) = #{suggest}
        </if>
        order by endtime desc
        <if test="pageSize != null  and pageNum != null">
            limit ${pageSize} OFFSET ${pageNum}