zjh202412013

zjh

2024-12-13 0ded4eb80a80ffd4f29aab8a7b6c02a269d72d2c

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

@@ -104,6 +104,8 @@
    private HisPDFUtil hisPDFUtil;
    @Autowired
    private IDictHospService dictHospService;
    @Autowired
    private ITjReportPrintService printService;

    @GetMapping("/savePdf")
    @ApiOperation(value = "从本地存储模板到数据库")
@@ -392,8 +394,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));
@@ -409,13 +415,13 @@
        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.hisPDFNew(tjOrder, tjCustomer, reportTemplate);

            ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate);
            ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
        } catch (Exception e) {
            e.printStackTrace();
            log.error(String.valueOf(e));
@@ -1714,22 +1720,23 @@
    @ApiOperation(value = "下载体检报告")
    public void preview(HttpServletResponse response, @PathVariable("flag") boolean flag, @PathVariable("TjNumber") String tjNumber) {
        //修改order表中的下载报告时间为当前时间
        LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
        updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
        updateWrapper.set(TjOrder::getPrintLastTime, new Date());
        updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
        updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
        tjOrderService.update(updateWrapper);
//        LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
//        updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
//        updateWrapper.set(TjOrder::getPrintLastTime, new Date());
//        updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
//        updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
//        tjOrderService.update(updateWrapper);

        Date date = new Date();
//        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
//        wq1.eq(TjOrder::getTjNumber, tjNumber);
//        TjOrder tjOrder = tjOrderService.getOne(wq1);
        TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);


        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
        wq1.eq(TjOrder::getTjNumber, tjNumber);
        TjOrder tjOrder = tjOrderService.getOne(wq1);


        LambdaQueryWrapper<TjCustomer> wq2 = new LambdaQueryWrapper<>();
        wq2.eq(TjCustomer::getCusId, tjOrder.getUserId());
        TjCustomer tjCustomer = tjCustomerService.getOne(wq2);
//        LambdaQueryWrapper<TjCustomer> wq2 = new LambdaQueryWrapper<>();
//        wq2.eq(TjCustomer::getCusId, tjOrder.getUserId());
        TjCustomer tjCustomer = tjCustomerService.getById( tjOrder.getUserId());


        LambdaQueryWrapper<TjReport> we = new LambdaQueryWrapper<>();
@@ -1777,6 +1784,17 @@
            while ((len = br.read(bs)) > 0) {
                out.write(bs, 0, len);
            }
            if(null !=tjOrder.getHeshouTime() && tjOrder.getHeshouStatus()==1){
                TjReportPrint print=new TjReportPrint();
                print.setTjNumber(tjNumber);
                print.setPrintBy(SecurityUtils.getLoginUser().getUser().getNickName());
                print.setPrintTime(date);
                print.setPrintStatus("已打印");
                if (printService.save(print)) {
                    tjOrder.setPrintLastTime(date);
                    tjOrderService.updateById(tjOrder);
                }
            }
            out.flush();
            out.close();
            br.close();