zjh20250111

zjh

2025-01-11 df55bbefb4b39dbfd259daf4a37c8b25e8c6e8ce

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java

@@ -286,10 +286,11 @@
                    list.removeIf(item -> Objects.equals(item.getId(), s));
                }
            }
            String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
            Map<String, List<TjSampling>> map = list.stream().filter(i->StrUtil.isNotBlank(i.getSpecimenTypeCode())).collect(Collectors.groupingBy(item -> item.getSpecimenTypeCode()));
            for (Map.Entry<String, List<TjSampling>> entry : map.entrySet()) {
                List<TjSampling> entryValue = entry.getValue();
                tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()));
                tjSamplingService.mergeCaiYangTran(entryValue.stream().map(TjSampling::getId).collect(Collectors.toList()),lis_tmh_prefix);
            }
        }
        wrapper = new LambdaQueryWrapper<>();
@@ -311,7 +312,8 @@
    @PostMapping("/mergeCaiYang")
    @ApiOperation(value = "采样登记合并项目接口")
    public AjaxResult mergeCaiYang(@RequestBody List<String> ids) {
        return tjSamplingService.mergeCaiYangTran(ids);
        String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
        return tjSamplingService.mergeCaiYangTran(ids,lis_tmh_prefix);
    }