2024-10-18

zhaowenxuan

2024-10-18 050c9712591dcd97ba1d508e3f7bc2cda9196f60

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -416,10 +416,10 @@
//        wq.eq(TjOrderDetail::getIsSampling, 0);
//        List<TjOrderDetail> detailList = tjOrderDetailService.list(wq);
        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
        addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser);
        addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser,null);
    }

    public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser) {
    public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
        if (null != detailList && detailList1) {
            String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS");
            for (TjOrderDetail detail : detailList) {
@@ -436,6 +436,7 @@
                        wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
                        LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
                        sampling.setSpecimenType(jybbzd.getJybbmc());
                        sampling.setJyxmdm(jyxmzd.getJyxmdm());
                    }
                } else {
                    TjProject project1 = projectService.getById(proParentId);
@@ -447,6 +448,7 @@
                        wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
                        LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
                        sampling.setSpecimenType(jybbzd.getJybbmc());
                        sampling.setJyxmdm(jyxmzd.getJyxmdm());
                    }
                }
                sampling.setSamplingNumber(format);
@@ -465,8 +467,14 @@
                sampling.setUpdateTime(new Date());
                sampling.setCreateId(String.valueOf(sysUser.getUserId()));
                sampling.setUpdateId(String.valueOf(sysUser.getUserId()));
                sampling.setJxbz(jxbz);
                samplingService.save(sampling);
            }
        }
        String config = configService.selectConfigByKey("sfkqdyhis");
        if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){
            AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
            log.info("getJyFlHb ->{}",JSONUtil.toJsonStr(ajaxResult));
        }
    }

@@ -580,6 +588,7 @@

        List<TjProject>  projectList=new ArrayList<>();

        ArrayList<TjOrderDetail> tjOrderDetails = new ArrayList<>();
        for (String tjProId : tjProIds) {
//            LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
//            wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
@@ -790,6 +799,7 @@
                detail.setUpdateId(String.valueOf(sysUser.getUserId()));
                detail.setJxbz(jxbz);
                tjOrderDetailService.save(detail);
                tjOrderDetails.add(detail);

            }

@@ -808,6 +818,12 @@
            }

        }
        List<TjOrderDetail> collect = tjOrderDetails.stream().filter(item -> {
            TjProject project = projectService.getById(item.getProId());
            return project != null && project.getProParentId() == 0;
        }).collect(Collectors.toList());
        addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
        tjOrderDetails = new ArrayList<>();

        ArrayList<TjProject> jianChaProjects = new ArrayList<>();
        ArrayList<TjProject> jianYanProjects = new ArrayList<>();
@@ -842,6 +858,7 @@
                detail1.setUpdateId(String.valueOf(sysUser.getUserId()));
                detail1.setJxbz(jxbz);
                tjOrderDetailService.save(detail1);
                tjOrderDetails.add(detail1);
                if(null !=config && config.equals("Y")){
                    //检验
//                    if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && (project.getDeptId() == 241L || project.getDeptId() == 317L)) {
@@ -979,14 +996,17 @@
                    }
                }
            }
            collect = tjOrderDetails.stream().filter(item -> {
                TjProject project = projectService.getById(item.getProId());
                return project != null && project.getProParentId() == 0;
            }).collect(Collectors.toList());
            addCaiYangDengJi(collect, !collect.isEmpty(), order, sysUser,jxbz);
        }

        Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
        if(null !=config && config.equals("Y")){
            if (lisApiMethod.isUseLisAndPacsRegister(order)) {
                List<TjProject> projectList2 = jianYanProjects.stream().distinct().collect(Collectors.toList());
                List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
                addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser);

            if (useLisAndPacsRegister) {
//                List<TjProject> projectList2 = jianYanProjects.stream().distinct().collect(Collectors.toList());
                // 检查申请
                pacsReg(order, customer, jianChaProjects);
            }else {
@@ -1766,7 +1786,7 @@
        }

        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
        addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser);
        addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser,null);
    }

    //首页饼状图登记人数接口