zjh
2024-07-05 ab550ebbfa4b579b373fdd7589e799bbb44362e7
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -349,12 +349,29 @@
                }
                Integer checkStatus = tjOrder.getCheckStatus();
                if (checkStatus == 1) {
                    if ("报表".equals(reportTemplate.getPrint())) {
                        TjReport tjReport = new TjReport();
                        tjReport.setTjNumber(String.valueOf(tjNumber));
                        tjReport.setPath(reportTemplate.getUrl() + "?tjNum=" + tjNumber);
                        tjReport.setType("体检报告");
                        tjReport.setPrint("报表");
                        tjReportService.save(tjReport);
                        //修改order表中的打印报告时间为当前时间
                        LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();
                        updateWrapper.eq(TjOrder::getTjNumber, tjNumber);
                        updateWrapper.set(TjOrder::getReportTime, new Date());
                        updateWrapper.set(TjOrder::getPrintLastTime, new Date());
                        updateWrapper.set(TjOrder::getDownloadLastTime, new Date());
                        updateWrapper.set(TjOrder::getStatus, TjConstants.TJ_END);
                        tjOrderService.update(updateWrapper);
                        return AjaxResult.success("已生成报告!可直接点击预览!");
                    }
                    String hisRegistrationId = tjOrder.getCardId();
                    Date createTime = tjOrder.getCreateTime();
                    Date finishTime = tjOrder.getFinishTime();
                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                    String ksrq = dateFormat.format(createTime);
                    String jsrq = dateFormat.format(finishTime);
                    String jsrq = dateFormat.format(new Date());
                    HashMap<String, Object> params = new HashMap<>();
                    params.put("his_registration_id", hisRegistrationId);
                    params.put("ksbm", "");