zjh
2024-12-09 345f5654fee547c2f06f74c9eb4855c8bd1f8712
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_体检报告")
@@ -299,9 +301,10 @@
//            return error;
//        }
//        return AjaxResult.success("该用户体检未完成,不能打印报告!!!");
        int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
        if (num > 0) {
            return AjaxResult.error("有延期项目暂不能生成报告!!!");
        String config = configService.selectConfigByKey("sfjcwjhyqxm");
        if(null != config && config.equalsIgnoreCase("Y")){
            int num = tjOrderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
            if (num > 0) return AjaxResult.error("存在未检或延期项目暂不能生成报告!!!");
        }
//        String configByKey = configService.selectConfigByKey("sfkqdyhis");
@@ -391,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("生成报告异常");
@@ -404,8 +407,14 @@
        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) {
            e.printStackTrace();
            log.error(String.valueOf(e));
        }
        if (!ajaxResult.get("code").toString().equals("200")) {
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        } else {