路泰科技体检后端
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zjh
2024-12-21 88c2ff3560c16a0d46493cd3d77ef7acb643bd96 
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java


@@ -2634,16 +2634,18 @@


//        }


    }




    @PostMapping("/heXiaoByIds/{orderIds}")


    @PostMapping("/heXiaoByIds")


    @ApiOperation(value = "核收报告——————总检审核通过后可以核销，核收后才能打印")


    @Transactional


    @RepeatSubmit


    public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {


    public AjaxResult heXiaoByIds(@RequestBody List<String> orderIds) {


        if(null !=orderIds && !orderIds.isEmpty()){


        Date date = new Date();


        for (String orderId : orderIds) {


            TjOrder byId = tjOrderService.getById(orderId);


            if (null != byId) {


                if (byId.getReportTime() == null) {




                /*if (byId.getReportTime() == null) {


                    LambdaQueryWrapper<TjReportTemplate> tjReportTemplateLambdaQueryWrapper = new LambdaQueryWrapper<>();


                    tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getFlag, 1);


                    tjReportTemplateLambdaQueryWrapper.eq(TjReportTemplate::getOpen, 0);


@@ -2658,25 +2660,10 @@


                        //修改order表中的打印报告时间为当前时间


                        LambdaUpdateWrapper<TjOrder> updateWrapper = new LambdaUpdateWrapper<>();


                        updateWrapper.eq(TjOrder::getTjNumber, byId.getTjNumber());


//                        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);


                    }


                    String hisRegistrationId = byId.getCardId();


                    Date createTime = byId.getCreateTime();


                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");


                    String ksrq = dateFormat.format(createTime);


                    String jsrq = dateFormat.format(date);


                    HashMap<String, Object> params = new HashMap<>();


                    params.put("his_registration_id", hisRegistrationId);


                    params.put("ksbm", "");


                    params.put("pationid", "");


                    params.put("ksrq", ksrq);


                    params.put("jsrq", jsrq);


                    params.put("pagecount", 100);


                    params.put("page", 1);




                    LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();


                    wq1.eq(TjCustomer::getCusId, byId.getUserId());


                    TjCustomer tjCustomer = tjCustomerService.getOne(wq1);


@@ -2687,9 +2674,6 @@


                    try {


                        shengchengbgmoban(byId.getTjNumber(), byId, tjCustomer, reportTemplate, zongJianYiShiQianMing);


                        byId.setStatus(TjConstants.TJ_END);


//                        byId.setReportTime(date);


//                        byId.setPrintLastTime(date);


//                        byId.setDownloadLastTime(date);


                    } catch (Exception e) {


                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


                        e.printStackTrace();


@@ -2697,8 +2681,7 @@


                        logger.error("生成报告异常");


                        return AjaxResult.error("生成报告异常,核收失败");


                    }


                }




                }*/


                byId.setHeshouStatus(1);


                byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());


                byId.setHeshouTime(date);


@@ -2708,13 +2691,13 @@


                }


            }


        }


        }


        return AjaxResult.success("核收成功");


    }






    public AjaxResult shengchengbgmoban(String tjNumber, TjOrder tjOrder, TjCustomer tjCustomer, TjReportTemplate reportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {


//        AjaxResult ajaxResult = hisPDFUtil.hisPDF(tjOrder, tjCustomer, reportTemplate);


//        AjaxResult ajaxResult = hisPDFUtil.hisPDFNew(tjOrder, tjCustomer, reportTemplate);




        AjaxResult ajaxResult = hisPDFUtil.hisPDFNew2(tjOrder, tjCustomer, reportTemplate, zongJianYiShiQianMing);


        if (!ajaxResult.get("code").toString().equals("200")) {


            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -2730,12 +2713,6 @@


            tjReport.setType("体检报告");


            tjReport.setPrint("pdf");


            tjReportService.save(tjReport);


//            Date date = new Date();


//            tjOrder.setStatus(TjConstants.TJ_END);


//            tjOrder.setReportTime(date);


//            tjOrder.setPrintLastTime(date);


//            tjOrder.setDownloadLastTime(date);


//            tjOrderService.updateById(tjOrder);


        }


        return ajaxResult;


    }


@@ -3295,11 +3272,19 @@






    @PostMapping("/heshouchexiao")


    @ApiOperation(value = "核收撤销接口")


    @ApiOperation(value = "撤销报告接口")


    @Transactional


    public AjaxResult heshouchexiao(@RequestBody List<String> tjNUms) {




        if(null !=tjNUms && !tjNUms.isEmpty()){




            // 不在使用逻辑删除 逻辑删除导致打印报告生成 查询sql缓慢


            //逻辑删除数据库里的报告


            LambdaQueryWrapper<TjReport> wq1 = new LambdaQueryWrapper<>();


            wq1.select(TjReport::getReId);


            wq1.in(TjReport::getTjNumber, tjNUms);


            wq1.eq(TjReport::getPrint, "pdf");


            List<Long> list = tjReportService.list(wq1).stream().map(TjReport::getReId).collect(Collectors.toList());


            for (String tjNUm : tjNUms) {


                TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);


                if(null !=order){


@@ -3307,6 +3292,7 @@


                    order.setHeshouTime(null);


                    order.setHeshouDoctor(null);


                    order.setPrintLastTime(null);


                    order.setReportTime(null);


                    order.setStatus(TjConstants.TJ_WAIT);


                    if (!tjOrderService.updateById(order)) {


                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();


@@ -3314,6 +3300,10 @@


                    }


                }


            }


            int i = tjReportService.deleteTjReportByReIds(list.toArray(new Long[]{}));


            if (i == 0) {


                return AjaxResult.error("撤回失败！");


            }


            return AjaxResult.success("操作成功");


        }


        return AjaxResult.error();