diff --git a/src/main/java/com/divudi/bean/common/EnumController.java b/src/main/java/com/divudi/bean/common/EnumController.java index 20e8bad9e3..441b4a534c 100644 --- a/src/main/java/com/divudi/bean/common/EnumController.java +++ b/src/main/java/com/divudi/bean/common/EnumController.java @@ -70,6 +70,7 @@ public class EnumController implements Serializable { @Inject ConfigOptionApplicationController configOptionApplicationController; List paymentMethodsForOpdBilling; + List paymentMethodsForOpdBillCanceling; List paymentMethodsForChanneling; List paymentMethodsForChannelSettling; List paymentMethodsForPharmacyBilling; @@ -126,6 +127,16 @@ public void fillPaymentMethodsForOpdBilling() { } } } + + public void fillPaymentMethodsForOpdBillCanceling() { + paymentMethodsForOpdBillCanceling = new ArrayList<>(); + for (PaymentMethod pm : PaymentMethod.values()) { + boolean include = configOptionApplicationController.getBooleanValueByKey(pm.getLabel() + " is available for OPD Bill Canceling", true); + if (include) { + paymentMethodsForOpdBillCanceling.add(pm); + } + } + } public void fillPaymentMethodsForPackageBilling() { paymentMethodsForOpdBilling = new ArrayList<>(); @@ -854,6 +865,17 @@ public void setPaymentMethodsForStaffCreditSettle(List paymentMet this.paymentMethodsForStaffCreditSettle = paymentMethodsForStaffCreditSettle; } + public List getPaymentMethodsForOpdBillCanceling() { + if (paymentMethodsForOpdBillCanceling == null) { + fillPaymentMethodsForOpdBillCanceling(); + } + return paymentMethodsForOpdBillCanceling; + } + + public void setPaymentMethodsForOpdBillCanceling(List paymentMethodsForOpdBillCanceling) { + this.paymentMethodsForOpdBillCanceling = paymentMethodsForOpdBillCanceling; + } + public List getPaymentMethodsForPatientDepositRefund() { paymentMethodsForPatientDepositRefund = new ArrayList<>(); for (PaymentMethod pm : PaymentMethod.values()) { @@ -868,5 +890,4 @@ public List getPaymentMethodsForPatientDepositRefund() { public void setPaymentMethodsForPatientDepositRefund(List paymentMethodsForPatientDepositRefund) { this.paymentMethodsForPatientDepositRefund = paymentMethodsForPatientDepositRefund; } - } diff --git a/src/main/webapp/opd/batch_bill_cancel.xhtml b/src/main/webapp/opd/batch_bill_cancel.xhtml index 579a7a1801..c0df6c6ad7 100644 --- a/src/main/webapp/opd/batch_bill_cancel.xhtml +++ b/src/main/webapp/opd/batch_bill_cancel.xhtml @@ -54,7 +54,7 @@ - + - +