zjh20241016

zjh

2024-10-16 6aaa47ce1028db3f3275eaf37beef4700971cfd6

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

@@ -875,13 +875,12 @@
    }



    /**
     * 体检签到登记接口
     */


    ReentrantLock lock=new ReentrantLock();
    ReentrantLock lock = new ReentrantLock();

    @PostMapping
    @ApiOperation(value = "体检签到登记接口")
@@ -977,7 +976,7 @@

        try {
            boolean b = lock.tryLock(3, TimeUnit.MINUTES);
            if(b){
            if (b) {
                //生成体检号
                String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
                tjOrder.setTjNumber(tjNumber);
@@ -1047,7 +1046,7 @@
                            tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
                            tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
                            tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
    //                    tjFlowingWater.setPayStasus(0L);
                            //                    tjFlowingWater.setPayStasus(0L);
                        }
                    }
                    if (tjFlowingWaterService.save(tjFlowingWater)) {
@@ -2569,7 +2568,7 @@
                        return AjaxResult.error("撤销失败,该人员已缴费,请先退费!");
                    }
                }
                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
                if (zfHisApiMethods) {
                    return AjaxResult.success("撤销成功");
                } else {
@@ -2716,7 +2715,7 @@
    public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "就诊号") String cardId) {

        LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(TjOrder::getCardId,cardId);
        queryWrapper.eq(TjOrder::getCardId, cardId);
        TjOrder order = tjOrderService.getOne(queryWrapper);
        order.setCardId(cardId);
        String configByKey = configService.selectConfigByKey("sfkqdyhis");
@@ -2737,7 +2736,7 @@
                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return AjaxResult.error("撤销失败,门诊患者费用清单信息不为空");
            } else {
                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
                if (zfHisApiMethods) {
                    return AjaxResult.success("撤销成功", map);
                } else {
@@ -2819,25 +2818,35 @@
        if (null != order) {
            String configByKey = configService.selectConfigByKey("sfkqdyhis");
            if (null != configByKey && configByKey.equals("Y")) {
                log.info("dto的数据是" + JSONUtil.toJsonStr(dto));
                HashMap<String, Object> hisRequestParams = new HashMap<>();
                hisRequestParams.put("patientId", order.getCardId());
                AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
                if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
                    List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
                    BigDecimal cateFeeAll = BigDecimal.ZERO;
                    List<String> advIds = new ArrayList<>();
                    for (Map<String, String> datum : data) {
                        String advId = datum.get("Adv_Id").split("_")[1];
                        BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
                        cateFeeAll = cateFeeAll.add(cateFee);
                        advIds.add(advId);
                    log.info("data的数据是" + JSONUtil.toJsonStr(data));
//                    BigDecimal cateFeeAll = BigDecimal.ZERO;
//                    List<String> advIds = new ArrayList<>();
                    List<LtkjJianchajianyanTree> buLuXmXinXi = tjOrderService.getBuLuXmXinXi(dto.getBldhs(), order.getCardId());
                    log.info("buLuXmXinXi的值为:==========" + buLuXmXinXi);
                    if (null != buLuXmXinXi && !buLuXmXinXi.isEmpty()) {
                        for (Map<String, String> datum : data) {
                            for (LtkjJianchajianyanTree tree : buLuXmXinXi) {
                                String advId = datum.get("Adv_Id").split("_")[1];
                                log.info("advid的值为:==========" + advId);
                                log.info("tree的值为:==========" + advId);
                                BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
                                log.info("cateFee的值为:==========" + cateFee);
                                log.info("tree.getFyhj()的值为:==========" + tree.getFyhj());
                                if (tree.getSqdh().equals(advId) && cateFee.compareTo(new BigDecimal(tree.getFyhj())) == 0) {
                                    log.info("该项目已缴费不可撤销");
                                    return AjaxResult.error("该项目已缴费不可撤销!!!");
                                }
                            }
                        }
                    }
                    if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
                        log.info("改项目已缴费不可撤销");
                        return AjaxResult.error("改项目已缴费不可撤销!!!");
                    }

                }

                boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
                if (!b) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -2856,7 +2865,7 @@
        return AjaxResult.error();
    }

    @Transactional(propagation =Propagation.REQUIRES_NEW)
    //    @Transactional(propagation =Propagation.REQUIRES_NEW)
    public void extracted(TjProBlDto dto) {
        for (String bldh : dto.getBldhs()) {
            remarkService.deleteTjOrderDetailByjxbz(bldh);