zjh20241018

zjh

2024-10-18 57b41b18aa3472be34b8b13d725db8578a14b836

 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);
@@ -433,6 +437,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");