liusheng
2024-12-05 78c9129e9045fafe4c2f7333b3dcafde6b20b96d
代码提交
已修改6个文件
151 ■■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/resources/application-druid.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java 105 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskDetailController.java
@@ -9,9 +9,11 @@
import com.smartor.service.IServiceSubtaskDetailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -65,6 +67,20 @@
    }
    /**
     * 新增任务结果明细
     */
    //@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:add')")
    @ApiOperation("批量新增任务结果明细")
    @Log(title = "语音任务呼叫明细", businessType = BusinessType.INSERT)
    @PostMapping("/batchAdd")
    public AjaxResult batchAdd(@RequestBody List<ServiceSubtaskDetail> serviceSubtaskDetails) {
        if (CollectionUtils.isEmpty(serviceSubtaskDetails)) {
            return error("需要新增语音详情为空");
        }
        return toAjax(ServiceSubtaskDetailService.batchInsertServiceSubtaskDetail(serviceSubtaskDetails));
    }
    /**
     * 修改语音任务呼叫明细
     */
    //@PreAuthorize("@ss.hasPermi('smartor:ServiceSubtaskDetail:edit')")
@@ -83,7 +99,10 @@
    @Log(title = "语音任务呼叫明细", businessType = BusinessType.UPDATE)
    @ApiOperation("修改任务结果明细")
    @PostMapping("/batchEdit")
    public AjaxResult edit(@RequestBody List<ServiceSubtaskDetail> serviceSubtaskDetails) {
    public AjaxResult batchEdit(@RequestBody List<ServiceSubtaskDetail> serviceSubtaskDetails) {
        if (CollectionUtils.isEmpty(serviceSubtaskDetails)) {
            return error("需要修改语音详情为空");
        }
        for (ServiceSubtaskDetail serviceSubtaskDetail : serviceSubtaskDetails) {
            ServiceSubtaskDetailService.updateServiceSubtaskDetail(serviceSubtaskDetail);
        }
ruoyi-admin/src/main/resources/application-druid.yml
@@ -170,9 +170,9 @@
app_key_yq: ZurNHpaQLq6P55YS
#本 地 短信请求地址(这个服务是我们自己写的)
xhsmsPath: http://192.168.2.13:8092/sendSms
#xhsmsPath: http://192.168.2.13:8092/sendSms
#新华短信请求地址(这个服务是我们自己写的)
#xhsmsPath: http://192.16.4.220:8092/sendSms
xhsmsPath: http://192.16.4.220:8092/sendSms
#帐号
xhsmsAccount: 911124
#接口密码
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -237,98 +237,15 @@
        iPatMedInhospService.dealOutHospInfo();
    }
//    /**
//     * 处理患者信息,进入子任务表(微信小程序)
//     */
//    public void dealOutHospInfoXHC() {
//        PatMedInhosp patMedInhosp = new PatMedInhosp();
//        //获取未处理的数据
//        List<ServicePatientTemp> servicePatientTemps = iServicePatientTempService.selectServicePatientTempList(new ServicePatientTemp());
//
//        for (ServicePatientTemp servicePatientTemp : servicePatientTemps) {
//            Long tid = null;
//            if (servicePatientTemp.getType() != null && servicePatientTemp.getType() == 1) {
//                IvrTaskTemplate ivrTaskTemplate = iIvrTaskTemplateService.selectIvrTaskTemplateByID(servicePatientTemp.getTempId());
//                tid = ivrTaskTemplate.getTaskid();
//            } else if (servicePatientTemp.getType() != null && servicePatientTemp.getType() == 2) {
//                SvyTaskTemplate svyTaskTemplate = svyTaskTemplateService.selectSvyTaskTemplateBySvyid(servicePatientTemp.getTempId());
//                tid = svyTaskTemplate.getTaskid();
//            }
//
//            ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(tid);
//            ServiceSubtask serviceSubtask = DtoConversionUtils.sourceToTarget(serviceTask, ServiceSubtask.class);
//            serviceSubtask.setTaskid(serviceTask.getTaskid());
//            serviceSubtask.setTemplateid(servicePatientTemp.getTempId());
//            serviceSubtask.setTemplatename(stt.getTemplateName());
//            serviceSubtask.setPatid(patArchive.getId());
//            serviceSubtask.setSendname(patArchive.getName());
//            serviceSubtask.setSfzh(patArchive.getIdcardno());
//            serviceSubtask.setPhone(patArchive.getTelcode());
//            serviceSubtask.setSex(patArchive.getSex());
//            serviceSubtask.setAge(patArchive.getAge());
//            serviceSubtask.setSendstate(2L);
//            serviceSubtask.setStarttime(patMedInhosp1.getStarttime());
//            serviceSubtask.setEndtime(patMedInhosp1.getEndtime());
//            serviceSubtask.setServiceType("2");
//            serviceSubtask.setPreachform(serviceTask.getPreachform());
//            serviceSubtask.setHospType("2");
//            serviceSubtask.setCreateTime(new Date());
//            serviceSubtask.setUpdateTime(new Date());
//            serviceSubtask.setCreateBy(patMedInhosp1.getNurseName());
//            serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
//            serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
//            //设置发送时间
//            Date newDate = addDays(patMedInhosp1.getEndtime(), stt.getSendDay());
//            serviceSubtask.setLongSendTime(newDate);
//            //患者发送时间
//            if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
//                remark = patArchive.getNotrequiredreason();
//                serviceSubtask.setRemark(remark);
//                serviceSubtask.setResult("error");
//                serviceSubtask.setFinishtime(new Date());
//                //不执行
//                serviceSubtask.setSendstate(4L);
//            }
//
//            //在新增之前,先通过患者ID,sendstate=2查询一下,在所有长期任务中,是不是还有该患者待执行的任务,有的话,比较之前的endtime是否小于当前的endtaime,如果之前的小于现在的,则直接将之前的停掉(原因再入院)
//            ServiceSubtaskVO subtask = new ServiceSubtaskVO();
//            subtask.setPatid(patArchive.getId());
//            subtask.setSendstate(2L);
//            List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
//            log.error("该患者待执行的任务:{}", selectServiceSubtaskList);
//            if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
//                for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
//                    if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
//                        //不是长期任务,不处理
//                        continue;
//                    }
//                    if (serviceSubtask1.getEndtime().before(serviceSubtask.getEndtime())) {
//                        //如果当前循环的子任务的出院时间在“准备新增的子任务”的出院时间之前,则将循环的子任务停掉
//                        serviceSubtask1.setSendstate(4L);
//                        serviceSubtask1.setRemark("患者再入院");
//                        serviceSubtask1.setResult("error");
//                        serviceSubtask1.setFinishtime(new Date());
//                        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
//                    } else {
//                        //相反,则将当有的数据停掉
//                        serviceSubtask.setResult("error");
//                        serviceSubtask.setFinishtime(new Date());
//                        serviceSubtask.setSendstate(4L);
//                        serviceSubtask.setRemark("患者再入院");
//                    }
//                }
//            }
//
//            serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
//            //将check_flag改成1(已处理)
//            PatMedInhosp patMedInhosp2 = new PatMedInhosp();
//            patMedInhosp2.setInhospid(patMedInhosp1.getInhospid());
//            patMedInhosp2.setCheckFlag("1");
//            patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
//        }
//
//        return 1;
//    }
    /**
     * 处理患者信息,进入子任务表(微信小程序)
     */
    public void dealOutHospInfoXHC() {
        PatMedInhosp patMedInhosp = new PatMedInhosp();
        //获取未处理的数据
        List<ServicePatientTemp> servicePatientTemps = iServicePatientTempService.selectServicePatientTempList(new ServicePatientTemp());
    }
    /**
@@ -781,10 +698,10 @@
                log.error("是否需要更新:{}", patMedInhosps.size());
                if (CollectionUtils.isNotEmpty(patMedInhosps)) {
                    patMedInhosp.setInhospid(patMedInhosps.get(0).getInhospid());
                    log.error("------患者出入院修改信息:{}",patMedInhosp);
                    log.error("------患者出入院修改信息:{}", patMedInhosp);
                    patMedInhospService.updatePatMedInhosp(patMedInhosp);
                } else {
                    log.error("----患者出入院新增信息:{}",patMedInhosp);
                    log.error("----患者出入院新增信息:{}", patMedInhosp);
                    patMedInhospService.insertPatMedInhosp(patMedInhosp);
                }
smartor/src/main/java/com/smartor/service/IServiceSubtaskDetailService.java
@@ -37,6 +37,13 @@
    public int insertServiceSubtaskDetail(ServiceSubtaskDetail serviceSubtaskDetail);
    /**
     * 批量新增语音任务呼叫明细
     *
     * @return 结果
     */
    public int batchInsertServiceSubtaskDetail(List<ServiceSubtaskDetail> serviceSubtaskDetails);
    /**
     * 修改语音任务呼叫明细
     *
     * @param serviceSubtaskDetail 语音任务呼叫明细
smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -409,11 +409,11 @@
                            serviceSubtask1.setResult("error");
                            serviceSubtask1.setFinishtime(new Date());
                            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
                            patMedInhosp1.setCheckFlag("1");
                        }
                    }
                }
                //将患入的入院数据设置为已处理
                patMedInhosp1.setCheckFlag("1");
                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
            }
        }
smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
@@ -141,6 +141,18 @@
        return ServiceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
    }
    @Override
    public int batchInsertServiceSubtaskDetail(List<ServiceSubtaskDetail> serviceSubtaskDetails) {
        int i = 0;
        if (CollectionUtils.isNotEmpty(serviceSubtaskDetails)) {
            for (ServiceSubtaskDetail serviceSubtaskDetail : serviceSubtaskDetails) {
                serviceSubtaskDetail.setCreateTime(DateUtils.getNowDate());
                i = ServiceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail);
            }
        }
        return i;
    }
    /**
     * 修改语音任务呼叫明细
     *