代码提交

liusheng

2025-04-18 55ede3cff5dbbbcb8675d1592a67f20d598d49e7

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

@@ -72,6 +72,9 @@
    private IPatMedInhospService iPatMedInhospService;

    @Autowired
    private IPatMedOuthospService iPatMedOuthospService;

    @Autowired
    private IPatMedOperationService iPatMedOperationService;

    @Autowired
@@ -100,6 +103,9 @@

    @Value("${req_path}")
    private String req_path;

    @Value("${visitHosp}")
    private Integer visitHosp;

    @Autowired
    private ServiceTaskMapper serviceTaskMapper;
@@ -220,7 +226,7 @@
    public void dealHisData2() {
        //将患者信息、出院、门诊数据全部采集
        // 指定的开始日期
        LocalDate endDate = LocalDate.of(2024, 9, 1);
        LocalDate endDate = LocalDate.of(2025, 3, 3);
        // 当前日期
        LocalDate currentDate = LocalDate.now();
        // 定义日期格式
@@ -239,7 +245,12 @@
     * 处理患者信息，进入子任务表
     */
    public void dealOutHospInfo() {
        //出院表
        iPatMedInhospService.dealOutHospInfo();
        //门诊表
        if(visitHosp!=1) {
            iPatMedOuthospService.dealOutpatientInfo();
        }
    }


@@ -335,6 +346,14 @@
                            //如何任务被“暂停”或“终止”
                            break;
                        }
                        if (org.apache.commons.lang3.StringUtils.isEmpty(serviceSubtask.getPhone())) {
                            serviceSubtask.setRemark("手机号为空");
                            serviceSubtask.setSendstate(4L);
                            serviceSubtask.setResult("error");
                            serviceSubtask.setFinishtime(new Date());
                            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
                            continue;
                        }
                        boolean dateToday = isDateToday(serviceSubtask.getLongSendTime());
                        //说明是立即发送(先把消息放到cache-0中，   displayNo不知道怎么配置)
                        if (dateToday) {
@@ -404,6 +423,8 @@
                            ssvo.setCreateStartTime(startOfDayDate);
                            ssvo.setCreateEndTime(endOfDayDate);
                            ssvo.setCreateBy(serviceSubtask.getCreateBy());
                            ssvo.setSendname(serviceSubtask.getSendname());
                            ssvo.setSfzh(serviceSubtask.getSfzh());
                            List<ServiceSubtask> serviceSubtaskListByCreateTime = serviceSubtaskMapper.selectServiceSubtaskListByCreateTime(ssvo);
                            if (CollectionUtils.isEmpty(serviceSubtaskListByCreateTime))
                                serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
@@ -590,7 +611,7 @@
        String filename = null;
        if (cry.equals("0")) filename = "入院信息" + System.currentTimeMillis();
        if (cry.equals("1")) filename = "出院信息" + System.currentTimeMillis();
        File file = new File("D:\\public\\华卓集成平台数据\\" + filename);
        File file = new File("D:\\public\\HIS数据采集\\" + filename);
        if (!file.exists()) {
            // 如果文件不存在，则创建新文件
            try {
@@ -643,7 +664,7 @@
                    patArchive.setPlaceOfResidence(StringUtils.isNotEmpty(thiedInhospInfo.getPatiHomeAddr()) ? thiedInhospInfo.getPatiHomeAddr().replace("null", "") : "");
                    try {
                        if (StringUtils.isNotEmpty(thiedInhospInfo.getPatiBirthday()))
                            patArchive.setBirthdate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(thiedInhospInfo.getPatiBirthday()));
                            patArchive.setBirthdate(new SimpleDateFormat("yyyy-MM-dd").parse(thiedInhospInfo.getPatiBirthday()));
                    } catch (ParseException e) {
                        e.printStackTrace();
                    }
@@ -672,6 +693,7 @@
                patMedInhosp.setNurseId(thiedInhospInfo.getNurseId());
                patMedInhosp.setNurseName(thiedInhospInfo.getNurseName());
                patMedInhosp.setSerialnum(thiedInhospInfo.getInpatientId());
                patMedInhosp.setFuflag("1");
                if (cry.equals("0")) {
                    patMedInhosp.setInhospstate("0");
                } else if (cry.equals("1")) {