Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(enhancement): Include department, policy, beneficiary & insurance details in (patient-bill) API response #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

(enhancement): Include department, policy, beneficiary & insurance details in (patient-bill) API response #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 54 additions & 59 deletions omod/src/main/java/org/openmrs/module/mohbilling/rest/resource/PatientBillResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
import java.util.List;
import java.math.BigDecimal;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.openmrs.Patient;
import org.openmrs.api.context.Context;
import org.openmrs.module.mohbilling.model.Consommation;
import org.openmrs.module.mohbilling.model.PatientBill;
import org.openmrs.module.mohbilling.service.BillingProcessingService;
import org.openmrs.module.mohbilling.service.BillingService;
import org.openmrs.module.webservices.rest.web.RequestContext;
import org.openmrs.module.webservices.rest.web.RestConstants;
import org.openmrs.module.webservices.rest.web.annotation.PropertyGetter;
Expand All @@ -23,10 +27,10 @@
import org.openmrs.module.webservices.rest.web.annotation.PropertySetter;
import org.openmrs.module.webservices.rest.web.response.ConversionException;


@Resource(name = RestConstants.VERSION_1 + "/mohbilling/patientBill",
supportedClass = PatientBill.class,
supportedOpenmrsVersions = {"2.0 - 2.*"})
@JsonIgnoreProperties(ignoreUnknown = true)
public class PatientBillResource extends DelegatingCrudResource<PatientBill> {

@Override
Expand All @@ -52,7 +56,6 @@ protected void delete(PatientBill delegate, String reason, RequestContext contex
@Override
public void purge(PatientBill delegate, RequestContext context) throws ResponseException {
// Implementation not required unless we'd need to permanently delete bills
// BA guidance
}

@Override
Expand All @@ -62,56 +65,69 @@ protected String getUniqueId(PatientBill delegate) {

@Override
public DelegatingResourceDescription getRepresentationDescription(Representation rep) {
if (rep instanceof DefaultRepresentation) {
if (rep instanceof DefaultRepresentation || rep instanceof RefRepresentation) {
DelegatingResourceDescription description = new DelegatingResourceDescription();
description.addProperty("patientBillId");
description.addProperty("amount");
description.addProperty("createdDate");
description.addProperty("status");
description.addProperty("voided");
description.addProperty("payments");
description.addProperty("payments", Representation.REF);
description.addProperty("phoneNumber");
description.addProperty("transactionStatus");
description.addProperty("paymentConfirmedBy");
description.addProperty("paymentConfirmedDate");
description.addSelfLink();
description.addLink("full", ".?v=" + RestConstants.REPRESENTATION_FULL);
return description;
} else if (rep instanceof FullRepresentation) {
DelegatingResourceDescription description = new DelegatingResourceDescription();
description.addProperty("patientBillId");
description.addProperty("amount");
description.addProperty("createdDate");
description.addProperty("status");
description.addProperty("voided");
description.addProperty("voidedBy");
description.addProperty("voidedDate");
description.addProperty("voidReason");
description.addProperty("payments");
description.addProperty("phoneNumber");
description.addProperty("transactionStatus");
description.addProperty("paymentConfirmedBy");
description.addProperty("paymentConfirmedDate");
description.addSelfLink();
return description;
} else if (rep instanceof RefRepresentation) {
DelegatingResourceDescription description = new DelegatingResourceDescription();
description.addProperty("patientBillId");
description.addProperty("amount");
description.addProperty("createdDate");
description.addProperty("status");
description.addProperty("voided");
description.addProperty("payments");
description.addProperty("phoneNumber");
description.addProperty("transactionStatus");
description.addProperty("paymentConfirmedBy");
description.addProperty("paymentConfirmedDate");
description.addProperty("creator");

// NEWLY ADDED FIELDS FROM `Consommation`
description.addProperty("departmentName");
description.addProperty("policyIdNumber");
description.addProperty("beneficiaryName");
description.addProperty("insuranceName");

description.addSelfLink();
return description;
}
return null;
}

@PropertyGetter("creator")
public String getCreator(PatientBill bill) {
if (bill.getCreator() != null && bill.getCreator().getPerson() != null) {
return bill.getCreator().getPerson().getPersonName().getFullName();
}
return null;
}

@PropertyGetter("departmentName")
public String getDepartmentName(PatientBill bill) {
Consommation cons = Context.getService(BillingService.class).getConsommationByPatientBill(bill);
return (cons != null && cons.getDepartment() != null) ? cons.getDepartment().getName() : null;
}

@PropertyGetter("policyIdNumber")
public String getPolicyIdNumber(PatientBill bill) {
Consommation cons = Context.getService(BillingService.class).getConsommationByPatientBill(bill);
return (cons != null && cons.getBeneficiary() != null) ? cons.getBeneficiary().getPolicyIdNumber() : null;
}

@PropertyGetter("beneficiaryName")
public String getBeneficiaryName(PatientBill bill) {
Consommation cons = Context.getService(BillingService.class).getConsommationByPatientBill(bill);
if (cons != null && cons.getBeneficiary() != null && cons.getBeneficiary().getPatient() != null) {
return cons.getBeneficiary().getPatient().getPersonName().getFullName();
}
return null;
}

@PropertyGetter("insuranceName")
public String getInsuranceName(PatientBill bill) {
Consommation cons = Context.getService(BillingService.class).getConsommationByPatientBill(bill);
return (cons != null && cons.getBeneficiary() != null &&
cons.getBeneficiary().getInsurancePolicy() != null &&
cons.getBeneficiary().getInsurancePolicy().getInsurance() != null) ?
cons.getBeneficiary().getInsurancePolicy().getInsurance().getName() : null;
}

@Override
public DelegatingResourceDescription getCreatableProperties() {
DelegatingResourceDescription description = new DelegatingResourceDescription();
Expand All @@ -131,43 +147,22 @@ public DelegatingResourceDescription getUpdatableProperties() {
@Override
protected PageableResult doSearch(RequestContext context) {
BillingProcessingService service = Context.getService(BillingProcessingService.class);

Integer startIndex = context.getStartIndex();
Integer limit = context.getLimit();

// Get order parameters from request
String orderBy = context.getRequest().getParameter("orderBy");
String orderDirection = context.getRequest().getParameter("order");

List<PatientBill> bills = service.getPatientBillsByPagination(
startIndex,
limit,
orderBy,
orderDirection
);

return new AlreadyPaged<>(context, bills, false);
}

@Override
protected PageableResult doGetAll(RequestContext context) throws ResponseException {
BillingProcessingService service = Context.getService(BillingProcessingService.class);

Integer startIndex = context.getStartIndex();
Integer limit = context.getLimit();

// Get order parameters from request
String orderBy = context.getRequest().getParameter("orderBy");
String orderDirection = context.getRequest().getParameter("order");

List<PatientBill> bills = service.getPatientBillsByPagination(
startIndex,
limit,
orderBy,
orderDirection
);

return new NeedsPaging<PatientBill>(bills, context);
return doSearch(context);
}

@PropertySetter("amount")
Expand Down