zjh
2024-06-28 0d4a80fd817b39417ad7eee88aa5d14bf571f79c
ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java
@@ -173,13 +173,9 @@
                Map<String, Object> parent = new HashMap<>();
                Map<String, Object> parent1 = new HashMap<>();
                TjProject tjProject = projectService.getById(remark.getProId());
                if (null != tjProject) {
                if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
                    parent.put("parent", tjProject.getProName());
                    parent1.put("parent", tjProject.getProName());
                } else {
                    parent.put("parent", null);
                    parent1.put("parent", null);
                }
                LambdaQueryWrapper<TjProject> wq2 = new LambdaQueryWrapper<>();
                wq2.eq(TjProject::getProParentId, remark.getProId());
                List<Long> sonsTjProjectList = null;
@@ -235,6 +231,7 @@
                    return AjaxResult.success("该客户在没有体检项目数据");
                }
            }
            }
            objectMap.put("list", list);
            objectMap.put("inspectionAdvice", one.getCheckAdvice());
            objectMap.put("tjAbnormal", abnormalList);
@@ -243,7 +240,6 @@
        }
        return AjaxResult.success("该客户在没有体检项目数据!");
    }
    /**
@@ -295,7 +291,6 @@
        }
        LambdaQueryWrapper<TjOrderDetail> wq4 = new LambdaQueryWrapper<>();
        wq4.eq(TjOrderDetail::getOrderId, one.getOrderId());
        wq4.in(TjOrderDetail::getProId, "1633660948860522527");
@@ -305,7 +300,6 @@
        }else {
            objectMap.put("shousuoya", one4.getProResult());
        }
        LambdaQueryWrapper<TjOrderDetail> wq5 = new LambdaQueryWrapper<>();
@@ -322,9 +316,6 @@
        return AjaxResult.success(objectMap);
    }
    /**
@@ -350,7 +341,6 @@
            return AjaxResult.error("暂无体检报告");
        }
    }
    @GetMapping("/preview/{flag}/{TjNumber}")
@@ -442,7 +432,6 @@
            }
        }
    }
    /**