20241213

zhaowenxuan

2024-12-13 ec266a0440669bb6b9830991770fa5b0a7568fdf

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

@@ -102,6 +102,8 @@
    private ITjBigPositiveService tjBigPositiveService;
    @Autowired
    private HisPDFUtil hisPDFUtil;
    @Autowired
    private IDictHospService dictHospService;

    @GetMapping("/savePdf")
    @ApiOperation(value = "从本地存储模板到数据库")
@@ -390,8 +392,12 @@
                LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjCustomer::getCusId, tjOrder.getUserId());
                TjCustomer tjCustomer = tjCustomerService.getOne(wq1);
                LambdaQueryWrapper<TjReportTemplate> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjReportTemplate::getFlag,"4");
                wrapper.eq(TjReportTemplate::getOpen,"1");
                TjReportTemplate zongJianYiShiQianMing = reportTemplateService.getOne(wrapper);
                try {
                    return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate);
                    return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
                } catch (Exception e) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    log.error(String.valueOf(e));
@@ -407,11 +413,15 @@
        return AjaxResult.error();
    }

    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) {
    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) {
        AjaxResult ajaxResult = null;
        try {
            ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
//            ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
//            ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);

            ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
        } catch (Exception e) {
            e.printStackTrace();
            log.error(String.valueOf(e));
        }
        if (!ajaxResult.get("code").toString().equals("200")) {
@@ -905,7 +915,8 @@
                // 设置正文字体样式：12号
                Font textFont = PdfUtils.setFont(9);
                //创建表格  将表头字体和正文字体放进去
                PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value);
                DictHosp dictHosp = dictHospService.list().get(0);
                PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value,dictHosp.equals("澄合矿务局中心医院"));
                document.add(paragraph);
                document.add(table);
                //判断备注是否为空  空不能显示null
@@ -959,6 +970,7 @@
    }

    private AjaxResult oldFun(String tjNumber) {
        DictHosp dictHosp = dictHospService.list().get(0);
        long startTime = System.currentTimeMillis();
        int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
        if (num > 0) return AjaxResult.error("有延期项目暂不能生成报告!!!");
@@ -1285,7 +1297,7 @@
                            // 设置正文字体样式：12号
                            Font textFont = PdfUtils.setFont(9);
                            //创建表格  将表头字体和正文字体放进去
                            PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value);
                            PdfPTable table = PdfUtils.setTable(headFont, textFont, titles, value,dictHosp.equals("澄合矿务局中心医院"));
                            document.add(paragraph);
                            document.add(table);

@@ -2060,6 +2072,7 @@
            one.setStatus(TjConstants.TJ_CONFIRM);
        }
        one.setReportTime(null);
        one.setCheckTime(null);
        //将状态改为未审核
//        UpdateWrapper updateWrapper=new UpdateWrapper();
//        updateWrapper.eq("tj_number",tjNumber);