Skip to content

Commit

Permalink
update_the_pharmacy_income_report_with_new_bill_type_atomics_
Browse files Browse the repository at this point in the history 
closes #9838
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
  • Loading branch information
@buddhika75
buddhika75 committed Dec 23, 2024
1 parent 7b80c1e commit ca50719
Show file tree
Hide file tree
Showing 6 changed files with 100 additions and 17 deletions.
15 changes: 14 additions & 1 deletion src/main/java/com/divudi/bean/pharmacy/PharmacySummaryReportController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ public void resetAllFilters() {
}

public void processPharmacyIncomeReport() {
System.out.println("processPharmacyIncomeReport");
List<BillTypeAtomic> billTypeAtomics = new ArrayList<>();
billTypeAtomics.add(BillTypeAtomic.PHARMACY_RETAIL_SALE);
billTypeAtomics.add(BillTypeAtomic.PHARMACY_RETAIL_SALE_CANCELLED);
Expand All @@ -242,6 +243,18 @@ public void processPharmacyIncomeReport() {
billTypeAtomics.add(BillTypeAtomic.PHARMACY_WHOLESALE_CANCELLED);
billTypeAtomics.add(BillTypeAtomic.PHARMACY_WHOLESALE_PRE);
billTypeAtomics.add(BillTypeAtomic.PHARMACY_WHOLESALE_REFUND);
billTypeAtomics.add(BillTypeAtomic.DIRECT_ISSUE_INWARD_MEDICINE);
billTypeAtomics.add(BillTypeAtomic.DIRECT_ISSUE_INWARD_MEDICINE_CANCELLATION);
billTypeAtomics.add(BillTypeAtomic.DIRECT_ISSUE_INWARD_MEDICINE_RETURN);
billTypeAtomics.add(BillTypeAtomic.DIRECT_ISSUE_THEATRE_MEDICINE);
billTypeAtomics.add(BillTypeAtomic.DIRECT_ISSUE_THEATRE_MEDICINE_CANCELLATION);
billTypeAtomics.add(BillTypeAtomic.DIRECT_ISSUE_THEATRE_MEDICINE_RETURN);
billTypeAtomics.add(BillTypeAtomic.ISSUE_MEDICINE_ON_REQUEST_INWARD);
billTypeAtomics.add(BillTypeAtomic.ISSUE_MEDICINE_ON_REQUEST_INWARD_CANCELLATION);
billTypeAtomics.add(BillTypeAtomic.ISSUE_MEDICINE_ON_REQUEST_THEATRE);
billTypeAtomics.add(BillTypeAtomic.ISSUE_MEDICINE_ON_REQUEST_THEATRE_CANCELLATION);
billTypeAtomics.add(BillTypeAtomic.ACCEPT_RETURN_MEDICINE_INWARD);
billTypeAtomics.add(BillTypeAtomic.ACCEPT_RETURN_MEDICINE_THEATRE);

List<Bill> bills = billService.fetchBills(fromDate, toDate, institution, site, department, webUser, billTypeAtomics);
bundle = new IncomeBundle(bills);
Expand All @@ -252,7 +265,7 @@ public void processPharmacyIncomeReport() {
if (r.getBill().getPaymentMethod() == null) {
continue;
}
if(r.getBill().getPaymentMethod().equals(PaymentMethod.MultiplePaymentMethods)){
if (r.getBill().getPaymentMethod().equals(PaymentMethod.MultiplePaymentMethods)) {
r.setPayments(billService.fetchBillPayments(r.getBill()));
}
}
Expand Down
23 changes: 16 additions & 7 deletions src/main/java/com/divudi/data/IncomeBundle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,18 @@ public void generatePaymentDetailsForBills() {
r.setNetTotal(b.getNetTotal());
r.setDiscount(b.getDiscount());
r.setActualTotal(b.getNetTotal() - b.getServiceCharge());

if (b.getPaymentMethod() == null) {
r.setNoneValue(b.getNetTotal());
r.setCreditValue(b.getNetTotal());
if (r.getBill().getPatientEncounter() != null) {
r.setOpdCreditValue(0);
r.setInpatientCreditValue(b.getNetTotal());
} else {
r.setOpdCreditValue(0);
r.setInpatientCreditValue(0);
r.setNoneValue(b.getNetTotal());
}

} else {
switch (b.getPaymentMethod()) {
case Agent:
Expand All @@ -261,7 +270,7 @@ public void generatePaymentDetailsForBills() {
break;
case Credit:
r.setCreditValue(b.getNetTotal());
if (r.getBill().getPatientEncounter() == null) {
if (r.getBill().getPatientEncounter() != null) {
r.setOpdCreditValue(0);
r.setInpatientCreditValue(b.getNetTotal());
} else {
Expand Down Expand Up @@ -301,7 +310,7 @@ public void generatePaymentDetailsForBills() {
}

}

}
populateSummaryRow();
}
Expand Down Expand Up @@ -336,10 +345,10 @@ private void calculateBillPaymentValuesFromPayments(IncomeRow r) {
break;
case Credit:
r.setCreditValue(r.getCreditValue() + p.getPaidValue());
if (r.getBill().getPatientEncounter() == null) {
r.setOpdCreditValue(r.getOpdCreditValue() + p.getPaidValue());
} else {
if (r.getBill().getPatientEncounter() != null) {
r.setInpatientCreditValue(r.getInpatientCreditValue() + p.getPaidValue());
} else {
r.setOpdCreditValue(r.getOpdCreditValue() + p.getPaidValue());
}
break;
case IOU:
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/divudi/service/BillService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,10 @@ public List<Bill> fetchBills(Date fromDate,
}

jpql += " order by b.createdAt desc ";

return billFacade.findByJpql(jpql, params, TemporalType.TIMESTAMP);
System.out.println("params = " + params);
System.out.println("jpql = " + jpql);
List<Bill> fetchedBills = billFacade.findByJpql(jpql, params, TemporalType.TIMESTAMP);
System.out.println("fetchedBills = " + fetchedBills);
return fetchedBills;
}
}
4 changes: 2 additions & 2 deletions src/main/webapp/pharmacy/pharmacy_analytics.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<p:panel header="Pharmacy Analytics" >
<div class="row">
<div class="col-md-3">
<div class="col-md-2">
<h:form>
<p:accordionPanel activeIndex="#{pharmacyController.managePharamcyReportIndex}">
<p:ajax process="@this"></p:ajax>
Expand Down Expand Up @@ -297,7 +297,7 @@
</p:accordionPanel>
</h:form>
</div>
<div class="col-md-9">
<div class="col-md-10">
<ui:insert name="subcontent">

</ui:insert>
Expand Down
11 changes: 6 additions & 5 deletions src/main/webapp/pharmacy/reports/summary_reports/pharmacy_income_report.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,11 @@
<p:printer target="tbl" />
</p:commandButton>



<p:dataTable
id="tbl"
styleClass="ui-datatable-borderless ui-datatable-sm compact-datatable"
value="#{pharmacySummaryReportController.bundle.rows}" var="row"
paginator="true" rows="10" rowsPerPageTemplate="5,10,15,50,100,500,1000,2000,5000,10000"
paginatorPosition="bottom">
Expand Down Expand Up @@ -232,7 +233,7 @@
</f:facet>

</p:column>
<p:column headerText="Inpatient Credit" class="text-end bg-secondary text-white">
<p:column headerText="Inpatient Credit" class="text-end light-grey-background">
<h:outputText value="#{row.inpatientCreditValue}">
<f:convertNumber pattern="#,##0.00" />
</h:outputText>
Expand All @@ -243,7 +244,7 @@
</f:facet>

</p:column>
<p:column headerText="Outpatient Credit" class="text-end bg-secondary text-white">
<p:column headerText="Outpatient Credit" class="text-end light-grey-background">
<h:outputText value="#{row.opdCreditValue}">
<f:convertNumber pattern="#,##0.00" />
</h:outputText>
Expand All @@ -254,7 +255,7 @@
</f:facet>

</p:column>
<p:column headerText="Staff Credit" class="text-end bg-secondary text-white" >
<p:column headerText="Staff Credit" class="text-end light-grey-background" >
<h:outputText value="#{row.staffValue}">
<f:convertNumber pattern="#,##0.00" />
</h:outputText>
Expand All @@ -265,7 +266,7 @@
</f:facet>

</p:column>
<p:column headerText="Agent Credit" class="text-end bg-secondary text-white" >
<p:column headerText="Agent Credit" class="text-end light-grey-background" >
<h:outputText value="#{row.agentValue}">
<f:convertNumber pattern="#,##0.00" />
</h:outputText>
Expand Down
57 changes: 57 additions & 0 deletions src/main/webapp/resources/css/ohmis.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,63 @@ th.align-right-header .ui-column-title {
width: 58%;
}

.compact-datatable {
--content-padding: 0.0rem; /* Reduced from 1rem */
--inline-spacing: 0.0rem; /* Reduced from 0.5rem */
--border-radius: 0px; /* Reduced from 4px */
}
.compact-datatable .ui-datatable-data tr td {
margin: 0 !important;
padding: 2px !important; /* Minimal padding */
line-height: 1.2; /* Reduce line spacing */
}
.compact-datatable .ui-datatable-header,
.compact-datatable .ui-datatable-footer,
.compact-datatable .ui-column-title,
.compact-datatable .ui-datatable-footer .ui-datatable-footer-table,
.compact-datatable .ui-datatable-footer .ui-datatable-footer-tablewrapper,
.compact-datatable .ui-datatable-footer table,
.compact-datatable .ui-datatable-footer td,
.compact-datatable .ui-datatable-footer td.ui-state-default,
.compact-datatable .ui-datatable-footer td:empty,
.compact-datatable .ui-datatable-footer .ui-datatable-footer-tablewrapper table {
margin: 0 !important;
padding: 2px !important;
line-height: 1.1;
}
.compact-datatable .ui-datatable-footer td:empty {
display: none; /* Hide empty cells completely */
}
.compact-datatable .ui-datatable-footer,
.compact-datatable tfoot.ui-widget-content,
.compact-datatable .ui-datatable-footer td,
.compact-datatable .ui-datatable-footer td.ui-state-default {
margin: 0 !important;
padding: 0.1rem !important;
line-height: 1;
font-size: 0.8rem;
}
.compact-datatable .ui-state-default {
margin: 0 !important;
padding: 0 !important;
}

.light-grey-background {
background-color: #e2e3e5; /* Slightly darker grey than before */
color: #343a40; /* Dark grey text, ensuring good contrast */
}
.light-grey-background,
.light-grey-background .ui-column-footer,
.light-grey-background .ui-column-header {
background-color: #e2e3e5; /* Slightly darker grey than before */
color: #343a40; /* Dark grey text, ensuring good contrast */
}
.compact-datatable .light-grey-background,
.compact-datatable .ui-datatable thead th.light-grey-background,
.compact-datatable .ui-datatable tfoot td.light-grey-background {
background-color: #e2e3e5; /* Slightly darker grey */
color: #343a40; /* Dark grey text for contrast */
}


@media print {
Expand Down

0 comments on commit ca50719

Please sign in to comment.