zjh20250620

zjh

2025-06-20 5f1d1c462bbf49bc6a22b9e17b49733bcc1e0bc6

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java

@@ -2530,11 +2530,11 @@
        String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
        String isRequestLisAllzx = configService.selectConfigByKey("jcx_is_requestLisAllzx");
        if (mergeRequest.equals("Y")){
            LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
            wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
            List<TjSampling> list = tjSamplingService.list(wrapper);
            if (isRequestLisAllzx != null && isRequestLisAllzx.equals("Y")){
                log.info("进入团体根据小项标本合并发送方法");
                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
                List<TjSampling> list = tjSamplingService.list(wrapper);
                if(null !=list && !list.isEmpty()){
                    List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
                    LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
@@ -2562,9 +2562,9 @@

            }else{
                try {
                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
                    List<TjSampling> list = tjSamplingService.list(wrapper);
//                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
//                    wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
//                    List<TjSampling> list = tjSamplingService.list(wrapper);
                    log.info("采样数据 ->{}",JSONUtil.toJsonStr(list));
                    if (!list.isEmpty()) {
                        Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));