zhaowenxuan
2024-10-14 7d702f59202496e28a80582b4aeeab2a9b9da76d
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) {
@@ -1086,23 +1084,7 @@
                        }
                        // 查询 对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs
//                        if (isUseLisAndPacsRegister(tjOrder)) {
//                            List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(),tjOrder.getCardId());
////                            lisApiMethod.save(tjOrder,tjCustomer,detailList);
//                            if(!pacsApiMethodService.save(tjOrder,tjCustomer,detailList)){
//                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
//                                Object jzh = result.get("jzh");
//                                if (null != jzh && null != jzh.toString()) {
//                                    hisApiMethod.ZfHisApiMethod(jzh.toString());
//                                }
//                                log.error("pacs申请失败 该登记人挂号失败, 就诊号为: " + tjOrder.getCardId());
//                                return AjaxResult.error("挂号失败!" + result.get("msg").toString());
//                            }
//                            LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
//                            wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
//                            wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
//                            wq2.eq(TjOrderDetail::getIsSampling, 0);
//                            List<TjOrderDetail> detailList1 = tjOrderDetailService.list(wq2);
//                            tjSysAsyncService.addCaiYangDengJi(detailList1, !detailList.isEmpty(), order, sysUser);
//                          hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"),tjOrder,sysUser,result);
//                        }else {
//                            hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
//                        }
@@ -1134,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;
        }
    }
@@ -2601,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 {
@@ -2747,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")) {
@@ -2767,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 {