zjh 本地 2024/03/6 -1

zjh

2024-03-06 b814abb328d65253e1ecf0a2ed1055d09506c414

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

@@ -77,6 +77,8 @@
    private ITjReportTemplateService reportTemplateService;
    @Value("${path.filePath}")
    private String value;
    @Value("${path.reportServer}")
    private String urlValue;
    @Resource
    private ISysUserService userService;
    @Resource
@@ -702,7 +704,7 @@

                    TjReport tjReport = new TjReport();
                    tjReport.setTjNumber(String.valueOf(tjNumber));
                    tjReport.setPath(outputPath1 + outputFileName1);
                    tjReport.setPath(urlValue + outputFileName1);
                    String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
                    tjReport.setReport(pdfBinary);
                    tjReport.setType("体检报告");
@@ -747,6 +749,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 +757,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 +768,7 @@
                tjOrderDetail.setProject(tjProject);
            }
        }
*/

        LambdaQueryWrapper<TjCustomer> wq22 = new LambdaQueryWrapper<>();
        wq22.eq(TjCustomer::getCusId, one.getUserId());
@@ -772,7 +776,7 @@
        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
        wqq.ne(TjOrderRemark::getDeptId,"241");
        wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257");
        wqq.in(TjOrderRemark::getDeptId,"269","270","253","254","255","257","251","271");
        wqq.notIn(TjOrderRemark::getProId,projectService.getNneedReprotProId());
        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);

@@ -781,7 +785,7 @@
            printReport.put(tjOrderRemark,null);
        }

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

@@ -824,13 +828,18 @@
        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
            printReport.put(tjOrderRemark,null);
        }
        List<Object> toRemoveKeys = new ArrayList<>();
        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            List<TjPdfVO> tjPdfVOS = new ArrayList<>();
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                    if(entry.getKey().getProId().equals(tjOrderDetail.getProId())){
                        TjPdfVO tjPdfVO = new TjPdfVO();
                        tjPdfVO.setProName(tjOrderDetail.getProName());
                        tjPdfVO.setProResult(tjOrderDetail.getProResult());
                        if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
                            tjPdfVO.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
                        }else {
                            tjPdfVO.setProResult(tjOrderDetail.getProResult());
                        }
                        tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
                        tjPdfVO.setStandardValue(tjOrderDetail.getStanId());
                        tjPdfVO.setCompany(tjOrderDetail.getProAdvice());
@@ -838,14 +847,23 @@
                    }
            }
            printReport.put(entry.getKey(), tjPdfVOS);
            if(tjPdfVOS.size()==0)
            {toRemoveKeys.add(entry.getKey());}
        }
        toRemoveKeys.forEach(printReport::remove);
        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 +933,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);