zhaowenxuan
2024-12-09 19590a728a4aa4286bd9bad7aa620357b8c65bd4
增加错误日志
2个文件已修改
21 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -147,7 +147,7 @@
                pageSize = pdfWriter.getPageNumber();
            }
        } catch (DocumentException e) {
            e.printStackTrace();
            log.error(String.valueOf(e));
            return AjaxResult.error();
        }
        document1.setMargins(70, 70, 40, 40);
@@ -159,7 +159,7 @@
            notHuaYanTable(document1, printReport,dictHosp,color);
        } catch (DocumentException e) {
            log.error("非化验项目填充表格异常");
            e.printStackTrace();
            log.error(String.valueOf(e));
            return AjaxResult.error();
        }
        // 组装检验数据
@@ -193,7 +193,7 @@
            copy.close();
        } catch (IOException e) {
            log.error("拷贝pdf异常");
            e.printStackTrace();
            log.error(String.valueOf(e));
            return AjaxResult.error();
        }
        String outputFileName1 = customer.getCusId() + tjOrder.getTjNumber() + customer.getCusName() + "_报告.pdf";
@@ -219,7 +219,7 @@
            pdfReader.close();
            finalOutPut = outputStream;
        } catch (IOException e) {
            e.printStackTrace();
            log.error(String.valueOf(e));
            return AjaxResult.error();
        }
        savePDFFile(outputFileName1, tjOrder, customer, finalOutPut);
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -39,6 +39,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Propagation;
@@ -56,6 +57,7 @@
 * @author ltkj
 * @date 2022-12-06
 */
@Slf4j
@RestController
@RequestMapping("/system/report")
@Api(tags = "AAAA_体检报告")
@@ -392,7 +394,7 @@
                    return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate);
                } catch (Exception e) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    e.printStackTrace();
                    log.error(String.valueOf(e));
                    // 调用撤销
//                    tjReportController.backOnlyCheckType(tjNumber);
                    logger.error("生成报告异常");
@@ -405,8 +407,13 @@
        return AjaxResult.error();
    }
    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) throws Exception {
        AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate) {
        AjaxResult ajaxResult = null;
        try {
            ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);
        } catch (Exception e) {
            log.error(String.valueOf(e));
        }
        if (!ajaxResult.get("code").toString().equals("200")) {
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        } else {