zhaowenxuan
2024-10-18 0cc6beb6f4d7cee0bd5c4ea95d93173a44817af4
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -287,6 +287,10 @@
            int pdsfczhbxm = tjSamplingService.pdsfczhbxm(ids);
            if (pdsfczhbxm == ids.size()) return AjaxResult.error("多个合并项目不可再继续合并!");
            if (pdsfczhbxm > 1) return AjaxResult.error("最多允许选择一个合并过的项目!");
            String string = tjSamplingService.getBuKeHebingProName(ids);
            if(null !=string){
                return AjaxResult.error(string+"这几个项目不可合并!");
            }
            if (pdsfczhbxm == 0) {
                TjSampling tjSampling = tjSamplingService.getById(ids.get(0));
                Map<String, Object> map = tjSamplingService.hebingCaiYangInFo(ids);
@@ -412,7 +416,10 @@
        List<TjSampling> tjSamplings = tjSamplingService.listByIds(ids);
        if (tjSamplings.isEmpty())
            return AjaxResult.error("请选择要确认项");
        String errorMsg = "";
        for (TjSampling sampling : tjSamplings) {
            if (sampling.getJyxmdm() == null)
                errorMsg+=sampling.getProName()+"在lis系统未找到对应编码无法发出申请";
            sampling.setIsSignFor("0");
//                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
//                wq.eq(TjProject::getProParentId, sampling.getProId());
@@ -433,6 +440,7 @@
//                    }
//                }
            TjOrder tjOrder = orderService.getOrderByTjNum(sampling.getTjNum());
            if(null==tjOrder)return AjaxResult.error("体检记录不存在");
            TjCustomer tjCustomer = customerService.getById(tjOrder.getUserId());
            boolean updChild;
            String config = configService.selectConfigByKey("sfkqdyhis");
@@ -463,6 +471,7 @@
                return AjaxResult.error("操作失败请重试");
            }
        }
        if (StrUtil.isNotBlank(errorMsg)) return AjaxResult.error(errorMsg);
        return AjaxResult.success("操作成功");
    }
}