zjh 本地 2024/06/20 --2

zjh

2024-06-20 7a4ef2968a0d5d28b2fedaaaec2227557fc9d420

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

@@ -364,7 +364,17 @@
                    params.put("pagecount", 100);
                    params.put("page", 1);
                    HashMap<String, Object> map = new HashMap<>();
                    return hisPDFUtil.execHisRequest(map, params, tjOrder, reportTemplate);
                    LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
                    wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
                    TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
//                    return hisPDFUtil.execHisRequest(map, params, tjOrder, reportTemplate);
                    try {
                        return hisPDFUtil.hisPDF(tjOrder,tjCustomer,reportTemplate);
                    } catch (DocumentException e) {
                        logger.error("生成报告异常");
                        e.printStackTrace();
                        return AjaxResult.error("生成报告异常");
                    }
                } else {
                    return AjaxResult.error("请先总检");
                }
@@ -1334,7 +1344,7 @@
                    e.printStackTrace();
                    return AjaxResult.success("PDF导出失败");
                } finally {
                    transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
//                    transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjOrder.getCardId());
                }
            }
        }