Merge branch 'master' into master-任务组

陈昶聿

6 天以前 83c49918bb3709fce818fcdeb8c1db147eadcede

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

@@ -562,20 +562,20 @@
        }
    }

//    /**
//     * 处理患者信息，进入子任务表
//     */
//    public void dealOutHospInfoByDimension() {
//        String config = configService.selectConfigByKey("visit.early.day");
//        if (port.equals("8095")) {
//            //出院表
//            iPatMedInhospService.dealOutHospInfoByDimension(config);
//            //门诊表(新华的暂时不做门诊随访)
    /**
     * 处理患者信息，进入子任务表(任务组)
     */
    public void dealOutHospInfoBySchedule() {
        String config = configService.selectConfigByKey("visit.early.day");
        if (port.equals("8095")) {
            //出院表
            iPatMedInhospService.dealOutHospInfoBySchedule(config);
            //门诊表(新华的暂时不做门诊随访)
//            if (!active.equals("xh")) {
//                //iPatMedOuthospService.dealOutpatientInfo();
//            }
//        }
//    }
        }
    }


    /**
@@ -1094,8 +1094,26 @@
            if (dateToday) {
                try {
                    String patid = rsaPublicKeyExample.encryptedData(serviceSubtask.getPatid().toString(), pub_key);
                    String subId = rsaPublicKeyExample.encryptedData(serviceSubtask.getId().toString(), pub_key);
                    String url = null;
                    url = localIP + ":" + req_path + "/outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false";
                    url = localIP + ":" + req_path + "/outsideChainwt?param1=" + taskId +
                            "&param2=" +  patid +
                            "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) +
                            "&param5=false" +
                            "$param6=" + subId;

                    ServiceOutPath serviceOutPath = new ServiceOutPath();
                    serviceOutPath.setParam1(taskId);
                    serviceOutPath.setParam2(patid);
                    serviceOutPath.setParam3(ivrTask1.getTaskName());
                    serviceOutPath.setParam6(subId);
                    serviceOutPath.setCreateTime(new Date());
                    serviceOutPath.setOrgid(serviceSubtask.getOrgid());
                    iServiceOutPathService.insertServiceOutPath(serviceOutPath);
                    String format = String.format("%03X", serviceOutPath.getId());
                    serviceOutPath.setRadix(format);
                    serviceOutPath.setUpdateTime(new Date());
                    iServiceOutPathService.updateServiceOutPath(serviceOutPath);

                    //获取微信公众号请求信息根据机构ID
                    List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
@@ -1502,6 +1520,27 @@
    }

    /**
     * 任务组（appltype=5）首轮纳入：扫描新出院患者，按 schedule 绑定的维度匹配任务组，
     * 为命中的患者按计划明细一次性生成第 0 轮 N 条 subtask，并置 schedulecheck_flag=1。
     * 后续轮次由 {@link #rollTaskGroupCycle()} 负责。
     * <p>
     * 与主扫描 dealOutHospInfo 分离，互不干扰。建议每 30 分钟执行一次。
     */
    public void dealTaskGroupOutHosp() {
        log.info("【dealTaskGroupOutHosp】开始扫描任务组新出院患者");
        if (!port.equals("8095")) {
            return;
        }
        try {
            String config = configService.selectConfigByKey("visit.early.day");
            iPatMedInhospService.dealOutHospInfoBySchedule(config);
            log.info("【dealTaskGroupOutHosp】任务组首轮纳入扫描完成");
        } catch (Exception e) {
            log.error("【dealTaskGroupOutHosp】任务组扫描异常", e);
        }
    }

    /**
     * 任务组（appltype=5）循环任务滚动调度。
     * <p>
     * 扫描所有 schedule_style=1 的计划，若本轮 subtask 全部 finalize（sendstate ∉ 1/2/3），