zjh 本地 2024/03/5 -2

zjh

2024-03-05 294d3e535210ca2e543328c7c819ff1c77367f29

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java

@@ -747,6 +747,7 @@
        wq1.eq(TjOrder::getTjNumber, tjNumber);
        TjOrder one = tjOrderService.getOne(wq1);

/*
        //拿到体检记录的orderid，查出项目详细信息
        LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
        wq.eq(TjOrderDetail::getOrderId, one.getOrderId());
@@ -754,7 +755,7 @@
        wq.ne(TjOrderDetail::getTjStatus, 0);
        wq.ne(TjOrderDetail::getProId,projectService.getHuaYanProId());
        wq.eq(TjOrderDetail::getProId,projectService.getNotCcCtXdtProId());
        wq.notIn(TjOrderDetail::getProId,projectService.getNneedReprotProId());
//        wq.notIn(TjOrderDetail::getProId,projectService.getNneedReprotProId());
        List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.list(wq);

        //遍历体检记录 将项目的具体信息
@@ -765,6 +766,7 @@
                tjOrderDetail.setProject(tjProject);
            }
        }
*/

        LambdaQueryWrapper<TjCustomer> wq22 = new LambdaQueryWrapper<>();
        wq22.eq(TjCustomer::getCusId, one.getUserId());
@@ -781,7 +783,7 @@
            printReport.put(tjOrderRemark,null);
        }

        extracted(printReport, tjOrderDetails, customer);
        extracted(printReport,one, customer);
        return printReport;
    }

@@ -842,10 +844,16 @@
        return printReport;
    }

    private void extracted(Map<TjOrderRemark, List<TjPdfVO>> printReport, List<TjOrderDetail> tjOrderDetails, TjCustomer customer) {
    private void extracted(Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            List<TjPdfVO> tjPdfVOS = new ArrayList<>();
//            TjOrder one = tjOrderService.getOrderByTjNum(entry.getKey().getTjNumber());
            List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(),entry.getKey().getProId());
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                TjProject tjProject = projectService.getById(tjOrderDetail.getProId());
                if (null != tjProject) {
                    tjOrderDetail.setProject(tjProject);
                }
                if (null == tjOrderDetail.getProject()) {
                    System.out.println("'''''''''''''''''''''''''''''''''''" + tjOrderDetail.getOrderDetailId());
                }
@@ -915,6 +923,9 @@
        we.eq(TjReport::getTjNumber, tjNumber);
        we.eq(TjReport::getType, "体检报告");
        TjReport one = tjReportService.getOne(we);
        if (one==null){
            return AjaxResult.error("暂无体检报告");
        }
        if ("pdf".equals(one.getPrint())){
            res.put("flag","0");
            return AjaxResult.success(res);