diff --git a/src/main/java/com/ynxbd/common/action/TreatAction.java b/src/main/java/com/ynxbd/common/action/TreatAction.java index 73d4ec2..4b10193 100644 --- a/src/main/java/com/ynxbd/common/action/TreatAction.java +++ b/src/main/java/com/ynxbd/common/action/TreatAction.java @@ -74,7 +74,7 @@ public class TreatAction extends BaseAction { HisTreat treat = new HisTreatDao().createTreat(treatNum, deptCode, doctCode, registCode, regFee, clinicFee, transNo, payMoney, payDate, payTime, payWay, payDeviceID, bankTransNo, openId); return Result.success(treat); - } catch (ServiceException e) { + } catch (Exception e) { return Result.error(e); } } diff --git a/src/main/java/com/ynxbd/common/service/RxService.java b/src/main/java/com/ynxbd/common/service/RxService.java index 87b4634..9cd2815 100644 --- a/src/main/java/com/ynxbd/common/service/RxService.java +++ b/src/main/java/com/ynxbd/common/service/RxService.java @@ -1119,10 +1119,11 @@ public class RxService { if (!HisConfig.IS_CANCEL_RX_REFUND) { return Result.success(); } - log.info("[问诊-处方]退费-入参 treatNum={}, rxCode={}", treatNum, rxCode); + log.info("[问诊-处方]查询-入参 treatNum={}, rxCode={}", treatNum, rxCode); List rxList = new RxService().selectRxPaidByTreatNumAndRxCode(treatNum, rxCode); if (rxList.isEmpty()) { - return Result.error(ResultEnum.PAY_ORDER_NOT_FOUND); + log.info("[问诊-处方]退费-未查询到处方,不退费"); + return Result.success(); } if (rxList.size() > 1) { return Result.error("存在多笔订单禁止退费");