zjh
2024-07-16 f3445e5babad91627609b898dbc9b5ed844d7cdd
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -2544,15 +2544,14 @@
            transitionService.deletedTbTransitionByTjNum(tjNum);
            TjCustomer customer = tjCustomerService.getById(order.getUserId());
            if (null != customer) {
                customer.setCardId("0");
                tjCustomerService.updateById(customer);
            }
            String configByKey = configService.selectConfigByKey("sfkqdyhis");
            if (configByKey.equals("Y")) {
                HashMap<String, Object> map = new HashMap<>();
                map.put("cardtype", "4");
                map.put("input", order.getCardId());
//                map.put("input", order.getCardId());
                map.put("input", customer.getPationId());
                LocalDate currentDate = LocalDate.now();
                LocalDateTime startOfDay = currentDate.atStartOfDay();
                LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
@@ -2564,7 +2563,7 @@
                AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
                if (Integer.parseInt(String.valueOf(result.get("code"))) == 200) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return AjaxResult.error("撤销失败,门诊患者费用清单信息不为空");
                    return AjaxResult.error("撤销失败,该人员已缴费,请先退费!");
                } else {
                    boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
                    if (zfHisApiMethods) {
@@ -2575,8 +2574,6 @@
                    }
                }
            }
//            transitionService.updateTbTransitionByTjNum(tjNum);
            return AjaxResult.success("撤销成功!!!");
        }
        return AjaxResult.success("签到记录不存在!");
@@ -2802,7 +2799,6 @@
    }
    @PostMapping("/revokeBlProByBldhAndTjh")
    @ApiOperation(value = "根据补录单号和体检号删除记录")
    @Transactional
@@ -2860,12 +2856,6 @@
        }
        return AjaxResult.success();
    }
}