liusheng
45 分钟以前 41ac1512f52f7670fff3200168b8bdd23c0b6489
ruoyi-task/src/main/java/com/ruoyi/task/service/impl/ServiceSubtaskServiceImpl.java
@@ -7,6 +7,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.ImportFlagEnum;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.core.service.IConfigService;
import com.ruoyi.satisfaction.api.SatisfactionFacade;
@@ -279,6 +280,14 @@
    /** 二次随访生成锁前缀,防止同一原任务并发生成多条二次随访 */
    private static final String AGAIN_LOCK_KEY_PREFIX = "smartor:again:lock:";
    private static final long AGAIN_LOCK_SECONDS = 30L;
    /**
     * /getSfStatisticsHyperlink 下钻类型后缀:「出院人次/无需随访/应随访」按「普通/日间」细分后的列,
     * 前端传 {@code <列名>DaytimeInfo} / {@code <列名>NormalInfo}(见
     * {@code applyDaytimeHyperLinkInfoType})。改这里等于改前后端约定。
     */
    private static final String HYPERLINK_DAYTIME_SUFFIX = "Daytime";
    private static final String HYPERLINK_NORMAL_SUFFIX = "Normal";
    /**
     * 查询单一任务(随访)
@@ -913,7 +922,7 @@
            serviceOutPath.setSubId(serviceSubtask1.getId());
            List<ServiceOutPath> serviceOutPaths = serviceOutPathMapper.selectServiceOutPathList(serviceOutPath);
            if (CollectionUtils.isNotEmpty(serviceOutPaths))
                format = String.format("%03X", serviceOutPaths.get(0).getId());
                format = ShortCode.encode(serviceOutPaths.get(0).getId());
            else format = getOutPath(serviceSubtask1, rsaPublicKeyExample);
            serviceSubtask = serviceSubtask1;
        } else {
@@ -965,7 +974,7 @@
        serviceOutPath.setSubId(serviceSubtask.getId());
        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
        //转成16进制
        format = String.format("%03X", serviceOutPath.getId());
        format = ShortCode.encode(serviceOutPath.getId());
        serviceOutPath.setRadix(format);
        serviceOutPath.setUpdateTime(new Date());
        iServiceOutPathService.updateServiceOutPath(serviceOutPath);
@@ -1599,6 +1608,61 @@
    }
    /**
     * 取逗号串里的第一个值(任务上科室/病区是多选,而 {@code service_subtask} 上都是单值列)。
     */
    private String firstValue(String value) {
        if (StringUtils.isEmpty(value)) {
            return null;
        }
        for (String item : value.split(",")) {
            if (StringUtils.isNotEmpty(item.trim())) {
                return item.trim();
            }
        }
        return null;
    }
    /**
     * 任务配置({@link ServiceTaskVO})→ 子任务({@link ServiceSubtask})的字段搬运。
     * <p>
     * <b>为什么不能直接 {@code DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class)}:</b>
     * 它是纯同名拷贝,而两边同名的 {@code deptcode / deptname} <b>语义不同</b>:
     * <ul>
     *   <li>{@code ServiceTaskVO.deptcode / deptname} = 任务的「适用科室」,
     *       出院随访(serviceType=2)/ 出院宣教(4)/ 门诊随访(3)等场景下就是<b>离院科室</b>;</li>
     *   <li>{@code ServiceSubtask.deptcode / deptname} = <b>在院科室</b>
     *       (2026-11 由原 sendlimitpbegin/pend 复用而来,见 {@code ServiceSubtask} 字段注释)。</li>
     * </ul>
     * 于是纯同名拷贝会把「离院科室」写进「在院科室」列,后果有两个:
     * <ol>
     *   <li>按在院维度筛({@code deptcodes} → {@code service_subtask.deptcode})会误命中这些子任务;</li>
     *   <li>按离院维度筛({@code leaveldeptcodes} → {@code service_subtask.leaveldeptcode})时,
     *       患者自己没带科室的那些(前端手动勾选患者很常见)会因为 {@code leaveldeptcode} 为空而查不到。</li>
     * </ol>
     * 因此这里按项目既定口径({@code doc/service_subtask_字段改名_改动清单.md} §8:这几条
     * 「长期任务 / 任务组 / 手动建任务」路径<b>不填在院维度</b>)统一处理:
     * <b>在院维度 4 列清空</b>(在院科室/在院病区只有 HIS 链路能从 {@code pat_med_inhosp} 拿到),
     * <b>科室 / 病区一律落离院维度</b>({@code leaveldeptcode/name}、{@code leavehospitaldistrictcode/name})。
     *
     * @param serviceTaskVO 建任务入参
     * @return 已按离院维度归位的子任务对象(在院维度为空)
     */
    private ServiceSubtask toSubtaskFromTaskVO(ServiceTaskVO serviceTaskVO) {
        ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
        // ① 在院维度必须清空:任务配置的科室不是患者本人的在院科室
        serviceSubtask.setDeptcode(null);
        serviceSubtask.setDeptname(null);
        serviceSubtask.setHospitaldistrictcode(null);
        serviceSubtask.setHospitaldistrictname(null);
        // ② 科室 / 病区 → 离院维度(多选串取第一个,子任务是单值列)
        serviceSubtask.setLeaveldeptcode(firstValue(serviceTaskVO.getDeptcode()));
        serviceSubtask.setLeaveldeptname(firstValue(serviceTaskVO.getDeptname()));
        serviceSubtask.setLeavehospitaldistrictcode(firstValue(serviceTaskVO.getLeavehospitaldistrictcode()));
        serviceSubtask.setLeavehospitaldistrictname(firstValue(serviceTaskVO.getLeavehospitaldistrictname()));
        return serviceSubtask;
    }
    /**
     * 单一任务
     *
     * @return 结果
@@ -1815,6 +1879,25 @@
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                        }
                    }
                    // 点位行(2026-11,appltype=7):科室 / 病区 / 点位在 service_taskdept 里是
                    // **各自独立的行**,可以共存也可以不共存 —— 所以点位行是"额外追加",
                    // 不替换上面的科室/病区行。点位行的 dept_code/dept_name 留空,编码只落 point_location。
                    if ("7".equals(serviceTaskVO.getAppltype())) {
                        String pointLocation = firstNonBlank(serviceTaskVO.getPointLocation(),
                                serviceTask.getPointLocation());
                        if (StringUtils.isNotEmpty(pointLocation)) {
                            ServiceTaskdept pointDept = new ServiceTaskdept();
                            pointDept.setTaskId(serviceTask.getTaskid());
                            pointDept.setTaskName(serviceTask.getTaskName());
                            pointDept.setOrgid(serviceTask.getOrgid());
                            pointDept.setLongtask(serviceTask.getLongTask() == null ? null
                                    : Long.valueOf(serviceTask.getLongTask()));
                            pointDept.setServiceType(serviceTaskVO.getServiceType());
                            pointDept.setDeptType("3");
                            pointDept.setPointLocation(pointLocation);
                            serviceTaskdeptService.insertServiceTaskdept(pointDept);
                        }
                    }
                }
            }
//长期任务,也允许加人了
@@ -1825,7 +1908,8 @@
//            }
            //将任务信息放到服务表中
            ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
            // 科室/病区按「离院维度」归位(出院随访的科室病区就是离院科室/病区),见 toSubtaskFromTaskVO
            ServiceSubtask serviceSubtask = toSubtaskFromTaskVO(serviceTaskVO);
            serviceSubtask.setTaskid(serviceTask.getTaskid().longValue());
            serviceSubtask.setTemplatename(ObjectUtils.isNotEmpty(tempid) ? tempName : serviceTask.getTemplatename());
            serviceSubtask.setTemplateid(ObjectUtils.isNotEmpty(tempid) ? tempid : serviceTask.getTemplateid());
@@ -1846,15 +1930,18 @@
                    serviceSubtask.setInhospid(patTaskRelevance.getHospid());
                    //新建完成就是待发送状态
                    serviceSubtask.setSendstate(2L);
                    String subtaskDeptCode = patTaskRelevance.getDeptcode();
                    if (StringUtils.isEmpty(subtaskDeptCode) && StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
                        // service_subtask.leaveldeptcode 为单值字段,不能写入任务的多科室拼接串,取第一个科室兜底
                        subtaskDeptCode = serviceTaskVO.getDeptcode().split(",")[0].trim();
                    }
                    serviceSubtask.setLeaveldeptcode(subtaskDeptCode);
                    serviceSubtask.setLeaveldeptname(StringUtils.isNotEmpty(patTaskRelevance.getDeptName()) ? patTaskRelevance.getDeptName() : serviceTaskVO.getDeptname());
                    serviceSubtask.setLeavehospitaldistrictcode(patTaskRelevance.getLeavehospitaldistrictcode());
                    serviceSubtask.setLeavehospitaldistrictname(patTaskRelevance.getLeavehospitaldistrictname());
                    // 离院维度(出院随访 = 出院科室 / 出院病区):
                    // 患者自带的出院科室/病区优先,患者侧没带(前端手动勾选很常见)时回退到任务配置,
                    // 不能无条件覆盖 —— 否则会把 toSubtaskFromTaskVO 按任务配置兜好的离院维度抹成 null,
                    // 结果「任务配了科室病区、生成出来的子任务离院科室/病区却是空」。
                    serviceSubtask.setLeaveldeptcode(firstNonBlank(patTaskRelevance.getDeptcode(),
                            firstValue(serviceTaskVO.getDeptcode())));
                    serviceSubtask.setLeaveldeptname(firstNonBlank(patTaskRelevance.getDeptName(),
                            firstValue(serviceTaskVO.getDeptname())));
                    serviceSubtask.setLeavehospitaldistrictcode(firstNonBlank(patTaskRelevance.getLeavehospitaldistrictcode(),
                            firstValue(serviceTaskVO.getLeavehospitaldistrictcode())));
                    serviceSubtask.setLeavehospitaldistrictname(firstNonBlank(patTaskRelevance.getLeavehospitaldistrictname(),
                            firstValue(serviceTaskVO.getLeavehospitaldistrictname())));
                    serviceSubtask.setType(serviceTaskVO.getType());
                    serviceSubtask.setHospType(patTaskRelevance.getHospType());
                    serviceSubtask.setOpenid(patTaskRelevance.getOpenid());
@@ -2190,6 +2277,27 @@
                    scheduleVO.setOplevelCodes(serviceTaskVO.getOplevelcode());
                    scheduleVO.setCreateBy(serviceTask.getUpdateBy());
                    serviceTaskScheduleService.saveScheduleWithDetail(scheduleVO);
                } else if (serviceTaskVO.getAppltype().equals("7")) {
                    // 按点位(同德需求):先软删该任务旧的 dept_type='3' 行,再按入参重建
                    //   (与科室/病区「先删后插」同口径;点位行 dept_code/dept_name 留空)
                    ServiceTaskdept oldPoint = new ServiceTaskdept();
                    oldPoint.setTaskId(serviceTask.getTaskid());
                    oldPoint.setDeptType("3");
                    serviceTaskdeptService.deleteServiceTaskdeptByTaskId(oldPoint);
                    String pointLocation = StringUtils.isNotEmpty(serviceTaskVO.getPointLocation())
                            ? serviceTaskVO.getPointLocation() : serviceTask.getPointLocation();
                    if (StringUtils.isNotEmpty(pointLocation)) {
                        ServiceTaskdept pointDept = new ServiceTaskdept();
                        pointDept.setTaskId(serviceTask.getTaskid());
                        pointDept.setTaskName(serviceTask.getTaskName());
                        pointDept.setOrgid(serviceTaskVO.getOrgid());
                        pointDept.setLongtask(serviceTask.getLongTask() == null ? null
                                : Long.valueOf(serviceTask.getLongTask()));
                        pointDept.setServiceType(serviceTaskVO.getServiceType());
                        pointDept.setDeptType("3");
                        pointDept.setPointLocation(pointLocation);
                        serviceTaskdeptService.insertServiceTaskdept(pointDept);
                    }
                }
            }
            if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) {
@@ -2212,7 +2320,8 @@
            }
            if (CollectionUtils.isNotEmpty(serviceTaskVO.getPatTaskRelevances())) {
                for (PatTaskRelevance patTaskRelevance : serviceTaskVO.getPatTaskRelevances()) {
                    ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTaskVO, ServiceSubtask.class);
                    // 科室/病区按「离院维度」归位(出院随访的科室病区就是离院科室/病区),见 toSubtaskFromTaskVO
                    ServiceSubtask serviceSubtask = toSubtaskFromTaskVO(serviceTaskVO);
                    serviceSubtask.setLibtemplateid(ObjectUtils.isEmpty(serviceTaskVO.getLibtemplateid()) ? null : Long.valueOf(serviceTaskVO.getLibtemplateid()));
                    serviceSubtask.setLibtemplatename(serviceTaskVO.getLibtemplatename());
                    serviceSubtask.setTemplateid(serviceTask.getTemplateid());
@@ -2224,10 +2333,16 @@
                    serviceSubtask.setAddr(patTaskRelevance.getAddr());
                    serviceSubtask.setPatid(patTaskRelevance.getPatid());
                    serviceSubtask.setOpenid(patTaskRelevance.getOpenid());
                    serviceSubtask.setLeaveldeptcode(patTaskRelevance.getDeptcode());
                    serviceSubtask.setLeavehospitaldistrictname(patTaskRelevance.getLeavehospitaldistrictname());
                    serviceSubtask.setLeavehospitaldistrictcode(patTaskRelevance.getLeavehospitaldistrictcode());
                    serviceSubtask.setLeaveldeptname(patTaskRelevance.getDeptName());
                    // 离院维度:患者自带的出院科室/病区优先,没带时回退到任务配置(否则会把
                    // toSubtaskFromTaskVO 按任务配置兜好的值抹成 null,出院随访就成「离院科室/病区为空」)
                    serviceSubtask.setLeaveldeptcode(firstNonBlank(patTaskRelevance.getDeptcode(),
                            firstValue(serviceTaskVO.getDeptcode())));
                    serviceSubtask.setLeaveldeptname(firstNonBlank(patTaskRelevance.getDeptName(),
                            firstValue(serviceTaskVO.getDeptname())));
                    serviceSubtask.setLeavehospitaldistrictcode(firstNonBlank(patTaskRelevance.getLeavehospitaldistrictcode(),
                            firstValue(serviceTaskVO.getLeavehospitaldistrictcode())));
                    serviceSubtask.setLeavehospitaldistrictname(firstNonBlank(patTaskRelevance.getLeavehospitaldistrictname(),
                            firstValue(serviceTaskVO.getLeavehospitaldistrictname())));
                    serviceSubtask.setType(serviceTaskVO.getType());
                    serviceSubtask.setCreateTime(DateUtils.getNowDate());
                    serviceSubtask.setDrname(patTaskRelevance.getDrname());
@@ -2766,6 +2881,8 @@
            //出院人次
            serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
            for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
                //普通/日间细分(出院人次、无需随访人次、应随访人次)
                applyDaytimeSplit(serviceSubtaskStatistic, serviceSubtask);
                //无需随访人次
                if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                    serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
@@ -3062,6 +3179,47 @@
    }
    /**
     * 把「出院人次 / 无需随访人次 / 应随访人次」按「普通 / 日间」细分累加。
     * <p>
     * 判定依据:{@code service_subtask.importance_flag_code}(建任务时从 {@code pat_med_inhosp}
     * 拷来的快照,现场存中文描述「日间手术」「日间诊疗」,也有环境存 {@code FH0165.01/02}),
     * 口径集中在 {@link ImportFlagEnum#isDaytime(String)}。
     * <p>
     * 三个方法({@link #getStatistic}、{@link #getStatisticFirst}、{@link #getStatisticAgain})
     * 的原始累加规则完全一致,所以这里只写一份,三处循环体各调一行即可。
     * 保证恒等式:普通 + 日间 == 原总量字段。
     *
     * @param statistic       当前分组的统计结果(累加目标)
     * @param serviceSubtask  当前明细行
     */
    private void applyDaytimeSplit(ServiceSubtaskStatistic statistic, ServiceSubtask serviceSubtask) {
        if (statistic == null || serviceSubtask == null) {
            return;
        }
        boolean daytime = ImportFlagEnum.isDaytime(serviceSubtask.getImportanceFlagCode());
        //出院人次:每一行明细都算 1 人次(与 statistic.setDischargeCount(list.size()) 同口径)
        if (daytime) {
            statistic.setDischargeCountDaytime(statistic.getDischargeCountDaytime() + 1);
        } else {
            statistic.setDischargeCountNormal(statistic.getDischargeCountNormal() + 1);
        }
        //无需随访人次(sendstate = 4)/ 应随访人次(sendstate != 4):与原总量字段完全同一判定
        if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
            if (daytime) {
                statistic.setNonFollowUpDaytime(statistic.getNonFollowUpDaytime() + 1L);
            } else {
                statistic.setNonFollowUpNormal(statistic.getNonFollowUpNormal() + 1L);
            }
        } else if (serviceSubtask.getSendstate() != null) {
            if (daytime) {
                statistic.setFollowUpNeededDaytime(statistic.getFollowUpNeededDaytime() + 1L);
            } else {
                statistic.setFollowUpNeededNormal(statistic.getFollowUpNeededNormal() + 1L);
            }
        }
    }
    /**
     * 是否属于「及时随访」:随访已完成且完成时状态为正常完成(未超时)。
     * <p>
     * finish_state:1-正常完成 2-延期完成 3-超时完成,只有 1 计入及时随访。
@@ -3157,6 +3315,8 @@
        for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
            applyFirstFollowUpExtraStatistics(serviceSubtaskStatistic, serviceSubtask);
            //普通/日间细分(出院人次、无需随访人次、应随访人次)
            applyDaytimeSplit(serviceSubtaskStatistic, serviceSubtask);
            //无需随访人次
            if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
@@ -3331,6 +3491,8 @@
        serviceSubtaskStatistic.setDischargeCount(serviceSubtaskList.size());
        for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
            applyAgainFollowUpExtraStatistics(serviceSubtaskStatistic, serviceSubtask);
            //普通/日间细分(出院人次、无需随访人次、应随访人次)
            applyDaytimeSplit(serviceSubtaskStatistic, serviceSubtask);
            //无需随访人次
            if (serviceSubtask.getSendstate() != null && serviceSubtask.getSendstate() == 4) {
                serviceSubtaskStatistic.setNonFollowUp(serviceSubtaskStatistic.getNonFollowUp() + 1L);
@@ -3801,6 +3963,14 @@
        serviceSubtaskCountReq.setFinishState(null);
        serviceSubtaskCountReq.setSuggest(null);
        //2026-11 新增:出院人次 / 无需随访人次 / 应随访人次 按「普通 / 日间」细分后的下钻。
        //放在清空动作之后、老 switch 之前:helper 自己会把 sendstates 设回去。
        Boolean daytimeResult = applyDaytimeHyperLinkInfoType(serviceSubtaskCountReq, hyperLinkInfoType);
        if (daytimeResult != null) {
            //true-已按「普通/日间」拼好条件;false-认出是普通/日间下钻但不认识是哪一列 → 返回空明细
            return daytimeResult;
        }
        switch (hyperLinkInfoType) {
            case "dischargeCountInfo":
                break;
@@ -4019,6 +4189,75 @@
                break;
        }
        return true;
    }
    /**
     * 「出院人次 / 无需随访人次 / 应随访人次」按「普通 / 日间」细分后的下钻类型解析。
     * <p>
     * 前端传的 {@code hyperLinkInfoType} 形如 {@code <列名><Daytime|Normal>Info},实测例如:
     * <ul>
     *   <li>{@code dischargeCountDaytimeInfo} —— 出院人次-日间</li>
     *   <li>{@code dischargeCountNormalInfo} —— 出院人次-普通</li>
     *   <li>{@code nonFollowUpDaytimeInfo} / {@code nonFollowUpNormalInfo} —— 无需随访人次</li>
     *   <li>{@code followUpNeededDaytimeInfo} / {@code followUpNeededNormalInfo} —— 应随访人次</li>
     * </ul>
     * 后缀也接受不带 {@code Info} 的写法({@code ...Daytime} / {@code ...Normal}),
     * 前缀额外兼容 {@code nonFollowUpAll} / {@code followUpNeededAll}(对齐老的
     * {@code nonFollowUpInfo} / {@code followUpNeededAllInfo} 命名习惯)。
     * <p>
     * 三列与汇总口径一一对应:
     * <ul>
     *   <li>出院人次 = 该分组全部明细行(不限 sendstate),对应 {@code dischargeCountInfo};</li>
     *   <li>无需随访人次 = {@code sendstate = 4},对应 {@code nonFollowUpInfo};</li>
     *   <li>应随访人次 = {@code sendstate in (1,2,3,5,6,7)},对应 {@code followUpNeededAllInfo}。</li>
     * </ul>
     * 「普通/日间」本身由 {@link ServiceSubtaskCountReq#getDaytimeOnly()} 下推到 SQL
     * (见 {@code ServiceSubtaskMapper.xml#getSfStatisticsHyperlink}),判定口径与汇总侧
     * {@link ImportFlagEnum#isDaytime(String)} 完全一致。
     * <p>
     * 注意:老 switch 的 {@code default} 是"什么都不设"——即认不出的 type 会退化成"无条件全量明细",
     * 前端点新列却拿到全量数据就是这么来的。所以这里一旦认出是普通/日间下钻、但列名对不上,
     * 直接返回 {@code false}(明细为空 + 告警日志),不再让它掉进 default。
     *
     * @return {@code null}-不是普通/日间类型的下钻,交回老 switch 处理;
     * {@code true}-条件已拼好;{@code false}-不认识该列,应返回空明细
     */
    private Boolean applyDaytimeHyperLinkInfoType(ServiceSubtaskCountReq serviceSubtaskCountReq, String hyperLinkInfoType) {
        //统一去掉结尾的 Info,这样 xxxDaytimeInfo / xxxDaytime 两种写法都能认
        String type = hyperLinkInfoType.endsWith("Info")
                ? hyperLinkInfoType.substring(0, hyperLinkInfoType.length() - "Info".length())
                : hyperLinkInfoType;
        boolean daytime;
        String base;
        if (type.endsWith(HYPERLINK_DAYTIME_SUFFIX)) {
            daytime = true;
            base = type.substring(0, type.length() - HYPERLINK_DAYTIME_SUFFIX.length());
        } else if (type.endsWith(HYPERLINK_NORMAL_SUFFIX)) {
            daytime = false;
            base = type.substring(0, type.length() - HYPERLINK_NORMAL_SUFFIX.length());
        } else {
            return null;
        }
        Integer daytimeOnly = daytime ? 1 : 0;
        if ("dischargeCount".equals(base)) {
            //出院人次:不限 sendstate,与 getStatistic 的 dischargeCount 口径一致
            serviceSubtaskCountReq.setDaytimeOnly(daytimeOnly);
            return true;
        }
        if ("nonFollowUp".equals(base) || "nonFollowUpAll".equals(base)) {
            //无需随访人次:sendstate = 4,与 nonFollowUpInfo 口径一致
            serviceSubtaskCountReq.setSendstates(new ArrayList<>(Collections.singletonList(4L)));
            serviceSubtaskCountReq.setDaytimeOnly(daytimeOnly);
            return true;
        }
        if ("followUpNeeded".equals(base) || "followUpNeededAll".equals(base)) {
            //应随访人次:sendstate != 4,与 followUpNeededAllInfo 口径一致
            serviceSubtaskCountReq.setSendstates(new ArrayList<>(Arrays.asList(1L, 2L, 3L, 5L, 6L, 7L)));
            serviceSubtaskCountReq.setDaytimeOnly(daytimeOnly);
            return true;
        }
        log.warn("getSfStatisticsHyperlink-普通/日间下钻的列名无法识别,返回空明细:hyperLinkInfoType={}", hyperLinkInfoType);
        return false;
    }
    /**
@@ -4482,6 +4721,13 @@
        total.setNonFollowUp(0L);
        total.setFilterCount(0L);
        total.setFollowUpNeeded(0L);
        //2026-11:普通/日间细分(与上方三个总量字段成对累加)
        total.setDischargeCountNormal(0);
        total.setDischargeCountDaytime(0);
        total.setNonFollowUpNormal(0L);
        total.setNonFollowUpDaytime(0L);
        total.setFollowUpNeededNormal(0L);
        total.setFollowUpNeededDaytime(0L);
        total.setNeedFollowUp(0L);
        total.setPendingFollowUp(0L);
        total.setFollowUpSuccess(0L);
@@ -4527,6 +4773,13 @@
            total.setNonFollowUp(total.getNonFollowUp() + (stat.getNonFollowUp() != null ? stat.getNonFollowUp() : 0L));
            total.setFilterCount(total.getFilterCount() + (stat.getFilterCount() != null ? stat.getFilterCount() : 0L));
            total.setFollowUpNeeded(total.getFollowUpNeeded() + (stat.getFollowUpNeeded() != null ? stat.getFollowUpNeeded() : 0L));
            //2026-11:普通/日间细分,与上方三个总量字段同源累加(普通 + 日间 == 总量)
            total.setDischargeCountNormal(total.getDischargeCountNormal() + (stat.getDischargeCountNormal() != null ? stat.getDischargeCountNormal() : 0));
            total.setDischargeCountDaytime(total.getDischargeCountDaytime() + (stat.getDischargeCountDaytime() != null ? stat.getDischargeCountDaytime() : 0));
            total.setNonFollowUpNormal(total.getNonFollowUpNormal() + (stat.getNonFollowUpNormal() != null ? stat.getNonFollowUpNormal() : 0L));
            total.setNonFollowUpDaytime(total.getNonFollowUpDaytime() + (stat.getNonFollowUpDaytime() != null ? stat.getNonFollowUpDaytime() : 0L));
            total.setFollowUpNeededNormal(total.getFollowUpNeededNormal() + (stat.getFollowUpNeededNormal() != null ? stat.getFollowUpNeededNormal() : 0L));
            total.setFollowUpNeededDaytime(total.getFollowUpNeededDaytime() + (stat.getFollowUpNeededDaytime() != null ? stat.getFollowUpNeededDaytime() : 0L));
            total.setNeedFollowUp(total.getNeedFollowUp() + (stat.getNeedFollowUp() != null ? stat.getNeedFollowUp() : 0L));
            total.setPendingFollowUp(total.getPendingFollowUp() + (stat.getPendingFollowUp() != null ? stat.getPendingFollowUp() : 0L));
            total.setFollowUpSuccess(total.getFollowUpSuccess() + (stat.getFollowUpSuccess() != null ? stat.getFollowUpSuccess() : 0L));
@@ -5128,7 +5381,7 @@
        serviceOutPath.setCreateTime(new Date());
        serviceOutPath.setOrgid(serviceSubtask.getOrgid());
        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
        String format = String.format("%03X", serviceOutPath.getId());
        String format = ShortCode.encode(serviceOutPath.getId());
        String url = "";
        SendMagParam sendMagParam = new SendMagParam();
        sendMagParam.setType("4");
@@ -5212,7 +5465,7 @@
            serviceOutPath.setCreateTime(new Date());
            serviceOutPath.setOrgid(serviceSubtask.getOrgid());
            iServiceOutPathService.insertServiceOutPath(serviceOutPath);
            String format = String.format("%03X", serviceOutPath.getId());
            String format = ShortCode.encode(serviceOutPath.getId());
            serviceOutPath.setRadix(format);
            serviceOutPath.setUpdateTime(new Date());
            serviceOutPath.setUrl(url);
@@ -5390,16 +5643,46 @@
        String ip = localIP;
        ServiceTask serviceTask = new ServiceTask();
        serviceTask = serviceTaskService.selectServiceTaskByTaskid(serviceTaskVo.getTaskid());
        if (ObjectUtils.isEmpty(serviceTask)) {
            // 任务不存在 → 不可能有 data,直接抛业务异常(接口层会转成 code=500)
            throw new BaseException("扫码生成任务失败:任务不存在或已删除(taskid=" + serviceTaskVo.getTaskid() + ")");
        }
        if (ObjectUtils.isNotEmpty(serviceTask)) {
            try {
                ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                if (ObjectUtils.isNotEmpty(serviceTaskVo.getDeptcode())) {
                    serviceTaskdept.setDeptType("1");
                    serviceTaskdept.setDeptCode(serviceTaskVo.getDeptcode());
                }
                if (ObjectUtils.isNotEmpty(serviceTaskVo.getLeavehospitaldistrictcode())) {
                // 维度(科室/病区/点位)由任务的 appltype 决定:1=科室、2=病区、7=点位。
                //   三种维度在 service_taskdept 里是**各自独立的行**(各自的列),可以共存、也可以不共存;
                //   但查行时必须只带一个维度 —— 否则会用 A 维度的编码去撞 B 维度的行,
                //   而点位行的 dept_code 本来就是空的。
                String appltype = serviceTask.getAppltype();
                if ("7".equals(appltype)) {
                    serviceTaskdept.setDeptType("3");
                    serviceTaskdept.setPointLocation(firstNonBlank(serviceTaskVo.getPointLocation(),
                            serviceTask.getPointLocation()));
                } else if ("2".equals(appltype)) {
                    serviceTaskdept.setDeptType("2");
                    serviceTaskdept.setDeptCode(serviceTaskVo.getLeavehospitaldistrictcode());
                    // 任务上的科室/病区可能是逗号多选,查 service_taskdept 要用单值(取第一个)
                    serviceTaskdept.setDeptCode(firstNonBlank(serviceTaskVo.getLeavehospitaldistrictcode(),
                            firstValue(serviceTask.getLeavehospitaldistrictcode())));
                } else if ("1".equals(appltype)) {
                    serviceTaskdept.setDeptType("1");
                    serviceTaskdept.setDeptCode(firstNonBlank(serviceTaskVo.getDeptcode(),
                            firstValue(serviceTask.getDeptcode())));
                } else {
                    // appltype 为空的历史任务:沿用改造前的口径(科室 → 病区,后写的覆盖先写的),
                    // 点位作为第三维,只在传了点位时补上。
                    if (ObjectUtils.isNotEmpty(serviceTaskVo.getDeptcode())) {
                        serviceTaskdept.setDeptType("1");
                        serviceTaskdept.setDeptCode(serviceTaskVo.getDeptcode());
                    }
                    if (ObjectUtils.isNotEmpty(serviceTaskVo.getLeavehospitaldistrictcode())) {
                        serviceTaskdept.setDeptType("2");
                        serviceTaskdept.setDeptCode(serviceTaskVo.getLeavehospitaldistrictcode());
                    }
                    if (ObjectUtils.isNotEmpty(serviceTaskVo.getPointLocation())) {
                        serviceTaskdept.setDeptType("3");
                        serviceTaskdept.setPointLocation(serviceTaskVo.getPointLocation());
                    }
                }
                serviceTaskdept.setServiceType(serviceTask.getServiceType());
                serviceTaskdept.setOrgid(serviceTask.getOrgid());
@@ -5410,6 +5693,7 @@
                    PatArchive patArchive = new PatArchive();
                    patArchive.setId(999999999L);
                    patArchive.setName("虚拟患者");
                    patArchive.setTelcode(serviceTaskVo.getPhone());
                    //封装serviceSubtask
                    ServiceSubtask serviceSubtask = boxedServiceSubtask(serviceTask, serviceTaskdepts.get(0), patArchive);
                    int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
@@ -5427,7 +5711,7 @@
                        serviceOutPath.setCreateTime(new Date());
                        serviceOutPath.setOrgid(serviceTask.getOrgid());
                        iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                        String format = String.format("%03X", serviceOutPath.getId());
                        String format = ShortCode.encode(serviceOutPath.getId());
                        serviceOutPath.setRadix(format);
                        serviceOutPath.setUpdateTime(new Date());
                        String url = StringUtils.isNotEmpty(req_path) ? ip + ":" + req_path + "/wt?p=" + format : ip + "/wt?p=" + format;
@@ -5436,10 +5720,21 @@
                        iServiceOutPathService.updateServiceOutPath(serviceOutPath);
                    }
                } else {
                    // 配置缺失属「业务可预期」情况:带上排查信息抛出去(不吞),
                    // 接口层据此返回 code=500 + 明确 msg,避免「200 + 空 data」。
                    throw new BaseException("扫码生成任务失败:未匹配到任务维度配置(taskid=" + serviceTaskVo.getTaskid()
                            + ",appltype=" + appltype
                            + ",deptType=" + serviceTaskdept.getDeptType()
                            + ",deptCode=" + serviceTaskdept.getDeptCode()
                            + ",pointLocation=" + serviceTaskdept.getPointLocation() + ")");
                }
            } catch (BaseException be) {
                // ⚠️ 必须排在 catch (Exception) 之前:BaseException 是 RuntimeException,
                //    否则刚抛出的业务异常会被下面整段吞掉,接口又变成 200 + 空 data。
                throw be;
            } catch (Exception e) {
                e.printStackTrace();
                log.error("【扫码生成任务】处理异常:{}", e.getMessage());
                log.error("【扫码生成任务】处理异常:taskid={},{}", serviceTaskVo.getTaskid(), e.getMessage(), e);
            }
        }
        return content;
@@ -5457,6 +5752,9 @@
        if (StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("1")) {
            serviceSubtask.setLeaveldeptcode(serviceTaskdept.getDeptCode());
            serviceSubtask.setLeaveldeptname(serviceTaskdept.getDeptName());
        } else if (StringUtils.isNotEmpty(serviceTaskdept.getDeptType()) && serviceTaskdept.getDeptType().equals("3")) {
            // 点位行(dept_type='3'):dept_code/dept_name 为空,点位只落 point_location
            serviceSubtask.setPointLocation(serviceTaskdept.getPointLocation());
        } else {
            serviceSubtask.setLeavehospitaldistrictcode(serviceTaskdept.getDeptCode());
            serviceSubtask.setLeavehospitaldistrictname(serviceTaskdept.getDeptName());