zjh20250703

zjh

2 天以前 3067ad92965d6b48db42b4cd7a37f2116e52f4c0

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

@@ -83,8 +83,8 @@
    private IDictCompService dictCompService;
    @Resource
    private ITjReportTemplateService reportTemplateService;
    @Value("${path.filePath}")
    private String value;
//    @Value("${path.filePath}")
//    private String value;
    @Value("${path.reportServer}")
    private String urlValue;
    @Resource
@@ -341,7 +341,7 @@
                    return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
                } catch (Exception e) {
//                    throw new Exception(e);
//                    log.error("生成报告失败："+e.getMessage(),String.valueOf(e));
                    log.error("生成报告失败："+e.getMessage(),String.valueOf(e));
                     e.printStackTrace();
                    tjOrder.setReportTime(null);
                    tjOrder.setCheckTime(null);
@@ -358,6 +358,7 @@
    }

    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate,TjReportTemplate zongJianYiShiQianMing) throws Exception {
        String value = configService.selectConfigByKey("path_filePath");
        AjaxResult ajaxResult = null;
        try {
            ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
@@ -908,6 +909,7 @@
//        if (one == null) {
//            return;
//        }
        String value = configService.selectConfigByKey("path_filePath");
        String key = DataSourceContextHolder.getDataSourceKey();
        key = key.replace("ltkjpeis10_","");
//        String userId = SecurityUtils.getLoginUser().getUsername();
@@ -982,7 +984,7 @@
        }
        String key = DataSourceContextHolder.getDataSourceKey();
        key = key.replace("ltkjpeis10_","");

        String value = configService.selectConfigByKey("path_filePath");
//        String userId = SecurityUtils.getLoginUser().getUsername();
//        PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + key + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_体检报告.pdf");
        String filePath = value + File.separator + key + File.separator + tjCustomer.getCusId() + tjNumber + tjCustomer.getCusName() + "_报告.pdf";
@@ -1054,8 +1056,9 @@
    public AjaxResult preview(@RequestBody String data) {
        String is_batch_report_use_sql = configService.selectConfigByKey("is_batch_report_use_sql");
        List<String> tjNumbers = Arrays.stream(data.split(",")).collect(Collectors.toList());
        String value = configService.selectConfigByKey("path_filePath");
        if ("true".equals(is_batch_report_use_sql)) {
            return tjReportService.makeBatchReport(tjNumbers);
            return tjReportService.makeBatchReport(tjNumbers, value);
        } else {
            return makeReport(tjNumbers);
        }