修改判断是否需要lis、pacs

zhaowenxuan

2024-10-14 e4de984c46c980d39df745351a2fbd5f97cc354d

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

@@ -212,8 +212,6 @@
    private HisPDFUtil hisPDFUtil;
    @Value("${path.reportServer}")
    private String urlValue;
    @Autowired
    private TjSysAsyncServiceImpl tjSysAsyncService;

    //将方法返回值解析成json格式
    public JSONObject getJSONObject(String builder) {
@@ -1118,20 +1116,6 @@
            lock.unlock();
        }
        return AjaxResult.error();
    }

    /**
     * 根据体检类型判断是否需要直接从Lis、pacs直接申请
     */
    public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
        try {
            String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
            String[] split = useLisAndPacsRegisterDictTeam.split(",");
            List<String> list = Arrays.asList(split);
            return list.contains(tjOrder.getTjType());
        } catch (Exception e) {
            return false;
        }
    }


@@ -2585,7 +2569,7 @@
                        return AjaxResult.error("撤销失败,该人员已缴费,请先退费!");
                    }
                }
                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
                if (zfHisApiMethods) {
                    return AjaxResult.success("撤销成功");
                } else {
@@ -2731,7 +2715,9 @@
    @Transactional
    public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "就诊号") String cardId) {

        TjOrder order = new TjOrder();
        LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(TjOrder::getCardId,cardId);
        TjOrder order = tjOrderService.getOne(queryWrapper);
        order.setCardId(cardId);
        String configByKey = configService.selectConfigByKey("sfkqdyhis");
        if (configByKey.equals("Y")) {
@@ -2751,7 +2737,7 @@
                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return AjaxResult.error("撤销失败,门诊患者费用清单信息不为空");
            } else {
                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
                if (zfHisApiMethods) {
                    return AjaxResult.success("撤销成功", map);
                } else {