代码提交

liusheng

2025-02-25 1468abbfadd8ba623c85e0c871aade69607ce085

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java

@@ -66,6 +66,9 @@
    private IServiceTaskdeptService serviceTaskdeptService;

    @Autowired
    private IServiceTaskdiagService serviceTaskdiagService;

    @Autowired
    private RedisCache redisCache;

    @Autowired
@@ -251,8 +254,8 @@
    public List<ServiceSubtask> patItem(ServiceSubtaskVO serviceSubtaskVO) {
        List<ServiceSubtask> selectServiceSubtaskList = this.selectServiceSubtaskList(serviceSubtaskVO);
        //根据出院 时间倒序
//        List<ServiceSubtask> sortedServiceSubtaskList = selectServiceSubtaskList.stream().sorted(Comparator.comparing(ServiceSubtask::getEndtime).reversed()).collect(Collectors.toList());
        return selectServiceSubtaskList;
        List<ServiceSubtask> sortedServiceSubtaskList = selectServiceSubtaskList.stream().sorted(Comparator.comparing(ServiceSubtask::getEndtime, Comparator.nullsLast(Comparator.naturalOrder())).reversed()).collect(Collectors.toList());
        return sortedServiceSubtaskList;
    }

    @Override
@@ -377,39 +380,55 @@
            serviceTask.setTemplatename(tempName);
            serviceTask.setLeaveldeptcodes(serviceTaskVO.getLeaveldeptcodes());
            serviceTask.setLeavehospitaldistrictcode(serviceTask.getLeavehospitaldistrictcode());
            if (serviceTaskVO.getLongTask() == 1L) serviceTask.setSendState(2L);
            serviceTaskService.insertServiceTask(serviceTask);
            ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
            serviceTaskdept.setTaskId(serviceTask.getTaskid());
            serviceTaskdept.setTaskName(serviceTask.getTaskName());
            serviceTaskdept.setLongtask(0L);
            serviceTaskdept.setGuid(serviceTask.getGuid());
            serviceTaskdept.setOrgid(serviceTask.getOrgid());
            serviceTaskdept.setOrgid(serviceTask.getOrgid());
            if (serviceTaskVO.getLongTask() == 1) serviceTaskdept.setLongtask(1L);
            if (StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
                String[] deptcodes = serviceTaskVO.getDeptcode().split(",");
                for (String deptCode : deptcodes) {
                    serviceTaskdept.setDeptCode(deptCode);
                    serviceTaskdept.setDeptType("1");
                    serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                    serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
            if (serviceTaskVO.getLongTask() == 1L) {
                serviceTask.setSendState(2L);
                serviceTaskService.insertServiceTask(serviceTask);
                if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) {
                    ServiceTaskdept serviceTaskdept = new ServiceTaskdept();
                    serviceTaskdept.setTaskId(serviceTask.getTaskid());
                    serviceTaskdept.setTaskName(serviceTask.getTaskName());
                    serviceTaskdept.setLongtask(1L);
                    serviceTaskdept.setGuid(serviceTask.getGuid());
                    serviceTaskdept.setOrgid(serviceTask.getOrgid());
                    serviceTaskdept.setOrgid(serviceTask.getOrgid());
                    if (serviceTaskVO.getLongTask() == 1) serviceTaskdept.setLongtask(1L);
                    if (StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) {
                        String[] deptcodes = serviceTaskVO.getDeptcode().split(",");
                        for (String deptCode : deptcodes) {
                            serviceTaskdept.setDeptCode(deptCode);
                            serviceTaskdept.setDeptType("1");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                        }
                    }
                    if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
                        String[] leavehospitaldistrictcodes = serviceTaskVO.getLeavehospitaldistrictcode().split(",");
                        for (String districtcode : leavehospitaldistrictcodes) {
                            serviceTaskdept.setDeptCode(districtcode);
                            serviceTaskdept.setDeptType("2");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                        }
                    }

                } else {
                    ServiceTaskdiag serviceTaskdiag = new ServiceTaskdiag();
                    serviceTaskdiag.setTaskId(serviceTask.getTaskid());
                    serviceTaskdiag.setTaskName(serviceTask.getTaskName());
                    serviceTaskdiag.setLongtask(1L);
                    serviceTaskdiag.setGuid(serviceTask.getGuid());
                    serviceTaskdiag.setOrgid(serviceTask.getOrgid());
                    if (serviceTaskVO.getLongTask() == 1) serviceTaskdiag.setLongtask(1L);
                    serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag);

                }
            }
            if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
                String[] leavehospitaldistrictcodes = serviceTaskVO.getLeavehospitaldistrictcode().split(",");
                for (String districtcode : leavehospitaldistrictcodes) {
                    serviceTaskdept.setDeptCode(districtcode);
                    serviceTaskdept.setDeptType("2");
                    serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                    serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1 && serviceTaskVO.getPatCycle() == 0L) {
                    Map<String, Integer> map = new HashMap<>();
                    map.put("taskId", serviceTask.getTaskid().intValue());
                    return map;
                }
            }
//
            if (serviceTaskVO.getLongTask() != null && serviceTaskVO.getLongTask() == 1 && serviceTaskVO.getPatCycle() == 0L) {
                Map<String, Integer> map = new HashMap<>();
                map.put("taskId", serviceTask.getTaskid().intValue());
                return map;
            } else {
                serviceTaskService.insertServiceTask(serviceTask);
            }

            //将任务信息放到服务表中
@@ -1936,7 +1955,7 @@
    public List<ServiceSubtaskStatistic> getSfStatistics(ServiceSubtaskCountReq serviceSubtaskCountReq) {
        log.error("getSfStatistics的入参为：{}", serviceSubtaskCountReq);
        List<ServiceSubtaskStatistic> serviceSubtaskStatistics = new ArrayList<>();
        Map<String, List<ServiceSubtask>> collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(ServiceSubtask::getLeavehospitaldistrictname));
        Map<String, List<ServiceSubtask>> collect = serviceSubtaskMapper.getSfStatistics(serviceSubtaskCountReq).stream().collect(Collectors.groupingBy(subtask -> Optional.ofNullable(subtask.getLeavehospitaldistrictname()).orElse("Unknown")));
        for (List<ServiceSubtask> serviceSubtaskList : collect.values()) {
            if (CollectionUtils.isEmpty(serviceSubtaskList)) {
                continue;