20250103-1

zhaowenxuan

2025-01-03 9199522e90b4f50dc0444dc90cad61366efd8db7

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

@@ -92,6 +92,8 @@
    private TjFlowingWaterHisService tjFlowingWaterHisService;
    @Autowired
    private ITjSamplingService tjSamplingService;
    @Autowired
    private TjOrderController tjOrderController;

    /**
     * 查询该体检号对应的订单流水列表
@@ -248,7 +250,8 @@
                }

                String s = configService.selectConfigByKey("is_request_common_his_api");
                if (null != s && s.equals("Y") && order.getTjType().equals("2")) {
//                if (null != s && s.equals("Y") && order.getTjType().equals("2")) {
                if (null != s && s.equals("Y")) {
                    String apiUrl = configService.selectConfigByKey("common_api_url");
                    String hospbm = configService.selectConfigByKey("common_api_service_hospbm");
                    HashMap<String, Object> map = new HashMap<>();
@@ -436,10 +439,18 @@
                if (null != tbTransitionList && !tbTransitionList.isEmpty()) {
//                    extracted(order, list2, tbTransitionList);
                    //异步添加收费明细
                    asyncService.collectFees(order, list2, tbTransitionList, sysUser, tjFlowingWater.getDiscount());
//                    asyncService.collectFees(order, list2, tbTransitionList, sysUser, tjFlowingWater.getDiscount());
                    Map<String, Object> map = new HashMap<>();
                    map.put("waterId", tjFlowingWater.getWaterId());
                    map.put("mobanId", reportService.getMoBanIds());

                    SysUser user = null;
                    if (flowingWater.getCreateId()!= null)
                        user = userService.getById(flowingWater.getCreateId());
                    else user = userService.getById(1L);
                    TjOrder tjOrder = orderService.getById(flowingWater.getOrderId());
                    List<TjOrderDetail> detailList1 = detailService.getCaiYangDengJi(flowingWater.getOrderId());
                    tjOrderController.addCaiYangDengJi(detailList1, !detailList1.isEmpty(), tjOrder, user, null);
                    return AjaxResult.success("收费成功", map);
                }
            }