zjh20250403

zjh

2025-04-03 3a991e8dedbb748b0623992485904cf29b110868

zjh20250403

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

@@ -188,7 +188,7 @@
                map.put("date", sfxmList);
                map.put("total", sfxms.size());
            } else {
                map.put("date", 0);
                map.put("date", null);
                map.put("total", 0);
            }
            return AjaxResult.success(map);
@@ -209,7 +209,7 @@
                map.put("date", sfxmList);
                map.put("total", sfx.size());
            } else {
                map.put("date", 0);
                map.put("date", null);
                map.put("total", 0);
            }
            return AjaxResult.success(map);

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

@@ -964,6 +964,7 @@
    @ApiOperation("提交该科室下客户体检结果接口")
    @Transactional
    public AjaxResult addRemark(@ApiParam(value = "体检父项目备注集合") @RequestBody List<TjOrderRemark> remarklList) {
        try {
        Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
        SysUser sysUser = userService.getById(userId);
        if (remarklList == null || remarklList.isEmpty()) {
@@ -977,9 +978,8 @@
                orderRemark.setSummary(null);
            }
            if (StringUtils.isBlank(orderRemark.getRemark())) orderRemark.setRemark(null);
            LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
            qw.eq(TjOrder::getTjNumber, orderRemark.getTjNumber());
            TjOrder order = orderService.getOne(qw);
                TjOrder order = orderService.getOrderByTjNum(orderRemark.getTjNumber());
                if(null !=order && null !=order.getReportTime())return AjaxResult.error("该人员报告已出 不可修改");
            orderRemark.setDeptId(sysUser.getDeptId());
            if (orderRemark.getDoctorName() == null) {
                orderRemark.setDoctorName(String.valueOf(sysUser.getUserId()));
@@ -1045,11 +1045,13 @@
                asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
                return AjaxResult.success("操作成功");
            }
//            asyncService.updateCheckType(orderRemark.getTjNumber());
//            asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
        }
        remarkService.tjYishengjianchajianyi(null, null, null, null);
        return AjaxResult.success("操作成功");
        } catch (NumberFormatException e) {
            log.error(e.getMessage());
            throw new RuntimeException(e);
        }
    }

    /**

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

@@ -1069,6 +1069,7 @@
                return result;
            }
        }catch (Exception e){
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            log.error(String.valueOf(e));
        }
        finally {
@@ -1077,7 +1078,8 @@
        return AjaxResult.error();
    }

    @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
//    @Transactional(propagation = Propagation.REQUIRES_NEW, isolation = Isolation.READ_COMMITTED)
    @Transactional(propagation = Propagation.REQUIRED) // 共享事务
    public AjaxResult processOrderWithTransaction(TjOrder tjOrder, TjCustomer tjCustomer, TjReservation tjReservation, TjFlowingWater tjFlowingWater, MallOrder mallOrder, SysUser sysUser) {

        //获取拼接前缀
@@ -1234,7 +1236,8 @@
                        hisApiMethod.ZfHisApiMethod(jzh.toString());
                    }
                    log.info("该登记人挂号失败, 就诊号为: " + tjOrder.getCardId());
                    return AjaxResult.error("挂号失败!" + result.get("msg").toString());
//                    return AjaxResult.error("挂号失败!" + result.get("msg").toString());
                    throw new IllegalStateException("挂号失败!" + result.get("msg").toString());
                }

                log.info("该登记人的his就诊号是: " + tjOrder.getCardId());
@@ -1249,6 +1252,7 @@
                    newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                }*/
                // 查询 对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs
                try {
                if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
                    log.info("调用his开启 进入不收费方法 该体检人员不收费:"+tjOrder.getTjNumber());
                    // 这是上面个人方法引入数据
@@ -1273,6 +1277,10 @@
                    if (isUseMx.equalsIgnoreCase("Y"))
                        hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
                    else hisApiMethod.tijianshenqingJinchuanNew(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
                    }
                } catch (Exception e) {
                    log.error(e.getMessage());
                    throw new IllegalStateException();
                }
                return AjaxResult.success(tjNumber);
            } else {
@@ -1371,6 +1379,7 @@

            log.info("签到登记接口该人员: "+tjOrder.getTjNumber()+" 的体检类型是:"+tjOrder.getTjType());
            if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
                try {
                log.info(tjOrder.getTjNumber()+"签到登记进入未收费方法");
                // 这是上面个人方法引入数据
                tjFlowingWater.setPayStasus(1L);
@@ -1384,11 +1393,22 @@
                log.info(tjOrder.getTjNumber()+"签到登记:采样数据查询个数"+detailList.size());
                addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
                return AjaxResult.success(tjNumber);
                } catch (Exception e) {
                    log.error(e.getMessage());
                    throw new IllegalStateException(e);
                }
            } else {
                try {
                log.info(tjOrder.getTjNumber()+"else签到登记进入收费方法");
                newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                AjaxResult error = isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
                if (error != null) return error;
                    isRequestCommonHisApi(tjOrder, tjCustomer, tjFlowingWater);
                } catch (Exception e) {
//                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    log.error("processOrderWithTransaction 方法异常"+e.getMessage());
                    throw new RuntimeException("调用公共方法失败 强制触发回滚");
//                    return AjaxResult.error();
                }
//                if (error != null) return error;
//                List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
//                addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null);
            }
@@ -1397,11 +1417,12 @@
//            pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
//            return AjaxResult.success(tjNumber);
        }
        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        return AjaxResult.error();
//        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
        throw new RuntimeException("体检记录保存失败 强制触发回滚");
    }

    private AjaxResult isRequestCommonHisApi(TjOrder tjOrder, TjCustomer tjCustomer, TjFlowingWater tjFlowingWater) {
    @Transactional(propagation = Propagation.REQUIRED) // 共享事务
    public void isRequestCommonHisApi(TjOrder tjOrder, TjCustomer tjCustomer, TjFlowingWater tjFlowingWater) {
        String s = configService.selectConfigByKey("is_request_common_his_api");
        if (null != s && s.equals("Y")) {
            String apiUrl = configService.selectConfigByKey("common_api_url");
@@ -1463,13 +1484,16 @@
                }
                tjFlowingWaterService.updateById(tjFlowingWater);
            } else {
                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return AjaxResult.error();
//                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                log.error("isRequestCommonHisApi 方法异常");
                throw new RuntimeException("is_request_common_his_api 强制触发回滚");
//                return AjaxResult.error();
            }
        }
        return null;
//        return null;
    }

    @Transactional(propagation = Propagation.REQUIRED) // 共享事务
    public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) {
        try {
            String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
@@ -2866,7 +2890,9 @@
    }


    @Transactional(propagation = Propagation.REQUIRED) // 共享事务
    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        try {
        tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
        if (null != tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")) {
            tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(),
@@ -2907,6 +2933,9 @@
            List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber());
            xdPictureService.saveBatch(xdPictureList);
        }
        } catch (Exception e) {
            throw new RuntimeException(e);
        }
    }



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

@@ -83,14 +83,14 @@
        }
        wq.orderByAsc(TjRules::getSort);
        List<TjRules> list = tjRulesService.list(wq);
        if (list != null) {
            for (TjRules rules : list) {
                LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjRuleAdvice::getBz, rules.getAid());
                final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
                rules.setRuleAdvices(list1);
            }
        }
//        if (list != null) {
//            for (TjRules rules : list) {
//                LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
//                wq1.eq(TjRuleAdvice::getBz, rules.getAid());
//                final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
//                rules.setRuleAdvices(list1);
//            }
//        }
        return getDataTable(list);
    }