this repo has no description
Refact: Charge item Category filtering in Account and addition of fields in payment reconciliation datapoints (#3538)
* fix:charge item category selection
* feat:added account datapoint fields
authored by
Nandkishor R
and committed by
GitHub
8e226a58
1dbdc659
+18
-5
+3
-4
care/emr/reports/context_builder/data_points/charge_items.py
+3
-4
care/emr/reports/context_builder/data_points/charge_items.py
···
11
11
SingleObjectContextBuilder,
12
12
)
13
13
from care.emr.reports.context_builder.data_points.invoice import (
14
-
ChargeItemInvoiceContextBuilder,
14
+
MinimumInvoiceContextBuilder,
15
15
)
16
16
from care.emr.reports.context_builder.data_points.monetary_component import (
17
17
MonetaryComponentContextBuilder,
···
57
57
)
58
58
status = Field(
59
59
display="Charge Item Status",
60
-
preview_value="Active",
60
+
preview_value="Billable",
61
61
mapping=lambda ci: CHARGE_ITEM_STATUS_DISPLAY.get(
62
62
ci.status, ci.status.replace("_", " ").title()
63
63
)
···
107
107
paid_invoice = Field(
108
108
display="Paid Invoice",
109
109
preview_value="",
110
-
target_context=ChargeItemInvoiceContextBuilder,
110
+
target_context=MinimumInvoiceContextBuilder,
111
111
description="Invoice associated with the payment of the charge item",
112
112
)
113
113
created_date = Field(
···
135
135
categories = ResourceCategory.objects.filter(
136
136
resource_type="charge_item_definition",
137
137
facility_id=self.parent_context.facility_id,
138
-
parent_id__isnull=True,
139
138
)
140
139
summary = []
141
140
for category in categories:
+1
-1
care/emr/reports/context_builder/data_points/invoice.py
+1
-1
care/emr/reports/context_builder/data_points/invoice.py
···
73
73
return Invoice.objects.filter(account=self.parent_context)
74
74
75
75
76
-
class ChargeItemInvoiceContextBuilder(SingleObjectContextBuilder):
76
+
class MinimumInvoiceContextBuilder(SingleObjectContextBuilder):
77
77
def get_context(self):
78
78
return getattr(self.parent_context, self.parent_attribute)
79
79
+14
care/emr/reports/context_builder/data_points/payment_reconciliation.py
+14
care/emr/reports/context_builder/data_points/payment_reconciliation.py
···
5
5
Field,
6
6
QuerysetContextBuilder,
7
7
)
8
+
from care.emr.reports.context_builder.data_points.invoice import (
9
+
MinimumInvoiceContextBuilder,
10
+
)
8
11
9
12
PAYMENT_RECONCILIATION_STATUS = {
10
13
"active": "Active",
···
128
131
if p.method
129
132
else "",
130
133
description="Method used for the payment reconciliation",
134
+
)
135
+
target_invoice = Field(
136
+
display="Target Invoice",
137
+
target_context=MinimumInvoiceContextBuilder,
138
+
preview_value="",
139
+
description="Invoice associated with the payment reconciliation",
140
+
)
141
+
created_date = Field(
142
+
display="Created Date",
143
+
preview_value="2024-01-01T10:00:00Z",
144
+
description="Timestamp when the payment reconciliation was created",
131
145
)
132
146
133
147
def get_context(self):