2024-11-01

zhaowenxuan

2024-11-01 fe9f16a02c89eb6c5264c06bf76e748a0d809647

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

@@ -828,8 +828,9 @@
            }

        }
        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(),jxbz);
        addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);
        // TODO 和签到登记一样 只有配置中的以及收费类型为体检票时才增加到采样管理表
//        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(),jxbz);
//        addCaiYangDengJi(detailList,!detailList.isEmpty(), order, sysUser,jxbz);

        tjOrderDetails = new ArrayList<>();

@@ -1289,8 +1290,9 @@
                pacsReg(order, customer, jianChaProjects);
                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjSampling::getTjNum,order.getTjNumber());
                wrapper.eq(TjSampling::getJxbz,jxbz);
                List<TjSampling> list = tjSamplingService.list(wrapper);
                log.info("采样数据 ->{}",list);
                log.info("采样数据 ->{}",JSONUtil.toJsonStr(list));
                if (!list.isEmpty()){
                    Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
                    log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
@@ -1300,7 +1302,7 @@
                        // Lis标本代码
                        String specimenTypeCode = entry.getKey();
                        List<TjSampling> samplings = entry.getValue();
                        if (samplings.size() > 1){
                        if (samplings.size() >= 2){
                            // 进行合并
                            List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
                            log.info("提取id ->{}",stringList);
@@ -1311,8 +1313,12 @@
                                    ids.add(s);
                                }
                            }
                            String id = tjSamplingService.mergeCaiYangApi(stringList);
                            ids.add(id);
                            if (stringList.size() > 1) {
                                String id = tjSamplingService.mergeCaiYangApi(stringList);
                                ids.add(id);
                            }else {
                                ids.add(stringList.get(0));
                            }
                        }else {
                            ids.add(samplings.get(0).getId());
                        }