代码提交

liusheng

22 小时以前 ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -76,6 +76,13 @@
import com.ruoyi.task.domain.ServiceSubtaskPreachform;
import com.ruoyi.task.service.IServiceSubtaskService;
import com.ruoyi.task.domain.SendMagParam;
import com.ruoyi.task.service.IServiceSubtaskRecordService;
import com.ruoyi.task.mapper.ServiceSubtaskPreachformMapper;
import com.ruoyi.patarchive.service.IPatArchiveService;
import com.ruoyi.datacollection.service.IXHGatherPatArchiveService;
import com.ruoyi.datacollection.service.IServiceSLTDHealthcareRecordService;
import com.ruoyi.datacollection.domain.ServiceSLTDInhospReqVO;
import com.ruoyi.datacollection.domain.ServiceSLTDInhospResDTO;

/**
 * 定时任务调度测试
@@ -1044,8 +1051,10 @@
     * 处理患者信息，进入子任务表(任务组)
     * <p>
     * ⚠️ 2025 修复（开关失效）：原走 smartor 遗留实现，不判开关（同 {@link #dealOutHospInfo()}）。
     * 现走模块门面。注意模块侧的 {@code dealOutHospInfoBySchedule} 内部仍会转发回 smartor
     * （{@code OtherVisitApiBridge}，见该类注释），但<b>开关在门面这一层判</b>，所以关闭时不会走到那里。
     * 现走模块门面。模块侧 {@code dealOutHospInfoBySchedule} 经 {@code OtherVisitApi} 契约
     * 回调 {@code ruoyi-task/api/contract/OtherVisitApiImpl}（2026-11 起实现整簇搬进 task 模块，
     * smartor 侧的 {@code OtherVisitApiBridge} 已删除），但<b>开关在门面这一层判</b>，
     * 所以关闭时不会走到那里。
     */
    public void dealOutHospInfoBySchedule() {
        String config = configService.selectConfigByKey("visit.early.day");
@@ -1558,10 +1567,10 @@
    private String resolveShiyiCampus(ServiceSubtask serviceSubtask) {
        SysDept sysDeptVo = new SysDept();
        List<SysDept> sysDepts = new ArrayList<>();
        if (ObjectUtils.isNotEmpty(serviceSubtask.getDeptcode())) {
        if (ObjectUtils.isNotEmpty(serviceSubtask.getLeaveldeptcode())) {
            sysDeptVo.setDeptType("1");
            sysDeptVo.setOrgid(serviceSubtask.getOrgid());
            sysDeptVo.setDeptCode(serviceSubtask.getDeptcode());
            sysDeptVo.setDeptCode(serviceSubtask.getLeaveldeptcode());
            sysDeptService.selectDeptList(sysDeptVo);
        } else if (ObjectUtils.isNotEmpty(serviceSubtask.getLeavehospitaldistrictcode())) {
            sysDeptVo.setDeptType("2");