zjh20250618

zjh

2025-06-18 b115eea2b161adddeb92c5e885019aba8763bb0e

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

@@ -2535,26 +2535,31 @@
                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjSampling::getTjNum,tjOrder.getTjNumber());
                List<TjSampling> list = tjSamplingService.list(wrapper);
                List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
                LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
                wrapper1.in(TjProject::getProParentId,strings);
                wrapper1.eq(TjProject::getProStatus,0);
                wrapper1.groupBy(TjProject::getProId);
                List<TjProject> tjProjectList = projectService.list(wrapper1);
                if(null !=  tjProjectList && !tjProjectList.isEmpty()){
                    Map<String, List<TjProject>> listMap = tjProjectList.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
                    log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
                    boolean save = lisApiMethod.save(listMap, tjOrder, customer);
                    if (!save) {
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return AjaxResult.error("处理失败");
                if(null !=list && !list.isEmpty()){
                    List<String> strings = list.stream().map(TjSampling::getProId).collect(Collectors.toList());
                    LambdaQueryWrapper<TjProject> wrapper1 = new LambdaQueryWrapper<>();
                    wrapper1.in(TjProject::getProParentId,strings);
                    wrapper1.eq(TjProject::getProStatus,0);
                    wrapper1.groupBy(TjProject::getProId);
                    List<TjProject> tjProjectList = projectService.list(wrapper1);
                    if(null !=  tjProjectList && !tjProjectList.isEmpty()){
                        Map<String, List<TjProject>> listMap = tjProjectList.stream()
                                .collect(Collectors.groupingBy(p->p.getSpecimenType()+"_"+p.getYb()));

                        log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
                        boolean save = lisApiMethod.save(listMap, tjOrder, customer);
                        if (!save) {
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                            return AjaxResult.error("处理失败");
                        }
                        for (TjSampling tjSampling : list) {
                            tjSampling.setIsSignFor("0");
                        }
                        tjSamplingService.updateBatchById(list);
                    }
                    for (TjSampling tjSampling : list) {
                        tjSampling.setIsSignFor("0");
                    }
                    tjSamplingService.updateBatchById(list);
                }


            }else{
                try {
                    LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();