zjh20250115

zjh

2025-01-15 5489d624e6642b459ecf8d143c548ac8a980a8c8

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

@@ -260,10 +260,14 @@
        wrapper.eq(TjSampling::getTjNum, tjNumber);
        wrapper.eq(TjSampling::getIsSignFor,isSignFor);
        wrapper.and(i -> i.isNull(TjSampling::getParentId).or().eq(TjSampling::getIsMerge,1));
//        wrapper.eq(TjSampling::getIsPay,1);
//        if (isSignFor == 1)
//            wrapper.eq(TjSampling::getIsApply,0);
        wrapper.orderByDesc(TjSampling::getIsMerge);
        List<TjSampling> list = tjSamplingService.list(wrapper);
        if (list.isEmpty()){
            logger.info("jtNum ->{}",tjNumber);
//            return AjaxResult.error("未查询到数据，人员未缴费或没有未采样项目");
            return AjaxResult.error("参数错误,未查询到数据");
        }
//        for (TjSampling sampling : list) {
@@ -282,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<>();
@@ -307,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);
    }