门急诊分表代码（增、改、查）提交

liusheng

昨天 29069b790469cb7136cadba7ddcd63a83bc4ac70

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

@@ -104,10 +104,16 @@
    private IServiceOutPathService iServiceOutPathService;

    @Autowired
    private IPatMedOuthospService iPatMedOuthospService;

    @Autowired
    private FtpService ftpService;

    @Autowired
    private PatMedInhospMapper patMedInhospMapper;

    @Autowired
    private PatMedOuthospMapper patMedOuthospMapper;

    @Autowired
    private PatArchiveMapper patArchiveMapper;
@@ -621,8 +627,7 @@
                            serviceTaskdept.setDeptCode(deptCode);
                            serviceTaskdept.setDeptType("1");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                        }
                    }
                    if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
@@ -631,8 +636,7 @@
                            serviceTaskdept.setDeptCode(districtcode);
                            serviceTaskdept.setDeptType("2");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                            serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                        }
                    }
                }
@@ -765,8 +769,15 @@
                            serviceTaskdept.setDeptCode(deptCode);
                            serviceTaskdept.setDeptType("1");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                            ServiceTaskdept st = new ServiceTaskdept();
                            st.setDeptCode(deptCode);
                            st.setTaskId(serviceTask.getTaskid());
                            List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
                            if (CollectionUtils.isEmpty(serviceTaskdepts)) {
                                serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                            } else {
                                serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
                            }
                        }
                    }
                    if (StringUtils.isNotEmpty(serviceTaskVO.getLeavehospitaldistrictcode())) {
@@ -781,7 +792,15 @@
                            serviceTaskdept.setDeptType("2");
                            serviceTaskdept.setServiceType(serviceTaskVO.getServiceType());
                            //先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
                            serviceTaskdeptService.insertOrUpdateServiceTaskdept(serviceTaskdept);
                            ServiceTaskdept st = new ServiceTaskdept();
                            st.setDeptCode(districtcode);
                            st.setTaskId(serviceTask.getTaskid());
                            List<ServiceTaskdept> serviceTaskdepts = serviceTaskdeptService.selectServiceTaskdeptList(st);
                            if (CollectionUtils.isEmpty(serviceTaskdepts)) {
                                serviceTaskdeptService.insertServiceTaskdept(serviceTaskdept);
                            } else {
                                serviceTaskdeptService.updateServiceTaskdept(serviceTaskdept);
                            }
                        }
                    }
                } else if (serviceTaskVO.getAppltype().equals("3")) {
@@ -2183,6 +2202,26 @@

        List<ServiceStatisticsResponse> result = serviceSubtaskMapper.getServiceStatistics(request);

        //获取门急诊数据

        //填充门诊数据
        for (ServiceStatisticsResponse serviceStatisticsResponse : result) {
            PatMedOuthospQueryReq req = new PatMedOuthospQueryReq();
            String deptcodes = CollectionUtils.isEmpty(request.getDeptcodes()) ? null : String.join(",", request.getDeptcodes());
            if (!request.getTimeType().equals("month")) {
                req.setBeginAdmitdate(DateUtils.parseDate(serviceStatisticsResponse.getTimePeriod()));
                req.setEndAdmitdate(DateUtils.parseDate(serviceStatisticsResponse.getTimePeriod()));
            } else {
                // year 类型：timePeriod 格式为 "yyyy-MM"，取当月第一天和最后一天
                java.time.YearMonth ym = java.time.YearMonth.parse(serviceStatisticsResponse.getTimePeriod());
                req.setBeginAdmitdate(DateUtils.toDate(ym.atDay(1)));
                req.setEndAdmitdate(DateUtils.toDate(ym.atEndOfMonth()));
            }
            req.setDeptcode(deptcodes);
            req.setOrgid(request.getOrgid());
            Long count = patMedOuthospMapper.callSpQueryOuthospCount(req);
            serviceStatisticsResponse.setPmoCount(count);
        }

        log.info("getServiceStatistics返回结果数量：{}", result.size());
        return result;