From 0751f15379f17860e2b1113976ad193c611cb97a Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Wed, 20 Mar 2024 18:24:44 +0300 Subject: [PATCH 01/25] chore: add readme content (cherry picked from commit f203741b8ac76354045c450a4595c5a0a8b5d066) --- README.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c79b64a0..094634d7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,22 @@ -## Hms Tz +## HMS TZ - Healthcare Management System tuned for Tanzania -Hms Tz +HMS Tz is a healthcare management module designed for use within ERPNext. It provides a comprehensive suite of features tailored for healthcare facilities and services. The module includes functionalities for managing laboratory equipment, medication, healthcare providers, financial aspects like insurance claims (specifically NHIF - National Health Insurance Fund), patient care services, and various healthcare data records. HMS Tz is geared towards streamlining operations in healthcare settings, ensuring efficient patient care, and managing financial and administrative tasks effectively. + +Features in ERPNext can be categorized into several key areas: + +1. **Lab and Medication Management**: This includes managing lab machine profiles, messages, and medication change requests. + +2. **Healthcare Provider and Facility Management**: Managing information about healthcare providers, facilities, and practitioner availability. + +3. **Insurance and Financial Management**: This involves managing NHIF claims, tracking changes, setting up company NHIF settings, and handling patient discount requests. + +4. **Patient Care and Services**: This covers healthcare package orders, referral management, and tracking of patient care services. + +5. **Data and Record Management**: Involves managing various healthcare data such as physician qualifications, organ systems, and healthcare referral records. + +6. **NHIF Specific Management**: This includes managing NHIF products, claims, reconciliations, responses, and scheme details. + +This categorization provides a structured overview of the functionalities offered by the HMS Tz module. #### License From ecd51052db9b428f8d9845c082deb6c404e28786 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Thu, 21 Mar 2024 17:59:34 +0300 Subject: [PATCH 02/25] fix: KeyError on hsic_map[template] when template is not on HSIC (cherry picked from commit ff156b17916c5e3f704403667d372a5d63bd956f) --- hms_tz/nhif/api/patient_encounter.py | 132 +++++++++++++++++---------- 1 file changed, 82 insertions(+), 50 deletions(-) diff --git a/hms_tz/nhif/api/patient_encounter.py b/hms_tz/nhif/api/patient_encounter.py index a06b4f8f..002b65a1 100644 --- a/hms_tz/nhif/api/patient_encounter.py +++ b/hms_tz/nhif/api/patient_encounter.py @@ -400,37 +400,53 @@ def on_submit_validation(doc, method): healthcare_insurance_coverage_plan, ["coverage_plan_name", "is_exclusions"], ) + + validate_item_coverage( + doc, + method, + healthcare_service_templates, + hsic_map, + hicp_name, + is_exclusions, + ) + validate_totals(doc, method) + +def validate_item_coverage( + doc, + method, + healthcare_service_templates, + hsic_map, + hicp_name, + is_exclusions +): for template in healthcare_service_templates: """ If the value of "is_exclusions" is 1, it means the template should not be listed in the "hsic_map". This is because when "is_exclusions" is 1, it indicates that the template which is in "hsic_map" is not covered. - + However, there's an exception to this rule. If the "approval_mandatory_for_claim" for that template is also 1, it means the template is covered but needs extra authorization for approval. - + This apply for NHIF and Non NHIF Insurance """ if is_exclusions: - if template in hsic_map and hsic_map[template].approval_mandatory_for_claim == 0: - for row_item in healthcare_service_templates[template]: - if ( - doc.company - and frappe.get_cached_value( - "Company", - doc.company, - "auto_prescribe_items_on_patient_encounter", - ) - == 1 - ): - row_item.prescribe = 1 - - msg = _( - f"{template}

NOT COVERED

in Healthcare Insurance Coverage Plan {str(hicp_name)} plan.
Patient should pay cash for this service" - ) - msgThrow( - msg, + if ( + template in hsic_map + and hsic_map[template].approval_mandatory_for_claim == 0 + ): + mark_item_not_covered( + doc.company, + hicp_name, + template, + healthcare_service_templates, method, ) + elif ( + template in hsic_map + and hsic_map[template].approval_mandatory_for_claim == 1 + ): + set_is_restricted(template, healthcare_service_templates, hsic_map) + else: """ If the value of "is_exclusions" is 0, it means the template must be listed in the "hsic_map" for it to be covered. @@ -441,40 +457,56 @@ def on_submit_validation(doc, method): This apply for NHIF and Non NHIF Insurance. """ if template not in hsic_map: - for row_item in healthcare_service_templates[template]: - if ( - doc.company - and frappe.get_cached_value( - "Company", - doc.company, - "auto_prescribe_items_on_patient_encounter", - ) - == 1 - ): - row_item.prescribe = 1 - - msg = _( - f"{template}

NOT COVERED

in Healthcare Insurance Coverage Plan {str(hicp_name)} plan.
Patient should pay cash for this service" - ) - msgThrow( - msg, + mark_item_not_covered( + doc.company, + hicp_name, + template, + healthcare_service_templates, method, ) - coverage_info = hsic_map[template] - for row in healthcare_service_templates[template]: - row.is_restricted = coverage_info.approval_mandatory_for_claim - if row.is_restricted: - frappe.msgprint( - _("{0} with template {1} requires additional authorization").format( - _(row.doctype), template - ), - alert=True, - ) - if coverage_info.maximum_number_of_claims == 0: - continue + elif ( + template in hsic_map + and hsic_map[template].approval_mandatory_for_claim == 1 + ): + set_is_restricted(template, healthcare_service_templates, hsic_map) - validate_totals(doc, method) + +def mark_item_not_covered( + company, hicp_name, template, healthcare_service_templates, method +): + for row_item in healthcare_service_templates[template]: + if ( + company + and frappe.get_cached_value( + "Company", + company, + "auto_prescribe_items_on_patient_encounter", + ) + == 1 + ): + row_item.prescribe = 1 + + msg = _( + f"{template}

NOT COVERED

in Healthcare Insurance Coverage Plan {str(hicp_name)} plan.
Patient should pay cash for this service" + ) + msgThrow( + msg, + method, + ) + + +def set_is_restricted(template, healthcare_service_templates, hsic_map): + coverage_info = hsic_map[template] + for row in healthcare_service_templates[template]: + row.is_restricted = coverage_info.approval_mandatory_for_claim + if row.is_restricted: + frappe.msgprint( + _("{0} with template {1} requires additional authorization").format( + _(row.doctype), template + ), + alert=True, + ) def checkـforـduplicate(doc, method): From 5551af57c2b39e5cfe5b21ff0db59acd60458aa1 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Thu, 4 Apr 2024 00:59:47 +0300 Subject: [PATCH 03/25] feat: Cancel or return therapy sessions via LRPMT Returns doctype (cherry picked from commit db8d8dd182ba5a8f9e2fe81063263f8910f25209) # Conflicts: # hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json --- .../doctype/item_return/item_return.json | 4 +- .../doctype/lrpmt_returns/lrpmt_returns.js | 278 +++++- .../doctype/lrpmt_returns/lrpmt_returns.json | 22 +- .../doctype/lrpmt_returns/lrpmt_returns.py | 833 ++++++++++++------ .../medication_return/medication_return.json | 18 +- .../hms_tz/doctype/therapy_return/__init__.py | 0 .../therapy_return/therapy_return.json | 110 +++ .../doctype/therapy_return/therapy_return.py | 8 + .../therapy_session/therapy_session.js | 6 - hms_tz/hooks.py | 9 +- hms_tz/nhif/api/therapy_plan.js | 24 +- hms_tz/nhif/api/therapy_plan.py | 32 +- hms_tz/nhif/api/therapy_session.js | 27 + hms_tz/nhif/api/therapy_session.py | 18 + hms_tz/patches.txt | 2 + ...led_custom_field_on_therapy_plan_detail.py | 26 + .../status_options_for_therapy_plan.py | 14 + 17 files changed, 1096 insertions(+), 335 deletions(-) create mode 100644 hms_tz/hms_tz/doctype/therapy_return/__init__.py create mode 100644 hms_tz/hms_tz/doctype/therapy_return/therapy_return.json create mode 100644 hms_tz/hms_tz/doctype/therapy_return/therapy_return.py create mode 100644 hms_tz/patches/custom_fields/sessions_cancelled_custom_field_on_therapy_plan_detail.py create mode 100644 hms_tz/patches/property_setter/status_options_for_therapy_plan.py diff --git a/hms_tz/hms_tz/doctype/item_return/item_return.json b/hms_tz/hms_tz/doctype/item_return/item_return.json index 2f7f815d..2f2cc9c7 100644 --- a/hms_tz/hms_tz/doctype/item_return/item_return.json +++ b/hms_tz/hms_tz/doctype/item_return/item_return.json @@ -28,7 +28,6 @@ "default": "1", "fieldname": "quantity", "fieldtype": "Int", - "in_list_view": 1, "label": "Quantity", "non_negative": 1, "read_only": 1 @@ -76,7 +75,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2022-01-10 11:51:17.676628", + "modified": "2024-04-02 22:51:39.983491", "modified_by": "Administrator", "module": "Hms Tz", "name": "Item Return", @@ -84,5 +83,6 @@ "permissions": [], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.js b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.js index 92dcae91..276a87f6 100644 --- a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.js +++ b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.js @@ -2,16 +2,21 @@ // For license information, please see license.txt frappe.ui.form.on('LRPMT Returns', { - setup: function(frm) { - var requested_by = frappe.user.full_name() - frm.set_value("requested_by", requested_by) + setup: function (frm) { + var requested_by = frappe.user.full_name(); + frm.set_value("requested_by", requested_by); }, - after_save: function(frm) { - frm.reload_doc() + after_save: function (frm) { + frm.reload_doc(); }, - refresh: function(frm) { + refresh: function (frm) { + frm.get_field("lrpt_items").grid.cannot_add_rows = true; + frm.get_field("therapy_items").grid.cannot_add_rows = true; + frm.get_field("drug_items").grid.cannot_add_rows = true; + frm.get_field("sales_items").grid.cannot_add_rows = true; + frm.set_query('appointment', () => { return { filters: { @@ -19,22 +24,31 @@ frappe.ui.form.on('LRPMT Returns', { } } }); - + if (frm.doc.patient && frm.doc.appointment) { - frm.add_custom_button(__("Get LRPT Items"), function(){ - frm.trigger("get_lrpt_items") + frm.add_custom_button(__("Get LRP Items"), function () { + frm.trigger("get_lrp_items"); + }) + + frm.add_custom_button(__("Get Therapy Items"), function () { + frm.trigger("get_therapy_items"); }) - frm.add_custom_button(__("Get Drug Items"), function(){ - frm.trigger("get_drug_items") + frm.add_custom_button(__("Get Drug Items"), function () { + frm.trigger("get_drug_items"); }) } }, - - onload: function(frm){ - frm.validate_quantity_to_return = function(frm, row) { + + onload: function (frm) { + frm.get_field("lrpt_items").grid.cannot_add_rows = true; + frm.get_field("therapy_items").grid.cannot_add_rows = true; + frm.get_field("drug_items").grid.cannot_add_rows = true; + frm.get_field("sales_items").grid.cannot_add_rows = true; + + frm.validate_quantity_to_return = function (frm, row) { frm.doc.drug_items.forEach(data => { - if (data.quantity_to_return > data.quantity_prescribed) { + if (data.quantity_to_return > (data.quantity_prescribed - data.qty_returned)) { row.quantity_to_return = 0; frappe.msgprint({ title: __('Message'), @@ -48,15 +62,31 @@ frappe.ui.form.on('LRPMT Returns', { } }) } + frm.validate_no_of_sessions_to_cancel = function (frm, row) { + frm.doc.therapy_items.forEach(data => { + if (data.sessions_to_cancel > (data.sessions_prescribed - data.sessions_cancelled)) { + row.sessions_to_cancel = 0; + frappe.msgprint({ + title: __('Message'), + indicator: 'yellow', + message: __( + '

\ + No of Sessions to Cancel can not be greater than No of Sessions Prescribed

' + ) + }); + frm.refresh_field("therapy_items") + } + }) + } }, - before_submit: function(frm) { + before_submit: function (frm) { frm.set_value("approved_by", frappe.user.full_name()) }, - get_lrpt_items: function (frm) { + get_lrp_items: function (frm) { let d = new frappe.ui.Dialog({ - title: "Select LRPT Items", + title: "Select LRP Items", fields: [ { fieldname: "result_area", @@ -71,17 +101,19 @@ frappe.ui.form.on('LRPMT Returns', { var columns = (["item_name", "encounter_no", "reference_docname", "reference_doctype", "status"]) frappe.call({ - method: "hms_tz.hms_tz.doctype.lrpmt_returns.lrpmt_returns.get_lrpt_item_list", + method: "hms_tz.hms_tz.doctype.lrpmt_returns.lrpmt_returns.get_lrp_item_list", args: { patient: frm.doc.patient, appointment: frm.doc.appointment, company: frm.doc.company }, + freeze: true, + freeze_message: __(''), callback: (data) => { if (data.message.length > 0) { - $results.append(make_lrpt_list_row(columns, true)); + $results.append(make_lrp_list_row(columns, true)); for (let i = 0; i < data.message.length; i++) { - $results.append(make_lrpt_list_row(columns, true, data.message[i])); + $results.append(make_lrp_list_row(columns, true, data.message[i])); } } else { $results.append($placeholder); @@ -95,19 +127,77 @@ frappe.ui.form.on('LRPMT Returns', { $placeholder = $(`
-

No LRPT Items found

+

No LRP Items found
`); $results.on('click', '.list-item--head :checkbox', (e) => { $results.find('.list-item-container .list-row-check') .prop("checked", ($(e.target).is(':checked'))); }); - set_lrpt_primary_action(frm, d, $results, true); + set_lrp_primary_action(frm, d, $results, true); d.$wrapper.find('.modal-content').css('width', '900px'); d.show(); }, + get_therapy_items: (frm) => { + let d = new frappe.ui.Dialog({ + title: "Select Therapy Items", + fields: [ + { + fieldname: "html_space", + fieldtype: "HTML" + } + ] + }); + var $wrapper; + var $results; + var $placeholder; + if (frm.doc.patient, frm.doc.appointment, frm.doc.company) { + let columns = (["therapy_type", "sessions", "encounter_no", "therapy_plan", "therapy_session", 'status']); + + frappe.call({ + method: "hms_tz.hms_tz.doctype.lrpmt_returns.lrpmt_returns.get_therapies", + args: { + patient: frm.doc.patient, + appointment: frm.doc.appointment, + company: frm.doc.company + }, + freeze: true, + freeze_message: __(''), + callback: (r) => { + if (r.message.length > 0) { + var data = r.message; + $results.append(make_therapy_list_row(columns, true)); + for (let i = 0; i < data.length; i++) { + $results.append(make_therapy_list_row(columns, true, data[i])); + } + } + else { + $results.append($placeholder) + } + } + }) + }; + $wrapper = d.fields_dict.html_space.$wrapper.append(`
`); + + + $results = $wrapper.find('.results'); + $placeholder = $(`
+ + +

No Therapy Items found

+ +
`); + $results.on('click', '.list-item--head :checkbox', (e) => { + $results.find('.list-item-container .list-row-check') + .prop("checked", ($(e.target).is(':checked'))); + }); + set_therapy_primary_action(frm, d, $results, true); + d.$wrapper.find('.modal-content').css('width', '950px'); + d.show(); + }, - get_drug_items: function (frm){ + get_drug_items: function (frm) { let d = new frappe.ui.Dialog({ title: "Select Drug Items", fields: [ @@ -121,7 +211,7 @@ frappe.ui.form.on('LRPMT Returns', { var $results; var $placeholder; if (frm.doc.patient, frm.doc.appointment, frm.doc.company) { - var columns = (["item_name", "quantity", "encounter_no", "delivery_note", 'status']) + var columns = (["item_name", "qty_prescribed", "qty_returned", "encounter_no", "delivery_note", 'status']) frappe.call({ method: "hms_tz.hms_tz.doctype.lrpmt_returns.lrpmt_returns.get_drug_item_list", args: { @@ -129,11 +219,13 @@ frappe.ui.form.on('LRPMT Returns', { appointment: frm.doc.appointment, company: frm.doc.company }, + freeze: true, + freeze_message: __(''), callback: (r) => { if (r.message.length > 0) { var data = r.message; $results.append(make_drug_list_row(columns, true)); - for (let i = 0; i < data.length; i++){ + for (let i = 0; i < data.length; i++) { $results.append(make_drug_list_row(columns, true, data[i])); } } @@ -162,7 +254,7 @@ frappe.ui.form.on('LRPMT Returns', { }, }); -var make_lrpt_list_row = function (columns, item, result = {}) { +var make_lrp_list_row = function (columns, item, result = {}) { var me = this; // Make a head row by default (if result not passed) let head = Object.keys(result).length === 0; @@ -184,11 +276,11 @@ var make_lrpt_list_row = function (columns, item, result = {}) { ${contents} `); - $row = list_row_lrpt_items(head, $row, result, item); + $row = list_row_lrp_items(head, $row, result, item); return $row; }; -var list_row_lrpt_items = function (head, $row, result, item) { +var list_row_lrp_items = function (head, $row, result, item) { if (item) { head ? $row.addClass('list-item--head') : $row = $(`
0) { - add_to_lrpt_line(frm, checked_items, item); + add_to_lrp_line(frm, checked_items, item); d.hide(); } }); }; -var get_checked_lrpt_items = function ($results) { +var get_checked_lrp_items = function ($results) { return $results.find('.list-item-container').map(function () { let checked_items = {}; if ($(this).find(".list-row-check:checkbox:checked").length > 0) { @@ -240,10 +332,10 @@ var get_checked_lrpt_items = function ($results) { }).get(); }; -var add_to_lrpt_line = function (frm, checked_items, item) { +var add_to_lrp_line = function (frm, checked_items, item) { if (item) { frappe.call({ - method: "hms_tz.hms_tz.doctype.lrpmt_returns.lrpmt_returns.set_checked_lrpt_items", + method: "hms_tz.hms_tz.doctype.lrpmt_returns.lrpmt_returns.set_checked_lrp_items", args: { doc: frm.doc, checked_items: checked_items @@ -267,7 +359,8 @@ var make_drug_list_row = function (columns, item, result = {}) { let head = Object.keys(result).length === 0; let contents = ``; columns.forEach(function (column) { - contents += `
+ let contentWidth = column === "qty_prescribed" || column === "qty_returned" || column === "status" ? 100 : 160; // Set width based on column name + contents += `
${head ? `${__(frappe.model.unscrub(column))}` : (column !== "name" ? `${__(result[column])}` @@ -293,7 +386,8 @@ var list_row_drug_items = function (head, $row, result, item) { : $row = $(`
0) { checked_items["child_name"] = $(this).attr("data-child_name"); checked_items["item_name"] = $(this).attr("data-item_name"); - checked_items["quantity_prescribed"] = $(this).attr("data-quantity"); + checked_items["qty_prescribed"] = $(this).attr("data-qty_prescribed"); + checked_items["qty_returned"] = $(this).attr("data-qty_returned"); checked_items["encounter_no"] = $(this).attr("data-encounter_no"); checked_items["delivery_note"] = $(this).attr("data-delivery_note"); checked_items["dn_detail"] = $(this).attr("data-dn_detail"); @@ -351,9 +446,112 @@ var add_to_drug_line = function (frm, checked_items, item) { } }; +var make_therapy_list_row = function (columns, item, result = {}) { + var me = this; + // Make a head row by default (if result not passed) + let head = Object.keys(result).length === 0; + let contents = ``; + columns.forEach(function (column) { + let contentWidth = column === "status" || column === "sessions" ? 65 : 150; // Set width based on column name + contents += `
+ ${head ? `${__(frappe.model.unscrub(column))}` + : (column !== "name" ? `${__(result[column])}` + : `${__(result[column])}`) + } +
`; + }); + + let $row = $(`
+
+ +
+ ${contents} +
`); + + $row = list_row_therapy_items(head, $row, result, item); + return $row; +}; + +var list_row_therapy_items = function (head, $row, result, item) { + if (item) { + head ? $row.addClass('list-item--head') + : $row = $(`
`).append($row); + } + return $row; +}; + +var set_therapy_primary_action = function (frm, d, $results, item) { + var me = this; + d.set_primary_action(__('Add'), function () { + let checked_items = get_checked_therapy_items($results); + if (checked_items.length > 0) { + add_to_therapy_line(frm, checked_items, item); + d.hide(); + } + }); +}; + +var get_checked_therapy_items = function ($results) { + return $results.find('.list-item-container').map(function () { + let checked_items = {}; + if ($(this).find(".list-row-check:checkbox:checked").length > 0) { + checked_items["status"] = $(this).attr("data-status"); + checked_items["therapy_type"] = $(this).attr("data-therapy_type"); + checked_items["encounter_no"] = $(this).attr("data-encounter_no"); + checked_items["therapy_plan"] = $(this).attr("data-therapy_plan"); + checked_items["sessions_prescribed"] = $(this).attr("data-sessions"); + checked_items["therapy_session"] = $(this).attr("data-therapy_session"); + checked_items["sessions_cancelled"] = $(this).attr("data-sessions_cancelled"); + checked_items["plan_child_table_id"] = $(this).attr("data-plan_child_table_id"); + checked_items["encounter_child_table_id"] = $(this).attr("data-encounter_child_table_id"); + return checked_items; + } + }).get(); +}; + +var add_to_therapy_line = function (frm, checked_items, item) { + if (item) { + frappe.call({ + method: "hms_tz.hms_tz.doctype.lrpmt_returns.lrpmt_returns.set_checked_therapy_items", + args: { + doc: frm.doc, + checked_items: checked_items + }, + callback: function (r) { + frm.trigger("validate"); + frm.refresh_fields(); + if (frm.is_new()) { + frappe.set_route("Form", "LRPMT Returns", r.message); + } else { + frm.reload_doc(); + } + } + }); + } +}; + frappe.ui.form.on("Medication Return", { - quantity_to_return: function(frm, cdt, cdn) { + quantity_to_return: function (frm, cdt, cdn) { let row = locals[cdt][cdn]; frm.validate_quantity_to_return(frm, row) } -}) \ No newline at end of file +}) + + +frappe.ui.form.on("Therapy Return", { + sessions_to_cancel: function (frm, cdt, cdn) { + let row = locals[cdt][cdn]; + frm.validate_no_of_sessions_to_cancel(frm, row) + } +}) diff --git a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json index 0dfae2d2..3d18442e 100644 --- a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json +++ b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json @@ -17,6 +17,8 @@ "admitted_datetime", "sec_break_1", "lrpt_items", + "therapy_sec", + "therapy_items", "sec_break_2", "drug_items", "sec_break_3", @@ -71,7 +73,7 @@ "fetch_from": "inpatient_record.status", "fieldname": "status", "fieldtype": "Data", - "label": "Status", + "label": "Inpatient Status", "read_only": 1 }, { @@ -87,7 +89,7 @@ "depends_on": "eval: doc.appointment", "fieldname": "sec_break_1", "fieldtype": "Section Break", - "label": "LRPT Items" + "label": "LRP Items" }, { "fieldname": "naming_series", @@ -163,12 +165,28 @@ "in_list_view": 1, "label": "Patient Appointment", "options": "Patient Appointment" + }, + { + "fieldname": "therapy_sec", + "fieldtype": "Section Break", + "label": "Therapy Items" + }, + { + "depends_on": "eval: doc.appointment", + "fieldname": "therapy_items", + "fieldtype": "Table", + "label": "items", + "options": "Therapy Return" } ], "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2022-04-29 18:22:45.789471", +======= + "modified": "2024-04-02 22:41:54.900854", +>>>>>>> db8d8dd1 (feat: Cancel or return therapy sessions via LRPMT Returns doctype) "modified_by": "Administrator", "module": "Hms Tz", "name": "LRPMT Returns", diff --git a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.py b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.py index 7577fb9f..8e730f4a 100644 --- a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.py +++ b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.py @@ -1,23 +1,34 @@ # Copyright (c) 2021, Aakvatech and contributors # For license information, please see license.txt -import frappe import json +import frappe +import itertools from frappe import bold, _ from frappe.model.document import Document from frappe.model.workflow import apply_workflow -from frappe.utils import nowdate, nowtime, flt, unique, get_fullname, get_url_to_form +from frappe.utils import ( + nowdate, + nowtime, + flt, + cint, + unique, + get_fullname, + get_url_to_form, +) from hms_tz.nhif.api.healthcare_utils import validate_nhif_patient_claim_status class LRPMTReturns(Document): def validate(self): set_missing_values(self) + combine_therapy_info(self.therapy_items) def before_insert(self): validate_nhif_patient_claim_status( "LRPMT Return", self.company, self.appointment ) + self.validate_duplicates() def before_submit(self): if not self.approved_by: @@ -27,31 +38,95 @@ def before_submit(self): "LRPMT Return", self.company, self.appointment ) - validate_reason(self) - validate_drug_row(self) - cancel_lrpt_doc(self) - return_or_cancel_drug_item(self) + self.validate_reason() + self.validate_drug_row() + self.cancel_lrp_doc() + self.cancel_therapy_doc() + self.return_or_cancel_drugs() def on_submit(self): - get_sales_return(self) - - -def cancel_lrpt_doc(self): - prescription_lrpmt = { - "Lab Test": "Lab Prescription", - "Radiology Examination": "Radiology Procedure Prescription", - "Clinical Procedure": "Procedure Prescription", - } - for item in self.lrpt_items: - if item.reference_doctype == "Therapy Plan": - cancel_tharapy_plan_doc(self.patient, item.reference_docname) - frappe.db.set_value( - "Therapy Plan Detail", item.child_name, "is_cancelled", 1 + self.get_sales_return() + + def validate_reason(self): + def check_reason(item_table): + msg = "" + for entry in item_table: + if not entry.reason: + msg += f"Reason Field is Empty for Item name: {bold(entry.get('item_name') or entry.get('therapy_type'))},\ + Row: #{bold(entry.idx)}, please fill it to proceed
" + + if msg: + frappe.throw( + title="Notification", + msg=msg, + exc="Frappe.ValidationError", + ) + + if len(self.lrpt_items) > 0: + check_reason(self.lrpt_items) + + if len(self.therapy_items) > 0: + check_reason(self.therapy_items) + + def validate_drug_row(self): + if len(self.drug_items) > 0: + msg = "" + for row in self.drug_items: + msg_print = "" + if row.quantity_to_return == 0: + msg_print += f"Quantity to return can not be Zero for drug name: {bold(row.drug_name)},\ + Row: #{bold(row.idx)}:
" + + if not row.reason: + msg_print += "Reason for Return Field can not be Empty for drug name: {bold(row.drug_name)},\ + Row: #{bold(row.idx)}:
" + + if not row.drug_condition: + msg_print += "Drug Condition Field can not Empty for drug name: {bold(row.drug_name)},\ + Row: #{bold(row.idx)}:
" + + if not msg_print: + continue + + msg += msg_print + "
" + + if msg: + frappe.throw( + title="Notification", msg=msg, exc="Frappe.ValidationError" + ) + + def validate_duplicates(self): + dt = frappe.qb.DocType("LRPMT Returns") + lrpmts = ( + frappe.qb.from_(dt) + .select(dt.name.as_("lrpmt_docname")) + .where( + (dt.docstatus == 0) + & (dt.name != self.name) + & (dt.appointment == self.appointment) + ) + ).run(as_dict=True) + if len(lrpmts) > 0: + frappe.throw( + title="Duplicate Error", + exc=frappe.ValidationError, + msg="draft LRPMT Returns for this appointment: {bold(self.appointment)} already exists,\ + Please visit {lrpmts[0].lrpmt_docname)} to continue", ) - else: + + def cancel_lrp_doc(self): + if len(self.lrpt_items) == 0: + return + + prescription_lrp = { + "Lab Test": "Lab Prescription", + "Radiology Examination": "Radiology Procedure Prescription", + "Clinical Procedure": "Procedure Prescription", + } + for item in self.lrpt_items: if not item.reference_docname: frappe.db.set_value( - prescription_lrpmt[item.reference_doctype], + prescription_lrp[item.reference_doctype], item.child_name, "is_cancelled", 1, @@ -73,7 +148,7 @@ def cancel_lrpt_doc(self): or doc.workflow_state == "Submitted but Not Serviced" ): frappe.db.set_value( - prescription_lrpmt[item.reference_doctype], + prescription_lrp[item.reference_doctype], item.child_name, "is_cancelled", 1, @@ -81,86 +156,276 @@ def cancel_lrpt_doc(self): except Exception: frappe.log_error(frappe.get_traceback(), str(self.doctype)) frappe.throw( - "There was an error while cancelling the Item: {0} of ReferenceDoctype: {1}, ReferenceName: {2},
\ - Check error log for review".format( - frappe.bold(item.item_name), - frappe.bold(item.reference_doctype), - frappe.bold(item.reference_docname), - ) + f"There was an error while cancelling the Item: {bold(item.item_name)} of ReferenceDoctype: {bold(item.reference_doctype)},\ + ReferenceName: {bold(item.reference_docname)},
Check error log for review" ) + def cancel_therapy_doc(self): + if len(self.therapy_items) == 0: + return -def cancel_tharapy_plan_doc(patient, therapy_plan_id): - therapy_sessions = frappe.get_all( - "Therapy Session", - filters={"patient": patient, "therapy_plan": therapy_plan_id}, - fields=["name"], - pluck="name", - ) + therapy_details = combine_therapy_info(self.therapy_items) - if therapy_sessions: - for session in therapy_sessions: - therapy_session_doc = frappe.get_doc("Therapy Session", session) + for item in therapy_details: + total_sessions_prescribed = ( + frappe.get_cached_value( + "Therapy Plan Detail", + item.get("encounter_child_table_id"), + "no_of_sessions", + ) + or 0 + ) + is_cancelled = 0 + total_sessions_cancelled = item.get("sessions_to_cancel") + item.get( + "sessions_cancelled" + ) + delivered_quantity = total_sessions_prescribed - total_sessions_cancelled + if total_sessions_prescribed <= total_sessions_cancelled: + is_cancelled = 1 - if therapy_session_doc.docstatus == 1: - therapy_session_doc.cancel() + if not item.get("therapy_plan"): + frappe.db.set_value( + "Therapy Plan Detail", + item.get("encounter_child_table_id"), + { + "is_cancelled": is_cancelled, + "delivered_quantity": delivered_quantity, + "sessions_cancelled": total_sessions_cancelled, + }, + ) - therapy_plan_doc = frappe.get_doc("Therapy Plan", therapy_plan_id) + elif item.get("therapy_plan") and len(item.get("therapy_session_ids")) == 0: + update_therapy_plan( + self, + item, + is_cancelled, + delivered_quantity, + total_sessions_cancelled, + ) - for entry in therapy_plan_doc.therapy_plan_details: - if entry.no_of_sessions: - entry.no_of_sessions = 0 - if entry.sessions_completed: - entry.sessions_completed = 0 - therapy_plan_doc.total_sessions = 0 - therapy_plan_doc.total_sessions_completed = 0 - therapy_plan_doc.status = "Not Serviced" - therapy_plan_doc.save(ignore_permissions=True) - therapy_plan_doc.reload() - return therapy_plan_doc.name + elif item.get("therapy_plan") and len(item.get("therapy_session_ids")) > 0: + update_therapy_session( + self, + item, + is_cancelled, + delivered_quantity, + total_sessions_cancelled, + ) + def return_or_cancel_drugs(self): + if len(self.drug_items) == 0: + return -def return_or_cancel_drug_item(self): - if len(self.drug_items) == 0: - return + update_drug_prescription_for_uncreated_delivery_note(self) - update_drug_prescription_for_uncreated_delivery_note(self) + unique_draft_delivery_notes = get_unique_delivery_notes(self, "Draft") + if unique_draft_delivery_notes: + for draft_delivery_note in unique_draft_delivery_notes: + update_drug_description_for_draft_delivery_note( + self, draft_delivery_note + ) - unique_draft_delivery_notes = get_unique_delivery_notes(self, "Draft") - if unique_draft_delivery_notes: - for draft_delivery_note in unique_draft_delivery_notes: - update_drug_description_for_draft_delivery_note(self, draft_delivery_note) + unique_submitted_delivery_notes = get_unique_delivery_notes(self, "Submitted") + if unique_submitted_delivery_notes: + for dn in unique_submitted_delivery_notes: + try: + source_doc = frappe.get_doc("Delivery Note", dn) + target_doc = return_drug_quantity_to_stock(self, source_doc) - unique_submitted_delivery_notes = get_unique_delivery_notes(self, "Submitted") - if unique_submitted_delivery_notes: - for dn in unique_submitted_delivery_notes: - try: - source_doc = frappe.get_doc("Delivery Note", dn) - target_doc = return_drug_quantity_to_stock(self, source_doc) + if target_doc.get("name"): + transition_workflow_states(source_doc, target_doc) + + except Exception: + frappe.log_error( + frappe.get_traceback(), + str(f"Error in creating return delivery note for {dn}"), + ) + frappe.throw( + f"Error in creating return delivery note against delivery note: {bold(dn)}\ +
Check error log for review" + ) + + return self.name + + def get_sales_return(self): + conditions = { + "patient": self.patient, + "company": self.company, + "reference_name": self.name, + "is_return": 1, + "docstatus": 1, + } + + returned_delivery_note_nos = frappe.get_all( + "Delivery Note", filters=conditions, fields=["name"], pluck="name" + ) - if target_doc.get("name"): - transition_workflow_states(source_doc, target_doc) + if returned_delivery_note_nos: + for dn in returned_delivery_note_nos: + sales_doc = frappe.get_doc("Delivery Note", dn) + + for item in sales_doc.items: + for dd_n in self.drug_items: + if item.item_code == dd_n.drug_name: + self.append( + "sales_items", + { + "drug_name": item.item_code, + "quantity_prescribed": dd_n.quantity_prescribed, + "quantity_returned": item.qty - dd_n.qty_returned, + "quantity_serviced": flt( + dd_n.quantity_prescribed + item.qty - dd_n.qty_returned + ), + "delivery_note_no": dn, + "dn_detail": item.name, + "warehouse": item.warehouse, + "reference_doctype": item.reference_doctype, + "reference_name": item.reference_name, + }, + ) + self.save(ignore_permissions=True) + self.reload() + + return self.name + +def combine_therapy_info(therapy_items): + therapy_detail_map = [] + + for key, group in itertools.groupby( + therapy_items, + lambda x: { + "therapy_type": x.therapy_type, + "encounter_no": x.encounter_no, + "therapy_plan": x.therapy_plan, + "plan_child_table_id": x.plan_child_table_id, + "encounter_child_table_id": x.encounter_child_table_id, + }, + ): + sessions_prescribed = 0 + sessions_to_cancel = 0 + sessions_cancelled = 0 + therapy_session_ids = [] + for item in list(group): + sessions_prescribed += cint(item.sessions_prescribed) + sessions_to_cancel += cint(item.sessions_to_cancel) + sessions_cancelled += cint(item.sessions_cancelled) + if item.therapy_session: + therapy_session_ids.append(item.therapy_session) + + key.update( + { + "sessions_prescribed": sessions_prescribed, + "sessions_to_cancel": sessions_to_cancel, + "sessions_cancelled": sessions_cancelled, + "therapy_session_ids": therapy_session_ids, + } + ) + therapy_detail_map.append(key) + + return therapy_detail_map + + +def update_therapy_plan( + self, + row, + is_cancelled, + delivered_quantity, + total_sessions_cancelled, + session_docstatus=0, +): + plan_doc = frappe.get_cached_doc("Therapy Plan", row.get("therapy_plan")) + try: + for d in plan_doc.therapy_plan_details: + if d.name == row.get("plan_child_table_id") and d.therapy_type == row.get( + "therapy_type" + ): + d.sessions_cancelled += row.get("sessions_to_cancel") + d.no_of_sessions -= row.get("sessions_to_cancel") + if session_docstatus == 1: + d.sessions_completed -= 1 + + plan_doc.save(ignore_permissions=True) + plan_doc.add_comment( + text=f"LRPMT Returns: {bold(self.name)} is submitted" + ) + + frappe.db.set_value( + "Therapy Plan Detail", + row.get("encounter_child_table_id"), + { + "is_cancelled": is_cancelled, + "delivered_quantity": delivered_quantity, + "sessions_cancelled": total_sessions_cancelled, + }, + ) + except Exception: + frappe.log_error( + frappe.get_traceback(), + str(f"{self.doctype}/{plan_doc.doctype}"), + ) + frappe.throw( + f"There was an error while cancelling the Therapy Plan: {bold(plan_doc.name)}\ +
Check error log for review" + ) + + +def update_therapy_session( + self, + item, + is_cancelled, + delivered_quantity, + total_sessions_cancelled, +): + for session_id in item.get("therapy_session_ids"): + session_doc = frappe.get_doc("Therapy Session", session_id) + if session_doc.docstatus < 2: + try: + apply_workflow(session_doc, "Not Serviced") + session_doc.save(ignore_permissions=True) + session_doc.add_comment( + text=f"LRPMT Return: {bold(self.name)} is submitted" + ) + session_doc.reload() + + if session_doc.workflow_state in [ + "Not Serviced", + "Submitted but Not Serviced", + ]: + update_therapy_plan( + self, + item, + is_cancelled, + delivered_quantity, + total_sessions_cancelled, + session_doc.docstatus, + ) except Exception: frappe.log_error( frappe.get_traceback(), - str("Error in creating return delivery note for {0}".format(dn)), + str(f"{self.doctype}/{session_doc.doctype}"), ) frappe.throw( - "Error in creating return delivery note against delivery note: {0}".format( - frappe.bold(dn) - ) + f"There was an error while cancelling the Therapy Session: {bold(session_doc.name)}\ +
Check error log for review" ) - return self.name - def update_drug_prescription_for_uncreated_delivery_note(self): for item in self.drug_items: if item.child_name and not ( item.dn_detail and item.delivery_note_no and item.status ): - frappe.db.set_value("Drug Prescription", item.child_name, "is_cancelled", 1) + frappe.db.set_value( + "Drug Prescription", + item.child_name, + { + "is_cancelled": 1, + "quantity_returned": item.quantity_to_return + item.qty_returned, + "delivered_quantity": item.quantity_prescribed + - (item.quantity_to_return + item.qty_returned), + }, + ) def update_drug_description_for_draft_delivery_note(self, delivey_note): @@ -178,24 +443,21 @@ def update_drug_description_for_draft_delivery_note(self, delivey_note): item.child_name, { "is_cancelled": 1, - "quantity_returned": item.quantity_to_return, + "quantity_returned": item.quantity_to_return + + item.qty_returned, + "delivered_quantity": item.quantity_prescribed + - (item.quantity_to_return + item.qty_returned), }, ) except Exception: frappe.log_error( frappe.get_traceback(), - str( - "Apply workflow error for Delivery Note {0}".format( - frappe.bold(delivey_note) - ) - ), + str(f"Apply workflow error for Delivery Note {bold(delivey_note)}"), ) frappe.throw( str( - "Apply workflow error, for delivery note: {0}, check error log for more details".format( - frappe.bold(delivey_note) - ) + f"Apply workflow error, for delivery note: {bold(delivey_note)}, check error log for more details" ) ) @@ -203,17 +465,17 @@ def update_drug_description_for_draft_delivery_note(self, delivey_note): def update_drug_prescription_for_submitted_delivery_note(item): - if (item.quantity_prescribed - item.quantity_to_return) == 0: + item_cancelled = 0 + if item.quantity_prescribed <= (item.quantity_to_return + item.qty_returned): item_cancelled = 1 - else: - item_cancelled = 0 frappe.db.set_value( "Drug Prescription", item.child_name, { - "quantity_returned": item.quantity_to_return, - "delivered_quantity": item.quantity_prescribed - item.quantity_to_return, + "quantity_returned": item.quantity_to_return + item.qty_returned, + "delivered_quantity": item.quantity_prescribed + - (item.quantity_to_return + item.qty_returned), "is_cancelled": item_cancelled, }, ) @@ -298,119 +560,29 @@ def transition_workflow_states(source_doc, target_doc): frappe.log_error( frappe.get_traceback(), str( - "Apply workflow error for Delivery Note {0}".format( - frappe.bold(source_doc.name) - ) + f"Apply workflow error for Delivery Note {bold(source_doc.name)}" ), ) except Exception: frappe.log_error( frappe.get_traceback(), - str( - "Apply workflow error for Delivery Note {0}".format( - frappe.bold(target_doc.name) - ) - ), + str(f"Apply workflow error for Delivery Note {bold(target_doc.name)}"), ) frappe.throw( str( - "Apply workflow error, for delivery note: {0}, check error log for more details".format( - frappe.bold(target_doc.name) - ) + f"Apply workflow error, for delivery note: {bold(target_doc.name)}, check error log for more details" ) ) -def get_sales_return(self): - conditions = { - "patient": self.patient, - "company": self.company, - "reference_name": self.name, - "is_return": 1, - } - - returned_delivery_note_nos = frappe.get_all( - "Delivery Note", filters=conditions, fields=["name"], pluck="name" - ) - - if returned_delivery_note_nos: - doc = frappe.get_doc("LRPMT Returns", self.name) - - for dn in returned_delivery_note_nos: - sales_doc = frappe.get_doc("Delivery Note", dn) - - for item in sales_doc.items: - for dd_n in doc.drug_items: - if item.item_code == dd_n.drug_name: - doc.append( - "sales_items", - { - "drug_name": item.item_code, - "quantity_prescribed": dd_n.quantity_prescribed, - "quantity_returned": item.qty, - "quantity_serviced": flt( - dd_n.quantity_prescribed + item.qty - ), - "delivery_note_no": dn, - "dn_detail": item.name, - "warehouse": item.warehouse, - "reference_doctype": item.reference_doctype, - "reference_name": item.reference_name, - }, - ) - doc.save(ignore_permissions=True) - doc.reload() - - return self.name - - -def validate_reason(self): - if self.lrpt_items: - for entry in self.lrpt_items: - if not entry.reason: - msg = "Reason Field is Empty for Item name: {0}, Row: #{1}, please fill it to proceed" - frappe.throw( - title="Notification", - msg=msg.format(bold(entry.item_name), bold(entry.idx)), - exc="Frappe.ValidationError", - ) - - -def validate_drug_row(self): - if self.drug_items: - msg = "" - for row in self.drug_items: - msg_print = "" - if row.quantity_to_return == 0: - msg_print += "Quantity to return can not be Zero for drug name: {0},\ - Row: #{1}:
".format( - bold(row.drug_name), bold(row.idx) - ) - if not row.reason: - msg_print += "Reason for Return Field can not be Empty for drug name: {0},\ - Row: #{1}:
".format( - bold(row.drug_name), bold(row.idx) - ) - if not row.drug_condition: - msg_print += "Drug Condition Field can not Empty for drug name: {0},\ - Row: #{1}:
".format( - bold(row.drug_name), bold(row.idx) - ) - - msg = msg_print - - if msg: - frappe.throw(title="Notification", msg=msg, exc="Frappe.ValidationError") - - def get_unique_delivery_notes(self, status): return unique([d.delivery_note_no for d in self.drug_items if d.status == status]) @frappe.whitelist() -def get_lrpt_item_list(patient, appointment, company): +def get_lrp_item_list(patient, appointment, company): item_list = [] - child_list = get_lrpt_map() + child_list = get_lrp_map() encounter_list = get_patient_encounters(patient, appointment, company) @@ -498,21 +670,10 @@ def get_lrpt_item_list(patient, appointment, company): } ) - # if item.therapy_type: - # therapy_plan = frappe.get_value("Patient Encounter", item.parent, "therapy_plan") - # item_list.append({ - # "child_name": item.name, - # "item_name": item.therapy_type, - # "quantity": 1, - # "encounter_no": item.parent, - # "reference_doctype": "Therapy Plan", - # "reference_docname": therapy_plan - # }) - return item_list -def get_lrpt_map(): +def get_lrp_map(): child_map = [ { "doctype": "Lab Prescription", @@ -538,14 +699,6 @@ def get_lrpt_map(): "parent", ], }, - # { - # "doctype": "Therapy Plan Detail", - # "fields": [ - # "name", - # "therapy_type", - # "parent" - # ] - # } ] return child_map @@ -647,7 +800,7 @@ def get_patient_encounters(patient, appointment, company): @frappe.whitelist() -def set_checked_lrpt_items(doc, checked_items): +def set_checked_lrp_items(doc, checked_items): doc = frappe.get_doc(json.loads(doc)) checked_items = json.loads(checked_items) @@ -671,6 +824,8 @@ def get_drug_item_list(patient, appointment, company): delivery_note_items = [] item_list, name_list = get_drugs(patient, appointment, company) + if len(item_list) == 0: + return [] if name_list: delivery_note_items += frappe.get_all( @@ -717,25 +872,26 @@ def get_drug_item_list(patient, appointment, company): ) avoid_duplicate_list = [] - if item_list: - for item in item_list: - for delivery_note in delivery_note_items: - if delivery_note.docstatus == 0: - status = "Draft" - else: - status = "Submitted" - - if ( - item.dn_detail - and item.drug_prescription_created == 1 - and item.dn_detail == delivery_note.name - and delivery_note.docstatus == 1 - ): + for item in item_list: + for delivery_note in delivery_note_items: + if delivery_note.docstatus == 0: + status = "Draft" + else: + status = "Submitted" + + if ( + item.dn_detail + and item.drug_prescription_created == 1 + and item.dn_detail == delivery_note.name + and delivery_note.docstatus == 1 + ): + if item.name not in avoid_duplicate_list: drug_list.append( { "child_name": item.name, "item_name": item.drug_code, - "quantity": item.quantity - item.quantity_returned, + "qty_prescribed": item.quantity, # - item.quantity_returned, + "qty_returned": item.quantity_returned or "", "encounter_no": item.parent, "delivery_note": delivery_note.parent, "dn_detail": item.dn_detail, @@ -744,19 +900,21 @@ def get_drug_item_list(patient, appointment, company): ) avoid_duplicate_list.append(item.name) - if ( - delivery_note.reference_name - and item.name == delivery_note.reference_name - and item.drug_prescription_created == 1 - and delivery_note.docstatus == 0 - and not item.dn_detail - and not delivery_note.si_detail - ): + if ( + delivery_note.reference_name + and item.name == delivery_note.reference_name + and item.drug_prescription_created == 1 + and delivery_note.docstatus == 0 + and not item.dn_detail + and not delivery_note.si_detail + ): + if item.name not in avoid_duplicate_list: drug_list.append( { "child_name": item.name, "item_name": item.drug_code, - "quantity": item.quantity - item.quantity_returned, + "qty_prescribed": item.quantity, # - item.quantity_returned, + "qty_returned": item.quantity_returned or "", "encounter_no": item.parent, "delivery_note": delivery_note.parent, "dn_detail": item.dn_detail or "", @@ -765,39 +923,41 @@ def get_drug_item_list(patient, appointment, company): ) avoid_duplicate_list.append(item.name) - if ( - not item.dn_detail - and not delivery_note.reference_name - and item.drug_prescription_created == 1 - and delivery_note.si_detail - and delivery_note.docstatus == 0 - ): - if item.name not in avoid_duplicate_list: - drug_list.append( - { - "child_name": item.name, - "item_name": item.drug_code, - "quantity": item.quantity - item.quantity_returned, - "encounter_no": item.parent, - "delivery_note": delivery_note.parent, - "dn_detail": item.dn_detail or "", - "status": status, - } - ) - avoid_duplicate_list.append(item.name) + if ( + not item.dn_detail + and not delivery_note.reference_name + and item.drug_prescription_created == 1 + and delivery_note.si_detail + and delivery_note.docstatus == 0 + ): + if item.name not in avoid_duplicate_list: + drug_list.append( + { + "child_name": item.name, + "item_name": item.drug_code, + "qty_prescribed": item.quantity, # - item.quantity_returned, + "qty_returned": item.quantity_returned or "", + "encounter_no": item.parent, + "delivery_note": delivery_note.parent, + "dn_detail": item.dn_detail or "", + "status": status, + } + ) + avoid_duplicate_list.append(item.name) - if item.name not in avoid_duplicate_list: - drug_list.append( - { - "child_name": item.name, - "item_name": item.drug_code, - "quantity": item.quantity - item.quantity_returned, - "encounter_no": item.parent, - "delivery_note": "", - "dn_detail": "", - "status": "", - } - ) + if item.name not in avoid_duplicate_list: + drug_list.append( + { + "child_name": item.name, + "item_name": item.drug_code, + "qty_prescribed": item.quantity, # - item.quantity_returned, + "qty_returned": item.quantity_returned or "", + "encounter_no": item.parent, + "delivery_note": "", + "dn_detail": "", + "status": "", + } + ) return drug_list @@ -849,7 +1009,8 @@ def set_checked_drug_items(doc, checked_items): for checked_item in checked_items: item_row = doc.append("drug_items", {}) item_row.drug_name = checked_item["item_name"] - item_row.quantity_prescribed = checked_item["quantity_prescribed"] + item_row.quantity_prescribed = cint(checked_item["qty_prescribed"]) + item_row.qty_returned = cint(checked_item["qty_returned"]) item_row.encounter_no = checked_item["encounter_no"] item_row.delivery_note_no = checked_item["delivery_note"] or "" item_row.status = checked_item["status"] or "" @@ -858,3 +1019,149 @@ def set_checked_drug_items(doc, checked_items): doc.save() return doc.name + + +@frappe.whitelist() +def get_therapies(patient, appointment, company): + therapies = [] + plan_child_table_ids = [] + + encounter_list = get_patient_encounters(patient, appointment, company) + if len(encounter_list) == 0: + return [] + + therapy_items = frappe.get_all( + "Therapy Plan Detail", + filters={ + "parent": ["in", encounter_list], + "is_not_available_inhouse": 0, + "is_cancelled": 0, + }, + fields=[ + "name", + "therapy_type", + "parent", + "no_of_sessions", + "sessions_cancelled", + ], + ) + + for item in therapy_items: + if item.therapy_type: + therapy_plan = frappe.get_value( + "Therapy Plan", + {"ref_doctype": "Patient Encounter", "ref_docname": item.parent}, + "name", + ) + + plan_child_table_id = frappe.db.get_value( + "Therapy Plan Detail", + { + "parent": therapy_plan, + "parenttype": "Therapy Plan", + "hms_tz_ref_childname": item.name, + "therapy_type": item.therapy_type, + "parentfield": "therapy_plan_details", + }, + "name", + ) + + if not plan_child_table_id: + # find plan_child_table_id when hms_tz_ref_childname does not have value, (for old therapies) + child_table_ids = frappe.db.get_all( + "Therapy Plan Detail", + { + "parent": therapy_plan, + "parenttype": "Therapy Plan", + "therapy_type": item.therapy_type, + "parentfield": "therapy_plan_details", + }, + "name", + ) + if len(child_table_ids) > 0: + for row in child_table_ids: + if row.name not in child_table_ids: + plan_child_table_id = row.name + break + + if plan_child_table_id: + plan_child_table_ids.append(plan_child_table_id) + + record = { + "status": "", + "therapy_session": "", + "encounter_no": item.parent, + "sessions": item.no_of_sessions, + "therapy_type": item.therapy_type, + "therapy_plan": therapy_plan or "", + "encounter_child_table_id": item.name, + "plan_child_table_id": plan_child_table_id, + "sessions_cancelled": item.sessions_cancelled, + } + + sessions_info = frappe.get_all( + "Therapy Session", + { + "patient": patient, + "docstatus": ["!=", 2], + "appointment": appointment, + "therapy_plan": therapy_plan, + "therapy_type": item.therapy_type, + "workflow_state": [ + "not in", + ["Not Serviced", "Submitted but Not Serviced"], + ], + }, + ["name", "docstatus"], + ) + + if len(sessions_info) == 0: + therapies.append(record) + + elif item.no_of_sessions > len(sessions_info): + record.update( + { + "sessions": item.no_of_sessions - len(sessions_info), + } + ) + therapies.append(record) + + for session in sessions_info: + session_dict = record.copy() + session_dict.update( + { + "sessions": 1, + "sessions_cancelled": 0, + "therapy_session": session.name, + "status": ( + "Draft" if session.docstatus == 0 else "Submitted" + ), + } + ) + + therapies.append(session_dict) + + return therapies + + +@frappe.whitelist() +def set_checked_therapy_items(doc, checked_items): + doc = frappe.get_doc(json.loads(doc)) + checked_items = json.loads(checked_items) + + doc.therapy_items = [] + + for checked_item in checked_items: + item_row = doc.append("therapy_items", {}) + item_row.status = checked_item["status"] or "" + item_row.therapy_type = checked_item["therapy_type"] + item_row.encounter_no = checked_item["encounter_no"] + item_row.therapy_plan = checked_item["therapy_plan"] or "" + item_row.sessions_cancelled = cint(checked_item["sessions_cancelled"]) + item_row.therapy_session = checked_item["therapy_session"] or "" + item_row.sessions_prescribed = cint(checked_item["sessions_prescribed"]) + item_row.plan_child_table_id = checked_item["plan_child_table_id"] + item_row.encounter_child_table_id = checked_item["encounter_child_table_id"] + + doc.save() + return doc.name diff --git a/hms_tz/hms_tz/doctype/medication_return/medication_return.json b/hms_tz/hms_tz/doctype/medication_return/medication_return.json index f6858e0b..a8fa8f92 100644 --- a/hms_tz/hms_tz/doctype/medication_return/medication_return.json +++ b/hms_tz/hms_tz/doctype/medication_return/medication_return.json @@ -8,6 +8,7 @@ "field_order": [ "drug_name", "quantity_prescribed", + "qty_returned", "quantity_to_return", "reason", "drug_condition", @@ -28,6 +29,7 @@ "reqd": 1 }, { + "columns": 1, "fieldname": "reason", "fieldtype": "Link", "in_list_view": 1, @@ -36,6 +38,7 @@ "options": "Healthcare Return Reason" }, { + "columns": 1, "fieldname": "drug_condition", "fieldtype": "Link", "in_list_view": 1, @@ -65,11 +68,12 @@ "read_only": 1 }, { + "columns": 2, "default": "1", "fieldname": "quantity_prescribed", "fieldtype": "Float", "in_list_view": 1, - "label": "Quantity Prescribed", + "label": "Qty Prescribed", "non_negative": 1, "read_only": 1 }, @@ -90,12 +94,21 @@ "fieldtype": "Data", "label": "Delivery Note Status", "read_only": 1 + }, + { + "columns": 2, + "fieldname": "qty_returned", + "fieldtype": "Float", + "in_list_view": 1, + "label": "Qty Returned", + "non_negative": 1, + "read_only": 1 } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2022-04-05 11:00:30.856037", + "modified": "2024-04-04 00:35:44.137138", "modified_by": "Administrator", "module": "Hms Tz", "name": "Medication Return", @@ -103,5 +116,6 @@ "permissions": [], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/hms_tz/hms_tz/doctype/therapy_return/__init__.py b/hms_tz/hms_tz/doctype/therapy_return/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/hms_tz/doctype/therapy_return/therapy_return.json b/hms_tz/hms_tz/doctype/therapy_return/therapy_return.json new file mode 100644 index 00000000..6405ba74 --- /dev/null +++ b/hms_tz/hms_tz/doctype/therapy_return/therapy_return.json @@ -0,0 +1,110 @@ +{ + "actions": [], + "allow_rename": 1, + "creation": "2024-03-27 15:10:16.749568", + "default_view": "List", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "therapy_type", + "sessions_prescribed", + "sessions_cancelled", + "sessions_to_cancel", + "reason", + "encounter_no", + "therapy_plan", + "therapy_session", + "encounter_child_table_id", + "plan_child_table_id" + ], + "fields": [ + { + "bold": 1, + "fieldname": "therapy_type", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Therapy Type", + "read_only": 1, + "reqd": 1, + "search_index": 1 + }, + { + "fieldname": "reason", + "fieldtype": "Link", + "in_list_view": 1, + "in_preview": 1, + "label": "Reason", + "options": "Healthcare Return Reason", + "search_index": 1 + }, + { + "fieldname": "encounter_no", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Patient Encounter", + "options": "Patient Encounter", + "read_only": 1, + "search_index": 1 + }, + { + "fieldname": "therapy_plan", + "fieldtype": "Data", + "label": "Therapy Plan", + "read_only": 1 + }, + { + "fieldname": "therapy_session", + "fieldtype": "Data", + "label": "Therapy Session", + "read_only": 1, + "search_index": 1 + }, + { + "fieldname": "sessions_prescribed", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Sessions Prescribed", + "read_only": 1 + }, + { + "fieldname": "sessions_to_cancel", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Sessions to Cancel" + }, + { + "fieldname": "encounter_child_table_id", + "fieldtype": "Data", + "label": "Encounter Child Table ID", + "read_only": 1 + }, + { + "fieldname": "plan_child_table_id", + "fieldtype": "Data", + "label": "Therapy Plan Child Table ID", + "read_only": 1 + }, + { + "fieldname": "sessions_cancelled", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Sessions Cancelled", + "non_negative": 1, + "read_only": 1 + } + ], + "index_web_pages_for_search": 1, + "istable": 1, + "links": [], + "modified": "2024-04-03 19:36:23.703640", + "modified_by": "Administrator", + "module": "Hms Tz", + "name": "Therapy Return", + "owner": "Administrator", + "permissions": [], + "sort_field": "modified", + "sort_order": "DESC", + "states": [], + "track_changes": 1 +} \ No newline at end of file diff --git a/hms_tz/hms_tz/doctype/therapy_return/therapy_return.py b/hms_tz/hms_tz/doctype/therapy_return/therapy_return.py new file mode 100644 index 00000000..41dde5b8 --- /dev/null +++ b/hms_tz/hms_tz/doctype/therapy_return/therapy_return.py @@ -0,0 +1,8 @@ +# Copyright (c) 2024, Aakvatech and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class TherapyReturn(Document): + pass diff --git a/hms_tz/hms_tz/doctype/therapy_session/therapy_session.js b/hms_tz/hms_tz/doctype/therapy_session/therapy_session.js index bbda42e4..89262a3a 100644 --- a/hms_tz/hms_tz/doctype/therapy_session/therapy_session.js +++ b/hms_tz/hms_tz/doctype/therapy_session/therapy_session.js @@ -34,12 +34,6 @@ frappe.ui.form.on('Therapy Session', { if (frm.doc.source) { set_source_referring_practitioner(frm) } - if (frm.doc.patient) { - frm.add_custom_button(__('Patient History'), function () { - frappe.route_options = { 'patient': frm.doc.patient }; - frappe.set_route('tz-patient-history'); - }); - } }, refresh: function (frm) { diff --git a/hms_tz/hooks.py b/hms_tz/hooks.py index 0c77a5a8..8044fd99 100644 --- a/hms_tz/hooks.py +++ b/hms_tz/hooks.py @@ -209,11 +209,14 @@ "validate": "hms_tz.nhif.api.sales_order.validate", "before_submit": "hms_tz.nhif.api.sales_order.before_submit", }, - # "Therapy Plan": { - # "validate": "hms_tz.nhif.api.therapy_plan.validate", - # }, + "Therapy Plan": { + "before_insert": "hms_tz.nhif.api.therapy_plan.before_insert", + "validate": "hms_tz.nhif.api.therapy_plan.validate", + }, "Therapy Session": { + "before_insert": "hms_tz.nhif.api.therapy_session.before_insert", "after_insert": "hms_tz.nhif.api.therapy_session.after_insert", + "before_submit": "hms_tz.nhif.api.therapy_session.before_submit", }, } diff --git a/hms_tz/nhif/api/therapy_plan.js b/hms_tz/nhif/api/therapy_plan.js index 8f8af87e..ff152994 100644 --- a/hms_tz/nhif/api/therapy_plan.js +++ b/hms_tz/nhif/api/therapy_plan.js @@ -1,14 +1,14 @@ frappe.ui.form.on('Therapy Plan', { - setup: function(frm) { + setup: function (frm) { frm.get_field('therapy_plan_details').grid.editable_fields = [ - {fieldname: 'therapy_type', columns: 4}, - {fieldname: 'no_of_sessions', columns: 2}, + { fieldname: 'therapy_type', columns: 4 }, + { fieldname: 'no_of_sessions', columns: 2 }, { fieldname: 'sessions_completed', columns: 2 }, - { "fieldname": 'is_restricted', columns: 2} + { "fieldname": 'is_restricted', columns: 2 } ]; }, - - refresh: function(frm) { + + refresh: function (frm) { if (!frm.doc.__islocal && (frm.doc.status == 'Not Serviced')) { frm.clear_custom_buttons(); // frm.remove_custom_button("Create") @@ -20,4 +20,16 @@ frappe.ui.form.on('Therapy Plan', { }); } }, + onload: function (frm) { + if (!frm.doc.__islocal && (frm.doc.status == 'Not Serviced')) { + frm.clear_custom_buttons(); + // frm.remove_custom_button("Create") + } + if (frm.doc.patient) { + frm.add_custom_button(__('Patient History'), () => { + frappe.route_options = { 'patient': frm.doc.patient }; + frappe.set_route('tz-patient-history'); + }); + } + } }); \ No newline at end of file diff --git a/hms_tz/nhif/api/therapy_plan.py b/hms_tz/nhif/api/therapy_plan.py index f63040b3..886986d1 100644 --- a/hms_tz/nhif/api/therapy_plan.py +++ b/hms_tz/nhif/api/therapy_plan.py @@ -1,12 +1,18 @@ import frappe -def before_insert(doc): +def before_insert(doc, method): total_sessions = 0 + total_sessions_cancelled = 0 for entry in doc.therapy_plan_details: if entry.no_of_sessions: total_sessions += entry.no_of_sessions + + if entry.sessions_cancelled: + total_sessions_cancelled += entry.sessions_cancelled + doc.total_sessions = total_sessions + doc.total_sessions_cancelled = total_sessions_cancelled def validate(doc, method): @@ -15,26 +21,30 @@ def validate(doc, method): def set_status(doc): - if not doc.total_sessions_completed and not doc.total_sessions: + if doc.total_sessions == 0 and doc.total_sessions_cancelled > 0: doc.status = "Not Serviced" - if doc.total_sessions and not doc.total_sessions_completed: + elif doc.total_sessions and not doc.total_sessions_completed: doc.status = "Not Started" - else: - if doc.total_sessions_completed < doc.total_sessions: - doc.status = "In Progress" + elif doc.total_sessions_completed < doc.total_sessions: + doc.status = "In Progress" - elif doc.total_sessions != 0 and ( - doc.total_sessions_completed == doc.total_sessions - ): - doc.status = "Completed" + elif doc.total_sessions != 0 and ( + doc.total_sessions_completed == doc.total_sessions + ): + doc.status = "Completed" def set_totals(doc): total_sessions_completed = 0 + total_sessions_cancelled = 0 for entry in doc.therapy_plan_details: if entry.sessions_completed: total_sessions_completed += entry.sessions_completed - doc.db_set("total_sessions_completed", total_sessions_completed) + if entry.sessions_cancelled: + total_sessions_cancelled += entry.sessions_cancelled + + doc.total_sessions_completed = total_sessions_completed + doc.total_sessions_cancelled = total_sessions_cancelled diff --git a/hms_tz/nhif/api/therapy_session.js b/hms_tz/nhif/api/therapy_session.js index 5bb390dd..07ebba5d 100644 --- a/hms_tz/nhif/api/therapy_session.js +++ b/hms_tz/nhif/api/therapy_session.js @@ -1,5 +1,32 @@ frappe.ui.form.on('Therapy Session', { + refresh: function (frm) { + $('[data-label="Not%20Serviced"]').parent().hide(); + if (!frm.doc.__islocal && (frm.doc.status == 'Not Serviced')) { + frm.clear_custom_buttons(); + // frm.remove_custom_button("Create") + } + if (frm.doc.patient) { + frm.add_custom_button(__('Patient History'), () => { + frappe.route_options = { 'patient': frm.doc.patient }; + frappe.set_route('tz-patient-history'); + }); + } + }, + onload: function (frm) { + $('[data-label="Not%20Serviced"]').parent().hide(); + if (!frm.doc.__islocal && (frm.doc.status == 'Not Serviced')) { + frm.clear_custom_buttons(); + // frm.remove_custom_button("Create") + } + if (frm.doc.patient) { + frm.add_custom_button(__('Patient History'), () => { + frappe.route_options = { 'patient': frm.doc.patient }; + frappe.set_route('tz-patient-history'); + }); + } + }, + approval_number: (frm) => { frm.fields_dict.approval_number.$input.focusout(() => { if (frm.doc.approval_number != "" && frm.doc.approval_number != undefined) { diff --git a/hms_tz/nhif/api/therapy_session.py b/hms_tz/nhif/api/therapy_session.py index 88cab088..44390342 100644 --- a/hms_tz/nhif/api/therapy_session.py +++ b/hms_tz/nhif/api/therapy_session.py @@ -1,6 +1,10 @@ import frappe +def before_insert(doc, method): + validate_not_serviced(doc) + + def after_insert(doc, method): if doc.therapy_plan: plan = frappe.get_doc("Therapy Plan", doc.therapy_plan) @@ -20,3 +24,17 @@ def after_insert(doc, method): break doc.save(ignore_permissions=True) + + +def before_submit(doc, method): + validate_not_serviced(doc) + + +def validate_not_serviced(doc): + if doc.therapy_plan: + status = frappe.db.get_value("Therapy Plan", doc.therapy_plan, "status") + if status == "Not Serviced": + frappe.throw( + f"This Therapy Plan: {frappe.bold(doc.therapy_plan)} is Not Serviced,\ + Please select another Therapy Plan. or cancel this therapy session" + ) diff --git a/hms_tz/patches.txt b/hms_tz/patches.txt index aa1e6231..c36cfa85 100644 --- a/hms_tz/patches.txt +++ b/hms_tz/patches.txt @@ -57,3 +57,5 @@ hms_tz.patches.property_setter.set_only_once_appointment_property hms_tz.patches.custom_fields.add_admission_service_unit_type_custom_field hms_tz.patches.custom_fields.auto_sales_order_creation_from_encounter hms_tz.patches.custom_fields.nhif_restricted_therapy_for_service_approval_number +hms_tz.patches.custom_fields.sessions_cancelled_custom_field_on_therapy_plan_detail +hms_tz.patches.property_setter.status_options_for_therapy_plan diff --git a/hms_tz/patches/custom_fields/sessions_cancelled_custom_field_on_therapy_plan_detail.py b/hms_tz/patches/custom_fields/sessions_cancelled_custom_field_on_therapy_plan_detail.py new file mode 100644 index 00000000..7055b3dd --- /dev/null +++ b/hms_tz/patches/custom_fields/sessions_cancelled_custom_field_on_therapy_plan_detail.py @@ -0,0 +1,26 @@ +import frappe +from frappe.custom.doctype.custom_field.custom_field import create_custom_fields + +def execute(): + fields = { + "Therapy Plan Detail": [ + { + "fieldname": "sessions_cancelled", + "fieldtype": "Int", + "label": "Sessions Cancelled", + "insert_after": "no_of_sessions", + "read_only": 1, + } + ], + "Therapy Plan": [ + { + "fieldname": "total_sessions_cancelled", + "fieldtype": "Int", + "label": "Total Sessions Cancelled", + "insert_after": "total_sessions", + "read_only": 1, + } + ], + } + + create_custom_fields(fields, update=True) diff --git a/hms_tz/patches/property_setter/status_options_for_therapy_plan.py b/hms_tz/patches/property_setter/status_options_for_therapy_plan.py new file mode 100644 index 00000000..cf9ea2fc --- /dev/null +++ b/hms_tz/patches/property_setter/status_options_for_therapy_plan.py @@ -0,0 +1,14 @@ +import frappe +from frappe.custom.doctype.property_setter.property_setter import make_property_setter + +def execute(): + make_property_setter( + "Therapy Plan", + "status", + "options", + "Not Started\nIn Progress\nCompleted\nCancelled\nNot Serviced", + "Text", + for_doctype=False, + validate_fields_for_doctype=False, + ) + frappe.db.commit() From a8a1001de6b5cbde21b22b80a20a79ec69a411dc Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Tue, 9 Apr 2024 12:20:21 +0300 Subject: [PATCH 04/25] fix: conflict of 'modified' on lrpmt_returns.json file --- hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json index 3d18442e..291e5afc 100644 --- a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json +++ b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json @@ -182,11 +182,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2022-04-29 18:22:45.789471", -======= "modified": "2024-04-02 22:41:54.900854", ->>>>>>> db8d8dd1 (feat: Cancel or return therapy sessions via LRPMT Returns doctype) "modified_by": "Administrator", "module": "Hms Tz", "name": "LRPMT Returns", From 8c445b5fa69bc474b5f0ca9d776f736fc2d3e1ce Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Fri, 12 Apr 2024 15:45:39 +0300 Subject: [PATCH 05/25] feat: therapy automation and controls like other LRPM documents (cherry picked from commit 143ef1fba8f7e664752da8ab98ddcdfd9415e395) # Conflicts: # hms_tz/patches/custom_fields/sessions_cancelled_custom_field_on_therapy_plan_detail.py --- .../patient_encounter/patient_encounter.py | 49 ----- hms_tz/nhif/api/healthcare_utils.py | 167 ++++++++++++++++++ hms_tz/nhif/api/patient_encounter.py | 39 ++-- hms_tz/nhif/api/sales_invoice.py | 15 ++ hms_tz/nhif/api/sales_order.py | 2 + ...led_custom_field_on_therapy_plan_detail.py | 34 ++++ 6 files changed, 239 insertions(+), 67 deletions(-) create mode 100644 hms_tz/patches/custom_fields/sessions_cancelled_custom_field_on_therapy_plan_detail.py diff --git a/hms_tz/hms_tz/doctype/patient_encounter/patient_encounter.py b/hms_tz/hms_tz/doctype/patient_encounter/patient_encounter.py index ce9e49ab..f0b6a6a0 100644 --- a/hms_tz/hms_tz/doctype/patient_encounter/patient_encounter.py +++ b/hms_tz/hms_tz/doctype/patient_encounter/patient_encounter.py @@ -34,7 +34,6 @@ def after_insert(self): def on_submit(self): update_encounter_medical_record(self) - create_therapy_plan(self) create_healthcare_service_order(self) # make_insurance_claim(self) @@ -52,54 +51,6 @@ def set_title(self): )[:100] -def create_therapy_plan(encounter): - if len(encounter.therapies): - therapies = [] - for row in encounter.therapies: - if ( - row.is_cancelled - or row.hms_tz_is_limit_exceeded - or row.is_not_available_inhouse - ): - continue - - therapies.append(row) - if len(therapies) == 0: - return - - doc = frappe.new_doc("Therapy Plan") - doc.patient = encounter.patient - doc.company = encounter.company - doc.start_date = encounter.encounter_date - doc.hms_tz_appointment = encounter.appointment - doc.hms_tz_patient_age = encounter.patient_age - doc.hms_tz_patient_sex = encounter.patient_sex - doc.hms_tz_insurance_coverage_plan = encounter.insurance_coverage_plan - doc.insurance_company = encounter.insurance_company - doc.ref_doctype = "Patient Encounter" - doc.ref_docname = encounter.name - for entry in therapies: - doc.append( - "therapy_plan_details", - { - "therapy_type": entry.therapy_type, - "no_of_sessions": entry.no_of_sessions, - "prescribe": entry.prescribe or 0, - "is_restricted": entry.is_restricted or 0, - "hms_tz_ref_childname": entry.name - }, - ) - doc.save(ignore_permissions=True) - if doc.get("name"): - encounter.db_set("therapy_plan", doc.name) - frappe.msgprint( - _( - f"Therapy Plan {frappe.bold(doc.name)} created successfully." - ), - alert=True - ) - - def insert_encounter_to_medical_record(doc): subject = set_subject_field(doc) medical_record = frappe.new_doc("Patient Medical Record") diff --git a/hms_tz/nhif/api/healthcare_utils.py b/hms_tz/nhif/api/healthcare_utils.py index 6b0379f3..b731365b 100644 --- a/hms_tz/nhif/api/healthcare_utils.py +++ b/hms_tz/nhif/api/healthcare_utils.py @@ -134,6 +134,11 @@ def get_healthcare_service_order_to_invoice( ) qty = 1 + if value.get("doctype") == "Therapy Plan Detail": + qty = (row.get("no_of_sessions") or 0) - ( + row.get("sessions_cancelled") or 0 + ) + if value.get("doctype") == "Drug Prescription": qty = (row.get("quantity") or 0) - ( row.get("quantity_returned") or 0 @@ -804,6 +809,158 @@ def create_individual_procedure_prescription(source_doc, child): child.db_update() +def create_therapy_plan(enc_doc=None, invoice_therapy_dict=[]): + therapies = [] + encounter_ids = [] + patient_encounter_docs = [] + + if not enc_doc and len(invoice_therapy_dict) == 0: + return + + if len(invoice_therapy_dict) > 0: + # These invoice_therapy_dict comes from sales invoice items + for row in invoice_therapy_dict: + therapy_child = frappe.get_cached_doc( + "Therapy Plan Detail", row.reference_dn + ) + if therapy_child.is_cancelled == 1: + frappe.throw( + f"Item: {frappe.bold(therapy_child.therapy_type)} RowNo#: {frappe.bold(row.idx)} is already cancelled,\ + Please confirm cancellation of this item on Patient Encounter and remove this item from sales invoice" + ) + + if therapy_child.parent not in encounter_ids: + encounter_ids.append(therapy_child.parent) + enc_doc = frappe.get_doc("Patient Encounter", therapy_child.parent) + patient_encounter_docs.append(enc_doc) + + if ( + therapy_child.therapy_plan_created + or therapy_child.is_not_available_inhouse + or therapy_child.hms_tz_is_limit_exceeded + ): + continue + + therapy_child.invoiced = 1 + therapy_child.sales_invoice_number = row.parent + therapy_child.save(ignore_permissions=True) + therapies.append(therapy_child) + + row.hms_tz_is_lrp_item_created = 1 + row.db_update() + + elif len(enc_doc.therapies) > 0: + if enc_doc.docstatus != 1: + frappe.msgprint( + _( + "Cannot process Patient Encounter that is not submitted! Please submit" + " and try again." + ), + alert=True, + ) + return + if not enc_doc.appointment: + frappe.msgprint( + _( + "Patient Encounter does not have patient appointment number! Request" + " for support with this message." + ), + alert=True, + ) + return + + if not enc_doc.insurance_subscription and not enc_doc.inpatient_record: + return + + patient_encounter_docs.append(enc_doc) + for row in enc_doc.therapies: + if ( + row.is_cancelled + or row.hms_tz_is_limit_exceeded + or row.is_not_available_inhouse + or row.therapy_plan_created + ): + continue + + # ignore uncovered therapies for insurance patients + if enc_doc.insurance_subscription and row.prescribe == 1: + continue + + # ignore therapies that won't be paid by cash + if not enc_doc.insurance_subscription and row.prescribe == 0: + continue + + is_disabled = frappe.get_cached_value( + "Therapy Type", row.therapy_type, "disabled" + ) + if is_disabled == 1: + frappe.throw( + _( + f"Therapy Type: {row.therapy_type} selected at Row#: {row.idx} is disabled. Please select an enabled item." + ) + ) + + therapies.append(row) + + if len(therapies) == 0: + return + + create_plan(patient_encounter_docs, therapies) + + +def create_plan(patient_encounter_docs, therapies): + for encounter_doc in patient_encounter_docs: + item_counts = 0 + doc = frappe.new_doc("Therapy Plan") + doc.patient = encounter_doc.patient + doc.company = encounter_doc.company + doc.start_date = encounter_doc.encounter_date + doc.hms_tz_appointment = encounter_doc.appointment + doc.hms_tz_patient_age = encounter_doc.patient_age + doc.hms_tz_patient_sex = encounter_doc.patient_sex + doc.hms_tz_insurance_coverage_plan = encounter_doc.insurance_coverage_plan + doc.insurance_company = encounter_doc.insurance_company + doc.ref_doctype = encounter_doc.doctype + doc.ref_docname = encounter_doc.name + for entry in therapies: + if entry.parent == encounter_doc.name: + item_counts += 1 + doc.append( + "therapy_plan_details", + { + "therapy_type": entry.therapy_type, + "prescribe": entry.prescribe or 0, + "is_restricted": entry.is_restricted or 0, + "hms_tz_ref_childname": entry.name, + "no_of_sessions": entry.no_of_sessions + - entry.sessions_cancelled, + }, + ) + if item_counts == 0: + continue + + doc.save(ignore_permissions=True) + if doc.get("name"): + # April 09, 2024 + # stopping updating therapy plan on encounter, + # since single encounter may have multiple therapy plans, + # this may happen when insurance patient pay cash for some therapies and insurance for other therapies + + # encounter_doc.db_set("therapy_plan", doc.name) + for entry in therapies: + if entry.parent == encounter_doc.name: + entry.therapy_plan_created = 1 + entry.delivered_quantity = ( + entry.no_of_sessions - entry.sessions_cancelled + ) + entry.db_update() + + frappe.msgprint( + _(f"Therapy Plan {frappe.bold(doc.name)} created successfully."), + alert=True, + ) + + def msgThrow(msg, method="throw", alert=True): if method == "validate": frappe.msgprint(msg, alert=alert) @@ -1060,6 +1217,8 @@ def create_invoiced_items_if_not_created(): for invoice in si_invoices: si_doc = frappe.get_doc("Sales Invoice", invoice.name) + therapy_items = [] + for item in si_doc.items: if item.reference_dt in [ "Lab Prescription", @@ -1196,6 +1355,14 @@ def create_invoiced_items_if_not_created(): traceback = frappe.get_traceback() frappe.log_error(traceback) + elif item.reference_dt == "Therapy Plan Detail": + if item.hms_tz_is_lrp_item_created == 1: + continue + + therapy_items.append(item) + + create_therapy_plan(invoice_therapy_dict=therapy_items) + frappe.db.commit() diff --git a/hms_tz/nhif/api/patient_encounter.py b/hms_tz/nhif/api/patient_encounter.py index 002b65a1..ca688d0e 100644 --- a/hms_tz/nhif/api/patient_encounter.py +++ b/hms_tz/nhif/api/patient_encounter.py @@ -23,6 +23,7 @@ create_individual_lab_test, create_individual_radiology_examination, create_individual_procedure_prescription, + create_therapy_plan, msgThrow, msgPrint, validate_nhif_patient_claim_status, @@ -400,7 +401,7 @@ def on_submit_validation(doc, method): healthcare_insurance_coverage_plan, ["coverage_plan_name", "is_exclusions"], ) - + validate_item_coverage( doc, method, @@ -411,13 +412,9 @@ def on_submit_validation(doc, method): ) validate_totals(doc, method) + def validate_item_coverage( - doc, - method, - healthcare_service_templates, - hsic_map, - hicp_name, - is_exclusions + doc, method, healthcare_service_templates, hsic_map, hicp_name, is_exclusions ): for template in healthcare_service_templates: """ @@ -735,7 +732,7 @@ def on_submit(doc, method): if ( doc.healthcare_package_order - and not doc.insurance_subscription + # and not doc.insurance_subscription and not doc.inpatient_record ): create_items_from_healthcare_package_orders(doc, method) @@ -765,6 +762,7 @@ def create_healthcare_docs(patient_encounter_doc, method="event"): create_healthcare_docs_per_encounter( frappe.get_doc("Patient Encounter", encounter) ) + create_therapy_plan(enc_doc=frappe.get_doc("Patient Encounter", encounter)) if method == "from_button": frappe.msgprint( _( @@ -1661,16 +1659,17 @@ def inpatient_billing(patient_encounter_doc, method): "item_field": "procedure", "doctype": "Clinical Procedure Template", }, - { - "table_field": "drug_prescription", - "item_field": "drug_code", - "doctype": "Medication", - }, - { - "table_field": "therapies", - "item_field": "therapy_type", - "doctype": "Therapy Type", - }, + # unused part + # { + # "table_field": "drug_prescription", + # "item_field": "drug_code", + # "doctype": "Medication", + # }, + # { + # "table_field": "therapies", + # "item_field": "therapy_type", + # "doctype": "Therapy Type", + # }, ] for child_table_field in child_tables_list: if patient_encounter_doc.get(child_table_field.get("table_field")): @@ -1706,6 +1705,8 @@ def inpatient_billing(patient_encounter_doc, method): create_individual_procedure_prescription( patient_encounter_doc, child ) + + create_therapy_plan(enc_doc=patient_encounter_doc) create_delivery_note(patient_encounter_doc, method) @@ -2546,6 +2547,8 @@ def create_items_from_healthcare_package_orders(doc, method): create_individual_radiology_examination(doc, child) elif child.doctype == "Procedure Prescription": create_individual_procedure_prescription(doc, child) + + create_therapy_plan(enc_doc=doc) create_delivery_note(doc, method) diff --git a/hms_tz/nhif/api/sales_invoice.py b/hms_tz/nhif/api/sales_invoice.py index 532abecf..8b7e0438 100644 --- a/hms_tz/nhif/api/sales_invoice.py +++ b/hms_tz/nhif/api/sales_invoice.py @@ -10,6 +10,7 @@ create_individual_lab_test, create_individual_radiology_examination, create_individual_procedure_prescription, + create_therapy_plan ) from hms_tz.nhif.api.sales_order import validate_stock_item @@ -100,6 +101,8 @@ def create_healthcare_docs(doc, method): ) ) return + + therapy_items = [] if doc.get("items"): for item in doc.items: if item.reference_dt and item.reference_dt in [ @@ -108,6 +111,12 @@ def create_healthcare_docs(doc, method): "Procedure Prescription", ]: child = frappe.get_doc(item.reference_dt, item.reference_dn) + if child.is_cancelled == 1: + frappe.throw( + f"Item: {frappe.bold(item.item_code)} RowNo#: {frappe.bold(item.idx)} is already cancelled,\ + Please confirm cancellation of this item on Patient Encounter and remove this item from sales invoice" + ) + patient_encounter_doc = frappe.get_doc( "Patient Encounter", child.parent ) @@ -127,6 +136,10 @@ def create_healthcare_docs(doc, method): item.hms_tz_is_lrp_item_created = 1 item.db_update() + + elif item.reference_dt and item.reference_dt == "Therapy Plan Detail": + therapy_items.append(item) + elif item.reference_dt and item.reference_dt in [ "Inpatient Occupancy", "Inpatient Consultancy", @@ -144,6 +157,8 @@ def create_healthcare_docs(doc, method): }, ) + create_therapy_plan(invoice_therapy_dict=therapy_items) + if method == "From Front End": frappe.db.commit() diff --git a/hms_tz/nhif/api/sales_order.py b/hms_tz/nhif/api/sales_order.py index 246953cf..6c1a6c30 100644 --- a/hms_tz/nhif/api/sales_order.py +++ b/hms_tz/nhif/api/sales_order.py @@ -132,6 +132,8 @@ def get_items_from_encounter(doc, warehouse): drug_items.append(new_row) else: + if row.doctype == "Therapy Plan Detail": + new_row.update({"qty": row.no_of_sessions - row.sessions_cancelled,}) lrpt_items.append(new_row) return drug_items, lrpt_items diff --git a/hms_tz/patches/custom_fields/sessions_cancelled_custom_field_on_therapy_plan_detail.py b/hms_tz/patches/custom_fields/sessions_cancelled_custom_field_on_therapy_plan_detail.py new file mode 100644 index 00000000..341e0a7f --- /dev/null +++ b/hms_tz/patches/custom_fields/sessions_cancelled_custom_field_on_therapy_plan_detail.py @@ -0,0 +1,34 @@ +import frappe +from frappe.custom.doctype.custom_field.custom_field import create_custom_fields + + +def execute(): + fields = { + "Therapy Plan Detail": [ + { + "fieldname": "sessions_cancelled", + "fieldtype": "Int", + "label": "Sessions Cancelled", + "insert_after": "no_of_sessions", + "read_only": 1, + }, + { + "fieldname": "therapy_plan_created", + "fieldtype": "Check", + "label": "Therapy Plan Created", + "insert_after": "section_break_20", + "read_only": 1, + }, + ], + "Therapy Plan": [ + { + "fieldname": "total_sessions_cancelled", + "fieldtype": "Int", + "label": "Total Sessions Cancelled", + "insert_after": "total_sessions", + "read_only": 1, + } + ], + } + + create_custom_fields(fields, update=True) From d962a10c7bff5f621528ccc1b3598e3e44bdc84c Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Fri, 12 Apr 2024 17:52:49 +0300 Subject: [PATCH 06/25] feat: include 'sessions_cancelled' on all the revenue reports like itemized, ipd and itemwise hospital revenue (cherry picked from commit 2eb9315bdf90136d28f0b6404e61917cfd74559a) --- .../ipd_billing_report/ipd_billing_report.py | 10 +++---- .../itemized_bill_report.py | 12 ++++---- .../nhif_patient_claim/nhif_patient_claim.py | 30 +++++++++++++++---- .../itemwise_hospital_revenue.py | 18 +++++------ 4 files changed, 44 insertions(+), 26 deletions(-) diff --git a/hms_tz/hms_tz/report/ipd_billing_report/ipd_billing_report.py b/hms_tz/hms_tz/report/ipd_billing_report/ipd_billing_report.py index 2f20675b..79e1c796 100644 --- a/hms_tz/hms_tz/report/ipd_billing_report/ipd_billing_report.py +++ b/hms_tz/hms_tz/report/ipd_billing_report/ipd_billing_report.py @@ -285,7 +285,7 @@ def get_transaction_data(args): union all select 0 as lab_amount, 0 as radiology_amount, 0 as procedure_amount, 0 as drug_amount, - sum(lrpmt.amount) as therapy_amount, date(pe.encounter_date) as date, "" as service_unit, + sum(lrpmt.amount * (lrpmt.no_of_sessions - lrpmt.sessions_cancelled)) as therapy_amount, date(pe.encounter_date) as date, "" as service_unit, 0 as bed_charges, 0 as cons_charges from `tabTherapy Plan Detail` lrpmt inner join `tabPatient Encounter` pe on lrpmt.parent = pe.name @@ -793,9 +793,9 @@ def get_cash_lrpmt_transaction(filters): DATE(lrpmt.creation) AS date, item_template.item_group AS category, lrpmt.therapy_type AS description, - 1 AS quantity, + (lrpmt.no_of_sessions - lrpmt.sessions_cancelled) AS quantity, lrpmt.amount AS rate, - lrpmt.amount AS total_amount, + ((lrpmt.no_of_sessions - lrpmt.sessions_cancelled) * lrpmt.amount) AS total_amount, pa.patient AS patient, pa.patient_name AS patient_name, pa.appointment_type AS appointment_type, @@ -969,9 +969,9 @@ def get_insurance_lrpmt_transaction(filters): DATE(lrpmt.creation) AS date, item_template.item_group AS category, lrpmt.therapy_type AS description, - 1 AS quantity, + (lrpmt.no_of_sessions - lrpmt.sessions_cancelled) AS quantity, lrpmt.amount AS rate, - lrpmt.amount AS total_amount, + ((lrpmt.no_of_sessions - lrpmt.sessions_cancelled) * lrpmt.amount) AS total_amount, pa.patient AS patient, pa.patient_name AS patient_name, pa.appointment_type AS appointment_type, diff --git a/hms_tz/hms_tz/report/itemized_bill_report/itemized_bill_report.py b/hms_tz/hms_tz/report/itemized_bill_report/itemized_bill_report.py index 31fdc2ae..0f634b1c 100644 --- a/hms_tz/hms_tz/report/itemized_bill_report/itemized_bill_report.py +++ b/hms_tz/hms_tz/report/itemized_bill_report/itemized_bill_report.py @@ -406,9 +406,9 @@ def get_exceeded_therapy_items(encounters): fn.Date(therapy.creation).as_("date"), temp.item_group.as_("category"), therapy.therapy_type.as_("description"), - ValueWrapper(1).as_("quantity"), + (therapy.no_of_sessions - therapy.sessions_cancelled).as_("quantity"), therapy.amount.as_("rate"), - therapy.amount.as_("amount"), + ((therapy.no_of_sessions - therapy.sessions_cancelled) * therapy.amount).as_("amount"), ) .where( (therapy.prescribe == 0) @@ -745,9 +745,9 @@ def get_cash_lrpmt_transaction(filters): DATE(lrpmt.creation) AS date, item_template.item_group AS category, lrpmt.therapy_type AS description, - 1 AS quantity, + (lrpmt.no_of_sessions - lrpmt.sessions_cancelled) AS quantity, AS quantity, lrpmt.amount AS rate, - lrpmt.amount AS amount, + ((lrpmt.no_of_sessions - lrpmt.sessions_cancelled) * lrpmt.amount) AS amount, pa.patient AS patient, pa.patient_name AS patient_name, pa.appointment_type AS appointment_type, @@ -920,9 +920,9 @@ def get_insurance_lrpmt_transaction(filters): DATE(lrpmt.creation) AS date, item_template.item_group AS category, lrpmt.therapy_type AS description, - 1 AS quantity, + (lrpmt.no_of_sessions - lrpmt.sessions_cancelled) AS quantity, lrpmt.amount AS rate, - lrpmt.amount AS amount, + ((lrpmt.no_of_sessions - lrpmt.sessions_cancelled) * lrpmt.amount) AS amount, pa.patient AS patient, pa.patient_name AS patient_name, pa.appointment_type AS appointment_type, diff --git a/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py b/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py index 224bd2da..7e715d56 100644 --- a/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py +++ b/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py @@ -436,13 +436,22 @@ def set_patient_claim_item(self, inpatient_record=None, called_method=None): for row in encounter_doc.get(child.get("table")): if row.prescribe or row.is_cancelled: continue + item_code = frappe.get_value( child.get("doctype"), row.get(child.get("item")), "item" ) - delivered_quantity = (row.get("quantity") or 0) - ( - row.get("quantity_returned") or 0 - ) + delivered_quantity = 0 + if row.get("doctype") == "Drug Prescription": + delivered_quantity = (row.get("quantity") or 0) - ( + row.get("quantity_returned") or 0 + ) + elif row.get("doctype") == "Therapy Plan Detail": + delivered_quantity = (row.get("no_of_sessions") or 0) - ( + row.get("sessions_cancelled") or 0 + ) + else: + delivered_quantity = 1 new_row = self.append("nhif_patient_claim_item", {}) new_row.item_name = row.get(child.get("item_name")) @@ -575,15 +584,24 @@ def set_patient_claim_item(self, inpatient_record=None, called_method=None): for row in encounter_doc.get(child.get("table")): if row.prescribe or row.is_cancelled: continue + item_code = frappe.get_value( child.get("doctype"), row.get(child.get("item")), "item", ) - delivered_quantity = (row.get("quantity") or 0) - ( - row.get("quantity_returned") or 0 - ) + delivered_quantity = 0 + if row.get("doctype") == "Drug Prescription": + delivered_quantity = (row.get("quantity") or 0) - ( + row.get("quantity_returned") or 0 + ) + elif row.get("doctype") == "Therapy Plan Detail": + delivered_quantity = (row.get("no_of_sessions") or 0) - ( + row.get("sessions_cancelled") or 0 + ) + else: + delivered_quantity = 1 new_row = self.append("nhif_patient_claim_item", {}) new_row.item_name = row.get(child.get("item")) diff --git a/hms_tz/nhif/report/itemwise_hospital_revenue/itemwise_hospital_revenue.py b/hms_tz/nhif/report/itemwise_hospital_revenue/itemwise_hospital_revenue.py index de72d366..445329ea 100644 --- a/hms_tz/nhif/report/itemwise_hospital_revenue/itemwise_hospital_revenue.py +++ b/hms_tz/nhif/report/itemwise_hospital_revenue/itemwise_hospital_revenue.py @@ -1372,9 +1372,9 @@ def get_insurance_therapy_data(filters, appoints): tt.item_group.as_("service_type"), tpd.therapy_type.as_("service_name"), tp.hms_tz_insurance_coverage_plan.as_("payment_method"), - ValueWrapper(1).as_("qty"), + (tpd.no_of_sessions - tpd.sessions_cancelled).as_("qty"), tpd.amount.as_("rate"), - tpd.amount.as_("amount"), + ((tpd.no_of_sessions - tpd.sessions_cancelled) * tpd.amount).as_("amount"), Case() .when(tp.status == "Completed", "Submitted") .else_("Draft") @@ -1460,7 +1460,7 @@ def get_cash_therapy_data(filters, appoints): tt.item_group.as_("service_type"), tpd.therapy_type.as_("service_name"), ValueWrapper("Cash").as_("payment_method"), - ValueWrapper(1).as_("qty"), + (tpd.no_of_sessions - tpd.sessions_cancelled).as_("qty"), tpd.amount.as_("rate"), (sii.amount - sii.net_amount).as_("discount_amount"), sii.net_amount.as_("amount"), @@ -1526,9 +1526,9 @@ def get_cash_therapy_data(filters, appoints): tt.item_group.as_("service_type"), tpd.therapy_type.as_("service_name"), ValueWrapper("Cash").as_("payment_method"), - ValueWrapper(1).as_("qty"), + (tpd.no_of_sessions - tpd.sessions_cancelled).as_("qty"), tpd.amount.as_("rate"), - tpd.amount.as_("amount"), + ((tpd.no_of_sessions - tpd.sessions_cancelled) * tpd.amount).as_("amount"), Case() .when(tp.status == "Completed", "Submitted") .else_("Draft") @@ -1910,7 +1910,7 @@ def get_cancelled_lab_items(filters): .inner_join(pe) .on(ireturn.encounter_no == pe.name) .select( - fn.Date(lreturn.modified).as_("date"), + Date(lreturn.modified).as_("date"), lreturn.patient.as_("patient"), lreturn.patient_name.as_("patient_name"), Case() @@ -1980,7 +1980,7 @@ def get_cancelled_radiology_items(filters): .inner_join(pe) .on(ireturn.encounter_no == pe.name) .select( - fn.Date(lreturn.modified).as_("date"), + Date(lreturn.modified).as_("date"), lreturn.patient.as_("patient"), lreturn.patient_name.as_("patient_name"), Case() @@ -2050,7 +2050,7 @@ def get_cancelled_procedure_items(filters): .inner_join(pe) .on(ireturn.encounter_no == pe.name) .select( - fn.Date(lreturn.modified).as_("date"), + Date(lreturn.modified).as_("date"), lreturn.patient.as_("patient"), lreturn.patient_name.as_("patient_name"), Case() @@ -2119,7 +2119,7 @@ def get_cancelled_drug_items(filters): .inner_join(pe) .on(mreturn.encounter_no == pe.name) .select( - fn.Date(lreturn.modified).as_("date"), + Date(lreturn.modified).as_("date"), lreturn.patient.as_("patient"), lreturn.patient_name.as_("patient_name"), Case() From 66f394f7c2c196dcf75dfdc169fcde515059895e Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Wed, 27 Mar 2024 12:27:43 +0300 Subject: [PATCH 07/25] chore: add list view filters for patient, patient_name, appointment, company and inpatient_record (cherry picked from commit 7cbbae1e27b025ea13946b85b9ffa51d43446668) # Conflicts: # hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json --- .../doctype/lrpmt_returns/lrpmt_returns.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json index 291e5afc..521693d4 100644 --- a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json +++ b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json @@ -2,7 +2,7 @@ "actions": [], "allow_rename": 1, "autoname": "naming_series:", - "creation": "2021-12-11 10:43:22.393583", + "creation": "2024-03-27 12:05:48.759179", "doctype": "DocType", "editable_grid": 1, "engine": "InnoDB", @@ -35,6 +35,7 @@ "fieldname": "patient", "fieldtype": "Link", "in_list_view": 1, + "in_standard_filter": 1, "label": "Patient", "options": "Patient", "reqd": 1 @@ -43,6 +44,8 @@ "fetch_from": "patient.patient_name", "fieldname": "patient_name", "fieldtype": "Data", + "in_preview": 1, + "in_standard_filter": 1, "label": "Patient Name", "read_only": 1, "read_only_depends_on": "eval: doc.patient_name != \"\"" @@ -56,6 +59,8 @@ "fetch_from": "appointment.company", "fieldname": "company", "fieldtype": "Link", + "in_preview": 1, + "in_standard_filter": 1, "label": "Company", "options": "Company" }, @@ -64,6 +69,8 @@ "fieldname": "inpatient_record", "fieldtype": "Link", "in_list_view": 1, + "in_preview": 1, + "in_standard_filter": 1, "label": "Inpatient Record", "options": "Inpatient Record", "read_only": 1 @@ -163,6 +170,8 @@ "fieldname": "appointment", "fieldtype": "Link", "in_list_view": 1, + "in_preview": 1, + "in_standard_filter": 1, "label": "Patient Appointment", "options": "Patient Appointment" }, @@ -182,10 +191,15 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], +<<<<<<< HEAD "modified": "2024-04-02 22:41:54.900854", +======= + "modified": "2024-03-27 12:09:57.779364", +>>>>>>> 7cbbae1e (chore: add list view filters for patient, patient_name, appointment, company and inpatient_record) "modified_by": "Administrator", "module": "Hms Tz", "name": "LRPMT Returns", + "naming_rule": "By \"Naming Series\" field", "owner": "Administrator", "permissions": [ { @@ -203,5 +217,6 @@ ], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file From 07dca98bddd1b86b0248788b05f4027dd1d070a0 Mon Sep 17 00:00:00 2001 From: elius mgani <78465509+av-dev2@users.noreply.github.com> Date: Wed, 17 Apr 2024 13:26:46 +0300 Subject: [PATCH 08/25] fix: conflicts lrpmt_returns.json --- hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json index 521693d4..e23c4f9a 100644 --- a/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json +++ b/hms_tz/hms_tz/doctype/lrpmt_returns/lrpmt_returns.json @@ -191,11 +191,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD "modified": "2024-04-02 22:41:54.900854", -======= - "modified": "2024-03-27 12:09:57.779364", ->>>>>>> 7cbbae1e (chore: add list view filters for patient, patient_name, appointment, company and inpatient_record) "modified_by": "Administrator", "module": "Hms Tz", "name": "LRPMT Returns", @@ -219,4 +215,4 @@ "sort_order": "DESC", "states": [], "track_changes": 1 -} \ No newline at end of file +} From 95826b38e0b6f6c965026333603213e8591b61a2 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Wed, 17 Apr 2024 17:21:00 +0300 Subject: [PATCH 09/25] chore: allow rename on 'Company NHIF Settings' --- .../doctype/company_nhif_settings/company_nhif_settings.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.json b/hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.json index 1568e266..1f37d02f 100644 --- a/hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.json +++ b/hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.json @@ -1,5 +1,6 @@ { "actions": [], + "allow_rename": 1, "autoname": "field:company", "creation": "2020-11-10 16:52:35.894771", "doctype": "DocType", @@ -195,10 +196,11 @@ ], "index_web_pages_for_search": 1, "links": [], - "modified": "2023-09-28 23:11:07.972344", + "modified": "2024-04-17 17:20:12.085065", "modified_by": "Administrator", "module": "NHIF", "name": "Company NHIF Settings", + "naming_rule": "By fieldname", "owner": "Administrator", "permissions": [ { @@ -216,5 +218,6 @@ ], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file From 956ed25384d7d358194ab911a44c506f0d507f9e Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Wed, 17 Apr 2024 18:12:11 +0300 Subject: [PATCH 10/25] feat: rename 'Company NHIF Settings' to 'Company Insurance Setting' to support multiple insurance settings --- hms_tz/nhif/api/healthcare_utils.py | 8 +- hms_tz/nhif/api/patient.py | 6 +- hms_tz/nhif/api/patient_appointment.py | 6 +- hms_tz/nhif/api/token.py | 24 ++-- .../__init__.py | 0 .../company_insurance_setting.js} | 6 +- .../company_insurance_setting.json} | 133 ++++++++++-------- .../company_insurance_setting.py} | 2 +- .../test_company_insurance_setting.py} | 2 +- .../healthcare_referral.py | 22 ++- 10 files changed, 116 insertions(+), 93 deletions(-) rename hms_tz/nhif/doctype/{company_nhif_settings => company_insurance_setting}/__init__.py (100%) rename hms_tz/nhif/doctype/{company_nhif_settings/company_nhif_settings.js => company_insurance_setting/company_insurance_setting.js} (75%) rename hms_tz/nhif/doctype/{company_nhif_settings/company_nhif_settings.json => company_insurance_setting/company_insurance_setting.json} (69%) rename hms_tz/nhif/doctype/{company_nhif_settings/company_nhif_settings.py => company_insurance_setting/company_insurance_setting.py} (85%) rename hms_tz/nhif/doctype/{company_nhif_settings/test_company_nhif_settings.py => company_insurance_setting/test_company_insurance_setting.py} (76%) diff --git a/hms_tz/nhif/api/healthcare_utils.py b/hms_tz/nhif/api/healthcare_utils.py index b731365b..91d10c89 100644 --- a/hms_tz/nhif/api/healthcare_utils.py +++ b/hms_tz/nhif/api/healthcare_utils.py @@ -1501,15 +1501,15 @@ def get_card_no(appointment=None, encounter=None): ( enable_nhif_api, - nhifservice_url, + service_url, validate_service_approval_no, ) = frappe.get_cached_value( "Company NHIF Settings", company, [ "enable", - "nhifservice_url", - "validate_service_approval_number_on_lrpm_documents", + "service_url", + "validate_service_approval_number_on_lrpmt_documents", ], ) if not enable_nhif_api: @@ -1523,7 +1523,7 @@ def get_card_no(appointment=None, encounter=None): item_code = get_item_ref_code(template_doctype, template_name) url = ( - str(nhifservice_url) + str(service_url) + f"/nhifservice/breeze/verification/GetReferenceNoStatus?CardNo={cardno}&ReferenceNo={approval_number}&ItemCode={item_code}" ) diff --git a/hms_tz/nhif/api/patient.py b/hms_tz/nhif/api/patient.py index cfb30766..fb6f4f1e 100644 --- a/hms_tz/nhif/api/patient.py +++ b/hms_tz/nhif/api/patient.py @@ -69,12 +69,12 @@ def get_patient_info(card_no=None): frappe.throw(_("No companies found to connect to NHIF")) token = get_nhifservice_token(company) - nhifservice_url = frappe.get_cached_value( - "Company NHIF Settings", company, "nhifservice_url" + service_url = frappe.get_cached_value( + "Company NHIF Settings", company, "service_url" ) headers = {"Authorization": "Bearer " + token} url = ( - str(nhifservice_url) + str(service_url) + "/nhifservice/breeze/verification/GetCardDetails?CardNo=" + str(card_no) ) diff --git a/hms_tz/nhif/api/patient_appointment.py b/hms_tz/nhif/api/patient_appointment.py index 2c9b5b3c..a9450b90 100644 --- a/hms_tz/nhif/api/patient_appointment.py +++ b/hms_tz/nhif/api/patient_appointment.py @@ -357,8 +357,8 @@ def get_authorization_num( referral_no="", remarks="", ): - enable_nhif_api, nhifservice_url = frappe.get_cached_value( - "Company NHIF Settings", company, ["enable", "nhifservice_url"] + enable_nhif_api, service_url = frappe.get_cached_value( + "Company NHIF Settings", company, ["enable", "service_url"] ) if not enable_nhif_api: frappe.msgprint( @@ -389,7 +389,7 @@ def get_authorization_num( headers = {"Content-Type": "application/json", "Authorization": "Bearer " + token} url = ( - str(nhifservice_url) + str(service_url) + "/nhifservice/breeze/verification/AuthorizeCard?" + card_no + visit_type_id diff --git a/hms_tz/nhif/api/token.py b/hms_tz/nhif/api/token.py index 89b75d2d..a36e1a99 100644 --- a/hms_tz/nhif/api/token.py +++ b/hms_tz/nhif/api/token.py @@ -61,20 +61,20 @@ def make_token_request(doc, url, headers, payload, fields): def get_nhifservice_token(company): setting_doc = frappe.get_cached_doc("Company NHIF Settings", company) if ( - setting_doc.nhifservice_expiry - and setting_doc.nhifservice_expiry > now_datetime() + setting_doc.service_token_expiry + and setting_doc.service_token_expiry > now_datetime() ): - return setting_doc.nhifservice_token + return setting_doc.service_token username = setting_doc.username password = get_decrypted_password("Company NHIF Settings", company, "password") payload = "grant_type=password&username={0}&password={1}".format(username, password) headers = {"Content-Type": "application/x-www-form-urlencoded"} - url = str(setting_doc.nhifservice_url) + "/nhifservice/Token" + url = str(setting_doc.service_url) + "/nhifservice/Token" nhifservice_fields = { - "token": "nhifservice_token", - "expiry": "nhifservice_expiry", + "token": "service_token", + "expiry": "service_token_expiry", } return make_token_request(setting_doc, url, headers, payload, nhifservice_fields) @@ -108,21 +108,21 @@ def get_formservice_token(company): frappe.throw(_("Company {0} not enabled for NHIF Integration".format(company))) if ( - company_nhif_doc.nhifform_expiry - and company_nhif_doc.nhifform_expiry > now_datetime() + company_nhif_doc.form_token_expiry + and company_nhif_doc.form_token_expiry > now_datetime() ): - return company_nhif_doc.nhifform_token + return company_nhif_doc.form_token username = company_nhif_doc.username password = get_decrypted_password("Company NHIF Settings", company, "password") payload = "grant_type=password&username={0}&password={1}".format(username, password) headers = {"Content-Type": "application/x-www-form-urlencoded"} - url = cstr(company_nhif_doc.nhifform_url) + "/formposting/Token" + url = cstr(company_nhif_doc.form_url) + "/formposting/Token" nhifform_fields = { - "token": "nhifform_token", - "expiry": "nhifform_expiry", + "token": "form_token", + "expiry": "form_token_expiry", } return make_token_request(company_nhif_doc, url, headers, payload, nhifform_fields) diff --git a/hms_tz/nhif/doctype/company_nhif_settings/__init__.py b/hms_tz/nhif/doctype/company_insurance_setting/__init__.py similarity index 100% rename from hms_tz/nhif/doctype/company_nhif_settings/__init__.py rename to hms_tz/nhif/doctype/company_insurance_setting/__init__.py diff --git a/hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.js b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.js similarity index 75% rename from hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.js rename to hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.js index cd0de0f3..e428efa3 100644 --- a/hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.js +++ b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.js @@ -1,7 +1,7 @@ // Copyright (c) 2020, Aakvatech and contributors // For license information, please see license.txt -frappe.ui.form.on('Company NHIF Settings', { +frappe.ui.form.on('Company Insurance Setting', { // refresh: function(frm) { // } @@ -10,7 +10,8 @@ frappe.ui.form.on('Company NHIF Settings', { frappe.msgprint("Please set submit claim year or submit claim month}"); return } - frappe.call("hms_tz.nhif.api.healthcare_utils.auto_submit_nhif_patient_claim", { + if (frm.doc.api_provider == "NHIF") { + frappe.call("hms_tz.nhif.api.healthcare_utils.auto_submit_nhif_patient_claim", { setting_dict: { "company": frm.doc.name, "submit_claim_year": frm.doc.submit_claim_year, @@ -19,5 +20,6 @@ frappe.ui.form.on('Company NHIF Settings', { }).then(r => { // do nothing }) + } } }); diff --git a/hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.json b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json similarity index 69% rename from hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.json rename to hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json index 1f37d02f..26370770 100644 --- a/hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.json +++ b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json @@ -8,27 +8,28 @@ "engine": "InnoDB", "field_order": [ "company", + "facility_code", "username", "password", "column_break_4", - "facility_code", + "api_provider", "enable", - "validate_service_approval_number_on_lrpm_documents", + "validate_service_approval_number_on_lrpmt_documents", "enable_auto_submit_of_claims", "auto_submit_patient_claim", "section_break_5", - "nhifservice_url", - "nhifservice_token", - "nhifservice_expiry", + "service_url", + "service_token", + "service_token_expiry", "column_break_9", "claimsserver_url", "claimsserver_token", "claimsserver_expiry", "section_break_11", - "nhifform_url", - "nhifform_expiry", + "form_url", + "form_token_expiry", "column_break_18", - "nhifform_token", + "form_token", "section_break_15", "update_patient_history", "section_break_16", @@ -51,42 +52,28 @@ "fieldtype": "Data", "in_list_view": 1, "label": "User Name", - "reqd": 1 + "reqd": 1, + "search_index": 1 }, { "fieldname": "password", "fieldtype": "Password", "label": "Password", - "reqd": 1 + "reqd": 1, + "search_index": 1 }, { "default": "0", "fieldname": "enable", "fieldtype": "Check", "in_list_view": 1, - "label": "Enable NHIF API" + "label": "Enable API", + "search_index": 1 }, { "fieldname": "section_break_5", "fieldtype": "Section Break" }, - { - "fieldname": "nhifservice_url", - "fieldtype": "Data", - "label": "NHIF Service URL", - "reqd": 1 - }, - { - "fieldname": "nhifservice_token", - "fieldtype": "Small Text", - "label": "NHIF Service Token", - "read_only": 1 - }, - { - "fieldname": "nhifservice_expiry", - "fieldtype": "Datetime", - "label": "NHIF Service Token Expiry" - }, { "fieldname": "column_break_9", "fieldtype": "Column Break" @@ -95,7 +82,8 @@ "fieldname": "claimsserver_url", "fieldtype": "Data", "label": "Claims Server URL", - "reqd": 1 + "reqd": 1, + "search_index": 1 }, { "fieldname": "claimsserver_token", @@ -106,7 +94,8 @@ { "fieldname": "claimsserver_expiry", "fieldtype": "Datetime", - "label": "Claims Server Token Expiry" + "label": "Claims Server Token Expiry", + "search_index": 1 }, { "fieldname": "column_break_4", @@ -116,7 +105,8 @@ "fieldname": "facility_code", "fieldtype": "Data", "label": "Facility Code", - "reqd": 1 + "reqd": 1, + "search_index": 1 }, { "fieldname": "section_break_15", @@ -126,7 +116,8 @@ "default": "1", "fieldname": "update_patient_history", "fieldtype": "Check", - "label": "Update Patient history from Chronic records" + "label": "Update Patient history from Chronic records", + "search_index": 1 }, { "fieldname": "section_break_16", @@ -141,29 +132,15 @@ "bold": 1, "fieldname": "submit_claim_month", "fieldtype": "Int", - "label": "Submit Claim Month" + "label": "Submit Claim Month", + "search_index": 1 }, { "bold": 1, "fieldname": "submit_claim_year", "fieldtype": "Int", - "label": "Submit Claim Year" - }, - { - "fieldname": "nhifform_url", - "fieldtype": "Data", - "label": "NHIF Form URL" - }, - { - "fieldname": "nhifform_token", - "fieldtype": "Small Text", - "label": "NHIF Form Token", - "read_only": 1 - }, - { - "fieldname": "nhifform_expiry", - "fieldtype": "Datetime", - "label": "NHIF Form Token Expiry" + "label": "Submit Claim Year", + "search_index": 1 }, { "fieldname": "section_break_11", @@ -178,7 +155,8 @@ "depends_on": "eval: doc.enable", "fieldname": "enable_auto_submit_of_claims", "fieldtype": "Check", - "label": "Enable Auto Submit of Claims" + "label": "Enable Auto Submit of Claims", + "search_index": 1 }, { "depends_on": "eval: doc.enable && doc.enable_auto_submit_of_claims", @@ -189,17 +167,62 @@ { "default": "1", "depends_on": "eval: doc.enable", - "fieldname": "validate_service_approval_number_on_lrpm_documents", + "fieldname": "validate_service_approval_number_on_lrpmt_documents", "fieldtype": "Check", - "label": "Validate Service Approval number on LRPM Documents" + "label": "Validate Service Approval number on LRPMT Documents", + "search_index": 1 + }, + { + "fieldname": "service_url", + "fieldtype": "Data", + "label": "Service URL", + "reqd": 1, + "search_index": 1 + }, + { + "fieldname": "service_token", + "fieldtype": "Small Text", + "label": "Service Token", + "read_only": 1 + }, + { + "fieldname": "service_token_expiry", + "fieldtype": "Datetime", + "label": "Service Token Expiry", + "search_index": 1 + }, + { + "fieldname": "form_url", + "fieldtype": "Data", + "label": "Form URL", + "search_index": 1 + }, + { + "fieldname": "form_token_expiry", + "fieldtype": "Datetime", + "label": "Form Token Expiry", + "search_index": 1 + }, + { + "fieldname": "form_token", + "fieldtype": "Small Text", + "label": "Form Token", + "read_only": 1 + }, + { + "fieldname": "api_provider", + "fieldtype": "Select", + "label": "API Provider", + "options": "\nNHIF\nJubilee\nStrategis\nAssemble", + "reqd": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-04-17 17:20:12.085065", + "modified": "2024-04-17 18:08:51.344756", "modified_by": "Administrator", "module": "NHIF", - "name": "Company NHIF Settings", + "name": "Company Insurance Setting", "naming_rule": "By fieldname", "owner": "Administrator", "permissions": [ diff --git a/hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.py b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.py similarity index 85% rename from hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.py rename to hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.py index cf76213a..00cd4771 100644 --- a/hms_tz/nhif/doctype/company_nhif_settings/company_nhif_settings.py +++ b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.py @@ -8,5 +8,5 @@ from frappe.model.document import Document -class CompanyNHIFSettings(Document): +class CompanyInsuranceSetting(Document): pass diff --git a/hms_tz/nhif/doctype/company_nhif_settings/test_company_nhif_settings.py b/hms_tz/nhif/doctype/company_insurance_setting/test_company_insurance_setting.py similarity index 76% rename from hms_tz/nhif/doctype/company_nhif_settings/test_company_nhif_settings.py rename to hms_tz/nhif/doctype/company_insurance_setting/test_company_insurance_setting.py index 97bfbe67..46299d4b 100644 --- a/hms_tz/nhif/doctype/company_nhif_settings/test_company_nhif_settings.py +++ b/hms_tz/nhif/doctype/company_insurance_setting/test_company_insurance_setting.py @@ -7,5 +7,5 @@ import unittest -class TestCompanyNHIFSettings(unittest.TestCase): +class TestCompanyInsuranceSetting(unittest.TestCase): pass diff --git a/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py b/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py index 074f14d0..54f39376 100644 --- a/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py +++ b/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py @@ -20,22 +20,20 @@ def validate(self): def get_referral_no(name): doc = frappe.get_doc("Healthcare Referral", name) validate_required_fields(doc) - - nhifservice_url = frappe.get_cached_value( - "Company NHIF Settings", - doc.source_facility, - "nhifservice_url" - ) + + service_url = frappe.get_cached_value( + "Company NHIF Settings", doc.source_facility, "service_url" + ) token = get_nhifservice_token(doc.source_facility) - url = str(nhifservice_url) + "/nhifservice/breeze/verification/AddReferral" - + url = str(service_url) + "/nhifservice/breeze/verification/AddReferral" + qualificationid = frappe.get_cached_value( - "NHIF Physician Qualification", - doc.nhif_physician_qualification, - "physicianqualificationid" - ) + "NHIF Physician Qualification", + doc.nhif_physician_qualification, + "physicianqualificationid", + ) payload = json.dumps( { From be6ccf0edec9a8d4cdfcf60e639a25f8191fc80b Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Wed, 17 Apr 2024 23:24:17 +0300 Subject: [PATCH 11/25] chore: change 'Company NHIF Settings' to 'Company Insurance Setting' on deffirent files --- hms_tz/nhif/api/healthcare_utils.py | 4 +- hms_tz/nhif/api/insurance_company.py | 37 +- hms_tz/nhif/api/patient.py | 6 +- hms_tz/nhif/api/patient_appointment.py | 2 +- hms_tz/nhif/api/token.py | 12 +- .../healthcare_referral.json | 522 +++++++++--------- .../healthcare_referral.py | 2 +- .../nhif_claim_reconciliation.json | 294 +++++----- .../nhif_claim_reconciliation.py | 192 ++++--- .../nhif_custom_excluded_services.json | 230 ++++---- .../nhif_patient_claim/nhif_patient_claim.py | 18 +- .../claims_reconciliation_report.py | 4 +- .../nhif_tracking_claim_change_report.js | 4 +- 13 files changed, 672 insertions(+), 655 deletions(-) diff --git a/hms_tz/nhif/api/healthcare_utils.py b/hms_tz/nhif/api/healthcare_utils.py index 91d10c89..cfd6a104 100644 --- a/hms_tz/nhif/api/healthcare_utils.py +++ b/hms_tz/nhif/api/healthcare_utils.py @@ -1376,7 +1376,7 @@ def auto_submit_nhif_patient_claim(setting_dict=None): if not setting_dict: company_setting_detail = frappe.get_all( - "Company NHIF Settings", + "Company Insurance Setting", filters={"enable": 1, "enable_auto_submit_of_claims": 1}, fields=["company", "submit_claim_year", "submit_claim_month"], ) @@ -1504,7 +1504,7 @@ def get_card_no(appointment=None, encounter=None): service_url, validate_service_approval_no, ) = frappe.get_cached_value( - "Company NHIF Settings", + "Company Insurance Setting", company, [ "enable", diff --git a/hms_tz/nhif/api/insurance_company.py b/hms_tz/nhif/api/insurance_company.py index b8912d1f..dcb9d272 100644 --- a/hms_tz/nhif/api/insurance_company.py +++ b/hms_tz/nhif/api/insurance_company.py @@ -21,6 +21,7 @@ from time import sleep + @frappe.whitelist() def enqueue_get_nhif_price_package(company): enqueue( @@ -38,7 +39,7 @@ def get_nhif_price_package(kwargs): user = frappe.session.user token = get_claimsservice_token(company) claimsserver_url, facility_code = frappe.get_cached_value( - "Company NHIF Settings", company, ["claimsserver_url", "facility_code"] + "Company Insurance Setting", company, ["claimsserver_url", "facility_code"] ) headers = {"Authorization": "Bearer " + token} url = ( @@ -53,13 +54,15 @@ def get_nhif_price_package(kwargs): request_url=url, request_header=headers, response_data=r.text, - status_code=r.status_code + status_code=r.status_code, ) frappe.throw(json.loads(r.text)) else: if json.loads(r.text): frappe.db.sql( - """DELETE FROM `tabNHIF Price Package` WHERE company = '{0}' """.format(company) + """DELETE FROM `tabNHIF Price Package` WHERE company = '{0}' """.format( + company + ) ) frappe.db.sql( """DELETE FROM `tabNHIF Excluded Services` WHERE company = '{0}' """.format( @@ -76,7 +79,7 @@ def get_nhif_price_package(kwargs): request_url=url, request_header=headers, response_data=r.text, - status_code=r.status_code + status_code=r.status_code, ) time_stamp = now() data = json.loads(r.text) @@ -190,7 +193,9 @@ def process_nhif_records(company): def process_prices_list(kwargs): company = kwargs - facility_code = frappe.get_cached_value("Company NHIF Settings", company, "facility_code") + facility_code = frappe.get_cached_value( + "Company Insurance Setting", company, "facility_code" + ) currency = frappe.get_cached_value("Company", company, "default_currency") schemeid_list = frappe.db.sql( """ @@ -257,13 +262,11 @@ def process_prices_list(kwargs): ) if len(item_price_list) > 0: for price in item_price_list: - #2023-05-16 + # 2023-05-16 # remove condition for isactive # if package.isactive and int(package.isactive) == 1: - - if float(price.price_list_rate) != float( - package.unitprice - ): + + if float(price.price_list_rate) != float(package.unitprice): # delete Item Price if no package.unitprice or it is 0 if ( not float(package.unitprice) @@ -278,7 +281,7 @@ def process_prices_list(kwargs): float(package.unitprice), ) # else: - # frappe.delete_doc("Item Price", price.name) + # frappe.delete_doc("Item Price", price.name) # elif package.isactive and int(package.isactive) == 1: else: @@ -363,7 +366,9 @@ def get_insurance_coverage_items(company): WHERE icd.customer_name = 'NHIF' AND npp.company = {company} GROUP BY dt, m.name, icd.ref_code , icd.parent, npp.schemeid - """.format(company=frappe.db.escape(company)), + """.format( + company=frappe.db.escape(company) + ), as_dict=1, ) return items_list @@ -487,12 +492,12 @@ def process_insurance_coverages(kwargs): if insert_data: if plan.name: frappe.db.sql( - "DELETE FROM `tabHealthcare Service Insurance Coverage` WHERE is_auto_generated = 1 AND healthcare_insurance_coverage_plan = '{0}'".format( - plan.name - ) + "DELETE FROM `tabHealthcare Service Insurance Coverage` WHERE is_auto_generated = 1 AND healthcare_insurance_coverage_plan = '{0}'".format( + plan.name ) + ) frappe.db.commit() - + # wait for 60 seconds before creating HSIC records again sleep(60) diff --git a/hms_tz/nhif/api/patient.py b/hms_tz/nhif/api/patient.py index fb6f4f1e..97907a24 100644 --- a/hms_tz/nhif/api/patient.py +++ b/hms_tz/nhif/api/patient.py @@ -63,14 +63,14 @@ def get_patient_info(card_no=None): company = frappe.defaults.get_user_default("Company") if not company: company = frappe.get_list( - "Company NHIF Settings", fields=["company"], filters={"enable": 1} + "Company Insurance Setting", fields=["company"], filters={"enable": 1} )[0].company if not company: frappe.throw(_("No companies found to connect to NHIF")) token = get_nhifservice_token(company) service_url = frappe.get_cached_value( - "Company NHIF Settings", company, "service_url" + "Company Insurance Setting", company, "service_url" ) headers = {"Authorization": "Bearer " + token} url = ( @@ -120,7 +120,7 @@ def update_patient_history(doc): # Remarked till multi company setting is required and feasible from Patient doctype 2021-03-20 19:57:14 # company = get_default_company() # update_history = frappe.get_cached_value( - # "Company NHIF Settings", company, "update_patient_history") + # "Company Insurance Setting", company, "update_patient_history") # if not update_history: # return diff --git a/hms_tz/nhif/api/patient_appointment.py b/hms_tz/nhif/api/patient_appointment.py index a9450b90..202e1c1c 100644 --- a/hms_tz/nhif/api/patient_appointment.py +++ b/hms_tz/nhif/api/patient_appointment.py @@ -358,7 +358,7 @@ def get_authorization_num( remarks="", ): enable_nhif_api, service_url = frappe.get_cached_value( - "Company NHIF Settings", company, ["enable", "service_url"] + "Company Insurance Setting", company, ["enable", "service_url"] ) if not enable_nhif_api: frappe.msgprint( diff --git a/hms_tz/nhif/api/token.py b/hms_tz/nhif/api/token.py index a36e1a99..127f9d8b 100644 --- a/hms_tz/nhif/api/token.py +++ b/hms_tz/nhif/api/token.py @@ -59,7 +59,7 @@ def make_token_request(doc, url, headers, payload, fields): def get_nhifservice_token(company): - setting_doc = frappe.get_cached_doc("Company NHIF Settings", company) + setting_doc = frappe.get_cached_doc("Company Insurance Setting", company) if ( setting_doc.service_token_expiry and setting_doc.service_token_expiry > now_datetime() @@ -67,7 +67,7 @@ def get_nhifservice_token(company): return setting_doc.service_token username = setting_doc.username - password = get_decrypted_password("Company NHIF Settings", company, "password") + password = get_decrypted_password("Company Insurance Setting", company, "password") payload = "grant_type=password&username={0}&password={1}".format(username, password) headers = {"Content-Type": "application/x-www-form-urlencoded"} url = str(setting_doc.service_url) + "/nhifservice/Token" @@ -81,7 +81,7 @@ def get_nhifservice_token(company): def get_claimsservice_token(company): - setting_doc = frappe.get_cached_doc("Company NHIF Settings", company) + setting_doc = frappe.get_cached_doc("Company Insurance Setting", company) if ( setting_doc.claimsserver_expiry and setting_doc.claimsserver_expiry > now_datetime() @@ -89,7 +89,7 @@ def get_claimsservice_token(company): return setting_doc.claimsserver_token username = setting_doc.username - password = get_decrypted_password("Company NHIF Settings", company, "password") + password = get_decrypted_password("Company Insurance Setting", company, "password") payload = "grant_type=password&username={0}&password={1}".format(username, password) headers = {"Content-Type": "application/x-www-form-urlencoded"} url = str(setting_doc.claimsserver_url) + "/claimsserver/Token" @@ -103,7 +103,7 @@ def get_claimsservice_token(company): def get_formservice_token(company): - company_nhif_doc = frappe.get_cached_doc("Company NHIF Settings", company) + company_nhif_doc = frappe.get_cached_doc("Company Insurance Setting", company) if not company_nhif_doc.enable: frappe.throw(_("Company {0} not enabled for NHIF Integration".format(company))) @@ -114,7 +114,7 @@ def get_formservice_token(company): return company_nhif_doc.form_token username = company_nhif_doc.username - password = get_decrypted_password("Company NHIF Settings", company, "password") + password = get_decrypted_password("Company Insurance Setting", company, "password") payload = "grant_type=password&username={0}&password={1}".format(username, password) headers = {"Content-Type": "application/x-www-form-urlencoded"} diff --git a/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.json b/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.json index 27b8c61f..3c85ec5d 100644 --- a/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.json +++ b/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.json @@ -1,263 +1,263 @@ { - "actions": [], - "allow_rename": 1, - "autoname": "naming_series:", - "creation": "2022-06-29 17:17:49.625315", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "appointment", - "patient_name", - "gender", - "status_column_break", - "referral_status", - "card_no", - "authorization_number", - "posting_date", - "facility_section_break", - "source_facility", - "source_facility_code", - "facility_column_break", - "referrer_facility", - "referrer_facility_code", - "practitioner_section_break", - "practitioner", - "mobile_no", - "qualification_column_break", - "nhif_physician_qualification", - "reason_section", - "reason_for_referral", - "reason_column_break", - "referring_diagnosis", - "referral_section_break", - "referral_no", - "referralid", - "referringdate_column_break", - "referringdate", - "naming_series", - "amended_from" - ], - "fields": [ - { - "fieldname": "appointment", - "fieldtype": "Link", - "in_standard_filter": 1, - "label": "Patient Appointment", - "options": "Patient Appointment", - "reqd": 1 - }, - { - "fetch_from": "appointment.patient_name", - "fieldname": "patient_name", - "fieldtype": "Data", - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Patient Name", - "read_only": 1 - }, - { - "fetch_from": "appointment.patient_sex", - "fieldname": "gender", - "fieldtype": "Select", - "label": "Gender", - "options": "\nFemale\nMale", - "read_only": 1 - }, - { - "fetch_from": "appointment.coverage_plan_card_number", - "fieldname": "card_no", - "fieldtype": "Data", - "in_list_view": 1, - "in_standard_filter": 1, - "label": "CardNo", - "read_only": 1 - }, - { - "fetch_from": "appointment.authorization_number", - "fieldname": "authorization_number", - "fieldtype": "Data", - "in_list_view": 1, - "in_standard_filter": 1, - "label": "AuthorizationNo", - "read_only": 1 - }, - { - "fetch_from": "source_facility.facility_code", - "fieldname": "source_facility_code", - "fieldtype": "Data", - "label": "Source Facility Code", - "read_only": 1 - }, - { - "fieldname": "practitioner", - "fieldtype": "Link", - "in_standard_filter": 1, - "label": "Healthcare Practitioner", - "options": "Healthcare Practitioner", - "reqd": 1 - }, - { - "fieldname": "mobile_no", - "fieldtype": "Data", - "label": "Practitioner MobileNo" - }, - { - "fieldname": "posting_date", - "fieldtype": "Datetime", - "in_standard_filter": 1, - "label": "Posting Date", - "read_only": 1 - }, - { - "fieldname": "reason_for_referral", - "fieldtype": "Small Text", - "label": "Reason For Referral", - "reqd": 1 - }, - { - "fieldname": "reason_column_break", - "fieldtype": "Column Break" - }, - { - "fieldname": "referring_diagnosis", - "fieldtype": "Small Text", - "label": "Referring Diagnosis", - "reqd": 1 - }, - { - "fieldname": "referral_section_break", - "fieldtype": "Section Break", - "label": "Referral Info" - }, - { - "bold": 1, - "fieldname": "referral_no", - "fieldtype": "Data", - "in_list_view": 1, - "label": "ReferralNo", - "read_only": 1 - }, - { - "fieldname": "referralid", - "fieldtype": "Data", - "label": "ReferralID", - "read_only": 1 - }, - { - "fieldname": "referringdate", - "fieldtype": "Date", - "label": "ReferringDate", - "read_only": 1 - }, - { - "fieldname": "naming_series", - "fieldtype": "Select", - "label": "Series", - "options": "HLC-.R-.YYYY.-", - "read_only": 1 - }, - { - "fieldname": "status_column_break", - "fieldtype": "Column Break" - }, - { - "fieldname": "referral_status", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Referal Status", - "options": "Pending\nSuccess", - "read_only": 1 - }, - { - "fieldname": "facility_section_break", - "fieldtype": "Section Break", - "label": "Health Facility info" - }, - { - "fetch_from": "appointment.company", - "fieldname": "source_facility", - "fieldtype": "Link", - "in_standard_filter": 1, - "label": "Source Facility", - "options": "Company NHIF Settings", - "read_only": 1 - }, - { - "fieldname": "facility_column_break", - "fieldtype": "Column Break" - }, - { - "fieldname": "practitioner_section_break", - "fieldtype": "Section Break", - "label": "Practitioner Info" - }, - { - "fieldname": "qualification_column_break", - "fieldtype": "Column Break" - }, - { - "fieldname": "reason_section", - "fieldtype": "Section Break", - "label": "Referring Reason &Diagnosis" - }, - { - "fieldname": "referringdate_column_break", - "fieldtype": "Column Break" - }, - { - "fieldname": "referrer_facility", - "fieldtype": "Link", - "label": "Referrer Facility", - "options": "Healthcare External Referrer", - "reqd": 1 - }, - { - "fetch_from": "referrer_facility.facility_code", - "fieldname": "referrer_facility_code", - "fieldtype": "Data", - "label": "Referrer Facility Code", - "read_only": 1 - }, - { - "fieldname": "amended_from", - "fieldtype": "Link", - "label": "Amended From", - "no_copy": 1, - "options": "Healthcare Referral", - "print_hide": 1, - "read_only": 1 - }, - { - "fetch_from": "practitioner.nhif_physician_qualification", - "fieldname": "nhif_physician_qualification", - "fieldtype": "Data", - "label": "NHIF Physician Qualifiaction", - "read_only": 1 - } - ], - "index_web_pages_for_search": 1, - "is_submittable": 1, - "links": [], - "modified": "2022-06-30 12:18:38.471974", - "modified_by": "Administrator", - "module": "NHIF", - "name": "Healthcare Referral", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC" + "actions": [], + "allow_rename": 1, + "autoname": "naming_series:", + "creation": "2022-06-29 17:17:49.625315", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "appointment", + "patient_name", + "gender", + "status_column_break", + "referral_status", + "card_no", + "authorization_number", + "posting_date", + "facility_section_break", + "source_facility", + "source_facility_code", + "facility_column_break", + "referrer_facility", + "referrer_facility_code", + "practitioner_section_break", + "practitioner", + "mobile_no", + "qualification_column_break", + "nhif_physician_qualification", + "reason_section", + "reason_for_referral", + "reason_column_break", + "referring_diagnosis", + "referral_section_break", + "referral_no", + "referralid", + "referringdate_column_break", + "referringdate", + "naming_series", + "amended_from" + ], + "fields": [ + { + "fieldname": "appointment", + "fieldtype": "Link", + "in_standard_filter": 1, + "label": "Patient Appointment", + "options": "Patient Appointment", + "reqd": 1 + }, + { + "fetch_from": "appointment.patient_name", + "fieldname": "patient_name", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Patient Name", + "read_only": 1 + }, + { + "fetch_from": "appointment.patient_sex", + "fieldname": "gender", + "fieldtype": "Select", + "label": "Gender", + "options": "\nFemale\nMale", + "read_only": 1 + }, + { + "fetch_from": "appointment.coverage_plan_card_number", + "fieldname": "card_no", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "CardNo", + "read_only": 1 + }, + { + "fetch_from": "appointment.authorization_number", + "fieldname": "authorization_number", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "AuthorizationNo", + "read_only": 1 + }, + { + "fetch_from": "source_facility.facility_code", + "fieldname": "source_facility_code", + "fieldtype": "Data", + "label": "Source Facility Code", + "read_only": 1 + }, + { + "fieldname": "practitioner", + "fieldtype": "Link", + "in_standard_filter": 1, + "label": "Healthcare Practitioner", + "options": "Healthcare Practitioner", + "reqd": 1 + }, + { + "fieldname": "mobile_no", + "fieldtype": "Data", + "label": "Practitioner MobileNo" + }, + { + "fieldname": "posting_date", + "fieldtype": "Datetime", + "in_standard_filter": 1, + "label": "Posting Date", + "read_only": 1 + }, + { + "fieldname": "reason_for_referral", + "fieldtype": "Small Text", + "label": "Reason For Referral", + "reqd": 1 + }, + { + "fieldname": "reason_column_break", + "fieldtype": "Column Break" + }, + { + "fieldname": "referring_diagnosis", + "fieldtype": "Small Text", + "label": "Referring Diagnosis", + "reqd": 1 + }, + { + "fieldname": "referral_section_break", + "fieldtype": "Section Break", + "label": "Referral Info" + }, + { + "bold": 1, + "fieldname": "referral_no", + "fieldtype": "Data", + "in_list_view": 1, + "label": "ReferralNo", + "read_only": 1 + }, + { + "fieldname": "referralid", + "fieldtype": "Data", + "label": "ReferralID", + "read_only": 1 + }, + { + "fieldname": "referringdate", + "fieldtype": "Date", + "label": "ReferringDate", + "read_only": 1 + }, + { + "fieldname": "naming_series", + "fieldtype": "Select", + "label": "Series", + "options": "HLC-.R-.YYYY.-", + "read_only": 1 + }, + { + "fieldname": "status_column_break", + "fieldtype": "Column Break" + }, + { + "fieldname": "referral_status", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Referal Status", + "options": "Pending\nSuccess", + "read_only": 1 + }, + { + "fieldname": "facility_section_break", + "fieldtype": "Section Break", + "label": "Health Facility info" + }, + { + "fetch_from": "appointment.company", + "fieldname": "source_facility", + "fieldtype": "Link", + "in_standard_filter": 1, + "label": "Source Facility", + "options": "Company Insurance Setting", + "read_only": 1 + }, + { + "fieldname": "facility_column_break", + "fieldtype": "Column Break" + }, + { + "fieldname": "practitioner_section_break", + "fieldtype": "Section Break", + "label": "Practitioner Info" + }, + { + "fieldname": "qualification_column_break", + "fieldtype": "Column Break" + }, + { + "fieldname": "reason_section", + "fieldtype": "Section Break", + "label": "Referring Reason &Diagnosis" + }, + { + "fieldname": "referringdate_column_break", + "fieldtype": "Column Break" + }, + { + "fieldname": "referrer_facility", + "fieldtype": "Link", + "label": "Referrer Facility", + "options": "Healthcare External Referrer", + "reqd": 1 + }, + { + "fetch_from": "referrer_facility.facility_code", + "fieldname": "referrer_facility_code", + "fieldtype": "Data", + "label": "Referrer Facility Code", + "read_only": 1 + }, + { + "fieldname": "amended_from", + "fieldtype": "Link", + "label": "Amended From", + "no_copy": 1, + "options": "Healthcare Referral", + "print_hide": 1, + "read_only": 1 + }, + { + "fetch_from": "practitioner.nhif_physician_qualification", + "fieldname": "nhif_physician_qualification", + "fieldtype": "Data", + "label": "NHIF Physician Qualifiaction", + "read_only": 1 + } + ], + "index_web_pages_for_search": 1, + "is_submittable": 1, + "links": [], + "modified": "2022-06-30 12:18:38.471974", + "modified_by": "Administrator", + "module": "NHIF", + "name": "Healthcare Referral", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC" } \ No newline at end of file diff --git a/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py b/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py index 54f39376..d4b3529a 100644 --- a/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py +++ b/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py @@ -22,7 +22,7 @@ def get_referral_no(name): validate_required_fields(doc) service_url = frappe.get_cached_value( - "Company NHIF Settings", doc.source_facility, "service_url" + "Company Insurance Setting", doc.source_facility, "service_url" ) token = get_nhifservice_token(doc.source_facility) diff --git a/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.json b/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.json index 3a186420..8696e0f1 100644 --- a/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.json +++ b/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.json @@ -1,149 +1,149 @@ { - "actions": [], - "allow_rename": 1, - "autoname": "NCR-.#######", - "creation": "2022-08-22 13:22:02.826140", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "company", - "claim_year", - "claim_month", - "status_column_break", - "status", - "posting_date", - "get_detail", - "section_break_ts", - "number_of_submitted_claims", - "column_break_ac", - "total_amount_claimed", - "section_break_cards", - "claim_details", - "amended_from" - ], - "fields": [ - { - "fieldname": "company", - "fieldtype": "Link", - "in_global_search": 1, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Company", - "options": "Company NHIF Settings", - "reqd": 1, - "search_index": 1 - }, - { - "fieldname": "claim_year", - "fieldtype": "Data", - "in_global_search": 1, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Claim Year", - "reqd": 1, - "search_index": 1 - }, - { - "fieldname": "claim_month", - "fieldtype": "Int", - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Claim Month", - "reqd": 1, - "search_index": 1 - }, - { - "fieldname": "section_break_ts", - "fieldtype": "Section Break" - }, - { - "fieldname": "column_break_ac", - "fieldtype": "Column Break" - }, - { - "bold": 1, - "fieldname": "total_amount_claimed", - "fieldtype": "Currency", - "label": "Total Amount Claimed", - "read_only": 1 - }, - { - "fieldname": "section_break_cards", - "fieldtype": "Section Break", - "label": "Claimed Cards" - }, - { - "fieldname": "claim_details", - "fieldtype": "Table", - "options": "NHIF Claim Reconciliation Detail", - "read_only": 1 - }, - { - "fieldname": "amended_from", - "fieldtype": "Link", - "label": "Amended From", - "no_copy": 1, - "options": "NHIF Claim Reconciliation", - "print_hide": 1, - "read_only": 1 - }, - { - "fieldname": "status_column_break", - "fieldtype": "Column Break" - }, - { - "fieldname": "status", - "fieldtype": "Select", - "label": "Status", - "options": "Pending\nSuccessful", - "read_only": 1 - }, - { - "fieldname": "posting_date", - "fieldtype": "Date", - "label": "Posting Date", - "read_only": 1 - }, - { - "bold": 1, - "fieldname": "number_of_submitted_claims", - "fieldtype": "Int", - "label": "Number of Submitted Claims", - "read_only": 1 - }, - { - "depends_on": "eval: doc.docstatus==0", - "fieldname": "get_detail", - "fieldtype": "Button", - "label": "Get Detail" - } - ], - "index_web_pages_for_search": 1, - "is_submittable": 1, - "links": [], - "modified": "2022-08-27 13:04:56.427583", - "modified_by": "Administrator", - "module": "NHIF", - "name": "NHIF Claim Reconciliation", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 1, - "track_views": 1 + "actions": [], + "allow_rename": 1, + "autoname": "NCR-.#######", + "creation": "2022-08-22 13:22:02.826140", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "company", + "claim_year", + "claim_month", + "status_column_break", + "status", + "posting_date", + "get_detail", + "section_break_ts", + "number_of_submitted_claims", + "column_break_ac", + "total_amount_claimed", + "section_break_cards", + "claim_details", + "amended_from" + ], + "fields": [ + { + "fieldname": "company", + "fieldtype": "Link", + "in_global_search": 1, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Company", + "options": "Company Insurance Setting", + "reqd": 1, + "search_index": 1 + }, + { + "fieldname": "claim_year", + "fieldtype": "Data", + "in_global_search": 1, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Claim Year", + "reqd": 1, + "search_index": 1 + }, + { + "fieldname": "claim_month", + "fieldtype": "Int", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Claim Month", + "reqd": 1, + "search_index": 1 + }, + { + "fieldname": "section_break_ts", + "fieldtype": "Section Break" + }, + { + "fieldname": "column_break_ac", + "fieldtype": "Column Break" + }, + { + "bold": 1, + "fieldname": "total_amount_claimed", + "fieldtype": "Currency", + "label": "Total Amount Claimed", + "read_only": 1 + }, + { + "fieldname": "section_break_cards", + "fieldtype": "Section Break", + "label": "Claimed Cards" + }, + { + "fieldname": "claim_details", + "fieldtype": "Table", + "options": "NHIF Claim Reconciliation Detail", + "read_only": 1 + }, + { + "fieldname": "amended_from", + "fieldtype": "Link", + "label": "Amended From", + "no_copy": 1, + "options": "NHIF Claim Reconciliation", + "print_hide": 1, + "read_only": 1 + }, + { + "fieldname": "status_column_break", + "fieldtype": "Column Break" + }, + { + "fieldname": "status", + "fieldtype": "Select", + "label": "Status", + "options": "Pending\nSuccessful", + "read_only": 1 + }, + { + "fieldname": "posting_date", + "fieldtype": "Date", + "label": "Posting Date", + "read_only": 1 + }, + { + "bold": 1, + "fieldname": "number_of_submitted_claims", + "fieldtype": "Int", + "label": "Number of Submitted Claims", + "read_only": 1 + }, + { + "depends_on": "eval: doc.docstatus==0", + "fieldname": "get_detail", + "fieldtype": "Button", + "label": "Get Detail" + } + ], + "index_web_pages_for_search": 1, + "is_submittable": 1, + "links": [], + "modified": "2022-08-27 13:04:56.427583", + "modified_by": "Administrator", + "module": "NHIF", + "name": "NHIF Claim Reconciliation", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1, + "track_seen": 1, + "track_views": 1 } \ No newline at end of file diff --git a/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.py b/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.py index 47d554dc..802d67a2 100644 --- a/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.py +++ b/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.py @@ -9,110 +9,120 @@ from hms_tz.nhif.api.token import get_claimsservice_token from hms_tz.nhif.doctype.nhif_response_log.nhif_response_log import add_log + class NHIFClaimReconciliation(Document): - def validate(self): - if not self.posting_date: - self.posting_date = nowdate() - - def validate_reqd_fields(self): - for fieldname in ["company", "claim_year", "claim_month"]: - if not self.get(fieldname): - frappe.throw(frappe.bold("{0} is required".format(fieldname))) - - def before_submit(self): - if self.status == "Pending": - frappe.throw("Cannot submit a pending reconciliation") + def validate(self): + if not self.posting_date: + self.posting_date = nowdate() + + def validate_reqd_fields(self): + for fieldname in ["company", "claim_year", "claim_month"]: + if not self.get(fieldname): + frappe.throw(frappe.bold("{0} is required".format(fieldname))) + + def before_submit(self): + if self.status == "Pending": + frappe.throw("Cannot submit a pending reconciliation") @frappe.whitelist() def get_submitted_claims(self): - doc = frappe.get_doc(frappe.parse_json(self)) - doc.validate_reqd_fields() + doc = frappe.get_doc(frappe.parse_json(self)) + doc.validate_reqd_fields() - token = get_claimsservice_token(doc.get("company")) - headers = { - "Content-Type": "application/json", - "Authorization": "Bearer " + token - } + token = get_claimsservice_token(doc.get("company")) + headers = {"Content-Type": "application/json", "Authorization": "Bearer " + token} - facility_code, base_url = frappe.get_cached_value("Company NHIF Settings", doc.company, ["facility_code", "claimsserver_url"]) - params = "FacilityCode={0}&ClaimYear={1}&ClaimMonth={2}".format(facility_code, doc.claim_year, doc.claim_month) + facility_code, base_url = frappe.get_cached_value( + "Company Insurance Setting", doc.company, ["facility_code", "claimsserver_url"] + ) + params = "FacilityCode={0}&ClaimYear={1}&ClaimMonth={2}".format( + facility_code, doc.claim_year, doc.claim_month + ) - url = "{0}/claimsserver/api/v1/claims/getSubmittedClaims?{1}".format(base_url, params) + url = "{0}/claimsserver/api/v1/claims/getSubmittedClaims?{1}".format( + base_url, params + ) - data = make_request(url, headers, params) + data = make_request(url, headers, params) - if len(data) > 0: - return update_reconciliation_detail(doc, data) - - else: - frappe.msgprint("No record found for facility: {0}, claim year: {1} and claim month: {2}".format( - frappe.bold(doc.company), frappe.bold(doc.claim_year), frappe.bold(doc.claim_month) - )) - return False + if len(data) > 0: + return update_reconciliation_detail(doc, data) + + else: + frappe.msgprint( + "No record found for facility: {0}, claim year: {1} and claim month: {2}".format( + frappe.bold(doc.company), + frappe.bold(doc.claim_year), + frappe.bold(doc.claim_month), + ) + ) + return False def make_request(url, headers, payload): - try: - response = requests.get(url, headers=headers) - if response.status_code == 200: - data = json.loads(response.text) - add_log( - request_type="GetSubmittedClaims", - request_url=url, - request_header=headers, - request_body=payload, - response_data="total_records: {0}".format(len(data)), - status_code=response.status_code, - ) - return data - - else: - add_log( - request_type="GetSubmittedClaims", - request_url=url, - request_header=headers, - request_body=payload, - response_data=response.text, - status_code=response.status_code, - ) - data = json.loads(response.text) - frappe.throw("Message: {0}".format(frappe.bold(data["Message"]))) - - except Exception as e: - raise e - frappe.throw(str(e)) + try: + response = requests.get(url, headers=headers) + if response.status_code == 200: + data = json.loads(response.text) + add_log( + request_type="GetSubmittedClaims", + request_url=url, + request_header=headers, + request_body=payload, + response_data="total_records: {0}".format(len(data)), + status_code=response.status_code, + ) + return data + + else: + add_log( + request_type="GetSubmittedClaims", + request_url=url, + request_header=headers, + request_body=payload, + response_data=response.text, + status_code=response.status_code, + ) + data = json.loads(response.text) + frappe.throw("Message: {0}".format(frappe.bold(data["Message"]))) + + except Exception as e: + raise e + frappe.throw(str(e)) def update_reconciliation_detail(self, records): - total_amount = 0 - self.status = "Successful" - self.number_of_submitted_claims = len(records) - - self.claim_details = [] - for record in records: - total_amount += flt(record["AmountClaimed"]) - self.append("claim_details", { - "foliono": record["FolioNo"], - "billno": record["BillNo"], - "datesubmitted": record["DateSubmitted"], - "cardno": record["CardNo"], - "authorizationno": record["AuthorizationNo"], - "amountclaimed": flt(record["AmountClaimed"]), - "submissionid": record["SubmissionID"], - "submissionno": record["SubmissionNo"], - "remarks": record["Remarks"], - }) - - self.total_amount_claimed = total_amount - - self.save(ignore_permissions=True) - frappe.db.commit() - - self.reload() - - if len(self.claim_details) > 0: - self.submit() - - return True - + total_amount = 0 + self.status = "Successful" + self.number_of_submitted_claims = len(records) + + self.claim_details = [] + for record in records: + total_amount += flt(record["AmountClaimed"]) + self.append( + "claim_details", + { + "foliono": record["FolioNo"], + "billno": record["BillNo"], + "datesubmitted": record["DateSubmitted"], + "cardno": record["CardNo"], + "authorizationno": record["AuthorizationNo"], + "amountclaimed": flt(record["AmountClaimed"]), + "submissionid": record["SubmissionID"], + "submissionno": record["SubmissionNo"], + "remarks": record["Remarks"], + }, + ) + + self.total_amount_claimed = total_amount + + self.save(ignore_permissions=True) + frappe.db.commit() + + self.reload() + + if len(self.claim_details) > 0: + self.submit() + + return True diff --git a/hms_tz/nhif/doctype/nhif_custom_excluded_services/nhif_custom_excluded_services.json b/hms_tz/nhif/doctype/nhif_custom_excluded_services/nhif_custom_excluded_services.json index 25dec005..659cb03f 100644 --- a/hms_tz/nhif/doctype/nhif_custom_excluded_services/nhif_custom_excluded_services.json +++ b/hms_tz/nhif/doctype/nhif_custom_excluded_services/nhif_custom_excluded_services.json @@ -1,117 +1,117 @@ { - "actions": [], - "allow_rename": 1, - "autoname": "NCXS-.YY.-.MM.-.DD.-.#####", - "creation": "2022-04-08 16:04:53.235211", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "company", - "time_stamp", - "column_break_1", - "facilitycode", - "title", - "section_break_1", - "item", - "column_break_2", - "itemcode", - "section_break_2", - "excludedforproducts" - ], - "fields": [ - { - "fieldname": "company", - "fieldtype": "Link", - "in_standard_filter": 1, - "label": "Company", - "options": "Company NHIF Settings", - "reqd": 1 - }, - { - "fieldname": "time_stamp", - "fieldtype": "Datetime", - "in_standard_filter": 1, - "label": "Time Stamp", - "read_only": 1 - }, - { - "fieldname": "column_break_1", - "fieldtype": "Column Break" - }, - { - "fetch_from": "company.facility_code", - "fieldname": "facilitycode", - "fieldtype": "Data", - "label": "FacilityCode", - "read_only": 1 - }, - { - "fieldname": "section_break_1", - "fieldtype": "Section Break" - }, - { - "fieldname": "item", - "fieldtype": "Link", - "label": "Item", - "options": "Item", - "reqd": 1 - }, - { - "fieldname": "column_break_2", - "fieldtype": "Column Break" - }, - { - "fieldname": "itemcode", - "fieldtype": "Data", - "in_list_view": 1, - "in_standard_filter": 1, - "label": "ItemCode" - }, - { - "fieldname": "section_break_2", - "fieldtype": "Section Break" - }, - { - "fieldname": "excludedforproducts", - "fieldtype": "Small Text", - "in_list_view": 1, - "label": "ExcludedForProducts", - "reqd": 1 - }, - { - "fieldname": "title", - "fieldtype": "Data", - "hidden": 1, - "in_list_view": 1, - "in_standard_filter": 1, - "label": "Title", - "read_only": 1 - } - ], - "index_web_pages_for_search": 1, - "links": [], - "modified": "2022-04-09 21:14:50.842195", - "modified_by": "Administrator", - "module": "NHIF", - "name": "NHIF Custom Excluded Services", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC", - "title_field": "title", - "track_changes": 1 + "actions": [], + "allow_rename": 1, + "autoname": "NCXS-.YY.-.MM.-.DD.-.#####", + "creation": "2022-04-08 16:04:53.235211", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "company", + "time_stamp", + "column_break_1", + "facilitycode", + "title", + "section_break_1", + "item", + "column_break_2", + "itemcode", + "section_break_2", + "excludedforproducts" + ], + "fields": [ + { + "fieldname": "company", + "fieldtype": "Link", + "in_standard_filter": 1, + "label": "Company", + "options": "Company Insurance Setting", + "reqd": 1 + }, + { + "fieldname": "time_stamp", + "fieldtype": "Datetime", + "in_standard_filter": 1, + "label": "Time Stamp", + "read_only": 1 + }, + { + "fieldname": "column_break_1", + "fieldtype": "Column Break" + }, + { + "fetch_from": "company.facility_code", + "fieldname": "facilitycode", + "fieldtype": "Data", + "label": "FacilityCode", + "read_only": 1 + }, + { + "fieldname": "section_break_1", + "fieldtype": "Section Break" + }, + { + "fieldname": "item", + "fieldtype": "Link", + "label": "Item", + "options": "Item", + "reqd": 1 + }, + { + "fieldname": "column_break_2", + "fieldtype": "Column Break" + }, + { + "fieldname": "itemcode", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "ItemCode" + }, + { + "fieldname": "section_break_2", + "fieldtype": "Section Break" + }, + { + "fieldname": "excludedforproducts", + "fieldtype": "Small Text", + "in_list_view": 1, + "label": "ExcludedForProducts", + "reqd": 1 + }, + { + "fieldname": "title", + "fieldtype": "Data", + "hidden": 1, + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Title", + "read_only": 1 + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2022-04-09 21:14:50.842195", + "modified_by": "Administrator", + "module": "NHIF", + "name": "NHIF Custom Excluded Services", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "title", + "track_changes": 1 } \ No newline at end of file diff --git a/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py b/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py index 7e715d56..d993b94d 100644 --- a/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py +++ b/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py @@ -194,7 +194,7 @@ def set_claim_values(self): if not self.folio_id: self.folio_id = str(uuid.uuid1()) self.facility_code = frappe.get_cached_value( - "Company NHIF Settings", self.company, "facility_code" + "Company Insurance Setting", self.company, "facility_code" ) self.posting_date = nowdate() self.serial_no = int(self.name[-9:]) @@ -584,7 +584,7 @@ def set_patient_claim_item(self, inpatient_record=None, called_method=None): for row in encounter_doc.get(child.get("table")): if row.prescribe or row.is_cancelled: continue - + item_code = frappe.get_value( child.get("doctype"), row.get(child.get("item")), @@ -597,9 +597,9 @@ def set_patient_claim_item(self, inpatient_record=None, called_method=None): row.get("quantity_returned") or 0 ) elif row.get("doctype") == "Therapy Plan Detail": - delivered_quantity = (row.get("no_of_sessions") or 0) - ( - row.get("sessions_cancelled") or 0 - ) + delivered_quantity = ( + row.get("no_of_sessions") or 0 + ) - (row.get("sessions_cancelled") or 0) else: delivered_quantity = 1 @@ -782,7 +782,7 @@ def send_nhif_claim(self): json_data, json_data_wo_files = self.get_folio_json_data() token = get_claimsservice_token(self.company) claimsserver_url = frappe.get_value( - "Company NHIF Settings", self.company, "claimsserver_url" + "Company Insurance Setting", self.company, "claimsserver_url" ) headers = { "Authorization": "Bearer " + token, @@ -1023,7 +1023,7 @@ def validate_submit_date(self): import calendar submit_claim_month, submit_claim_year = frappe.get_value( - "Company NHIF Settings", + "Company Insurance Setting", self.company, ["submit_claim_month", "submit_claim_year"], ) @@ -1032,14 +1032,14 @@ def validate_submit_date(self): frappe.throw( frappe.bold( "Submit Claim Month or Submit Claim Year not found,\ - please inform IT department to set it on Company NHIF Settings" + please inform IT department to set it on Company Insurance Setting" ) ) if self.claim_month != submit_claim_month or self.claim_year != submit_claim_year: frappe.throw( "Claim Month: {0} or Claim Year: {1} of this document is not same to Submit Claim Month: {2}\ - or Submit Claim Year: {3} on Company NHIF Settings".format( + or Submit Claim Year: {3} on Company Insurance Setting".format( frappe.bold(calendar.month_name[self.claim_month]), frappe.bold(self.claim_year), frappe.bold(calendar.month_name[submit_claim_month]), diff --git a/hms_tz/nhif/report/claims_reconciliation_report/claims_reconciliation_report.py b/hms_tz/nhif/report/claims_reconciliation_report/claims_reconciliation_report.py index 549ba325..c05e7085 100644 --- a/hms_tz/nhif/report/claims_reconciliation_report/claims_reconciliation_report.py +++ b/hms_tz/nhif/report/claims_reconciliation_report/claims_reconciliation_report.py @@ -140,7 +140,9 @@ def get_data(filters): def get_nhif_data(filters): token = get_claimsservice_token(filters.company) claimsserver_url, facility_code = frappe.get_value( - "Company NHIF Settings", filters.company, ["claimsserver_url", "facility_code"] + "Company Insurance Setting", + filters.company, + ["claimsserver_url", "facility_code"], ) headers = {"Authorization": "Bearer " + token, "Content-Type": "application/json"} url = str( diff --git a/hms_tz/nhif/report/nhif_tracking_claim_change_report/nhif_tracking_claim_change_report.js b/hms_tz/nhif/report/nhif_tracking_claim_change_report/nhif_tracking_claim_change_report.js index 6b13c234..d2f24f82 100644 --- a/hms_tz/nhif/report/nhif_tracking_claim_change_report/nhif_tracking_claim_change_report.js +++ b/hms_tz/nhif/report/nhif_tracking_claim_change_report/nhif_tracking_claim_change_report.js @@ -8,7 +8,7 @@ frappe.query_reports["NHIF Tracking Claim Change Report"] = { "fieldname": "company", "label": __("Company"), "fieldtype": "Link", - "options": "Company NHIF Settings", + "options": "Company Insurance Setting", "reqd": 1, }, { @@ -40,7 +40,7 @@ frappe.query_reports["NHIF Tracking Claim Change Report"] = { "label": __("Claim Submitted By"), "fieldtype": "Link", "options": "User", - + }, ], "formatter": (value, row, column, data, default_formatter) => { From c3d9e3050421af3ea24f756acf43e9d920049176 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Wed, 17 Apr 2024 23:43:09 +0300 Subject: [PATCH 12/25] chore: add providerid and will be used for jubilee token request --- .../company_insurance_setting.json | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json index 26370770..e85197ee 100644 --- a/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json +++ b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json @@ -1,18 +1,20 @@ { "actions": [], "allow_rename": 1, - "autoname": "field:company", + "autoname": "format:{api_provider}-{abbr}", "creation": "2020-11-10 16:52:35.894771", "doctype": "DocType", "editable_grid": 1, "engine": "InnoDB", "field_order": [ "company", - "facility_code", + "abbr", "username", "password", "column_break_4", + "facility_code", "api_provider", + "providerid", "enable", "validate_service_approval_number_on_lrpmt_documents", "enable_auto_submit_of_claims", @@ -44,8 +46,7 @@ "in_list_view": 1, "label": "Company", "options": "Company", - "reqd": 1, - "unique": 1 + "reqd": 1 }, { "fieldname": "username", @@ -215,15 +216,30 @@ "label": "API Provider", "options": "\nNHIF\nJubilee\nStrategis\nAssemble", "reqd": 1 + }, + { + "fetch_from": "company.abbr", + "fetch_if_empty": 1, + "fieldname": "abbr", + "fieldtype": "Data", + "label": "Abbr", + "read_only": 1 + }, + { + "depends_on": "eval: doc.api_provider == \"Jubilee\"", + "fieldname": "providerid", + "fieldtype": "Data", + "label": "ProviderID", + "mandatory_depends_on": "eval: doc.api_provider == \"Jubilee\"" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-04-17 18:08:51.344756", + "modified": "2024-04-17 19:24:32.362279", "modified_by": "Administrator", "module": "NHIF", "name": "Company Insurance Setting", - "naming_rule": "By fieldname", + "naming_rule": "Expression", "owner": "Administrator", "permissions": [ { From 755cb23785b604baf779a414efc442fdf9d19ed4 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Wed, 17 Apr 2024 23:43:28 +0300 Subject: [PATCH 13/25] feat: jubilee module --- hms_tz/modules.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hms_tz/modules.txt b/hms_tz/modules.txt index a3f631da..b341f7d7 100644 --- a/hms_tz/modules.txt +++ b/hms_tz/modules.txt @@ -1,2 +1,3 @@ Hms Tz -NHIF \ No newline at end of file +NHIF +Jubilee \ No newline at end of file From 4355e4de3feb46b58cef8e96a5e5ec3977492907 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Wed, 17 Apr 2024 23:45:04 +0300 Subject: [PATCH 14/25] feat: jubilee response log for storing all request and response log sent to and received from Jubilee Server --- .../doctype/jubilee_response_log/__init__.py | 0 .../jubilee_response_log.js | 8 + .../jubilee_response_log.json | 146 ++++++++++++++++++ .../jubilee_response_log.py | 33 ++++ .../test_jubilee_response_log.py | 9 ++ 5 files changed, 196 insertions(+) create mode 100644 hms_tz/jubilee/doctype/jubilee_response_log/__init__.py create mode 100644 hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.js create mode 100644 hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.json create mode 100644 hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.py create mode 100644 hms_tz/jubilee/doctype/jubilee_response_log/test_jubilee_response_log.py diff --git a/hms_tz/jubilee/doctype/jubilee_response_log/__init__.py b/hms_tz/jubilee/doctype/jubilee_response_log/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.js b/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.js new file mode 100644 index 00000000..503d20ae --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.js @@ -0,0 +1,8 @@ +// Copyright (c) 2024, Aakvatech and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Jubilee Response Log', { + // refresh: function(frm) { + + // } +}); diff --git a/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.json b/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.json new file mode 100644 index 00000000..b0fcba3b --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.json @@ -0,0 +1,146 @@ +{ + "actions": [], + "autoname": "naming_series:", + "creation": "2024-04-17 19:47:17.483482", + "default_view": "List", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "timestamp", + "request_type", + "request_url", + "request_header", + "column_break_6", + "user_id", + "status_code", + "ref_doctype", + "ref_docname", + "request_section", + "request_body", + "section_break_8", + "response_data", + "naming_series" + ], + "fields": [ + { + "default": "Now", + "fieldname": "timestamp", + "fieldtype": "Datetime", + "in_list_view": 1, + "label": "Timestamp", + "read_only": 1 + }, + { + "fieldname": "request_type", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Request Type", + "read_only": 1 + }, + { + "fieldname": "request_url", + "fieldtype": "Data", + "label": "Request URL", + "length": 1000, + "read_only": 1 + }, + { + "fieldname": "status_code", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Response Status Code", + "read_only": 1, + "search_index": 1 + }, + { + "fieldname": "column_break_6", + "fieldtype": "Column Break" + }, + { + "fieldname": "user_id", + "fieldtype": "Data", + "label": "User ID", + "read_only": 1 + }, + { + "fieldname": "request_header", + "fieldtype": "Small Text", + "label": "Request Header", + "read_only": 1 + }, + { + "collapsible": 1, + "fieldname": "request_section", + "fieldtype": "Section Break", + "label": "Request Body" + }, + { + "fieldname": "request_body", + "fieldtype": "Long Text", + "label": "Request Body", + "read_only": 1 + }, + { + "collapsible": 1, + "fieldname": "section_break_8", + "fieldtype": "Section Break", + "label": "Response Data" + }, + { + "fieldname": "response_data", + "fieldtype": "Long Text", + "label": "Response Data" + }, + { + "fieldname": "naming_series", + "fieldtype": "Select", + "label": "Naming Series", + "options": "JUB-RES-.YY.-.########", + "read_only": 1 + }, + { + "fieldname": "ref_doctype", + "fieldtype": "Data", + "label": "Ref Doctype", + "read_only": 1 + }, + { + "fieldname": "ref_docname", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Ref Docname", + "read_only": 1, + "search_index": 1 + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2024-04-17 19:55:34.807520", + "modified_by": "Administrator", + "module": "Jubilee", + "name": "Jubilee Response Log", + "naming_rule": "By \"Naming Series\" field", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "states": [], + "track_changes": 1 +} \ No newline at end of file diff --git a/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.py b/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.py new file mode 100644 index 00000000..cf8f83ac --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.py @@ -0,0 +1,33 @@ +# Copyright (c) 2024, Aakvatech and contributors +# For license information, please see license.txt + +import frappe +from frappe.model.document import Document + +class JubileeResponseLog(Document): + pass + + +def add_jubilee_log( + request_type, + request_url, + request_header=None, + request_body=None, + response_data=None, + status_code=None, + ref_doctype=None, + ref_docname=None, +): + doc = frappe.new_doc("Jubilee Response Log") + doc.request_type = str(request_type) + doc.request_url = str(request_url) + doc.request_header = str(request_header) or "" + doc.request_body = str(request_body) or "" + doc.response_data = str(response_data) or "" + doc.user_id = frappe.session.user + doc.status_code = status_code or "" + doc.ref_doctype = ref_doctype or "" + doc.ref_docname = ref_docname or "" + doc.save(ignore_permissions=True) + frappe.db.commit() + return doc.name diff --git a/hms_tz/jubilee/doctype/jubilee_response_log/test_jubilee_response_log.py b/hms_tz/jubilee/doctype/jubilee_response_log/test_jubilee_response_log.py new file mode 100644 index 00000000..c8910d49 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_response_log/test_jubilee_response_log.py @@ -0,0 +1,9 @@ +# Copyright (c) 2024, Aakvatech and Contributors +# See license.txt + +# import frappe +from frappe.tests.utils import FrappeTestCase + + +class TestJubileeResponseLog(FrappeTestCase): + pass From d623bd569736f8359186003911bb0235bf8111e4 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Wed, 17 Apr 2024 23:45:42 +0300 Subject: [PATCH 15/25] feat: request token from jubilee server --- hms_tz/jubilee/__init__.py | 0 hms_tz/jubilee/api/token.py | 137 +++++++++++++++++++++++++++++ hms_tz/jubilee/doctype/__init__.py | 0 3 files changed, 137 insertions(+) create mode 100644 hms_tz/jubilee/__init__.py create mode 100644 hms_tz/jubilee/api/token.py create mode 100644 hms_tz/jubilee/doctype/__init__.py diff --git a/hms_tz/jubilee/__init__.py b/hms_tz/jubilee/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/api/token.py b/hms_tz/jubilee/api/token.py new file mode 100644 index 00000000..cd2f77a4 --- /dev/null +++ b/hms_tz/jubilee/api/token.py @@ -0,0 +1,137 @@ +import json +import frappe +import requests +from time import sleep, localtime +from frappe.utils import now_datetime, add_to_date, now +from frappe.utils.password import get_decrypted_password +from hms_tz.jubilee.doctype.jubilee_response_log.jubilee_response_log import ( + add_jubilee_log, +) + + +def make_jubilee_token_request(doc, url, headers, payload, fields): + for i in range(3): + try: + r = requests.request("POST", url, headers=headers, data=payload, timeout=5) + r.raise_for_status() + frappe.logger().debug({"webhook_success": r.text}) + data = json.loads(r.text) + if data: + add_jubilee_log( + request_type="Token", + request_url=url, + request_header=headers, + request_body=payload, + response_data=data, + status_code=r.status_code, + ) + + if ( + data["Description"] + and data["Description"].get("token_type") == "Bearer" + ): + token = data["Description"].get("access_token") + expired = data["Description"].get("expires_in") + expiry_date = localtime(expired) + doc.update({fields["token"]: token, fields["expiry"]: expiry_date}) + + doc.db_update() + frappe.db.commit() + return token + else: + add_jubilee_log( + request_type="Token", + request_url=url, + request_header=headers, + request_body=payload, + response_data=data, + status_code=r.status_code, + ) + frappe.throw(data) + + except Exception as e: + frappe.logger().debug({"webhook_error": e, "try": i + 1}) + sleep(3 * i + 1) + if i != 2: + continue + else: + raise e + + +@frappe.whitelist() +def get_jubilee_service_token(company, api_provider): + setting_name = frappe.get_cached_value( + "Company Insurance Setting", + {"company": company, "api_provider": api_provider}, + "name", + ) + if not setting_name: + frappe.throw( + f"Company Insurance Setting not found for company: {company} and API Provider: {api_provider}, please create one." + ) + + setting_doc = frappe.get_cached_doc("Company Insurance Setting", setting_name) + if ( + setting_doc.service_token_expiry + and setting_doc.service_token_expiry > now_datetime() + ): + return setting_doc.service_token + + payload = { + "username": setting_doc.username, + "password": get_decrypted_password( + setting_doc.doctype, setting_doc.name, "password" + ), + "providerid": setting_doc.providerid, + } + headers = {} + url = str(setting_doc.service_url) + "/jubileeapi/Token" + + jubileeservice_fields = { + "token": "service_token", + "expiry": "service_token_expiry", + } + + return make_jubilee_token_request( + setting_doc, url, headers, payload, jubileeservice_fields + ) + + +@frappe.whitelist() +def get_jubilee_claimsservice_token(company, api_provider): + setting_name = frappe.get_cached_value( + "Company Insurance Setting", + {"company": company, "api_provider": api_provider}, + "name", + ) + if not setting_name: + frappe.throw( + f"Company Insurance Setting not found for company: {company} and API Provider: {api_provider}, please create one." + ) + + setting_doc = frappe.get_cached_doc("Company Insurance Setting", setting_name) + + if ( + setting_doc.claimsserver_expiry + and setting_doc.claimsserver_expiry > now_datetime() + ): + return setting_doc.claimsserver_token + + payload = { + "username": setting_doc.username, + "password": get_decrypted_password( + setting_doc.doctype, setting_doc.name, "password" + ), + "providerid": setting_doc.providerid, + } + headers = {} + url = str(setting_doc.claimsserver_url) + "/jubileeapi/Token" + + claimserver_fields = { + "token": "claimsserver_token", + "expiry": "claimsserver_expiry", + } + + return make_jubilee_token_request( + setting_doc, url, headers, payload, claimserver_fields + ) diff --git a/hms_tz/jubilee/doctype/__init__.py b/hms_tz/jubilee/doctype/__init__.py new file mode 100644 index 00000000..e69de29b From 446df5c3d225903246da58c5cf03afbe75bf18b7 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Mon, 22 Apr 2024 16:39:15 +0300 Subject: [PATCH 16/25] feat: fetch member card details from jubilee server --- hms_tz/jubilee/api/api.py | 79 +++++ hms_tz/nhif/api/patient.js | 272 +++++++++++++----- .../custom_fields/hms_tz_custom_fields.py | 2 +- 3 files changed, 276 insertions(+), 77 deletions(-) create mode 100644 hms_tz/jubilee/api/api.py diff --git a/hms_tz/jubilee/api/api.py b/hms_tz/jubilee/api/api.py new file mode 100644 index 00000000..cb750544 --- /dev/null +++ b/hms_tz/jubilee/api/api.py @@ -0,0 +1,79 @@ +import json +import frappe +import requests +from frappe import _ +from time import sleep +from erpnext import get_default_company +from hms_tz.jubilee.api.token import get_jubilee_service_token +from hms_tz.jubilee.doctype.jubilee_response_log.jubilee_response_log import add_jubilee_log + + +@frappe.whitelist() +def get_member_card_detials(card_no, insurance_provider): + if not card_no or insurance_provider != "Jubilee": + return + + company = get_default_company() + if not company: + company = frappe.defaults.get_user_default("Company") + + if not company: + company = frappe.get_list( + "Company Insurance Setting", fields=["company"], filters={"enable": 1, "api_provider": insurance_provider} + )[0].company + if not company: + frappe.throw(_("No companies found to connect to Jubilee")) + + token = get_jubilee_service_token(company, insurance_provider) + + service_url = frappe.get_cached_value( + "Company Insurance Setting", + {"company": company, "api_provider": insurance_provider}, + "service_url", + ) + headers = {"Authorization": "Bearer " + token} + url = ( + str(service_url) + f"/jubileeapi/Getcarddetails?MemberNo={str(card_no)}" + ) + for i in range(3): + try: + r = requests.get(url, headers=headers, timeout=5) + r.raise_for_status() + frappe.logger().debug({"webhook_success": r.text}) + + if json.loads(r.text): + add_jubilee_log( + request_type="GetCardDetails", + request_url=url, + request_header=headers, + response_data=json.loads(r.text), + status_code=r.status_code, + ref_doctype="Patient", + ) + card = json.loads(r.text) + frappe.msgprint(_(card["Status"]), alert=True) + # add_scheme(card.get("SchemeID"), card.get("SchemeName")) + # add_product(card.get("ProductCode"), card.get("ProductName")) + return card + else: + add_jubilee_log( + request_type="GetCardDetails", + request_url=url, + request_header=headers, + response_data=str(r), + status_code=r.status_code, + ref_doctype="Patient", + ) + frappe.msgprint(json.loads(r.text)) + frappe.msgprint( + _( + "Getting information from NHIF failed. Try again after sometime, or continue manually." + ) + ) + except Exception as e: + frappe.logger().debug({"webhook_error": e, "try": i + 1}) + sleep(3 * i + 1) + if i != 2: + continue + else: + raise e diff --git a/hms_tz/nhif/api/patient.js b/hms_tz/nhif/api/patient.js index 490dff70..20da49ec 100644 --- a/hms_tz/nhif/api/patient.js +++ b/hms_tz/nhif/api/patient.js @@ -18,11 +18,18 @@ frappe.ui.form.on('Patient', { }); }, card_no: function (frm) { - frm.fields_dict.card_no.$input.focusout(function() { - frm.trigger('get_patient_info'); + frm.fields_dict.card_no.$input.focusout(function () { + if (frm.doc.insurance_provider) { + frm.trigger('get_patient_info'); + } frm.set_df_property('card_no', 'read_only', 1); }); }, + insurance_provider: function (frm) { + if (frm.doc.card_no && frm.doc.insurance_provider) { + frm.trigger('get_patient_info'); + } + }, mobile: function (frm) { frappe.call({ method: 'hms_tz.nhif.api.patient.validate_mobile_number', @@ -53,26 +60,86 @@ frappe.ui.form.on('Patient', { } }); if (exists) return; - frappe.call({ - method: 'hms_tz.nhif.api.patient.get_patient_info', - args: { - 'card_no': frm.doc.card_no, - }, - freeze: true, - freeze_message: __("Please Wait..."), - callback: function (data) { - if (data.message) { - const card = data.message; - if (!frm.is_new()) { - const d = new frappe.ui.Dialog({ - title: "Patient's information", - primary_action_label: 'Submit', - primary_action(values) { - update_patient_info(frm, card); - d.hide(); - } + + if (frm.doc.card_no && frm.doc.insurance_provider) { + if (frm.doc.insurance_provider == 'NHIF') { + get_nhif_patient_info(frm); + } else if (frm.doc.insurance_provider == "Jubilee") { + get_jubilee_patient_info(frm); + } + } + }, + update_cash_limit: function (frm) { + if (frappe.user.has_role('Healthcare Administrator')) { + frm.add_custom_button(__('Update Cash Limit'), function () { + let d = new frappe.ui.Dialog({ + title: 'Change Cash Limit', + fields: [ + { + fieldname: 'current_cash_limit', + fieldtype: 'Currency', + label: __('Current Cash Limit'), + default: frm.doc.cash_limit, + reqd: true + }, + { + fieldname: 'column_break_1', + fieldtype: 'Column Break' + }, + { + fieldname: 'new_cash_limit', + fieldtype: 'Currency', + label: 'New Cash Limit', + reqd: true + } + ], + }); + d.set_primary_action(__('Submit'), function () { + if (d.get_value('new_cash_limit') == 0) { + frappe.msgprint({ + title: 'Notification', + indicator: 'red', + message: __('New cash limit cannot be zero') }); - $(`
+ } else { + frappe.call('hms_tz.nhif.api.patient.enqueue_update_cash_limit', { + old_cash_limit: d.get_value('current_cash_limit'), + new_cash_limit: d.get_value('new_cash_limit') + }).then(r => { + frappe.show_alert(__("Processing patient's cash limit")) + }) + d.hide(); + } + + }); + d.show(); + }).removeClass('btn-default').addClass('btn-info font-weight-bold text-dark'); + } + } +}); + +function get_nhif_patient_info(frm) { + frappe.call({ + method: 'hms_tz.nhif.api.patient.get_patient_info', + args: { + 'card_no': frm.doc.card_no, + 'insurance_provider': frm.doc.insurance_provider + }, + freeze: true, + freeze_message: __("Please Wait..."), + callback: function (data) { + if (data.message) { + const card = data.message; + if (!frm.is_new()) { + const d = new frappe.ui.Dialog({ + title: "Patient's information", + primary_action_label: 'Submit', + primary_action(values) { + update_nhif_patient_info(frm, card); + d.hide(); + } + }); + $(`
@@ -125,65 +192,17 @@ frappe.ui.form.on('Patient', {
`).appendTo(d.body); - d.show(); - } - else { - update_patient_info(frm, card); - } + d.show(); + } + else { + update_nhif_patient_info(frm, card); } } - }); - }, - update_cash_limit: function(frm) { - if (frappe.user.has_role('Healthcare Administrator')) { - frm.add_custom_button(__('Update Cash Limit'), function () { - let d = new frappe.ui.Dialog({ - title: 'Change Cash Limit', - fields: [ - { - fieldname: 'current_cash_limit', - fieldtype: 'Currency', - label: __('Current Cash Limit'), - default: frm.doc.cash_limit, - reqd: true - }, - { - fieldname: 'column_break_1', - fieldtype: 'Column Break' - }, - { - fieldname: 'new_cash_limit', - fieldtype: 'Currency', - label: 'New Cash Limit', - reqd: true - } - ], - }); - d.set_primary_action(__('Submit'), function() { - if (d.get_value('new_cash_limit') == 0) { - frappe.msgprint({ - title: 'Notification', - indicator: 'red', - message: __('New cash limit cannot be zero') - }); - } else { - frappe.call('hms_tz.nhif.api.patient.enqueue_update_cash_limit', { - old_cash_limit: d.get_value('current_cash_limit'), - new_cash_limit: d.get_value('new_cash_limit') - }).then(r => { - frappe.show_alert(__("Processing patient's cash limit")) - }) - d.hide(); - } - - }); - d.show(); - }).removeClass('btn-default').addClass('btn-info font-weight-bold text-dark'); } - } -}); + }); +} -function update_patient_info(frm, card) { +function update_nhif_patient_info(frm, card) { frm.set_value("first_name", card.FirstName); frm.set_value("middle_name", card.MiddleName); frm.set_value("last_name", card.LastName); @@ -200,3 +219,104 @@ function update_patient_info(frm, card) { indicator: 'green' }, 5); } + +function get_jubilee_patient_info(frm) { + frappe.call({ + method: 'hms_tz.jubilee.api.api.get_member_card_detials', + args: { + 'card_no': frm.doc.card_no, + 'insurance_provider': frm.doc.insurance_provider + }, + freeze: true, + freeze_message: __("Please Wait..."), + callback: function (data) { + if (data.message) { + const cardinfo = data.message["Description"]; + if (!frm.is_new()) { + const d = new frappe.ui.Dialog({ + title: "Patient's information", + primary_action_label: 'Submit', + primary_action(values) { + update_jubilee_patient_info(frm, cardinfo); + d.hide(); + } + }); + $(`
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Field NameCurrent ValuesNew Values
First Name${frm.doc.first_name}${cardinfo.FirstName}
Last Name${frm.doc.middle_name}${cardinfo.MiddleName}
Last Name${frm.doc.last_name}${cardinfo.LastName}
Full Name${frm.doc.patient_name}${cardinfo.MemberName}
Mobile${frm.doc.mobile}${cardinfo.Phone}
Gender${frm.doc.sex}${cardinfo.Gender}
Date of birth${frm.doc.dob}${cardinfo.Dob.slice(0, 10)}
Membership No${frm.doc.membership_no}${cardinfo.PrincipleMemberNo}
+
`).appendTo(d.body); + d.show(); + } + else { + update_jubilee_patient_info(frm, cardinfo); + } + } + } + }); +} + +function update_jubilee_patient_info(frm, cardinfo) { + frm.set_value("first_name", cardinfo.FirstName); + frm.set_value("middle_name", cardinfo.MiddleName); + frm.set_value("last_name", cardinfo.LastName); + frm.set_value("patient_name", cardinfo.MemberName); + frm.set_value("sex", cardinfo.Gender); + frm.set_value("dob", cardinfo.Dob); + frm.set_value("nhif_employername", cardinfo.Company); + frm.set_value("membership_no", cardinfo.PrincipleMemberNo); + frm.set_value("mobile", cardinfo.Phone); + frm.save(); + frappe.show_alert({ + message: __("Patient's information is updated"), + indicator: 'green' + }, 5); +} diff --git a/hms_tz/patches/custom_fields/hms_tz_custom_fields.py b/hms_tz/patches/custom_fields/hms_tz_custom_fields.py index a12fb255..bbb83714 100644 --- a/hms_tz/patches/custom_fields/hms_tz_custom_fields.py +++ b/hms_tz/patches/custom_fields/hms_tz_custom_fields.py @@ -2531,7 +2531,7 @@ def execute(): }, { "fieldtype": "Section Break", - "label": "NHIF Details", + "label": "Insurance Details", "fieldname": "insurance_details", }, From 25ec74d938aaa99e3705196e3da232a2ba59a41c Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Mon, 24 Jun 2024 18:01:10 +0300 Subject: [PATCH 17/25] feat: get price package from jubilee --- hms_tz/jubilee/api/api.py | 68 +++++++- hms_tz/jubilee/api/price_package.py | 153 ++++++++++++++++++ hms_tz/jubilee/api/token.py | 2 + .../doctype/jubilee_price_package/__init__.py | 0 .../jubilee_price_package.js | 8 + .../jubilee_price_package.json | 135 ++++++++++++++++ .../jubilee_price_package.py | 8 + .../test_jubilee_price_package.py | 9 ++ .../jubilee_response_log.json | 10 +- .../jubilee_response_log.py | 3 + .../doctype/jubilee_update/__init__.py | 0 .../doctype/jubilee_update/jubilee_update.js | 8 + .../jubilee_update/jubilee_update.json | 92 +++++++++++ .../doctype/jubilee_update/jubilee_update.py | 8 + .../jubilee_update/test_jubilee_update.py | 9 ++ .../doctype/jubilee_update_item/__init__.py | 0 .../jubilee_update_item.json | 91 +++++++++++ .../jubilee_update_item.py | 8 + hms_tz/nhif/api/insurance_company.js | 64 +++++++- 19 files changed, 666 insertions(+), 10 deletions(-) create mode 100644 hms_tz/jubilee/api/price_package.py create mode 100644 hms_tz/jubilee/doctype/jubilee_price_package/__init__.py create mode 100644 hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.js create mode 100644 hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.json create mode 100644 hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.py create mode 100644 hms_tz/jubilee/doctype/jubilee_price_package/test_jubilee_price_package.py create mode 100644 hms_tz/jubilee/doctype/jubilee_update/__init__.py create mode 100644 hms_tz/jubilee/doctype/jubilee_update/jubilee_update.js create mode 100644 hms_tz/jubilee/doctype/jubilee_update/jubilee_update.json create mode 100644 hms_tz/jubilee/doctype/jubilee_update/jubilee_update.py create mode 100644 hms_tz/jubilee/doctype/jubilee_update/test_jubilee_update.py create mode 100644 hms_tz/jubilee/doctype/jubilee_update_item/__init__.py create mode 100644 hms_tz/jubilee/doctype/jubilee_update_item/jubilee_update_item.json create mode 100644 hms_tz/jubilee/doctype/jubilee_update_item/jubilee_update_item.py diff --git a/hms_tz/jubilee/api/api.py b/hms_tz/jubilee/api/api.py index cb750544..cd833b11 100644 --- a/hms_tz/jubilee/api/api.py +++ b/hms_tz/jubilee/api/api.py @@ -4,8 +4,12 @@ from frappe import _ from time import sleep from erpnext import get_default_company +from frappe.utils.background_jobs import enqueue from hms_tz.jubilee.api.token import get_jubilee_service_token -from hms_tz.jubilee.doctype.jubilee_response_log.jubilee_response_log import add_jubilee_log +from hms_tz.jubilee.api.price_package import sync_jubilee_price_package +from hms_tz.jubilee.doctype.jubilee_response_log.jubilee_response_log import ( + add_jubilee_log, +) @frappe.whitelist() @@ -19,7 +23,9 @@ def get_member_card_detials(card_no, insurance_provider): if not company: company = frappe.get_list( - "Company Insurance Setting", fields=["company"], filters={"enable": 1, "api_provider": insurance_provider} + "Company Insurance Setting", + fields=["company"], + filters={"enable": 1, "api_provider": insurance_provider}, )[0].company if not company: frappe.throw(_("No companies found to connect to Jubilee")) @@ -32,9 +38,7 @@ def get_member_card_detials(card_no, insurance_provider): "service_url", ) headers = {"Authorization": "Bearer " + token} - url = ( - str(service_url) + f"/jubileeapi/Getcarddetails?MemberNo={str(card_no)}" - ) + url = str(service_url) + f"/jubileeapi/Getcarddetails?MemberNo={str(card_no)}" for i in range(3): try: r = requests.get(url, headers=headers, timeout=5) @@ -77,3 +81,57 @@ def get_member_card_detials(card_no, insurance_provider): continue else: raise e + + +@frappe.whitelist() +def enqueue_get_jubilee_price_packages(company): + enqueue( + method=get_jubilee_price_packages, + job_name="get_jubilee_price_packages", + queue="default", + timeout=None, + is_async=True, + company=company, + ) + + +@frappe.whitelist() +def get_jubilee_price_packages(company, insurance_provider="Jubilee"): + if not company: + frappe.throw(_("No companies found to connect to Jubilee")) + + token = get_jubilee_service_token(company, insurance_provider) + + service_url = frappe.get_cached_value( + "Company Insurance Setting", + {"company": company, "api_provider": insurance_provider}, + "service_url", + ) + headers = {"Authorization": "Bearer " + token} + url = str(service_url) + "/jubileeapi/GetPriceList" + r = requests.get(url, headers=headers, timeout=300) + if r.status_code != 200: + add_jubilee_log( + request_type="GetPricePackage", + request_url=url, + request_header=headers, + response_data=r.text, + status_code=r.status_code, + ref_doctype="Jubilee Price Package", + company=company, + ) + frappe.throw(json.loads(r.text)) + else: + if json.loads(r.text): + log_name = add_jubilee_log( + request_type="GetPricePackage", + request_url=url, + request_header=headers, + response_data=r.text, + status_code=r.status_code, + ref_doctype="Jubilee Price Package", + company=company, + ) + + packages = json.loads(r.text)["Description"] + sync_jubilee_price_package(packages, company, log_name) diff --git a/hms_tz/jubilee/api/price_package.py b/hms_tz/jubilee/api/price_package.py new file mode 100644 index 00000000..841f4630 --- /dev/null +++ b/hms_tz/jubilee/api/price_package.py @@ -0,0 +1,153 @@ +import json +import frappe +from time import sleep +from frappe.utils import now_datetime +from frappe.query_builder import DocType + + +def sync_jubilee_price_package( + packages, company, log_name, insurance_provider="Jubilee" +): + if len(packages) == 0: + return + + delete_price_package(company) + + sleep(30) + create_price_package(packages, company, log_name) + + sleep(30) + set_package_diff(company) + + +def delete_price_package(company): + jpp = DocType("Jubilee Price Package") + frappe.qb.from_(jpp).delete().where(jpp.company == company).run() + + +def create_price_package(packages, company, log_name): + fields = [ + "name", + "company", + "itemcode", + "itemname", + "cleanname", + "itemprice", + "providerid", + "log_name", + "time_stamp", + ] + + data = [] + time_stamp = now_datetime() + for row in packages: + jpp_name = frappe.generate_hash(length=10) + + data.append( + ( + jpp_name, + company, + row.get("ItemCode"), + row.get("ItemName"), + row.get("CleanName"), + row.get("ItemPrice"), + row.get("ProviderID"), + log_name, + time_stamp, + ) + ) + frappe.db.bulk_insert( + "Jubilee Price Package", fields=fields, values=data, chunk_size=1000 + ) + + +def set_package_diff(company): + logs = frappe.get_all( + "Jubilee Response Log", + filters={ + "request_type": "GetPricePackage", + "response_data": ["not in", ["", None]], + "company": company, + }, + fields=["name", "response_data"], + order_by="creation desc", + page_length=2, + ) + if len(logs) < 2: + return + + current_rec = json.loads(logs[0]["response_data"]) + previous_rec = json.loads(logs[1]["response_data"]) + current_price_packages = current_rec.get("Description") + previousـprice_packages = previous_rec.get("Description") + + diff_price_packages_from_current = [ + i for i in current_price_packages if i not in previousـprice_packages + ] + diff_price_packages_from_previous = [ + i for i in previousـprice_packages if i not in current_price_packages + ] + + changed_price_packages = [] + new_price_packages = [] + + for e in diff_price_packages_from_current: + exist_rec = next( + ( + item + for item in diff_price_packages_from_previous + if item.get("ItemCode") == e.get("ItemCode") + ), + None, + ) + if exist_rec: + changed_price_packages.append(exist_rec) + else: + new_price_packages.append(e) + + deleted_price_packages = [] + + for z in diff_price_packages_from_previous: + exist_rec = next( + ( + item + for item in diff_price_packages_from_current + if item.get("ItemCode") == z.get("ItemCode") + ), + None, + ) + if not exist_rec: + deleted_price_packages.append(z) + + if ( + len(changed_price_packages) > 0 + or len(new_price_packages) > 0 + or len(deleted_price_packages) > 0 + ): + doc = frappe.new_doc("Jubilee Update") + + add_price_packages_records(doc, changed_price_packages, "Changed") + add_price_packages_records(doc, new_price_packages, "New") + add_price_packages_records(doc, deleted_price_packages, "Deleted") + + if (doc.get("price_package") and len(doc.price_package)) or (): + doc.company = company + doc.current_log = logs[0].name + doc.previous_log = logs[1].name + doc.save(ignore_permissions=True) + + +def add_price_packages_records(doc, rec, type): + if not len(rec) > 0: + return + + for e in rec: + price_row = doc.append("price_package", {}) + price_row.itemcode = e.get("ItemCode") + price_row.type = type + price_row.olditemcode = e.get("OldItemCode") + price_row.itemname = e.get("ItemName") + price_row.strength = e.get("Strength") + price_row.dosage = e.get("Dosage") + price_row.unitprice = e.get("UnitPrice") + price_row.record = json.dumps(e) diff --git a/hms_tz/jubilee/api/token.py b/hms_tz/jubilee/api/token.py index cd2f77a4..252d01fc 100644 --- a/hms_tz/jubilee/api/token.py +++ b/hms_tz/jubilee/api/token.py @@ -24,6 +24,7 @@ def make_jubilee_token_request(doc, url, headers, payload, fields): request_body=payload, response_data=data, status_code=r.status_code, + company=doc.company, ) if ( @@ -46,6 +47,7 @@ def make_jubilee_token_request(doc, url, headers, payload, fields): request_body=payload, response_data=data, status_code=r.status_code, + company=doc.company, ) frappe.throw(data) diff --git a/hms_tz/jubilee/doctype/jubilee_price_package/__init__.py b/hms_tz/jubilee/doctype/jubilee_price_package/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.js b/hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.js new file mode 100644 index 00000000..e66aa74b --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.js @@ -0,0 +1,8 @@ +// Copyright (c) 2024, Aakvatech and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Jubilee Price Package', { + // refresh: function(frm) { + + // } +}); diff --git a/hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.json b/hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.json new file mode 100644 index 00000000..8b6a8751 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.json @@ -0,0 +1,135 @@ +{ + "actions": [], + "autoname": "JPP-.YY.-.MM.-.DD.-.#####", + "creation": "2024-06-14 16:02:14.924451", + "default_view": "List", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "providerid", + "log_name", + "column_break_4", + "company", + "time_stamp", + "section_break_3", + "itemcode", + "itemprice", + "strength", + "dosage", + "column_break_12", + "itemname", + "cleanname" + ], + "fields": [ + { + "fieldname": "log_name", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Log Name", + "read_only": 1 + }, + { + "fieldname": "time_stamp", + "fieldtype": "Datetime", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Time Stamp", + "read_only": 1 + }, + { + "fieldname": "column_break_4", + "fieldtype": "Column Break" + }, + { + "fieldname": "company", + "fieldtype": "Data", + "in_standard_filter": 1, + "label": "Company", + "read_only": 1 + }, + { + "fieldname": "section_break_3", + "fieldtype": "Section Break" + }, + { + "fieldname": "itemcode", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "ItemCode", + "read_only": 1 + }, + { + "fieldname": "itemname", + "fieldtype": "Small Text", + "in_standard_filter": 1, + "label": "ItemName", + "read_only": 1 + }, + { + "fieldname": "strength", + "fieldtype": "Data", + "label": "Strength", + "read_only": 1 + }, + { + "fieldname": "dosage", + "fieldtype": "Data", + "label": "Dosage", + "read_only": 1 + }, + { + "fieldname": "column_break_12", + "fieldtype": "Column Break" + }, + { + "fieldname": "providerid", + "fieldtype": "Data", + "label": "ProviderID", + "read_only": 1 + }, + { + "fieldname": "itemprice", + "fieldtype": "Float", + "in_list_view": 1, + "label": "ItemPrice", + "read_only": 1 + }, + { + "fieldname": "cleanname", + "fieldtype": "Small Text", + "in_standard_filter": 1, + "label": "CleanName", + "read_only": 1 + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2024-06-18 18:11:06.535715", + "modified_by": "Administrator", + "module": "Jubilee", + "name": "Jubilee Price Package", + "naming_rule": "Expression (old style)", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "states": [], + "title_field": "itemname", + "track_changes": 1 +} \ No newline at end of file diff --git a/hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.py b/hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.py new file mode 100644 index 00000000..3477fb26 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_price_package/jubilee_price_package.py @@ -0,0 +1,8 @@ +# Copyright (c) 2024, Aakvatech and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class JubileePricePackage(Document): + pass diff --git a/hms_tz/jubilee/doctype/jubilee_price_package/test_jubilee_price_package.py b/hms_tz/jubilee/doctype/jubilee_price_package/test_jubilee_price_package.py new file mode 100644 index 00000000..c33e5b68 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_price_package/test_jubilee_price_package.py @@ -0,0 +1,9 @@ +# Copyright (c) 2024, Aakvatech and Contributors +# See license.txt + +# import frappe +from frappe.tests.utils import FrappeTestCase + + +class TestJubileePricePackage(FrappeTestCase): + pass diff --git a/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.json b/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.json index b0fcba3b..e2ee7cb2 100644 --- a/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.json +++ b/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.json @@ -16,6 +16,7 @@ "status_code", "ref_doctype", "ref_docname", + "company", "request_section", "request_body", "section_break_8", @@ -115,11 +116,18 @@ "label": "Ref Docname", "read_only": 1, "search_index": 1 + }, + { + "fieldname": "company", + "fieldtype": "Data", + "hidden": 1, + "label": "Company", + "read_only": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-04-17 19:55:34.807520", + "modified": "2024-06-18 09:28:58.023706", "modified_by": "Administrator", "module": "Jubilee", "name": "Jubilee Response Log", diff --git a/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.py b/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.py index cf8f83ac..2322af6e 100644 --- a/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.py +++ b/hms_tz/jubilee/doctype/jubilee_response_log/jubilee_response_log.py @@ -4,6 +4,7 @@ import frappe from frappe.model.document import Document + class JubileeResponseLog(Document): pass @@ -17,6 +18,7 @@ def add_jubilee_log( status_code=None, ref_doctype=None, ref_docname=None, + company=None, ): doc = frappe.new_doc("Jubilee Response Log") doc.request_type = str(request_type) @@ -28,6 +30,7 @@ def add_jubilee_log( doc.status_code = status_code or "" doc.ref_doctype = ref_doctype or "" doc.ref_docname = ref_docname or "" + doc.company = company doc.save(ignore_permissions=True) frappe.db.commit() return doc.name diff --git a/hms_tz/jubilee/doctype/jubilee_update/__init__.py b/hms_tz/jubilee/doctype/jubilee_update/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/doctype/jubilee_update/jubilee_update.js b/hms_tz/jubilee/doctype/jubilee_update/jubilee_update.js new file mode 100644 index 00000000..42ca9555 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_update/jubilee_update.js @@ -0,0 +1,8 @@ +// Copyright (c) 2024, Aakvatech and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Jubilee Update', { + // refresh: function(frm) { + + // } +}); diff --git a/hms_tz/jubilee/doctype/jubilee_update/jubilee_update.json b/hms_tz/jubilee/doctype/jubilee_update/jubilee_update.json new file mode 100644 index 00000000..cc96ddd9 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_update/jubilee_update.json @@ -0,0 +1,92 @@ +{ + "actions": [], + "autoname": "JU-.YY.-.#########", + "creation": "2024-06-18 09:47:39.160869", + "default_view": "List", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "company", + "datetime", + "column_break_lln7e", + "current_log", + "previous_log", + "jubilee_price_packages_section", + "price_package" + ], + "fields": [ + { + "fieldname": "company", + "fieldtype": "Data", + "label": "company", + "read_only": 1 + }, + { + "default": "Now", + "fieldname": "datetime", + "fieldtype": "Datetime", + "label": "DateTime", + "read_only": 1 + }, + { + "fieldname": "column_break_lln7e", + "fieldtype": "Column Break" + }, + { + "fieldname": "current_log", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Current Log", + "options": "Jubilee Response Log", + "read_only": 1, + "reqd": 1 + }, + { + "fieldname": "previous_log", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Previous Log", + "options": "Jubilee Response Log", + "read_only": 1, + "reqd": 1 + }, + { + "fieldname": "jubilee_price_packages_section", + "fieldtype": "Section Break", + "label": "Jubilee Price Packages" + }, + { + "fieldname": "price_package", + "fieldtype": "Table", + "label": "Price Packages", + "options": "Jubilee Update Item", + "read_only": 1 + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2024-06-18 09:47:39.160869", + "modified_by": "Administrator", + "module": "Jubilee", + "name": "Jubilee Update", + "naming_rule": "Expression (old style)", + "owner": "Administrator", + "permissions": [ + { + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "states": [], + "track_changes": 1 +} \ No newline at end of file diff --git a/hms_tz/jubilee/doctype/jubilee_update/jubilee_update.py b/hms_tz/jubilee/doctype/jubilee_update/jubilee_update.py new file mode 100644 index 00000000..57f89c88 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_update/jubilee_update.py @@ -0,0 +1,8 @@ +# Copyright (c) 2024, Aakvatech and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class JubileeUpdate(Document): + pass diff --git a/hms_tz/jubilee/doctype/jubilee_update/test_jubilee_update.py b/hms_tz/jubilee/doctype/jubilee_update/test_jubilee_update.py new file mode 100644 index 00000000..08fa8b15 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_update/test_jubilee_update.py @@ -0,0 +1,9 @@ +# Copyright (c) 2024, Aakvatech and Contributors +# See license.txt + +# import frappe +from frappe.tests.utils import FrappeTestCase + + +class TestJubileeUpdate(FrappeTestCase): + pass diff --git a/hms_tz/jubilee/doctype/jubilee_update_item/__init__.py b/hms_tz/jubilee/doctype/jubilee_update_item/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/doctype/jubilee_update_item/jubilee_update_item.json b/hms_tz/jubilee/doctype/jubilee_update_item/jubilee_update_item.json new file mode 100644 index 00000000..cb535334 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_update_item/jubilee_update_item.json @@ -0,0 +1,91 @@ +{ + "actions": [], + "creation": "2024-06-18 09:41:52.551063", + "default_view": "List", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "type", + "section_break_3", + "itemcode", + "itemprice", + "strength", + "dosage", + "column_break_12", + "itemname", + "cleanname", + "record" + ], + "fields": [ + { + "fieldname": "type", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Change Type" + }, + { + "fieldname": "section_break_3", + "fieldtype": "Section Break" + }, + { + "fieldname": "itemcode", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "ItemCode" + }, + { + "fieldname": "itemname", + "fieldtype": "Small Text", + "in_standard_filter": 1, + "label": "ItemName" + }, + { + "fieldname": "strength", + "fieldtype": "Data", + "label": "Strength" + }, + { + "fieldname": "dosage", + "fieldtype": "Data", + "label": "Dosage" + }, + { + "fieldname": "column_break_12", + "fieldtype": "Column Break" + }, + { + "fieldname": "record", + "fieldtype": "Small Text", + "label": "Record" + }, + { + "fieldname": "itemprice", + "fieldtype": "Float", + "in_list_view": 1, + "label": "ItemPrice", + "read_only": 1 + }, + { + "fieldname": "cleanname", + "fieldtype": "Small Text", + "in_list_view": 1, + "label": "CleanName", + "read_only": 1 + } + ], + "index_web_pages_for_search": 1, + "istable": 1, + "links": [], + "modified": "2024-06-18 18:56:42.770935", + "modified_by": "Administrator", + "module": "Jubilee", + "name": "Jubilee Update Item", + "owner": "Administrator", + "permissions": [], + "sort_field": "modified", + "sort_order": "DESC", + "states": [], + "title_field": "itemname" +} \ No newline at end of file diff --git a/hms_tz/jubilee/doctype/jubilee_update_item/jubilee_update_item.py b/hms_tz/jubilee/doctype/jubilee_update_item/jubilee_update_item.py new file mode 100644 index 00000000..76b75f40 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_update_item/jubilee_update_item.py @@ -0,0 +1,8 @@ +# Copyright (c) 2024, Aakvatech and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class JubileeUpdateItem(Document): + pass diff --git a/hms_tz/nhif/api/insurance_company.js b/hms_tz/nhif/api/insurance_company.js index fb05c3bf..3347cfbc 100644 --- a/hms_tz/nhif/api/insurance_company.js +++ b/hms_tz/nhif/api/insurance_company.js @@ -1,15 +1,29 @@ frappe.ui.form.on('Healthcare Insurance Company', { onload: function (frm) { - add_get_price_btn(frm) + // For NHIF + add_nhif_get_price_btn(frm); + + // For Jubilee + add_jubilee_get_price_btn(frm); + }, refresh: function (frm) { - add_get_price_btn(frm) + // For NHIF + add_nhif_get_price_btn(frm); + + // For Jubilee + add_jubilee_get_price_btn(frm); }, }); -var add_get_price_btn = function (frm) { +var add_nhif_get_price_btn = function (frm) { if (!frm.doc.insurance_company_name.includes("NHIF")) { return } frm.add_custom_button(__('Get NHIF Price Package'), function () { + frappe.show_alert({ + message: __("Fetching NHIF Price packages."), + indicator: 'green' + }, 10); + frappe.call({ method: 'hms_tz.nhif.api.insurance_company.enqueue_get_nhif_price_package', args: { company: frm.doc.company }, @@ -20,8 +34,12 @@ var add_get_price_btn = function (frm) { } }); }); - if (!frm.doc.insurance_company_name.includes("NHIF")) { return } frm.add_custom_button(__('Only Process NHIF Records'), function () { + frappe.show_alert({ + message: __("Processing NHIF Price packages."), + indicator: 'green' + }, 10); + frappe.call({ method: 'hms_tz.nhif.api.insurance_company.process_nhif_records', args: { company: frm.doc.company }, @@ -33,4 +51,42 @@ var add_get_price_btn = function (frm) { }); }); +} + +var add_jubilee_get_price_btn = function (frm) { + if (!frm.doc.insurance_company_name.includes("Jubilee")) { return } + + frm.add_custom_button(__('Get Jubilee Price Package'), function () { + frappe.show_alert({ + message: __("Fetching Jubilee Price packages."), + indicator: 'green' + }, 10); + + frappe.call({ + method: 'hms_tz.jubilee.api.api.enqueue_get_jubilee_price_packages', + args: { company: frm.doc.company }, + callback: function (data) { + if (data.message) { + console.log(data.message) + } + } + }); + }); + frm.add_custom_button(__('Only Process Jubilee Records'), function () { + frappe.show_alert({ + message: __("Processing Jubilee Price packages."), + indicator: 'green' + }, 10); + + frappe.call({ + method: 'hms_tz.jubilee.api.api.enqueue_get_jubilee_price_packages', + args: { company: frm.doc.company }, + callback: function (data) { + if (data.message) { + console.log(data.message) + } + } + }); + }); + } \ No newline at end of file From f3bb91943ca9f6ea4677adfd2a4b3f6d909e0755 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Thu, 27 Jun 2024 20:15:59 +0300 Subject: [PATCH 18/25] feat: process jubilee price list, item prices, HSIC --- hms_tz/jubilee/api/api.py | 2 +- hms_tz/jubilee/api/price_package.py | 426 ++++++++++++++++++++++++++- hms_tz/nhif/api/insurance_company.js | 14 +- 3 files changed, 425 insertions(+), 17 deletions(-) diff --git a/hms_tz/jubilee/api/api.py b/hms_tz/jubilee/api/api.py index cd833b11..bee85e32 100644 --- a/hms_tz/jubilee/api/api.py +++ b/hms_tz/jubilee/api/api.py @@ -89,7 +89,7 @@ def enqueue_get_jubilee_price_packages(company): method=get_jubilee_price_packages, job_name="get_jubilee_price_packages", queue="default", - timeout=None, + timeout=10000000, is_async=True, company=company, ) diff --git a/hms_tz/jubilee/api/price_package.py b/hms_tz/jubilee/api/price_package.py index 841f4630..3dacfce8 100644 --- a/hms_tz/jubilee/api/price_package.py +++ b/hms_tz/jubilee/api/price_package.py @@ -1,8 +1,31 @@ import json import frappe from time import sleep -from frappe.utils import now_datetime from frappe.query_builder import DocType +from frappe.utils.background_jobs import enqueue +from frappe.query_builder.terms import ValueWrapper +from frappe.utils import now_datetime, nowdate, flt + + +@frappe.whitelist() +def process_jubilee_records(company): + enqueue( + method=process_jubilee_price_list, + job_name="process_jubilee_price_list", + queue="default", + timeout=10000000, + is_async=True, + company=company, + ) + + enqueue( + method=process_jubilee_coverage, + job_name="process_jubilee_coverage", + queue="default", + timeout=10000000, + is_async=True, + company=company, + ) def sync_jubilee_price_package( @@ -11,20 +34,16 @@ def sync_jubilee_price_package( if len(packages) == 0: return - delete_price_package(company) + jpp = DocType("Jubilee Price Package") + frappe.qb.from_(jpp).delete().where(jpp.company == company).run() - sleep(30) + sleep(60) create_price_package(packages, company, log_name) - sleep(30) + sleep(60) set_package_diff(company) -def delete_price_package(company): - jpp = DocType("Jubilee Price Package") - frappe.qb.from_(jpp).delete().where(jpp.company == company).run() - - def create_price_package(packages, company, log_name): fields = [ "name", @@ -61,6 +80,149 @@ def create_price_package(packages, company, log_name): ) +def process_jubilee_coverage(company, coverage_plan=None): + hsic = DocType("Healthcare Service Insurance Coverage") + + coverage_plan_list = None + if coverage_plan: + coverage_plan_list.append({"name": coverage_plan}) + else: + coverage_plan_list = frappe.get_all( + "Healthcare Insurance Coverage Plan", + fields={"name"}, + filters={ + "insurance_company": ["like", "Jubilee%"], + "company": company, + "is_active": 1, + }, + page_length=1, + ) + + if len(coverage_plan_list) == 0: + frappe.throw("No active coverage plan found for Jubilee") + + for coverage_plan in coverage_plan_list: + item_list = get_jubile_items(company) + if len(item_list) == 0: + frappe.throw("No items found for Jubilee") + + data = [] + for item in item_list: + hsic_name = frappe.generate_hash(length=10) + data.append( + ( + hsic_name, + now_datetime(), + now_datetime(), + frappe.session.user, + frappe.session.user, + company, + coverage_plan.get("name"), + 100, + nowdate(), + "2099-12-31", + item.dt, + item.service_template, + 1, + 1, + ) + ) + + if len(data) > 0 and coverage_plan.get("name"): + frappe.qb.from_(hsic).delete().where( + (hsic.healthcare_insurance_coverage_plan == coverage_plan.get("name")) + & (hsic.company == company) + & (hsic.is_auto_generated == 1) + ).run() + + sleep(60) + + fields = [ + "name", + "creation", + "modified", + "modified_by", + "owner", + "company", + "healthcare_insurance_coverage_plan", + "coverage", + "start_date", + "end_date", + "healthcare_service", + "healthcare_service_template", + "is_auto_generated", + "is_active", + ] + frappe.db.bulk_insert( + "Healthcare Service Insurance Coverage", + fields=fields, + values=data, + chunk_size=1000, + ) + + sleep(60) + + +def process_jubilee_price_list(company, item=None): + itp = DocType("Item Price") + + company_info = frappe.get_cached_value( + "Company", company, ["abbr", "default_currency"], as_dict=True + ) + price_list_name = f"Jubilee {company_info.abbr}" + if not frappe.db.exists("Price List", price_list_name): + price_list_doc = frappe.new_doc("Price List") + price_list_doc.price_list_name = price_list_name + price_list_doc.currency = company_info.default_currency + price_list_doc.buying = 0 + price_list_doc.selling = 1 + price_list_doc.save(ignore_permissions=True) + + item_list = get_items_for_price_list(company, item) + + for item in item_list: + item_price_list = ( + frappe.qb.from_(itp) + .select("name", "item_code", "price_list_rate") + .where( + (itp.selling == 1) + & (itp.price_list == price_list_name) + & (itp.item_code == item.get("item_code")) + & (itp.currency == company_info.default_currency) + ) + ).run(as_dict=True) + + if len(item_price_list) > 0: + for price in item_price_list: + if flt(price.price_list_rate) != flt(item.itemprice): + # delete Item Price if no item.itemprice or it is 0 + if not flt(item.itemprice) or flt(item.itemprice) == 0: + frappe.qb.from_(itp).delete().where( + itp.name == price.name + ).run() + else: + # update Item Price with the new price + frappe.qb.update(itp).set( + itp.price_list_rate, flt(item.itemprice) + ).where(itp.name == price.name) + else: + item_price_doc = frappe.new_doc("Item Price") + item_price_doc.update( + { + "item_code": item.item_code, + "price_list": price_list_name, + "currency": company_info.default_currency, + "price_list_rate": flt(item.itemprice), + "buying": 0, + "selling": 1, + } + ) + item_price_doc.insert(ignore_permissions=True) + item_price_doc.save(ignore_permissions=True) + + frappe.db.commit() + + def set_package_diff(company): logs = frappe.get_all( "Jubilee Response Log", @@ -151,3 +313,249 @@ def add_price_packages_records(doc, rec, type): price_row.dosage = e.get("Dosage") price_row.unitprice = e.get("UnitPrice") price_row.record = json.dumps(e) + + +def get_jubile_items(company): + lab_items = get_lab_templates(company) + radiology_items = get_radiology_templates(company) + procedure_items = get_procedure_templates(company) + medication_items = get_medication_templates(company) + therapy_items = get_therapy_templates(company) + hsut_items = get_healthcare_service_unit_types(company) + + item_list = ( + lab_items + + radiology_items + + procedure_items + + medication_items + + therapy_items + + hsut_items + ) + + return item_list + + +def get_lab_templates(company): + it = DocType("Item") + icd = DocType("Item Customer Detail") + jpp = DocType("Jubilee Price Package") + lab = DocType("Lab Test Template") + + lab_query = ( + frappe.qb.from_(icd) + .inner_join(it) + .on(it.name == icd.parent) + .inner_join(lab) + .on(icd.parent == lab.item) + .inner_join(jpp) + .on(icd.ref_code == jpp.itemcode) + .select( + ValueWrapper("Lab Test Template").as_("dt"), + lab.name.as_("service_template"), + icd.ref_code, + icd.parent.as_("item_code"), + ) + .where( + (icd.customer_name == "Jubilee") + & (it.disabled == 0) + & (jpp.company == company) + ) + .groupby(lab.name, icd.ref_code, icd.parent) + ) + lab_data = lab_query.run(as_dict=True) + + return lab_data + + +def get_radiology_templates(company): + jpp = DocType("Jubilee Price Package") + it = DocType("Item") + icd = DocType("Item Customer Detail") + radiology = DocType("Radiology Examination Template") + + radiology_query = ( + frappe.qb.from_(icd) + .inner_join(it) + .on(it.name == icd.parent) + .inner_join(radiology) + .on(icd.parent == radiology.item) + .inner_join(jpp) + .on(icd.ref_code == jpp.itemcode) + .select( + ValueWrapper("Radiology Examination Template").as_("dt"), + radiology.name.as_("service_template"), + icd.ref_code, + icd.parent.as_("item_code"), + ) + .where( + (icd.customer_name == "The Jubilee Insurance (T) Ltd") + & (it.disabled == 0) + & (jpp.company == company) + ) + .groupby(radiology.name, icd.ref_code, icd.parent) + ) + + radiology_data = radiology_query.run(as_dict=True) + + return radiology_data + + +def get_procedure_templates(company): + it = DocType("Item") + icd = DocType("Item Customer Detail") + jpp = DocType("Jubilee Price Package") + procedure = DocType("Clinical Procedure Template") + + procedure_query = ( + frappe.qb.from_(icd) + .inner_join(it) + .on(it.name == icd.parent) + .inner_join(procedure) + .on(icd.parent == procedure.item) + .inner_join(jpp) + .on(icd.ref_code == jpp.itemcode) + .select( + ValueWrapper("Clinical Procedure Template").as_("dt"), + procedure.name.as_("service_template"), + icd.ref_code, + icd.parent.as_("item_code"), + ) + .where( + (icd.customer_name == "The Jubilee Insurance (T) Ltd") + & (it.disabled == 0) + & (jpp.company == company) + ) + .groupby(procedure.name, icd.ref_code, icd.parent) + ) + + procedure_data = procedure_query.run(as_dict=True) + return procedure_data + + +def get_medication_templates(company): + it = DocType("Item") + icd = DocType("Item Customer Detail") + jpp = DocType("Jubilee Price Package") + medication = DocType("Medication") + + medication_query = ( + frappe.qb.from_(icd) + .inner_join(it) + .on(it.name == icd.parent) + .inner_join(medication) + .on(icd.parent == medication.item) + .inner_join(jpp) + .on(icd.ref_code == jpp.itemcode) + .select( + ValueWrapper("Medication").as_("dt"), + medication.name.as_("service_template"), + icd.ref_code, + icd.parent.as_("item_code"), + ) + .where( + (icd.customer_name == "The Jubilee Insurance (T) Ltd") + & (it.disabled == 0) + & (jpp.company == company) + ) + .groupby(medication.name, icd.ref_code, icd.parent) + ) + + medication_data = medication_query.run(as_dict=True) + return medication_data + + +def get_therapy_templates(company): + it = DocType("Item") + icd = DocType("Item Customer Detail") + jpp = DocType("Jubilee Price Package") + therapy = DocType("Therapy Type") + + therapy_query = ( + frappe.qb.from_(icd) + .inner_join(it) + .on(it.name == icd.parent) + .inner_join(therapy) + .on(icd.parent == therapy.item) + .inner_join(jpp) + .on(icd.ref_code == jpp.itemcode) + .select( + ValueWrapper("Therapy Type").as_("dt"), + therapy.name.as_("service_template"), + icd.ref_code, + icd.parent.as_("item_code"), + ) + .where( + (icd.customer_name == "The Jubilee Insurance (T) Ltd") + & (it.disabled == 0) + & (jpp.company == company) + ) + .groupby(therapy.name, icd.ref_code, icd.parent) + ) + + therapy_data = therapy_query.run(as_dict=True) + return therapy_data + + +def get_healthcare_service_unit_types(company): + it = DocType("Item") + icd = DocType("Item Customer Detail") + jpp = DocType("Jubilee Price Package") + hsut = DocType("Healthcare Service Unit Type") + + hsut_query = ( + frappe.qb.from_(icd) + .inner_join(it) + .on(it.name == icd.parent) + .inner_join(hsut) + .on(icd.parent == hsut.item) + .inner_join(jpp) + .on(icd.ref_code == jpp.itemcode) + .select( + ValueWrapper("Healthcare Service Unit Type").as_("dt"), + hsut.name.as_("service_template"), + icd.ref_code, + icd.parent.as_("item_code"), + ) + .where( + (icd.customer_name == "The Jubilee Insurance (T) Ltd") + & (it.disabled == 0) + & (jpp.company == company) + ) + .groupby(hsut.name, icd.ref_code, icd.parent) + ) + + hsut_data = hsut_query.run(as_dict=True) + return hsut_data + + +def get_items_for_price_list(company, item=None): + it = DocType("Item") + icd = DocType("Item Customer Detail") + jpp = DocType("Jubilee Price Package") + + item_query = ( + frappe.qb.from_(icd) + .inner_join(it) + .on(it.name == icd.parent) + .inner_join(jpp) + .on(icd.ref_code == jpp.itemcode) + .select( + icd.ref_code, + icd.parent.as_("item_code"), + jpp.itemcode, + jpp.itemname, + jpp.cleanname, + jpp.itemprice, + ) + .where( + (it.disabled == 0) + & (jpp.company == company) + & (icd.customer_name == "The Jubilee Insurance (T) Ltd") + ) + .groupby(icd.ref_code, icd.parent) + ) + if item: + item_query = item_query.where(icd.parent == item) + + item_data = item_query.run(as_dict=True) + return item_data diff --git a/hms_tz/nhif/api/insurance_company.js b/hms_tz/nhif/api/insurance_company.js index 3347cfbc..619be49b 100644 --- a/hms_tz/nhif/api/insurance_company.js +++ b/hms_tz/nhif/api/insurance_company.js @@ -66,9 +66,9 @@ var add_jubilee_get_price_btn = function (frm) { method: 'hms_tz.jubilee.api.api.enqueue_get_jubilee_price_packages', args: { company: frm.doc.company }, callback: function (data) { - if (data.message) { - console.log(data.message) - } + // if (data.message) { + // console.log(data.message) + // } } }); }); @@ -79,12 +79,12 @@ var add_jubilee_get_price_btn = function (frm) { }, 10); frappe.call({ - method: 'hms_tz.jubilee.api.api.enqueue_get_jubilee_price_packages', + method: 'hms_tz.jubilee.api.price_package.process_jubilee_records', args: { company: frm.doc.company }, callback: function (data) { - if (data.message) { - console.log(data.message) - } + // if (data.message) { + // console.log(data.message) + // } } }); }); From a7401788648eb41f7a47a2c32f59df3e6099fb8b Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Tue, 16 Jul 2024 19:05:57 +0300 Subject: [PATCH 19/25] fix: resolve the error of 'Document is already modified' --- hms_tz/nhif/api/insurance_subscription.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hms_tz/nhif/api/insurance_subscription.py b/hms_tz/nhif/api/insurance_subscription.py index 7ef5a360..da067367 100644 --- a/hms_tz/nhif/api/insurance_subscription.py +++ b/hms_tz/nhif/api/insurance_subscription.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe from frappe import _ +from time import sleep # from frappe import _ from hms_tz.nhif.api.patient import get_patient_info @@ -41,6 +42,8 @@ def set_insurance_card_detail_in_patient(doc): card_count += 1 str_coverage_plan_card_number += card.coverage_plan_card_number + ", " + # wait for 30 seconds to avoid an Error of 'Document is already modified' + sleep(30) frappe.db.set_value( "Patient", doc.patient, From e24e36891746e2f10bc0a4987d490c71ac9160a5 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Tue, 16 Jul 2024 19:06:37 +0300 Subject: [PATCH 20/25] feat: auto create of healthcare insurance subscription for Jubilee patients --- hms_tz/jubilee/api/api.py | 61 ++++++++++++++++++++++++++++++++++++++ hms_tz/nhif/api/patient.js | 5 ++++ hms_tz/nhif/api/patient.py | 15 ++++++++-- 3 files changed, 78 insertions(+), 3 deletions(-) diff --git a/hms_tz/jubilee/api/api.py b/hms_tz/jubilee/api/api.py index bee85e32..30fcdc59 100644 --- a/hms_tz/jubilee/api/api.py +++ b/hms_tz/jubilee/api/api.py @@ -83,6 +83,67 @@ def get_member_card_detials(card_no, insurance_provider): raise e +@frappe.whitelist() +def create_jubilee_subscription(patient_id, card_no, insurance_provider): + if not insurance_provider or insurance_provider != "Jubilee": + return + + subscription_list = frappe.get_list( + "Healthcare Insurance Subscription", + filters={"patient": patient_id, "is_active": 1}, + ) + if len(subscription_list) > 0: + frappe.msgprint( + _( + "Existing Patient HIS was found. Create the Healthcare Insurance Subscription manually!" + ) + ) + return + + plan_filters = { + "is_active": 1, + "insurance_company": ["like", "Jubilee%"], + } + company = get_default_company() + if company: + plan_filters["company"] = company + + # Assumed that company is filtered based on user permissions + plan = frappe.db.get_list( + "Healthcare Insurance Coverage Plan", + filters=plan_filters, + fields=["name", "insurance_company", "company"], + ) + + if not plan or len(plan) == 0: + frappe.msgprint( + _("No active Healthcare Insurance Coverage Plan found for Jubilee") + ) + return + + if len(plan) > 1: + frappe.msgprint( + _( + "Multiple active Healthcare Insurance Coverage Plan found for Jubilee,\ +

please create the healthcare Insurance Subscription manually" + ) + ) + return + + sub_doc = frappe.new_doc("Healthcare Insurance Subscription") + sub_doc.patient = patient_id + sub_doc.insurance_company = plan[0].insurance_company + sub_doc.healthcare_insurance_coverage_plan = plan[0].name + sub_doc.coverage_plan_card_number = card_no + sub_doc.save(ignore_permissions=True) + sub_doc.submit() + frappe.msgprint( + _( + f"

AUTO

Healthcare Insurance Subscription: {sub_doc.name} is created for {plan[0].name}" + ) + ) + + @frappe.whitelist() def enqueue_get_jubilee_price_packages(company): enqueue( diff --git a/hms_tz/nhif/api/patient.js b/hms_tz/nhif/api/patient.js index 20da49ec..ea89f97a 100644 --- a/hms_tz/nhif/api/patient.js +++ b/hms_tz/nhif/api/patient.js @@ -305,6 +305,11 @@ function get_jubilee_patient_info(frm) { } function update_jubilee_patient_info(frm, cardinfo) { + frappe.msgprint(cardinfo.Status); + if (cardinfo.Status != "ERROR") { + frappe.msgprint(cardinfo.Description); + return; + } frm.set_value("first_name", cardinfo.FirstName); frm.set_value("middle_name", cardinfo.MiddleName); frm.set_value("last_name", cardinfo.LastName); diff --git a/hms_tz/nhif/api/patient.py b/hms_tz/nhif/api/patient.py index 97907a24..615b502b 100644 --- a/hms_tz/nhif/api/patient.py +++ b/hms_tz/nhif/api/patient.py @@ -17,7 +17,7 @@ from hms_tz.nhif.api.healthcare_utils import remove_special_characters from datetime import date from frappe.utils.background_jobs import enqueue -from hms_tz.nhif.doctype.nhif_product.nhif_product import add_product +from hms_tz.jubilee.api.api import create_jubilee_subscription def validate(doc, method): @@ -53,7 +53,10 @@ def validate_mobile_number(doc_name, mobile=None): @frappe.whitelist() -def get_patient_info(card_no=None): +def get_patient_info(card_no=None, insurance_provider=None): + if not insurance_provider or insurance_provider != "NHIF": + return + if not card_no: frappe.msgprint(_("Please set Card No")) return @@ -282,8 +285,14 @@ def get_coverage_plan(doc=None, card=None, company=None): def after_insert(doc, method): if not doc.card_no: return + doc.insurance_card_detail = (doc.card_no or "") + ", " - create_subscription(doc) + + if doc.insurance_provider and doc.insurance_provider == "NHIF": + create_subscription(doc) + + if doc.insurance_provider and doc.insurance_provider == "Jubilee": + create_jubilee_subscription(doc.name, doc.card_no, doc.insurance_provider) @frappe.whitelist() From f514e4a4a48f1e0104c5f2dca3faf86f7ebdf61f Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Wed, 17 Jul 2024 10:09:47 +0300 Subject: [PATCH 21/25] feat: authoize card via API for jubilee patients --- hms_tz/jubilee/api/api.py | 67 ++++++++++++++++++++++++++ hms_tz/jubilee/api/token.py | 8 +-- hms_tz/nhif/api/patient.js | 2 +- hms_tz/nhif/api/patient_appointment.js | 62 ++++++++++++++++++++---- 4 files changed, 125 insertions(+), 14 deletions(-) diff --git a/hms_tz/jubilee/api/api.py b/hms_tz/jubilee/api/api.py index 30fcdc59..6bf57981 100644 --- a/hms_tz/jubilee/api/api.py +++ b/hms_tz/jubilee/api/api.py @@ -144,6 +144,73 @@ def create_jubilee_subscription(patient_id, card_no, insurance_provider): ) +@frappe.whitelist() +def get_authorization_number( + company, + card_no, + appointment_no, + insurance_subscription, + insurance_provider="Jubilee", +): + if insurance_provider != "Jubilee": + return + + setting_name, service_url = frappe.get_cached_value( + "Company Insurance Setting", + {"company": company, "api_provider": insurance_provider, "enable": 1}, + ["name", "service_url"], + ) + if not setting_name: + frappe.throw( + f"Company Insurance Setting not found for company: {company} and API Provider: {insurance_provider}, please Create or Enable one." + ) + + if not card_no: + frappe.msgprint( + _( + f"Please set Card No in Healthcare Insurance Subscription {insurance_subscription}" + ) + ) + return + + token = get_jubilee_service_token(company, insurance_provider) + + headers = {"Content-Type": "application/json", "Authorization": "Bearer " + token} + url = str(service_url) + "/jubileeapi/CheckVerification?MemberNo=" + str(card_no) + + r = requests.get(url, headers=headers, timeout=5) + r.raise_for_status() + frappe.logger().debug({"webhook_success": r.text}) + if json.loads(r.text): + add_jubilee_log( + request_type="AuthorizeCard", + request_url=url, + request_header=headers, + response_data=json.loads(r.text), + status_code=r.status_code, + ref_doctype="Patient Appointment", + ref_docname=appointment_no, + company=company, + ) + card = json.loads(r.text) + if card.get("Status") != "OK": + frappe.throw(title=card.get("Status"), msg=card["Description"]) + frappe.msgprint(_(card["Description"]), alert=True) + return card + else: + add_jubilee_log( + request_type="AuthorizeCard", + request_url=url, + request_header=headers, + response_data=json.loads(r.text), + status_code=r.status_code, + ref_doctype="Patient Appointment", + ref_docname=appointment_no, + company=company, + ) + frappe.throw(json.loads(r.text)) + + @frappe.whitelist() def enqueue_get_jubilee_price_packages(company): enqueue( diff --git a/hms_tz/jubilee/api/token.py b/hms_tz/jubilee/api/token.py index 252d01fc..1ab2b121 100644 --- a/hms_tz/jubilee/api/token.py +++ b/hms_tz/jubilee/api/token.py @@ -64,12 +64,12 @@ def make_jubilee_token_request(doc, url, headers, payload, fields): def get_jubilee_service_token(company, api_provider): setting_name = frappe.get_cached_value( "Company Insurance Setting", - {"company": company, "api_provider": api_provider}, + {"company": company, "api_provider": api_provider, "enable": 1}, "name", ) if not setting_name: frappe.throw( - f"Company Insurance Setting not found for company: {company} and API Provider: {api_provider}, please create one." + f"Company Insurance Setting not found for company: {company} and API Provider: {api_provider}, please Create or Enable one." ) setting_doc = frappe.get_cached_doc("Company Insurance Setting", setting_name) @@ -103,12 +103,12 @@ def get_jubilee_service_token(company, api_provider): def get_jubilee_claimsservice_token(company, api_provider): setting_name = frappe.get_cached_value( "Company Insurance Setting", - {"company": company, "api_provider": api_provider}, + {"company": company, "api_provider": api_provider, "enable": 1}, "name", ) if not setting_name: frappe.throw( - f"Company Insurance Setting not found for company: {company} and API Provider: {api_provider}, please create one." + f"Company Insurance Setting not found for company: {company} and API Provider: {api_provider}, please Create or Enable one." ) setting_doc = frappe.get_cached_doc("Company Insurance Setting", setting_name) diff --git a/hms_tz/nhif/api/patient.js b/hms_tz/nhif/api/patient.js index ea89f97a..311d5519 100644 --- a/hms_tz/nhif/api/patient.js +++ b/hms_tz/nhif/api/patient.js @@ -306,7 +306,7 @@ function get_jubilee_patient_info(frm) { function update_jubilee_patient_info(frm, cardinfo) { frappe.msgprint(cardinfo.Status); - if (cardinfo.Status != "ERROR") { + if (cardinfo.Status == "ERROR") { frappe.msgprint(cardinfo.Description); return; } diff --git a/hms_tz/nhif/api/patient_appointment.js b/hms_tz/nhif/api/patient_appointment.js index 3d7d1b35..dfa6dce0 100644 --- a/hms_tz/nhif/api/patient_appointment.js +++ b/hms_tz/nhif/api/patient_appointment.js @@ -255,16 +255,17 @@ frappe.ui.form.on('Patient Appointment', { frappe.msgprint("Appointment is already cancelled") return } - frm.trigger("get_authorization_num"); - }, - get_authorization_num: function (frm) { - if (!frm.doc.insurance_company.includes("NHIF")) { - frappe.show_alert({ - message: __("This feature is not applicable for non NHIF insurance"), - indicator: 'orange' - }, 5); - return; + + if (frm.doc.insurance_company.includes("NHIF")) { + // get auth number for NHIF Patients + frm.trigger("get_nhif_authorization_num"); } + if (frm.doc.insurance_company.includes("Jubilee")) { + // get auth number for Jubilee Patients + frm.trigger("get_jubilee_authorization_number"); + } + }, + get_nhif_authorization_num: function (frm) { if (!frm.doc.insurance_subscription) { frappe.msgprint("Select Insurance Subscription to get authorization number"); return; @@ -309,6 +310,49 @@ frappe.ui.form.on('Patient Appointment', { } }); }, + get_jubilee_authorization_number: (frm) => { + if (!frm.doc.insurance_subscription) { + frappe.msgprint("Select Insurance Subscription to get authorization number"); + return; + } + if (frm.is_dirty()) { + frm.save(); + } + frappe.call({ + method: 'hms_tz.jubilee.api.api.get_authorization_number', + args: { + 'company': frm.doc.company, + 'card_no': frm.doc.coverage_plan_card_number, + "appointment_no": frm.doc.name, + 'insurance_subscription': frm.doc.insurance_subscription, + "insurance_provider": "Jubilee" + }, + async: true, + freeze: true, + freeze_message: __(''), + callback: function (data) { + console.log(data); + if (data.message) { + const card = data.message; + if (card.Status == 'OK') { + frm.set_value("authorization_number", card.AuthorizationNo); + frm.save(); + frappe.show_alert({ + message: __("Authorization Number is updated"), + indicator: 'green' + }, 5); + } else { + frm.set_value("insurance_subscription", ""); + frm.set_value("authorization_number", ""); + } + } + else { + frm.set_value("insurance_subscription", ""); + frm.set_value("authorization_number", ""); + } + } + }); + }, invoiced: function (frm) { frm.trigger("mandatory_fields"); }, From c74f1662f97e4427880c850cfa954d8a75bfa9b7 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Sun, 28 Jul 2024 19:27:04 +0300 Subject: [PATCH 22/25] feat: Create and Submit Jubilee Patient Claim via API --- .../doctype/jubilee_patient_claim/__init__.py | 0 .../jubilee_patient_claim.js | 102 ++ .../jubilee_patient_claim.json | 533 +++++++ .../jubilee_patient_claim.py | 1398 +++++++++++++++++ .../test_jubilee_patient_claim.py | 9 + .../jubilee_patient_claim_disease/__init__.py | 0 .../jubilee_patient_claim_disease.json | 128 ++ .../jubilee_patient_claim_disease.py | 8 + .../jubilee_patient_claim_item/__init__.py | 0 .../jubilee_patient_claim_item.json | 152 ++ .../jubilee_patient_claim_item.py | 8 + .../__init__.py | 0 .../original_jubilee_patient_claim_item.json | 174 ++ .../original_jubilee_patient_claim_item.py | 8 + 14 files changed, 2520 insertions(+) create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim/__init__.py create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.js create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.json create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim/test_jubilee_patient_claim.py create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim_disease/__init__.py create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim_disease/jubilee_patient_claim_disease.json create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim_disease/jubilee_patient_claim_disease.py create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim_item/__init__.py create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim_item/jubilee_patient_claim_item.json create mode 100644 hms_tz/jubilee/doctype/jubilee_patient_claim_item/jubilee_patient_claim_item.py create mode 100644 hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/__init__.py create mode 100644 hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/original_jubilee_patient_claim_item.json create mode 100644 hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/original_jubilee_patient_claim_item.py diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim/__init__.py b/hms_tz/jubilee/doctype/jubilee_patient_claim/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.js b/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.js new file mode 100644 index 00000000..a0f9ae5d --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.js @@ -0,0 +1,102 @@ +// Copyright (c) 2024, Aakvatech and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Jubilee Patient Claim', { + setup: function (frm) { + frm.set_query("patient_appointment", function () { + return { + "filters": { + "jubilee_patient_claim": ["in", ["", "None"]], + "insurance_company": ["like", "Jubilee%"], + "insurance_subscription": ["not in", ["", "None"]] + } + }; + }); + }, + refresh: function (frm) { + $("[data-action='delete_all_rows']").hide(); + + if (frm.doc.docstatus === 0 && frm.doc.authorization_no) { + frm.add_custom_button(__("Re-concile Repeated Items"), () => { + frappe.call({ + method: "reconcile_repeated_items", + args: { + self: frm.doc + }, + freeze: true, + freeze_message: __(''), + }).then(r => { + if (r.message) { + frm.refresh(); + } + }); + }); + + frm.add_custom_button(__("Merge Claims"), function () { + frm.dirty() + frm.call('get_appointments', { + self: frm.doc, + freeze: true, + freeze_message: __(''), + }).then(r => { + frm.save(); + frm.refresh(); + }); + }); + } + + // frm.add_custom_button(__("Send Claim"), () => { + // frm.call('send_jubilee_claim', { + // self: frm.doc, + // freeze: true, + // freeze_message: __(''), + // }).then(r => { + // // frm.refresh(); + // }); + // }); + }, + + onload: function (frm) { + $("[data-action='delete_all_rows']").hide(); + + if (frm.doc.patient && frm.doc.patient_appointment) { + frappe.db.get_list('LRPMT Returns', { + fields: ['name'], + filters: { + 'patient': frm.doc.patient, + 'appointment': frm.doc.patient_appointment, + 'docstatus': 1 + } + }).then(data => { + if (data.length > 0) { + let msg_lrpmt = `` + data.forEach(element => { + msg_lrpmt += `${__(element.name)} ,` + }); + + frappe.msgprint({ + title: __('Notification'), + indicator: 'orange', + message: __(` +

This Patient: ${__(frm.doc.patient)} of appointment No: ${__(frm.doc.patient_appointment)} + having some item(s) cancelled or some quantity of item(s) returned to stock, by ${__(msg_lrpmt)}, + inorder for items and their quantities to be reflected on this claim

+

+ Tick allow changes, then Untick allow changes and Save again

+ ` + ) + }); + } + }); + }; + }, + + is_ready_for_auto_submission: (frm) => { + if (frm.doc.is_ready_for_auto_submission == 1) { + frm.set_value("reviewed_by", frappe.user.full_name()); + } else { + frm.set_value("reviewed_by", ""); + } + } + +}); diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.json b/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.json new file mode 100644 index 00000000..ae1348cd --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.json @@ -0,0 +1,533 @@ +{ + "actions": [], + "allow_copy": 1, + "allow_import": 1, + "autoname": "naming_series:", + "creation": "2024-07-26 13:43:31.553011", + "default_view": "List", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "naming_series", + "patient_appointment", + "patient", + "patient_name", + "first_name", + "last_name", + "allow_changes", + "column_break_vgxlm", + "coverage_plan_name", + "cardno", + "authorization_no", + "inpatient_record", + "gender", + "date_of_birth", + "total_amount", + "column_break_10", + "telephone_no", + "company", + "posting_date", + "patient_signature", + "section_break_auto_send", + "is_ready_for_auto_submission", + "column_break_review_by", + "reviewed_by", + "section_break_8", + "folio_id", + "facility_code", + "claim_year", + "claim_month", + "folio_no", + "serial_no", + "item_crt_by", + "column_break_tqszx", + "practitioner_name", + "practitioner_no", + "date_discharge", + "discharge_time", + "date_admitted", + "admitted_time", + "patient_type_code", + "column_break_18", + "patient_file_no", + "attendance_date", + "attendance_time", + "delayreason", + "patient_file_section", + "patient_file", + "claim_file_section", + "claim_file", + "section_break_40", + "notes_sb", + "clinical_notes", + "section_break_28", + "jubilee_patient_claim_disease", + "section_break_30", + "jubilee_patient_claim_item", + "original_section_break", + "original_jubilee_patient_claim_item", + "hms_tz_claim_appointment_list", + "amended_from" + ], + "fields": [ + { + "default": "NPC-.#########", + "fieldname": "naming_series", + "fieldtype": "Select", + "hidden": 1, + "label": "Naming Series", + "options": "NPC-.#########", + "print_hide": 1, + "report_hide": 1, + "reqd": 1 + }, + { + "fieldname": "amended_from", + "fieldtype": "Link", + "label": "Amended From", + "no_copy": 1, + "options": "Jubilee Patient Claim", + "print_hide": 1, + "read_only": 1, + "search_index": 1 + }, + { + "fieldname": "patient_appointment", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Patient Appointment", + "options": "Patient Appointment", + "reqd": 1 + }, + { + "fetch_from": "patient_appointment.patient", + "fieldname": "patient", + "fieldtype": "Link", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Patient", + "options": "Patient", + "read_only": 1 + }, + { + "fetch_from": "patient.patient_name", + "fieldname": "patient_name", + "fieldtype": "Data", + "in_standard_filter": 1, + "label": "Patient Name", + "read_only": 1 + }, + { + "fetch_from": "patient.first_name", + "fieldname": "first_name", + "fieldtype": "Data", + "label": "First Name", + "read_only": 1 + }, + { + "fetch_from": "patient.last_name", + "fieldname": "last_name", + "fieldtype": "Data", + "label": "Last Name", + "read_only": 1 + }, + { + "fetch_from": "patient.mobile", + "fieldname": "telephone_no", + "fieldtype": "Data", + "in_standard_filter": 1, + "label": "Telephone No", + "read_only": 1 + }, + { + "fetch_from": "patient.dob", + "fieldname": "date_of_birth", + "fieldtype": "Date", + "label": "Date Of Birth", + "read_only": 1 + }, + { + "fetch_from": "patient.sex", + "fieldname": "gender", + "fieldtype": "Data", + "label": "Gender", + "read_only": 1 + }, + { + "default": "0", + "fieldname": "allow_changes", + "fieldtype": "Check", + "label": "Allow Changes" + }, + { + "fieldname": "column_break_10", + "fieldtype": "Column Break" + }, + { + "fetch_from": "patient_appointment.company", + "fieldname": "company", + "fieldtype": "Link", + "label": "Company", + "options": "Company", + "read_only": 1 + }, + { + "fieldname": "posting_date", + "fieldtype": "Date", + "label": "Posting Date", + "read_only": 1 + }, + { + "fieldname": "inpatient_record", + "fieldtype": "Link", + "label": "Inpatient Record", + "options": "Inpatient Record", + "read_only": 1 + }, + { + "fetch_from": "patient_appointment.coverage_plan_card_number", + "fieldname": "cardno", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "CardNo", + "no_copy": 1, + "reqd": 1 + }, + { + "fetch_from": "patient_appointment.authorization_number", + "fieldname": "authorization_no", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Authorization No", + "no_copy": 1, + "permlevel": 1, + "reqd": 1 + }, + { + "fetch_from": "patient_appointment.coverage_plan_name", + "fieldname": "coverage_plan_name", + "fieldtype": "Data", + "label": "Coverage Plan Name", + "no_copy": 1 + }, + { + "fieldname": "total_amount", + "fieldtype": "Float", + "label": "Total Amount", + "precision": "0", + "read_only": 1 + }, + { + "depends_on": "eval: doc.jubilee_patient_claim_item", + "fieldname": "patient_signature", + "fieldtype": "Signature", + "label": "Patient Signature" + }, + { + "fieldname": "section_break_auto_send", + "fieldtype": "Section Break" + }, + { + "bold": 1, + "default": "0", + "depends_on": "eval: doc.patient_signature", + "description": "If ticked, this claim will be submitted during night time", + "fieldname": "is_ready_for_auto_submission", + "fieldtype": "Check", + "label": "Is ready for auto submission" + }, + { + "fieldname": "column_break_review_by", + "fieldtype": "Column Break" + }, + { + "fieldname": "reviewed_by", + "fieldtype": "Data", + "label": "Reviewed By", + "read_only": 1 + }, + { + "collapsible": 1, + "fieldname": "section_break_8", + "fieldtype": "Section Break", + "label": "Folio Info" + }, + { + "fieldname": "folio_id", + "fieldtype": "Data", + "label": "Folio ID", + "read_only": 1 + }, + { + "fieldname": "facility_code", + "fieldtype": "Data", + "label": "Facility Code", + "read_only": 1 + }, + { + "fieldname": "claim_year", + "fieldtype": "Int", + "label": "Claim Year", + "read_only": 1 + }, + { + "fieldname": "claim_month", + "fieldtype": "Int", + "label": "Claim Month", + "read_only": 1 + }, + { + "fieldname": "folio_no", + "fieldtype": "Int", + "label": "Folio No", + "read_only": 1 + }, + { + "fieldname": "serial_no", + "fieldtype": "Data", + "label": "Serial No", + "read_only": 1 + }, + { + "fieldname": "item_crt_by", + "fieldtype": "Data", + "label": "Created By", + "read_only": 1 + }, + { + "fieldname": "column_break_tqszx", + "fieldtype": "Column Break" + }, + { + "fieldname": "practitioner_name", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Practitioner Name", + "read_only": 1 + }, + { + "fieldname": "practitioner_no", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Practitioner No", + "read_only": 1 + }, + { + "fieldname": "date_discharge", + "fieldtype": "Date", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Date Discharge", + "read_only": 1 + }, + { + "fieldname": "discharge_time", + "fieldtype": "Time", + "label": "Discharge Time", + "read_only": 1 + }, + { + "fieldname": "date_admitted", + "fieldtype": "Date", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Date Admitted", + "read_only": 1 + }, + { + "fieldname": "admitted_time", + "fieldtype": "Time", + "label": "Admitted Time", + "read_only": 1 + }, + { + "fieldname": "patient_type_code", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Patient Type Code", + "read_only": 1 + }, + { + "fieldname": "column_break_18", + "fieldtype": "Column Break" + }, + { + "fieldname": "patient_file_no", + "fieldtype": "Data", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Patient File No", + "read_only": 1 + }, + { + "fetch_from": "patient_appointment.appointment_date", + "fieldname": "attendance_date", + "fieldtype": "Date", + "in_list_view": 1, + "in_standard_filter": 1, + "label": "Attendance Date", + "read_only": 1 + }, + { + "fetch_from": "patient_appointment.appointment_time", + "fieldname": "attendance_time", + "fieldtype": "Time", + "label": "Attendance Time", + "read_only": 1 + }, + { + "fieldname": "delayreason", + "fieldtype": "Small Text", + "label": "DelayReason" + }, + { + "collapsible": 1, + "fieldname": "patient_file_section", + "fieldtype": "Section Break", + "label": "Patient File", + "print_hide": 1, + "report_hide": 1 + }, + { + "fieldname": "patient_file", + "fieldtype": "Markdown Editor", + "label": "Patient File", + "no_copy": 1, + "print_hide": 1, + "read_only": 1, + "report_hide": 1 + }, + { + "collapsible": 1, + "fieldname": "claim_file_section", + "fieldtype": "Section Break", + "label": "Claim File" + }, + { + "fieldname": "claim_file", + "fieldtype": "Markdown Editor", + "label": "Claim File", + "read_only": 1 + }, + { + "fieldname": "section_break_40", + "fieldtype": "Section Break" + }, + { + "collapsible": 1, + "fieldname": "notes_sb", + "fieldtype": "Section Break", + "label": "Clinical Notes" + }, + { + "fieldname": "clinical_notes", + "fieldtype": "Long Text", + "label": "Clinical Notes", + "read_only": 1 + }, + { + "fieldname": "section_break_28", + "fieldtype": "Section Break" + }, + { + "fieldname": "jubilee_patient_claim_disease", + "fieldtype": "Table", + "label": "Jubilee Patient Claim Disease", + "options": "Jubilee Patient Claim Disease" + }, + { + "fieldname": "section_break_30", + "fieldtype": "Section Break" + }, + { + "fieldname": "jubilee_patient_claim_item", + "fieldtype": "Table", + "label": "Jubilee Patient Claim Item", + "options": "Jubilee Patient Claim Item" + }, + { + "collapsible": 1, + "fieldname": "original_section_break", + "fieldtype": "Section Break", + "label": "Original Jubillee Patient Claim Item" + }, + { + "allow_on_submit": 1, + "fieldname": "original_jubilee_patient_claim_item", + "fieldtype": "Table", + "options": "Original Jubilee Patient Claim Item", + "read_only": 1 + }, + { + "fieldname": "hms_tz_claim_appointment_list", + "fieldtype": "Data", + "hidden": 1, + "label": "Claim Appointment List" + }, + { + "fieldname": "amended_from", + "fieldtype": "Link", + "label": "Amended From", + "no_copy": 1, + "options": "Jubilee Patient Claim", + "print_hide": 1, + "read_only": 1, + "search_index": 1 + }, + { + "fieldname": "column_break_vgxlm", + "fieldtype": "Column Break" + } + ], + "index_web_pages_for_search": 1, + "is_submittable": 1, + "links": [], + "modified": "2024-07-26 14:06:47.705131", + "modified_by": "Administrator", + "module": "Jubilee", + "name": "Jubilee Patient Claim", + "naming_rule": "By \"Naming Series\" field", + "owner": "Administrator", + "permissions": [ + { + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "submit": 1, + "write": 1 + }, + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "Healthcare Administrator", + "share": 1, + "submit": 1, + "write": 1 + } + ], + "show_name_in_global_search": 1, + "sort_field": "modified", + "sort_order": "DESC", + "states": [], + "title_field": "patient_name", + "track_changes": 1 +} \ No newline at end of file diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py b/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py new file mode 100644 index 00000000..8d583c50 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py @@ -0,0 +1,1398 @@ +# Copyright (c) 2024, Aakvatech and contributors +# For license information, please see license.txt + +import os +import json +import uuid +import frappe +import requests +import calendar +from frappe import _ +from PyPDF2 import PdfFileWriter +from frappe.utils.pdf import get_pdf +from frappe.query_builder import DocType +from frappe.model.document import Document +from hms_tz.nhif.api.patient_encounter import finalized_encounter +from hms_tz.jubilee.api.token import get_jubilee_claimsservice_token +from hms_tz.jubilee.doctype.jubilee_response_log.jubilee_response_log import ( + add_jubilee_log, +) +from hms_tz.nhif.api.healthcare_utils import ( + get_item_rate, + to_base64, + get_approval_number_from_LRPMT, +) +from frappe.utils import ( + cint, + unique, + nowdate, + nowtime, + getdate, + get_time, + date_diff, + get_fullname, + get_datetime, + get_url_to_form, + time_diff_in_seconds, +) + +pa = DocType("Patient Appointment") +pe = DocType("Patient Encounter") +ct = DocType("Codification Table") + + +class JubileePatientClaim(Document): + def before_insert(self): + if frappe.db.exists( + { + "doctype": "Jubilee Patient Claim", + "patient": self.patient, + "patient_appointment": self.patient_appointment, + "cardno": self.cardno, + "docstatus": 0, + } + ): + frappe.throw( + f"Jubilee Patient Claim is already exist for patient: #{self.patient} with appointment: #{self.patient_appointment}" + ) + + self.validate_appointment_info() + self.validate_multiple_appointments_per_authorization_no("before_insert") + + def after_insert(self): + items = [] + for row in self.jubilee_patient_claim_item: + new_row = row.as_dict() + for fieldname in [ + "name", + "owner", + "creation", + "modified", + "modified_by", + "docstatus", + ]: + new_row[fieldname] = None + items.append(new_row) + + if len(items) > 0: + frappe.set_value( + self.doctype, self.name, "original_jubilee_patient_claim_item", items + ) + + self.reload() + + def validate(self): + if self.docstatus != 0: + return + + self.validate_appointment_info() + self.patient_encounters = self.get_patient_encounters() + if not self.patient_encounters: + frappe.throw(_("There are no submitted encounters for this application")) + + if not self.allow_changes: + finalized_encounter(self.patient_encounters[-1]) + + self.final_patient_encounter = self.get_final_patient_encounter() + self.set_claim_values() + + if not self.get("final_patient_encounter"): + self.final_patient_encounter = self.get_final_patient_encounter() + + self.calculate_totals() + + if not self.is_new(): + self.update_original_patient_claim() + + frappe.qb.update(pa).set(pa.jubilee_patient_claim, self.name).where( + pa.name == self.patient_appointment + ).run() + + def before_submit(self): + start_datetime = get_datetime() + frappe.msgprint("Submit process started: " + str(get_datetime())) + + # validation + self.validate_claim_items_and_claim_diseases() + self.validate_submit_date() + self.validate_item_status() + self.validate_multiple_appointments_per_authorization_no() + + if not self.get("patient_encounters"): + self.patient_encounters = self.get_patient_encounters() + + if not self.patient_signature: + get_missing_patient_signature(self) + + # self.claim_file_mem = get_claim_pdf_file(self) + frappe.msgprint("Sending Jubilee Claim: " + str(get_datetime())) + + self.send_jubilee_claim() + frappe.msgprint("Got response from Jubilee: " + str(get_datetime())) + end_datetime = get_datetime() + time_in_seconds = time_diff_in_seconds(str(end_datetime), str(start_datetime)) + frappe.msgprint( + "Total time to complete the process in seconds = " + str(time_in_seconds) + ) + + def on_submit(self): + pass + + def on_trash(self): + frappe.qb.update(pa).set("jubilee_patient_claim", "").where( + pa.jubilee_patient_claim == self.name + ).run() + + def validate_appointment_info(self): + appointment_details = frappe.db.get_value( + "Patient Appointment", + self.patient_appointment, + ["authorization_number", "coverage_plan_card_number"], + as_dict=1, + ) + + if self.authorization_no != appointment_details.authorization_number: + url = get_url_to_form("Patient Appointment", self.patient_appointment) + frappe.throw( + _( + f"Authorization Number: {self.authorization_no} of this Claim is not same to \ + Authorization Number: {appointment_details.authorization_number} on Patient Appointment: {self.patient_appointment}

\ + Please rectify before creating this Claim" + ) + ) + if self.cardno != appointment_details.coverage_plan_card_number: + url = get_url_to_form("Patient Appointment", self.patient_appointment) + frappe.throw( + _( + f"Card Number: {self.cardno} of this Claim is not same to \ + Card Number: {appointment_details.coverage_plan_card_number} on Patient Appointment: {self.patient_appointment}

\ + Please rectify before creating this Claim" + ) + ) + + def validate_multiple_appointments_per_authorization_no(self, caller=None): + """Validate if patient gets multiple appointments with same authorization number""" + + # Check if there are multiple claims with same authorization number + claim_details = frappe.db.get_all( + "Jubilee Patient Claim", + filters={ + "patient": self.patient, + "authorization_no": self.authorization_no, + "cardno": self.cardno, + "docstatus": 0, + }, + fields=["name", "patient", "patient_name", "hms_tz_claim_appointment_list"], + ) + claim_name_list = "" + merged_appointments = [] + for claim in claim_details: + url = get_url_to_form("Jubilee Patient Claim", claim["name"]) + claim_name_list += f"{claim['name']} , " + if claim["hms_tz_claim_appointment_list"]: + merged_appointments += json.loads( + claim["hms_tz_claim_appointment_list"] + ) + + if len(claim_details) > 1 and not caller: + frappe.throw( + f"

\ + This Authorization Number: {self.authorization_no} \ + has used multiple times in Jubilee Patient Claim: {claim_name_list}. \ + Please merge these {len(claim_details)} claims to Proceed

" + ) + + # Check if there are multiple patient appointments with same authorization number + appointment_documents = frappe.db.get_all( + "Patient Appointment", + filters={ + "patient": self.patient, + "authorization_number": self.authorization_no, + "coverage_plan_card_number": self.cardno, + "status": ["!=", "Cancelled"], + }, + pluck="name", + ) + + if len(appointment_documents) > 1: + self.validate_hold_card_status( + appointment_documents, claim_details, merged_appointments, caller + ) + elif caller: + frappe.msgprint("Release Patient Card", 20, alert=True) + + def validate_hold_card_status( + self, appointment_documents, claim_details, merged_appointments, caller=None + ): + msg = f"

Patient: {self.patient}-{self.patient_name} has multiple appointments:
" + + # check if there is any merging done before + reqd_throw_count = 0 + for appointment in appointment_documents: + url = get_url_to_form("Patient Appointment", appointment) + msg += f"{appointment} , " + + if merged_appointments: + for app in unique(merged_appointments): + if appointment == app: + reqd_throw_count += 1 + + if caller: + unique_claims_appointments = 0 + if len(unique(merged_appointments)) < len(claim_details): + unique_claims_appointments = len(claim_details) + else: + unique_claims_appointments = len(unique(merged_appointments)) + + if (len(appointment_documents) - 1) == unique_claims_appointments: + frappe.msgprint("Release Patient Card", 20, alert=True) + frappe.msgprint("Release Patient Card") + else: + msg += f"
with same authorization no: {self.authorization_no}

\ + Please Hold patient card until claims for all {len(appointment_documents)} appointments to be created.

" + frappe.msgprint("Please Hold Card", 20, alert=True) + frappe.msgprint(str(msg)) + + return + + msg += f"
with same authorization no: {self.authorization_no}

Please consider merging of claims\ + if Claims for all {len(appointment_documents)} appointments have already been created

" + + if reqd_throw_count < len(appointment_documents): + frappe.throw(msg) + + def validate_claim_items_and_claim_diseases(self): + try: + if len(self.jubilee_patient_claim_disease) == 0: + frappe.throw( + _( + "

Please add at least one disease code, before submitting this claim

" + ) + ) + if len(self.jubilee_patient_claim_item) == 0: + frappe.throw( + _( + "

Please add at least one item, before submitting this claim

" + ) + ) + + if self.total_amount != sum( + [item.amount_claimed for item in self.jubilee_patient_claim_item] + ): + frappe.throw( + _( + "

Total amount does not match with the total of the items

" + ) + ) + except Exception as e: + self.add_comment( + comment_type="Comment", + text=str(e), + ) + frappe.db.commit() + frappe.throw("") + + def validate_item_status(self): + for row in self.jubilee_patient_claim_item: + if row.status == "Draft": + frappe.throw( + f"Item: {frappe.bold(row.item_name)}, doctype: {frappe.bold(row.ref_doctype)}. \ + RowNo: {frappe.bold(row.idx)} is in Draft,\ + please contact relevant department for clarification" + ) + + def validate_submit_date(self): + submit_claim_month, submit_claim_year = frappe.get_cached_value( + "Company Insurance Setting", + {"company": self.company, "insurance_provider": "Jubilee"}, + ["submit_claim_month", "submit_claim_year"], + ) + + if not (submit_claim_month or submit_claim_year): + frappe.throw( + frappe.bold( + "Submit Claim Month or Submit Claim Year not found,\ + please inform IT department to set it on Company Insurance Setting" + ) + ) + + if ( + self.claim_month != submit_claim_month + or self.claim_year != submit_claim_year + ): + frappe.throw( + f"Claim Month: {frappe.bold(calendar.month_name[self.claim_month])} or Claim Year: {frappe.bold(self.claim_year)} \ + of this document is not same to Submit Claim Month: {frappe.bold(calendar.month_name[submit_claim_month])} \ + or Submit Claim Year: {frappe.bold(submit_claim_year)} on Company Insurance Setting" + ) + + @frappe.whitelist() + def get_appointments(self): + appointment_list = frappe.db.get_all( + "Jubilee Patient Claim", + filters={ + "patient": self.patient, + "authorization_no": self.authorization_no, + "cardno": self.cardno, + }, + fields=["patient_appointment", "hms_tz_claim_appointment_list"], + ) + if len(appointment_list) == 1: + frappe.throw( + _( + f"

\ + This Authorization no: {frappe.bold(self.authorization_no)} \ + as used only once on
Jubilee Patient Claim: {frappe.bold(self.name)} \ +

" + ) + ) + + app_list = [] + for app_name in appointment_list: + if app_name["hms_tz_claim_appointment_list"]: + app_numbers = json.loads(app_name["hms_tz_claim_appointment_list"]) + app_list += app_numbers + + for d in app_numbers: + frappe.qb.update(pa).set(pa.jubilee_patient_claim, self.name).where( + pa.name == d + ).run() + else: + app_list.append(app_name["patient_appointment"]) + frappe.qb.update(pa).set(pa.jubilee_patient_claim, self.name).where( + pa.name == app_name["patient_appointment"] + ).run() + + app_list = list(set(app_list)) + self.allow_changes = 0 + self.hms_tz_claim_appointment_list = json.dumps(app_list) + + self.save(ignore_permissions=True) + + def get_patient_encounters(self): + if not self.hms_tz_claim_appointment_list: + patient_appointment = self.patient_appointment + else: + patient_appointment = ["in", json.loads(self.hms_tz_claim_appointment_list)] + + patient_encounters = frappe.db.get_all( + "Patient Encounter", + filters={ + "appointment": patient_appointment, + "docstatus": 1, + }, + fields={"name", "encounter_date"}, + order_by="`creation` ASC", + ) + return patient_encounters + + def get_final_patient_encounter(self): + appointment = None + if self.hms_tz_claim_appointment_list: + appointment = ["in", json.loads(self.hms_tz_claim_appointment_list)] + else: + appointment = self.patient_appointment + + patient_encounter_list = frappe.db.get_all( + "Patient Encounter", + filters={ + "appointment": appointment, + "docstatus": 1, + "duplicated": 0, + "encounter_type": "Final", + }, + fields=["name", "practitioner", "inpatient_record"], + order_by="`modified` desc", + ) + if len(patient_encounter_list) == 0: + frappe.throw(_("There no Final Patient Encounter for this Appointment")) + + return patient_encounter_list + + def set_claim_values(self): + if not self.folio_id: + self.folio_id = str(uuid.uuid1()) + + self.facility_code = frappe.get_cached_value( + "Company Insurance Setting", self.company, "facility_code" + ) + self.facility_code = frappe.get_cached_value( + "Company Insurance Setting", + {"enable": 1, "insurance_provider": "Jubilee", "company": self.company}, + "facility_code", + ) + + self.posting_date = nowdate() + self.serial_no = cint(self.name[-9:]) + self.item_crt_by = get_fullname(frappe.session.user) + practitioners = [d.practitioner for d in self.final_patient_encounter] + practitioner_details = frappe.db.get_all( + "Healthcare Practitioner", + {"name": ["in", practitioners]}, + ["practitioner_name", "tz_mct_code"], + ) + if not practitioner_details[0].practitioner_name: + frappe.throw( + _(f"There is no Practitioner Name for Practitioner: {practitioners[0]}") + ) + + if not practitioner_details[0].tz_mct_code: + frappe.throw( + _( + f"There is no TZ MCT Code for Practitioner {practitioner_details[0].practitioner_name}" + ) + ) + + self.practitioner_name = practitioner_details[0].practitioner_name + self.practitioner_no = ",".join([d.tz_mct_code for d in practitioner_details]) + inpatient_record = [ + h.inpatient_record + for h in self.final_patient_encounter + if h.inpatient_record + ] or None + self.inpatient_record = inpatient_record[0] if inpatient_record else None + # Reset values for every validate + self.patient_type_code = "OUT" + self.date_admitted = None + self.admitted_time = None + self.date_discharge = None + self.discharge_time = None + if self.inpatient_record: + ( + discharge_date, + scheduled_date, + admitted_datetime, + time_created, + ) = frappe.db.get_value( + "Inpatient Record", + self.inpatient_record, + ["discharge_date", "scheduled_date", "admitted_datetime", "creation"], + ) + + if getdate(scheduled_date) < getdate(admitted_datetime): + self.date_admitted = scheduled_date + self.admitted_time = get_time(get_datetime(time_created)) + else: + self.date_admitted = getdate(admitted_datetime) + self.admitted_time = get_time(get_datetime(admitted_datetime)) + + # If the patient is same day discharged then consider it as Outpatient + if self.date_admitted == getdate(discharge_date): + self.patient_type_code = "OUT" + self.date_admitted = None + else: + self.patient_type_code = "IN" + self.date_discharge = discharge_date + + # the time claim is created will treated as discharge time + # because there is no field of discharge time on Inpatient Record + self.discharge_time = nowtime() + + self.attendance_date, self.attendance_time = frappe.db.get_value( + "Patient Appointment", + self.patient_appointment, + ["appointment_date", "appointment_time"], + ) + if self.date_discharge: + self.claim_year = int(self.date_discharge.strftime("%Y")) + self.claim_month = int(self.date_discharge.strftime("%m")) + else: + self.claim_year = int(self.attendance_date.strftime("%Y")) + self.claim_month = int(self.attendance_date.strftime("%m")) + + self.patient_file_no = self.patient + + if not self.allow_changes: + self.set_patient_claim_disease() + self.set_patient_claim_item() + + def calculate_totals(self): + self.total_amount = 0 + for item in self.jubilee_patient_claim_item: + item.amount_claimed = item.unit_price * item.item_quantity + item.folio_item_id = item.folio_item_id or str(uuid.uuid1()) + item.date_created = item.date_created or nowdate() + item.folio_id = item.folio_id or self.folio_id + + self.total_amount += item.amount_claimed + + for item in self.jubilee_patient_claim_disease: + item.folio_id = item.folio_id or self.folio_id + item.folio_disease_id = item.folio_disease_id or str(uuid.uuid1()) + item.date_created = item.date_created or nowdate() + + def set_clinical_notes(self, encounter_doc): + if not self.clinical_notes: + patient_name = f"Patient: {self.patient_name}," + date_of_birth = f"Date of Birth: {self.date_of_birth}," + gender = f"Gender: {self.gender}," + years = ( + f"Age: {(date_diff(nowdate(), self.date_of_birth))//365} years," + ) + self.clinical_notes = ( + " ".join([patient_name, gender, date_of_birth, years]) + "
" + ) + + if not encounter_doc.examination_detail: + frappe.msgprint( + _( + f"Encounter {encounter_doc.name} does not have Examination Details defined. Check the encounter." + ), + alert=True, + ) + + department = frappe.get_cached_value( + "Healthcare Practitioner", encounter_doc.practitioner, "department" + ) + self.clinical_notes += f"
PractitionerName: {encounter_doc.practitioner_name}, Speciality: {department}, DateofService: {encounter_doc.encounter_date} {encounter_doc.encounter_time}
" + self.clinical_notes += encounter_doc.examination_detail or "" + + if len(encounter_doc.get("drug_prescription")) > 0: + self.clinical_notes += "
Medication(s):
" + for row in encounter_doc.get("drug_prescription"): + med_info = "" + if row.dosage: + med_info += f", Dosage: {row.dosage}" + if row.period: + med_info += f", Period: {row.period}" + if row.dosage_form: + med_info += f", Dosage Form: {row.dosage_form}" + + self.clinical_notes += f"Drug: {row.drug_code} {med_info}" + self.clinical_notes += "
" + self.clinical_notes = self.clinical_notes.replace('"', " ") + + def set_patient_claim_disease(self): + self.jubilee_patient_claim_disease = [] + preliminary_diagnosis_list = ( + frappe.qb.from_(ct) + .inner_join(pe) + .on(ct.parent == pe.name) + .select( + ct.name, + ct.parent, + ct.code, + ct.medical_code, + ct.description, + ct.modified_by, + ct.modified, + ct.creation, + pe.practitioner, + ) + .where( + (ct.parenttype == "Patient Encounter") + & (ct.parentfield == "patient_encounter_preliminary_diagnosis") + & ( + ct.parent.isin( + [encounter.name for encounter in self.patient_encounters] + ) + ) + ) + ).run(as_dict=True) + + for row in preliminary_diagnosis_list: + new_row = self.append("jubilee_patient_claim_disease", {}) + new_row.diagnosis_type = "Provisional Diagnosis" + new_row.status = "Provisional" + new_row.patient_encounter = row.encounter + new_row.codification_table = row.name + new_row.medical_code = row.medical_code + # Convert the ICD code of CDC to Jubilee + if row.code and len(row.code) > 3 and "." not in row.code: + new_row.disease_code = row.code[:3] + "." + (row.code[3:4] or "0") + elif row.code and len(row.code) <= 5 and "." in row.code: + new_row.disease_code = row.code + else: + new_row.disease_code = row.code[:3] + new_row.description = row.description[0:139] + new_row.item_crt_by = row.practitioner + new_row.date_created = row.modified.strftime("%Y-%m-%d") + + final_diagnosis_list = ( + frappe.qb.from_(ct) + .inner_join(pe) + .on(ct.parent == pe.name) + .select( + ct.name, + ct.parent, + ct.code, + ct.medical_code, + ct.description, + ct.modified_by, + ct.modified, + pe.practitioner, + ) + .where( + (ct.parenttype == "Patient Encounter") + & (ct.parentfield == "patient_encounter_final_diagnosis") + & ( + ct.parent.isin( + [encounter.name for encounter in self.patient_encounters] + ) + ) + ) + ).run(as_dict=True) + + for row in final_diagnosis_list: + new_row = self.append("jubilee_patient_claim_disease", {}) + new_row.diagnosis_type = "Final Diagnosis" + new_row.status = "Final" + new_row.patient_encounter = row.parent + new_row.codification_table = row.name + new_row.medical_code = row.medical_code + # Convert the ICD code of CDC to Jubilee + if row.code and len(row.code) > 3 and "." not in row.code: + new_row.disease_code = row.code[:3] + "." + (row.code[3:4] or "0") + elif row.code and len(row.code) <= 5 and "." in row.code: + new_row.disease_code = row.code + else: + new_row.disease_code = row.code[:3] + new_row.description = row.description[0:139] + new_row.item_crt_by = row.practitioner + new_row.date_created = row.modified.strftime("%Y-%m-%d") + + def set_patient_claim_item(self, called_method=None): + if called_method == "enqueue": + self.reload() + self.final_patient_encounter = self.get_final_patient_encounter() + self.patient_encounters = self.get_patient_encounters() + + self.jubilee_patient_claim_item = [] + self.clinical_notes = "" + if not self.inpatient_record: + for encounter in self.patient_encounters: + encounter_doc = frappe.get_doc("Patient Encounter", encounter.name) + + self.set_clinical_notes(encounter_doc) + self.set_service_items(encounter_doc) + + else: + ip_doc = frappe.get_doc("Inpatient Record", self.inpatient_record) + + occupancies = self.get_occupancies(ip_doc) + + for occupancy in occupancies: + if not occupancy.is_confirmed: + continue + + checkin_date = occupancy.check_in.strftime("%Y-%m-%d") + + self.set_ipd_consultancies(ip_doc, occupancy, checkin_date) + + for encounter in self.patient_encounters: + if str(encounter.encounter_date) != checkin_date: + continue + + encounter_doc = frappe.get_doc("Patient Encounter", encounter.name) + + # allow clinical notes to be added to the claim even if the service is not chargeable and encounters will be ignored + self.set_clinical_notes(encounter_doc) + + if not occupancy.is_service_chargeable: + continue + + self.set_service_items(encounter_doc) + + self.set_opd_consultancy() + + def set_service_items(self, encounter_doc): + for child in get_child_map(): + for row in encounter_doc.get(child.get("table")): + if row.prescribe or row.is_cancelled: + continue + + item_code = frappe.db.get_value( + child.get("doctype"), row.get(child.get("item")), "item" + ) + + delivered_quantity = 0 + if row.get("doctype") == "Drug Prescription": + delivered_quantity = (row.get("quantity") or 0) - ( + row.get("quantity_returned") or 0 + ) + elif row.get("doctype") == "Therapy Plan Detail": + delivered_quantity = (row.get("no_of_sessions") or 0) - ( + row.get("sessions_cancelled") or 0 + ) + else: + delivered_quantity = 1 + + new_row = self.append("jubilee_patient_claim_item", {}) + new_row.item_name = row.get(child.get("item_name")) + new_row.item_code = get_item_refcode(item_code) + new_row.item_quantity = delivered_quantity or 1 + new_row.unit_price = row.get("amount") + new_row.amount_claimed = new_row.unit_price * new_row.item_quantity + new_row.approval_ref_no = get_approval_number_from_LRPMT( + child["ref_doctype"], row.get(child["ref_docname"]) + ) + + new_row.status = get_LRPMT_status(encounter_doc.name, row, child) + new_row.patient_encounter = encounter_doc.name + new_row.ref_doctype = row.doctype + new_row.ref_docname = row.name + new_row.folio_item_id = str(uuid.uuid1()) + new_row.folio_id = self.folio_id + new_row.date_created = row.modified.strftime("%Y-%m-%d") + new_row.item_crt_by = encounter_doc.practitioner + + def set_opd_consultancy(self): + patient_appointment_list = [] + if not self.hms_tz_claim_appointment_list: + patient_appointment_list.append(self.patient_appointment) + else: + patient_appointment_list = json.loads(self.hms_tz_claim_appointment_list) + + sorted_patient_claim_item = sorted( + self.jubilee_patient_claim_item, + key=lambda k: ( + k.get("ref_doctype"), + k.get("item_code"), + k.get("date_created"), + ), + ) + idx = len(patient_appointment_list) + 1 + for row in sorted_patient_claim_item: + row.idx = idx + idx += 1 + self.jubilee_patient_claim_item = sorted_patient_claim_item + + appointment_idx = 1 + for appointment_no in patient_appointment_list: + patient_appointment_doc = frappe.get_doc( + "Patient Appointment", appointment_no + ) + + # SHM Rock: 202 + if patient_appointment_doc.has_no_consultation_charges == 1: + continue + + if not self.inpatient_record and not patient_appointment_doc.follow_up: + item_code = patient_appointment_doc.billing_item + new_row = self.append("jubilee_patient_claim_item", {}) + new_row.item_name = patient_appointment_doc.billing_item + new_row.item_code = get_item_refcode(item_code) + new_row.item_quantity = 1 + new_row.unit_price = patient_appointment_doc.paid_amount + new_row.amount_claimed = patient_appointment_doc.paid_amount + new_row.approval_ref_no = "" + new_row.ref_doctype = patient_appointment_doc.doctype + new_row.ref_docname = patient_appointment_doc.name + new_row.folio_item_id = str(uuid.uuid1()) + new_row.folio_id = self.folio_id + new_row.date_created = patient_appointment_doc.modified.strftime( + "%Y-%m-%d" + ) + new_row.item_crt_by = get_fullname(patient_appointment_doc.modified_by) + new_row.idx = appointment_idx + appointment_idx += 1 + + def set_occupancies(self, ip_doc): + beds = [] + dates = [] + admission_encounter_doc = frappe.get_doc( + "Patient Encounter", ip_doc.admission_encounter + ) + for occupancy in ip_doc.inpatient_occupancies: + if not occupancy.is_confirmed: + continue + + service_unit_type = frappe.get_cached_value( + "Healthcare Service Unit", + occupancy.service_unit, + "service_unit_type", + ) + + ( + is_service_chargeable, + is_consultancy_chargeable, + item_code, + ) = frappe.get_cached_value( + "Healthcare Service Unit Type", + service_unit_type, + ["is_service_chargeable", "is_consultancy_chargeable", "item"], + ) + + # update occupancy object + occupancy.update( + { + "service_unit_type": service_unit_type, + "is_service_chargeable": is_service_chargeable, + "is_consultancy_chargeable": is_consultancy_chargeable, + } + ) + + checkin_date = occupancy.check_in.strftime("%Y-%m-%d") + # Add only in occupancy once a day. + if checkin_date not in dates: + dates.append(checkin_date) + beds.append(occupancy) + + item_rate = get_item_rate( + item_code, + self.company, + admission_encounter_doc.insurance_subscription, + admission_encounter_doc.insurance_company, + ) + new_row = self.append("jubilee_patient_claim_item", {}) + new_row.item_name = occupancy.service_unit + new_row.item_code = get_item_refcode(item_code) + new_row.item_quantity = 1 + new_row.unit_price = item_rate + new_row.amount_claimed = new_row.unit_price * new_row.item_quantity + new_row.approval_ref_no = "" + new_row.patient_encounter = admission_encounter_doc.name + new_row.ref_doctype = occupancy.doctype + new_row.ref_docname = occupancy.name + new_row.folio_item_id = str(uuid.uuid1()) + new_row.folio_id = self.folio_id + new_row.date_created = occupancy.modified.strftime("%Y-%m-%d") + new_row.item_crt_by = get_fullname(occupancy.modified_by) + + return beds + + def set_ipd_consultancies(self, ip_doc, occupancy, checkin_date): + if occupancy.is_consultancy_chargeable: + for row_item in ip_doc.inpatient_consultancy: + if ( + row_item.is_confirmed + and str(row_item.date) == checkin_date + and row_item.rate + ): + item_code = row_item.consultation_item + new_row = self.append("jubilee_patient_claim_item", {}) + new_row.item_name = row_item.consultation_item + new_row.item_code = get_item_refcode(item_code) + new_row.item_quantity = 1 + new_row.unit_price = row_item.rate + new_row.amount_claimed = row_item.rate + new_row.approval_ref_no = "" + new_row.patient_encounter = ( + row_item.encounter or ip_doc.admission_encounter + ) + new_row.ref_doctype = row_item.doctype + new_row.ref_docname = row_item.name + new_row.folio_item_id = str(uuid.uuid1()) + new_row.folio_id = self.folio_id + new_row.date_created = row_item.modified.strftime("%Y-%m-%d") + new_row.item_crt_by = get_fullname(row_item.modified_by) + + @frappe.whitelist() + def send_jubilee_claim(self): + json_data, json_data_wo_files = self.get_folio_json_data() + token = get_jubilee_claimsservice_token(self.company, "Jubilee") + claimsserver_url = frappe.get_cached_value( + "Company Insurance Setting", + {"company": self.company, "insurance_provider": "Jubilee"}, + "claimsserver_url", + ) + headers = { + "Authorization": "Bearer " + token, + "Content-Type": "application/json", + } + url = str(claimsserver_url) + "/jubileeapi/SendClaim" + r = None + try: + r = requests.post(url, headers=headers, data=json_data, timeout=300) + + if r.status_code != 200: + frappe.throw( + f"Jubilee Server responded with HTTP status code: {r.status_code}

{str(r.text) if r.text else str(r)}" + ) + else: + data = json.loads(r.text) + if data.get("status") == "ERROR": + frappe.throw(str(data.get("description"))) + + else: + frappe.msgprint(str(data.get("description"))) + if data: + add_jubilee_log( + request_type="SubmitClaim", + request_url=url, + request_header=headers, + request_body=json_data_wo_files, + response_data=data, + status_code=r.status_code, + ref_doctype=self.doctype, + ref_docname=self.name, + company=self.company, + ) + + frappe.msgprint( + _("The claim has been sent successfully"), alert=True + ) + + except Exception as e: + add_jubilee_log( + request_type="SubmitClaim", + request_url=url, + request_header=headers, + request_body=json_data, + response_data=(r.text if str(r) else "NO RESPONSE r. Timeout???"), + status_code=( + r.status_code if str(r) else "NO STATUS CODE r. Timeout???" + ), + ref_doctype=self.doctype, + ref_docname=self.name, + company=self.company, + ) + self.add_comment( + comment_type="Comment", + text=r.text if str(r) else "NO RESPONSE", + ) + frappe.db.commit() + + frappe.throw( + "This folio was NOT submitted due to the error above!. \ + Please retry after resolving the problem. " + + str(get_datetime()) + ) + + def get_folio_json_data(self): + folio_data = frappe._dict() + folio_data.entities = [] + entities = frappe._dict() + entities.FolioID = self.folio_id + entities.ClaimYear = self.claim_year + entities.ClaimYear = self.claim_year + entities.ClaimMonth = self.claim_month + entities.FolioNo = self.folio_no + entities.SerialNo = self.serial_no + # entities.FacilityCode = self.facility_code + entities.CardNo = self.cardno.strip() + entities.BillNo = self.name + entities.FirstName = self.first_name + entities.LastName = self.last_name + entities.Gender = self.gender + entities.DateOfBirth = str(self.date_of_birth) + entities.Age = f"{(date_diff(nowdate(), self.date_of_birth)) // 365}" + entities.TelephoneNo = self.telephone_no + entities.PatientFileNo = self.patient_file_no + entities.AuthorizationNo = self.authorization_no + entities.AttendanceDate = str(self.attendance_date) + entities.PatientTypeCode = self.patient_type_code + if self.patient_type_code == "IN": + entities.DateAdmitted = ( + str(self.date_admitted) + " " + str(self.admitted_time) + ) + entities.DateDischarged = ( + str(self.date_discharge) + " " + str(self.discharge_time) + ) + entities.PractitionerNo = self.practitioner_no + # entities.PractitionerName = self.practitioner_name + entities.ProviderID = ( + frappe.get_cached_value( + "Company Insurance Setting", + {"company": self.company, "insurance_provider": "Jubilee"}, + "providerid", + ) + or None + ) + entities.ClinicalNotes = self.clinical_notes + entities.AmountClaimed = sum( + [item.amount_claimed for item in self.jubilee_patient_claim_item] + ) + entities.DelayReason = self.delayreason + entities.LateSubmissionReason = self.delayreason + entities.LateAuthorizationReason = None + entities.EmergencyAuthorizationReason = get_emergency_reason( + self.patient_appointment + ) + entities.CreatedBy = self.item_crt_by + entities.DateCreated = str(self.posting_date) + entities.LastModifiedBy = get_fullname(frappe.session.user) + entities.LastModified = str(get_datetime()) + entities.PatientFile = generate_pdf(self) + entities.ClaimFile = get_claim_pdf_file(self) + + entities.FolioDiseases = [] + for disease in self.jubilee_patient_claim_disease: + FolioDisease = frappe._dict() + FolioDisease.DiseaseCode = disease.disease_code + FolioDisease.Remarks = None + FolioDisease.Status = disease.status + FolioDisease.CreatedBy = disease.item_crt_by + FolioDisease.DateCreated = str(disease.date_created) + FolioDisease.LastModifiedBy = disease.item_crt_by + FolioDisease.LastModified = str(disease.date_created) + entities.FolioDiseases.append(FolioDisease) + + entities.FolioItems = [] + for item in self.jubilee_patient_claim_item: + FolioItem = frappe._dict() + FolioItem.ItemCode = item.item_code + FolioItem.OtherDetails = None + FolioItem.ItemQuantity = item.item_quantity + FolioItem.UnitPrice = item.unit_price + FolioItem.AmountClaimed = item.amount_claimed + FolioItem.ApprovalRefNo = item.approval_ref_no or None + FolioItem.CreatedBy = item.item_crt_by + FolioItem.DateCreated = str(item.date_created) + FolioItem.LastModifiedBy = item.item_crt_by + FolioItem.LastModified = str(item.date_created) + entities.FolioItems.append(FolioItem) + + folio_data.entities.append(entities) + jsonStr = json.dumps(folio_data) + + # Strip off the patient file + folio_data.entities[0].PatientFile = "Stripped off" + folio_data.entities[0].ClaimFile = "Stripped off" + jsonStr_wo_files = json.dumps(folio_data) + return jsonStr, jsonStr_wo_files + + def update_original_patient_claim(self): + """Update original patient claim incase merging if done for this claim""" + + ref_docnames = [] + for item in self.original_jubilee_patient_claim_item: + if item.ref_docname: + d = item.ref_docname.split(",") + ref_docnames.extend(d) + + for row in self.jubilee_patient_claim_item: + if row.ref_docname not in ref_docnames: + new_row = row.as_dict() + for fieldname in [ + "name", + "owner", + "creation", + "modified", + "modified_by", + "docstatus", + ]: + new_row[fieldname] = None + + self.append("original_jubilee_patient_claim_item", new_row) + + @frappe.whitelist() + def reconcile_repeated_items(self): + def reconcile_items(claim_items): + unique_items = [] + repeated_items = [] + unique_refcodes = [] + + for row in claim_items: + if row.item_code not in unique_refcodes: + unique_refcodes.append(row.item_code) + unique_items.append(row) + else: + repeated_items.append(row) + + if len(repeated_items) > 0: + items = [] + for item in unique_items: + ref_docnames = [] + ref_encounters = [] + + for d in repeated_items: + if item.item_code == d.item_code: + item.item_quantity += d.item_quantity + item.amount_claimed += d.amount_claimed + + if d.approval_ref_no: + approval_ref_no = None + if item.approval_ref_no: + approval_ref_no = ( + str(item.approval_ref_no) + + "," + + str(d.approval_ref_no) + ) + else: + approval_ref_no = d.approval_ref_no + + item.approval_ref_no = approval_ref_no + + if d.patient_encounter: + ref_encounters.append(d.patient_encounter) + if d.ref_docname: + ref_docnames.append(d.ref_docname) + + if item.status != "Submitted" and d.status == "Submitted": + item.status = "Submitted" + + if item.patient_encounter: + ref_encounters.append(item.patient_encounter) + if item.ref_docname: + ref_docnames.append(item.ref_docname) + + if len(ref_encounters) > 0: + item.patient_encounter = ",".join(set(ref_encounters)) + + if len(ref_docnames) > 0: + item.ref_docname = ",".join(set(ref_docnames)) + + items.append(item) + + for record in repeated_items: + frappe.delete_doc( + record.doctype, + record.name, + force=True, + ignore_permissions=True, + ignore_on_trash=True, + delete_permanently=True, + ) + return items + + else: + return unique_items + + # claim_doc = frappe.get_doc("Jubilee Patient Claim", self.name) + self.allow_changes = 1 + self.jubilee_patient_claim_item = reconcile_items( + self.jubilee_patient_claim_item + ) + self.original_jubilee_patient_claim_item = reconcile_items( + self.original_jubilee_patient_claim_item + ) + + self.save(ignore_permissions=True) + self.reload() + return True + + +def get_child_map(): + childs_map = [ + { + "table": "lab_test_prescription", + "doctype": "Lab Test Template", + "item": "lab_test_code", + "item_name": "lab_test_name", + "comment": "lab_test_comment", + "ref_doctype": "Lab Test", + "ref_docname": "lab_test", + }, + { + "table": "radiology_procedure_prescription", + "doctype": "Radiology Examination Template", + "item": "radiology_examination_template", + "item_name": "radiology_procedure_name", + "comment": "radiology_test_comment", + "ref_doctype": "Radiology Examination", + "ref_docname": "radiology_examination", + }, + { + "table": "procedure_prescription", + "doctype": "Clinical Procedure Template", + "item": "procedure", + "item_name": "procedure_name", + "comment": "comments", + "ref_doctype": "Clinical Procedure", + "ref_docname": "clinical_procedure", + }, + { + "table": "drug_prescription", + "doctype": "Medication", + "item": "drug_code", + "item_name": "drug_name", + "comment": "comment", + "ref_doctype": "Delivery Note Item", + "ref_docname": "dn_detail", + }, + { + "table": "therapies", + "doctype": "Therapy Type", + "item": "therapy_type", + "item_name": "therapy_type", + "comment": "comment", + "ref_doctype": "", + "ref_docname": "", + }, + ] + return childs_map + + +def get_item_refcode(item_code): + code_list = frappe.db.get_all( + "Item Customer Detail", + filters={"parent": item_code, "customer_name": ["like", "%Jubilee%"]}, + fields=["ref_code"], + ) + if len(code_list) == 0: + frappe.throw(_(f"Item: {item_code} has not Jubilee Code Reference")) + # return None + + ref_code = code_list[0].ref_code + if not ref_code: + frappe.throw(_(f"Item: {item_code} has not Jubilee Code Reference")) + # return None + + return ref_code + + +def get_LRPMT_status(encounter_no, row, child): + status = None + if child["doctype"] == "Therapy Type" or row.get(child["ref_docname"]): + status = "Submitted" + + elif child["doctype"] == "Lab Test Template" and not row.get(child["ref_docname"]): + lab_workflow_state = frappe.get_value( + "Lab Test", + { + "ref_docname": encounter_no, + "ref_doctype": "Patient Encounter", + "hms_tz_ref_childname": row.name, + }, + "workflow_state", + ) + if lab_workflow_state and lab_workflow_state != "Lab Test Requested": + status = "Submitted" + else: + status = "Draft" + else: + status = "Draft" + + return status + + +def get_missing_patient_signature(doc): + if doc.patient: + signature = frappe.get_cached_value("Patient", doc.patient, "patient_signature") + if not signature: + frappe.throw(_("Patient signature is required")) + + doc.patient_signature = signature + + +def get_emergency_reason(appointment): + remarks = frappe.db.get_value( + "Patient Appointment", + {"name": appointment, "appointment_type": ["like", "Emergency%"]}, + "remarks", + ) + + return remarks or None + + +def generate_pdf(doc): + file_list = frappe.db.get_all( + "File", + filters={ + "attached_to_doctype": "Jubilee Patient Claim", + "file_name": str(doc.name + ".pdf"), + }, + ) + if file_list: + patientfile = frappe.get_cached_doc("File", file_list[0].name) + if patientfile: + pdf = patientfile.get_content() + return to_base64(pdf) + + data_list = [] + for i in doc.patient_encounters: + data_list.append(i.name) + + doctype = dict({"Patient Encounter": data_list}) + print_format = "" + default_print_format = frappe.db.get_value( + "Property Setter", + dict(property="default_print_format", doc_type="Patient Encounter"), + "value", + ) + if default_print_format: + print_format = default_print_format + else: + print_format = "Patient File" + + pdf = download_multi_pdf( + doctype, doc.name, print_format=print_format, no_letterhead=1 + ) + if pdf: + ret = frappe.get_doc( + { + "doctype": "File", + "attached_to_doctype": "Jubilee Patient Claim", + "attached_to_name": doc.name, + "folder": "Home/Attachments", + "file_name": doc.name + ".pdf", + "file_url": "/private/files/" + doc.name + ".pdf", + "content": pdf, + "is_private": 1, + } + ) + ret.save(ignore_permissions=1) + # ret.db_update() + return to_base64(pdf) + + +def download_multi_pdf(doctype, name, print_format=None, no_letterhead=0): + output = PdfFileWriter() + if isinstance(doctype, dict): + for doctype_name in doctype: + for doc_name in doctype[doctype_name]: + try: + output = frappe.get_print( + doctype_name, + doc_name, + print_format, + as_pdf=True, + output=output, + no_letterhead=no_letterhead, + ) + except Exception: + frappe.log_error(frappe.get_traceback()) + + return read_multi_pdf(output) + + +def read_multi_pdf(output): + fname = os.path.join("/tmp", f"frappe-pdf-{frappe.generate_hash()}.pdf") + output.write(open(fname, "wb")) + + with open(fname, "rb") as fileobj: + filedata = fileobj.read() + + return filedata + + +def get_claim_pdf_file(doc): + file_list = frappe.db.get_all( + "File", + filters={ + "attached_to_doctype": "Jubilee Patient Claim", + "file_name": str(doc.name + "-claim.pdf"), + }, + ) + if file_list: + for file in file_list: + frappe.delete_doc("File", file.name, ignore_permissions=True, force=True) + + default_print_format = frappe.db.get_value( + "Property Setter", + dict(property="default_print_format", doc_type=doc.doctype), + "value", + ) + if default_print_format: + print_format = default_print_format + else: + print_format = "Jubilee Form 2A & B" + + html = frappe.get_print( + doc.doctype, doc.name, print_format, doc=None, no_letterhead=1 + ) + + filename = f"""{doc.name.replace(" ", "-").replace("/", "-")}-claim""" + pdf = get_pdf(html) + if pdf: + ret = frappe.get_doc( + { + "doctype": "File", + "attached_to_doctype": doc.doctype, + "attached_to_name": doc.name, + "folder": "Home/Attachments", + "file_name": filename + ".pdf", + "file_url": "/private/files/" + filename + ".pdf", + "content": pdf, + "is_private": 1, + } + ) + ret.insert(ignore_permissions=True) + ret.db_update() + if not ret.name: + frappe.throw("ret name not exist") + base64_data = to_base64(pdf) + return base64_data + else: + frappe.throw(_("Failed to generate pdf")) diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim/test_jubilee_patient_claim.py b/hms_tz/jubilee/doctype/jubilee_patient_claim/test_jubilee_patient_claim.py new file mode 100644 index 00000000..71af459d --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_patient_claim/test_jubilee_patient_claim.py @@ -0,0 +1,9 @@ +# Copyright (c) 2024, Aakvatech and Contributors +# See license.txt + +# import frappe +from frappe.tests.utils import FrappeTestCase + + +class TestJubileePatientClaim(FrappeTestCase): + pass diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim_disease/__init__.py b/hms_tz/jubilee/doctype/jubilee_patient_claim_disease/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim_disease/jubilee_patient_claim_disease.json b/hms_tz/jubilee/doctype/jubilee_patient_claim_disease/jubilee_patient_claim_disease.json new file mode 100644 index 00000000..399c9e7c --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_patient_claim_disease/jubilee_patient_claim_disease.json @@ -0,0 +1,128 @@ +{ + "actions": [], + "creation": "2024-07-26 13:18:04.846672", + "default_view": "List", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "diagnosis_type", + "status", + "medical_code", + "disease_code", + "description", + "column_break_7", + "patient_encounter", + "codification_table", + "folio_id", + "folio_disease_id", + "created_by", + "item_crt_by", + "date_created" + ], + "fields": [ + { + "fieldname": "diagnosis_type", + "fieldtype": "Data", + "label": "Diagnosis Type", + "permlevel": 1 + }, + { + "fieldname": "status", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Status", + "options": "Provisional\nFinal" + }, + { + "fieldname": "medical_code", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Medical Code", + "options": "Medical Code", + "permlevel": 1 + }, + { + "fetch_from": "medical_code.code", + "fetch_if_empty": 1, + "fieldname": "disease_code", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Disease Code", + "permlevel": 1 + }, + { + "fetch_from": "medical_code.description", + "fieldname": "description", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Description", + "read_only": 1 + }, + { + "fieldname": "column_break_7", + "fieldtype": "Column Break" + }, + { + "fieldname": "patient_encounter", + "fieldtype": "Link", + "label": "Patient Encounter", + "options": "Patient Encounter", + "read_only": 1 + }, + { + "fieldname": "codification_table", + "fieldtype": "Link", + "label": "Codification Table", + "options": "Codification Table", + "read_only": 1 + }, + { + "fieldname": "folio_id", + "fieldtype": "Data", + "label": "Folio ID", + "read_only": 1 + }, + { + "fieldname": "folio_disease_id", + "fieldtype": "Data", + "label": "Folio Disease ID", + "read_only": 1 + }, + { + "fieldname": "created_by", + "fieldtype": "Data", + "hidden": 1, + "label": "Old Created By", + "read_only": 1 + }, + { + "fieldname": "item_crt_by", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Created By", + "read_only": 1 + }, + { + "fieldname": "date_created", + "fieldtype": "Date", + "in_list_view": 1, + "label": "Date Created", + "permlevel": 1 + } + ], + "index_web_pages_for_search": 1, + "istable": 1, + "links": [], + "modified": "2024-07-26 13:18:04.846672", + "modified_by": "Administrator", + "module": "Jubilee", + "name": "Jubilee Patient Claim Disease", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "states": [], + "track_changes": 1 +} \ No newline at end of file diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim_disease/jubilee_patient_claim_disease.py b/hms_tz/jubilee/doctype/jubilee_patient_claim_disease/jubilee_patient_claim_disease.py new file mode 100644 index 00000000..98381955 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_patient_claim_disease/jubilee_patient_claim_disease.py @@ -0,0 +1,8 @@ +# Copyright (c) 2024, Aakvatech and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class JubileePatientClaimDisease(Document): + pass diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim_item/__init__.py b/hms_tz/jubilee/doctype/jubilee_patient_claim_item/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim_item/jubilee_patient_claim_item.json b/hms_tz/jubilee/doctype/jubilee_patient_claim_item/jubilee_patient_claim_item.json new file mode 100644 index 00000000..5bfceb2a --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_patient_claim_item/jubilee_patient_claim_item.json @@ -0,0 +1,152 @@ +{ + "actions": [], + "creation": "2024-07-26 13:16:36.223382", + "default_view": "List", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "ref_doctype", + "item_name", + "item_code", + "item_quantity", + "unit_price", + "amount_claimed", + "created_by", + "item_crt_by", + "column_break_8", + "status", + "patient_encounter", + "ref_docname", + "approval_ref_no", + "folio_item_id", + "folio_id", + "date_created" + ], + "fields": [ + { + "fieldname": "ref_doctype", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Ref DocType", + "options": "DocType", + "permlevel": 1, + "reqd": 1 + }, + { + "fieldname": "item_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Item Name", + "read_only": 1 + }, + { + "columns": 1, + "fieldname": "item_code", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Item Code", + "read_only": 1 + }, + { + "columns": 1, + "fieldname": "item_quantity", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Item Quantity" + }, + { + "columns": 1, + "fieldname": "unit_price", + "fieldtype": "Float", + "in_list_view": 1, + "label": "Unit Price", + "permlevel": 1 + }, + { + "columns": 1, + "fieldname": "amount_claimed", + "fieldtype": "Float", + "in_list_view": 1, + "label": "Amount Claimed", + "read_only": 1 + }, + { + "fieldname": "created_by", + "fieldtype": "Data", + "hidden": 1, + "label": "Old Created By", + "read_only": 1 + }, + { + "default": "None", + "fieldname": "item_crt_by", + "fieldtype": "Data", + "label": "Created By" + }, + { + "fieldname": "column_break_8", + "fieldtype": "Column Break", + "read_only": 1 + }, + { + "bold": 1, + "fieldname": "status", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Status" + }, + { + "fieldname": "patient_encounter", + "fieldtype": "Small Text", + "in_list_view": 1, + "label": "Patient Encounter", + "read_only": 1 + }, + { + "fieldname": "ref_docname", + "fieldtype": "Small Text", + "label": "Ref DocName", + "read_only": 1 + }, + { + "fieldname": "approval_ref_no", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Approval Ref No", + "permlevel": 1 + }, + { + "fieldname": "folio_item_id", + "fieldtype": "Data", + "label": "Folio Item ID", + "read_only": 1 + }, + { + "fieldname": "folio_id", + "fieldtype": "Data", + "label": "Folio ID", + "read_only": 1 + }, + { + "fieldname": "date_created", + "fieldtype": "Date", + "label": "Date Created", + "read_only": 1 + } + ], + "index_web_pages_for_search": 1, + "istable": 1, + "links": [], + "modified": "2024-07-26 13:16:36.223382", + "modified_by": "Administrator", + "module": "Jubilee", + "name": "Jubilee Patient Claim Item", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "states": [], + "track_changes": 1 +} \ No newline at end of file diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim_item/jubilee_patient_claim_item.py b/hms_tz/jubilee/doctype/jubilee_patient_claim_item/jubilee_patient_claim_item.py new file mode 100644 index 00000000..07abd252 --- /dev/null +++ b/hms_tz/jubilee/doctype/jubilee_patient_claim_item/jubilee_patient_claim_item.py @@ -0,0 +1,8 @@ +# Copyright (c) 2024, Aakvatech and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class JubileePatientClaimItem(Document): + pass diff --git a/hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/__init__.py b/hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/original_jubilee_patient_claim_item.json b/hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/original_jubilee_patient_claim_item.json new file mode 100644 index 00000000..82a51c5a --- /dev/null +++ b/hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/original_jubilee_patient_claim_item.json @@ -0,0 +1,174 @@ +{ + "actions": [], + "creation": "2024-07-26 13:05:14.116544", + "default_view": "List", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "ref_doctype", + "item_name", + "item_code", + "item_quantity", + "unit_price", + "amount_claimed", + "created_by", + "item_crt_by", + "column_break_8", + "status", + "patient_encounter", + "ref_docname", + "approval_ref_no", + "folio_item_id", + "folio_id", + "date_created", + "section_break_15", + "reference_doctype", + "reference_docname" + ], + "fields": [ + { + "fieldname": "ref_doctype", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Ref DocType", + "permlevel": 1, + "reqd": 1 + }, + { + "fieldname": "item_name", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Item Name", + "read_only": 1 + }, + { + "columns": 1, + "fieldname": "item_code", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Item Code", + "read_only": 1 + }, + { + "columns": 1, + "fieldname": "item_quantity", + "fieldtype": "Int", + "in_list_view": 1, + "label": "Item Quantity" + }, + { + "columns": 1, + "fieldname": "unit_price", + "fieldtype": "Float", + "in_list_view": 1, + "label": "Unit Price", + "permlevel": 1 + }, + { + "columns": 1, + "fieldname": "amount_claimed", + "fieldtype": "Float", + "in_list_view": 1, + "label": "Amount Claimed", + "read_only": 1 + }, + { + "fieldname": "created_by", + "fieldtype": "Data", + "hidden": 1, + "label": "Old Created By", + "read_only": 1 + }, + { + "default": "None", + "fieldname": "item_crt_by", + "fieldtype": "Data", + "label": "Created By" + }, + { + "fieldname": "column_break_8", + "fieldtype": "Column Break", + "read_only": 1 + }, + { + "bold": 1, + "fieldname": "status", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Status" + }, + { + "fieldname": "patient_encounter", + "fieldtype": "Small Text", + "in_list_view": 1, + "label": "Patient Encounter", + "read_only": 1 + }, + { + "fieldname": "ref_docname", + "fieldtype": "Small Text", + "label": "Ref DocName", + "read_only": 1 + }, + { + "fieldname": "approval_ref_no", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Approval Ref No", + "permlevel": 1 + }, + { + "fieldname": "folio_item_id", + "fieldtype": "Data", + "label": "Folio Item ID", + "read_only": 1 + }, + { + "fieldname": "folio_id", + "fieldtype": "Data", + "label": "Folio ID", + "read_only": 1 + }, + { + "fieldname": "date_created", + "fieldtype": "Date", + "label": "Date Created", + "read_only": 1 + }, + { + "fieldname": "section_break_15", + "fieldtype": "Section Break" + }, + { + "allow_on_submit": 1, + "fieldname": "reference_doctype", + "fieldtype": "Link", + "label": "Reference DocType", + "options": "DocType", + "permlevel": 2 + }, + { + "allow_on_submit": 1, + "fieldname": "reference_docname", + "fieldtype": "Dynamic Link", + "label": "Reference DocName", + "options": "reference_doctype", + "permlevel": 2 + } + ], + "index_web_pages_for_search": 1, + "istable": 1, + "links": [], + "modified": "2024-07-26 13:13:11.956151", + "modified_by": "Administrator", + "module": "Jubilee", + "name": "Original Jubilee Patient Claim Item", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "sort_field": "modified", + "sort_order": "DESC", + "states": [], + "track_changes": 1 +} \ No newline at end of file diff --git a/hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/original_jubilee_patient_claim_item.py b/hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/original_jubilee_patient_claim_item.py new file mode 100644 index 00000000..0457e44a --- /dev/null +++ b/hms_tz/jubilee/doctype/original_jubilee_patient_claim_item/original_jubilee_patient_claim_item.py @@ -0,0 +1,8 @@ +# Copyright (c) 2024, Aakvatech and contributors +# For license information, please see license.txt + +# import frappe +from frappe.model.document import Document + +class OriginalJubileePatientClaimItem(Document): + pass From 8e4d8399c99cb64ca78591d06e649cdf0fe13a2f Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Sun, 28 Jul 2024 19:46:11 +0300 Subject: [PATCH 23/25] feat: change 'NHIF Folio Counter' to 'Insurance Folio Counter' to handle folio counter of multiple insurance claims --- .../jubilee_patient_claim.py | 52 ++++++++++++++++--- .../__init__.py | 0 .../insurance_folio_counter.js} | 2 +- .../insurance_folio_counter.json} | 19 +++++-- .../insurance_folio_counter.py} | 2 +- .../test_insurance_folio_counter.py} | 2 +- .../nhif_patient_claim/nhif_patient_claim.py | 21 ++++---- 7 files changed, 72 insertions(+), 26 deletions(-) rename hms_tz/nhif/doctype/{nhif_folio_counter => insurance_folio_counter}/__init__.py (100%) rename hms_tz/nhif/doctype/{nhif_folio_counter/nhif_folio_counter.js => insurance_folio_counter/insurance_folio_counter.js} (75%) rename hms_tz/nhif/doctype/{nhif_folio_counter/nhif_folio_counter.json => insurance_folio_counter/insurance_folio_counter.json} (75%) rename hms_tz/nhif/doctype/{nhif_folio_counter/nhif_folio_counter.py => insurance_folio_counter/insurance_folio_counter.py} (80%) rename hms_tz/nhif/doctype/{nhif_folio_counter/test_nhif_folio_counter.py => insurance_folio_counter/test_insurance_folio_counter.py} (67%) diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py b/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py index 8d583c50..2785bd50 100644 --- a/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py +++ b/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py @@ -30,8 +30,9 @@ getdate, get_time, date_diff, - get_fullname, + now_datetime, get_datetime, + get_fullname, get_url_to_form, time_diff_in_seconds, ) @@ -60,6 +61,41 @@ def before_insert(self): self.validate_multiple_appointments_per_authorization_no("before_insert") def after_insert(self): + folio_counter = frappe.db.get_all( + "Insurance Folio Counter", + filters={ + "company": self.company, + "claim_year": self.claim_year, + "claim_month": self.claim_month, + "insurance_provider": "Jubilee" + }, + fields=["name", "folio_no"], + page_length=1, + ) + + folio_no = 1 + if len(folio_counter) == 0: + new_folio_doc = frappe.get_doc( + { + "doctype": "Insurance Folio Counter", + "company": self.company, + "claim_year": self.claim_year, + "claim_month": self.claim_month, + "posting_date": now_datetime(), + "insurance_provider": "Jubilee", + "folio_no": folio_no, + } + ).insert(ignore_permissions=True) + new_folio_doc.reload() + else: + folio_no = cint(folio_counter[0].folio_no) + 1 + frappe.set_value("Insurance Folio Counter", folio_counter[0].name, { + "folio_no": folio_no, + "posting_date": now_datetime() + } + ) + frappe.set_value(self.doctype, self.name, "folio_no", folio_no) + items = [] for row in self.jubilee_patient_claim_item: new_row = row.as_dict() @@ -109,8 +145,8 @@ def validate(self): ).run() def before_submit(self): - start_datetime = get_datetime() - frappe.msgprint("Submit process started: " + str(get_datetime())) + start_datetime = now_datetime() + frappe.msgprint("Submit process started: " + str(now_datetime())) # validation self.validate_claim_items_and_claim_diseases() @@ -125,11 +161,11 @@ def before_submit(self): get_missing_patient_signature(self) # self.claim_file_mem = get_claim_pdf_file(self) - frappe.msgprint("Sending Jubilee Claim: " + str(get_datetime())) + frappe.msgprint("Sending Jubilee Claim: " + str(now_datetime())) self.send_jubilee_claim() - frappe.msgprint("Got response from Jubilee: " + str(get_datetime())) - end_datetime = get_datetime() + frappe.msgprint("Got response from Jubilee: " + str(now_datetime())) + end_datetime = now_datetime() time_in_seconds = time_diff_in_seconds(str(end_datetime), str(start_datetime)) frappe.msgprint( "Total time to complete the process in seconds = " + str(time_in_seconds) @@ -946,7 +982,7 @@ def send_jubilee_claim(self): frappe.throw( "This folio was NOT submitted due to the error above!. \ Please retry after resolving the problem. " - + str(get_datetime()) + + str(now_datetime()) ) def get_folio_json_data(self): @@ -1002,7 +1038,7 @@ def get_folio_json_data(self): entities.CreatedBy = self.item_crt_by entities.DateCreated = str(self.posting_date) entities.LastModifiedBy = get_fullname(frappe.session.user) - entities.LastModified = str(get_datetime()) + entities.LastModified = str(now_datetime()) entities.PatientFile = generate_pdf(self) entities.ClaimFile = get_claim_pdf_file(self) diff --git a/hms_tz/nhif/doctype/nhif_folio_counter/__init__.py b/hms_tz/nhif/doctype/insurance_folio_counter/__init__.py similarity index 100% rename from hms_tz/nhif/doctype/nhif_folio_counter/__init__.py rename to hms_tz/nhif/doctype/insurance_folio_counter/__init__.py diff --git a/hms_tz/nhif/doctype/nhif_folio_counter/nhif_folio_counter.js b/hms_tz/nhif/doctype/insurance_folio_counter/insurance_folio_counter.js similarity index 75% rename from hms_tz/nhif/doctype/nhif_folio_counter/nhif_folio_counter.js rename to hms_tz/nhif/doctype/insurance_folio_counter/insurance_folio_counter.js index 110beb97..f776c565 100644 --- a/hms_tz/nhif/doctype/nhif_folio_counter/nhif_folio_counter.js +++ b/hms_tz/nhif/doctype/insurance_folio_counter/insurance_folio_counter.js @@ -1,7 +1,7 @@ // Copyright (c) 2022, Aakvatech and contributors // For license information, please see license.txt -frappe.ui.form.on('NHIF Folio Counter', { +frappe.ui.form.on('Insurance Folio Counter', { // refresh: function(frm) { // } diff --git a/hms_tz/nhif/doctype/nhif_folio_counter/nhif_folio_counter.json b/hms_tz/nhif/doctype/insurance_folio_counter/insurance_folio_counter.json similarity index 75% rename from hms_tz/nhif/doctype/nhif_folio_counter/nhif_folio_counter.json rename to hms_tz/nhif/doctype/insurance_folio_counter/insurance_folio_counter.json index ada379f7..d3c13ab8 100644 --- a/hms_tz/nhif/doctype/nhif_folio_counter/nhif_folio_counter.json +++ b/hms_tz/nhif/doctype/insurance_folio_counter/insurance_folio_counter.json @@ -1,7 +1,7 @@ { "actions": [], "allow_rename": 1, - "autoname": "NHIF-FC-.#####", + "autoname": "IFC-.#####", "creation": "2022-11-28 09:02:31.862037", "doctype": "DocType", "editable_grid": 1, @@ -9,10 +9,11 @@ "field_order": [ "company", "claim_year", - "folio_no", + "claim_month", "column_break_4", + "insurance_provider", "posting_date", - "claim_month" + "folio_no" ], "fields": [ { @@ -43,14 +44,21 @@ "fieldname": "claim_month", "fieldtype": "Int", "label": "Claim Month" + }, + { + "fieldname": "insurance_provider", + "fieldtype": "Select", + "label": "Insurance Provider", + "options": "\nNHIF\nJubilee\nStrategies" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2022-11-28 10:29:01.447147", + "modified": "2024-07-28 19:20:09.176230", "modified_by": "Administrator", "module": "NHIF", - "name": "NHIF Folio Counter", + "name": "Insurance Folio Counter", + "naming_rule": "Expression (old style)", "owner": "Administrator", "permissions": [ { @@ -68,5 +76,6 @@ ], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/hms_tz/nhif/doctype/nhif_folio_counter/nhif_folio_counter.py b/hms_tz/nhif/doctype/insurance_folio_counter/insurance_folio_counter.py similarity index 80% rename from hms_tz/nhif/doctype/nhif_folio_counter/nhif_folio_counter.py rename to hms_tz/nhif/doctype/insurance_folio_counter/insurance_folio_counter.py index 656e73e1..4b081c65 100644 --- a/hms_tz/nhif/doctype/nhif_folio_counter/nhif_folio_counter.py +++ b/hms_tz/nhif/doctype/insurance_folio_counter/insurance_folio_counter.py @@ -4,5 +4,5 @@ # import frappe from frappe.model.document import Document -class NHIFFolioCounter(Document): +class InsuranceFolioCounter(Document): pass diff --git a/hms_tz/nhif/doctype/nhif_folio_counter/test_nhif_folio_counter.py b/hms_tz/nhif/doctype/insurance_folio_counter/test_insurance_folio_counter.py similarity index 67% rename from hms_tz/nhif/doctype/nhif_folio_counter/test_nhif_folio_counter.py rename to hms_tz/nhif/doctype/insurance_folio_counter/test_insurance_folio_counter.py index d996ae0e..9c8472c5 100644 --- a/hms_tz/nhif/doctype/nhif_folio_counter/test_nhif_folio_counter.py +++ b/hms_tz/nhif/doctype/insurance_folio_counter/test_insurance_folio_counter.py @@ -4,5 +4,5 @@ # import frappe import unittest -class TestNHIFFolioCounter(unittest.TestCase): +class TestInsuranceFolioCounter(unittest.TestCase): pass diff --git a/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py b/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py index d993b94d..7003bc48 100644 --- a/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py +++ b/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py @@ -928,14 +928,15 @@ def before_insert(self): self.validate_multiple_appointments_per_authorization_no("before_insert") def after_insert(self): - folio_counter = frappe.get_all( - "NHIF Folio Counter", + folio_counter = frappe.db.get_all( + "Insurance Folio Counter", filters={ "company": self.company, "claim_year": self.claim_year, "claim_month": self.claim_month, + "insurance_provider": "NHIF", }, - fields=["name"], + fields=["name", "folio_no"], page_length=1, ) @@ -943,22 +944,22 @@ def after_insert(self): if not folio_counter: new_folio_doc = frappe.get_doc( { - "doctype": "NHIF Folio Counter", + "doctype": "Insurance Folio Counter", "company": self.company, "claim_year": self.claim_year, "claim_month": self.claim_month, "posting_date": now_datetime(), + "insurance_provider": "NHIF", "folio_no": folio_no, } ).insert(ignore_permissions=True) new_folio_doc.reload() else: - folio_doc = frappe.get_doc("NHIF Folio Counter", folio_counter[0].name) - folio_no = cint(folio_doc.folio_no) + 1 - - folio_doc.folio_no += 1 - folio_doc.posting_date = now_datetime() - folio_doc.save(ignore_permissions=True) + folio_no = cint(folio_counter[0].folio_no) + 1 + frappe.set_value("Insurance Folio Counter", folio_counter[0].name, { + "folio_no": folio_no, + "posting_date": now_datetime() + }) frappe.set_value(self.doctype, self.name, "folio_no", folio_no) items = [] From 293d01cd10bc3dcf84109a3c1178ed23c432432d Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Sun, 28 Jul 2024 19:47:51 +0300 Subject: [PATCH 24/25] feat: create form 2A & B print format for jubilee patient claim --- hms_tz/jubilee/print_format/__init__.py | 0 .../jubilee_form_2a_&_b/__init__.py | 0 .../jubilee_form_2a_&_b.json | 34 +++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 hms_tz/jubilee/print_format/__init__.py create mode 100644 hms_tz/jubilee/print_format/jubilee_form_2a_&_b/__init__.py create mode 100644 hms_tz/jubilee/print_format/jubilee_form_2a_&_b/jubilee_form_2a_&_b.json diff --git a/hms_tz/jubilee/print_format/__init__.py b/hms_tz/jubilee/print_format/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/print_format/jubilee_form_2a_&_b/__init__.py b/hms_tz/jubilee/print_format/jubilee_form_2a_&_b/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/hms_tz/jubilee/print_format/jubilee_form_2a_&_b/jubilee_form_2a_&_b.json b/hms_tz/jubilee/print_format/jubilee_form_2a_&_b/jubilee_form_2a_&_b.json new file mode 100644 index 00000000..1393d5df --- /dev/null +++ b/hms_tz/jubilee/print_format/jubilee_form_2a_&_b/jubilee_form_2a_&_b.json @@ -0,0 +1,34 @@ +{ + "absolute_value": 0, + "align_labels_right": 0, + "creation": "2024-07-28 15:18:31.358673", + "css": "hr {\r\n border: 0;\r\n clear:both;\r\n display:block;\r\n width: 96%; \r\n background-color:#cdcdca;\r\n height: 1px;\r\n}", + "custom_format": 1, + "default_print_language": "en", + "disabled": 0, + "doc_type": "Jubilee Patient Claim", + "docstatus": 0, + "doctype": "Print Format", + "font": "Default", + "font_size": 0, + "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"Custom HTML\", \"options\": \"\\n\\n \\n \\n \\n
\\n \\n \\n
\\n CONFIDENTIAL
\\n THE NHIF - HEALTH PROVIDER IN/OUT PATIENT CLAIM FORM\\n
\\n 		\\n Form NHIF 2A & B
\\n Regulation 18(1)
\\n Serial No:
{{ doc.folio_no }}\\n
\"}, {\"fieldtype\": \"Section Break\", \"label\": \"A: PARTICULARS\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"company\", \"print_hide\": 0, \"align\": \"left\", \"label\": \"Healthcare Facility\"}, {\"fieldname\": \"patient_name\", \"print_hide\": 0, \"align\": \"left\", \"label\": \"Name\"}, {\"fieldname\": \"date_of_birth\", \"print_hide\": 0, \"label\": \"Date Of Birth\"}, {\"fieldname\": \"gender\", \"print_hide\": 0, \"align\": \"left\", \"label\": \"Sex\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n
\\n \\n\\t
\\n\\t
\\n\\t
\\n
\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n
\\n \\n\\t
\\n\\t
\\n\\t\\t{{frappe.db.get_value(\\\"Patient\\\", doc.patient, \\\"area\\\")}}\\n\\t
\\n
\\n\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n
\\n \\n\\t
\\n\\t
\\n\\t
\\n
\\n\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n
\\n \\n\\t
\\n\\t
\\n\\t\\tChusi Street, P.O.BOX 581 Ilala.\\n\\t
\\n
\"}, {\"fieldname\": \"cardno\", \"print_hide\": 0, \"label\": \"CardNo\"}, {\"fieldname\": \"attendance_date\", \"print_hide\": 0, \"align\": \"left\", \"label\": \"Date of Attendance\"}, {\"fieldname\": \"patient_type_code\", \"print_hide\": 0, \"align\": \"left\", \"label\": \"Patient Type Code\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n
\\n \\n\\t
\\n\\t
\\n\\t\\t{{frappe.db.get_value(\\\"Patient Appointment\\\", doc.patient_appointment, \\\"department\\\")}}\\n\\t
\\n
\"}, {\"fieldname\": \"patient_file_no\", \"print_hide\": 0, \"label\": \"Patient File No\"}, {\"fieldname\": \"authorization_no\", \"print_hide\": 0, \"label\": \"Authorization No\"}, {\"fieldtype\": \"Section Break\", \"label\": \"Diagnosis Code\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n Provisional Diagnosis
\\n \\n \\n \\n \\n \\n \\n \\n {% for item in doc.nhif_patient_claim_disease %}\\n {% if item.status == \\\"Provisional\\\" %}\\n \\n \\n \\n \\n {% endif %}\\n {% endfor %}\\n
Disease CodeDescription
{{item.disease_code }}{{item.description }}
\\n
\\n\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n Final Diagnosis
\\n \\n \\n \\n \\n \\n \\n \\n {% for item in doc.nhif_patient_claim_disease %}\\n {% if item.status == \\\"Final\\\" %}\\n \\n \\n \\n \\n {% endif %}\\n {% endfor %}\\n
Disease CodeDescription
{{item.disease_code }}{{item.description }}
\\n
\"}, {\"fieldtype\": \"Section Break\", \"label\": \"B: Details / Cost of service's\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"\\n
\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n {% set total = [0] %}\\n {% for item in doc.nhif_patient_claim_item %}\\n {% set total = total.append(total.pop() + item.amount_claimed) %}\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n {# {%= frappe.utils.fmt_money(d.price_list_rate, currency = \\u2018USD\\u2019, precision = 2) %} #}\\n {% endfor %}\\n \\n \\n \\n \\n
SrServiceItem NameItem CodeQtyUnit PriceAmount
{{ loop.index }}{{ item.ref_doctype }}{{item.item_name }} {% if item.approval_ref_no %} {{ item.approval_ref_no }} {% endif %}{{item.item_code }}{{item.item_quantity }}{{ frappe.utils.fmt_money(item.unit_price, currency=\\\"TZS\\\", precision=2) }}{{ frappe.utils.fmt_money(item.amount_claimed, currency='TZS', precision = 2) }}
Total{{ frappe.utils.fmt_money(total[0], currency='TZS', precision = 2) }}
\\n
\"}, {\"fieldtype\": \"Section Break\", \"label\": \"C: Clinician Information\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n
\\n \\n\\t
\\n\\t
\\n\\t\\t{{ frappe.db.get_value(\\\"Patient Appointment\\\", doc.patient_appointment, \\\"practitioner\\\") }}\\n\\t
\\n
\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n
\\n \\n\\t
\\n\\t
\\n\\t\\t{{ frappe.db.get_value(\\n \\\"Healthcare Practitioner\\\", \\n frappe.db.get_value(\\n \\\"Patient Appointment\\\", \\n doc.patient_appointment, \\n \\\"practitioner\\\"), \\n \\\"tz_mct_code\\\")\\n\\t\\t}}\\n\\t
\\n
\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n
\\n \\n\\t
\\n\\t
\\n\\t\\t{{ frappe.db.get_value(\\n \\\"NHIF Physician Qualification\\\",\\n frappe.db.get_value(\\n \\\"Healthcare Practitioner\\\", \\n frappe.db.get_value(\\n \\\"Patient Appointment\\\", \\n doc.patient_appointment, \\n \\\"practitioner\\\"), \\n \\\"nhif_physician_qualification\\\"),\\n \\\"qualification\\\")\\n\\t\\t}}\\n\\t
\\n
\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n
\\n \\n\\t
\\n\\t
\\n\\t\\t{{ frappe.db.get_value(\\n \\\"Healthcare Practitioner\\\", \\n frappe.db.get_value(\\n \\\"Patient Appointment\\\", \\n doc.patient_appointment, \\n \\\"practitioner\\\"), \\n \\\"mobile_phone\\\")\\n\\t\\t}}\\n\\t
\\n
\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"{% set signature = frappe.db.get_value( \\\"Healthcare Practitioner\\\", frappe.db.get_value(\\\"Patient Appointment\\\",doc.patient_appointment, \\\"practitioner\\\"), \\\"doctors_signature\\\") %}\\r\\n{% if not signature %}\\r\\n {% set signature = frappe.db.get_value( \\\"Healthcare Practitioner\\\", \\\"Direct Cash\\\", \\\"doctors_signature\\\") %}\\r\\n{% endif %}\\r\\n
\\r\\n
\\r\\n \\r\\n
\\r\\n
\\r\\n\\t \\r\\n\\t
\\r\\n
\"}, {\"fieldtype\": \"Section Break\", \"label\": \"D: Patient Certification:\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"I certify that I received the above named services.\"}, {\"fieldname\": \"patient_name\", \"print_hide\": 0, \"align\": \"left\", \"label\": \"Name\"}, {\"fieldname\": \"telephone_no\", \"print_hide\": 0, \"align\": \"left\", \"label\": \"Mobile No\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\r\\n
\\r\\n \\r\\n
\\r\\n
\\r\\n\\t \\r\\n\\t
\\r\\n
\"}, {\"fieldtype\": \"Section Break\", \"label\": \"E: Description of In/Out-patient Management / any other information\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"attendance_date\", \"print_hide\": 0, \"align\": \"left\", \"label\": \"Date of Attendance\"}, {\"fieldname\": \"clinical_notes\", \"print_hide\": 0, \"label\": \"Clinical Notes\"}, {\"fieldtype\": \"Section Break\", \"label\": \"F. Claimant Certification:\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"I certify that I provided the above named services\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"
\\n
\\n \\n\\t
\\n\\t
\\n\\t\\t{{ frappe.db.get_value(\\\"Healthcare Practitioner\\\",\\n\\t\\t {\\\"user_id\\\": doc.modified_by}, \\\"name\\\") }}\\n\\t
\\n
\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"\\n\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"{% set signature = frappe.db.get_value(\\\"Healthcare Practitioner\\\", {\\\"user_id\\\": doc.modified_by}, \\\"doctors_signature\\\") %}\\n{% if not signature %}\\n {% set signature = frappe.db.get_value( \\\"Healthcare Practitioner\\\", \\\"Direct Cash\\\", \\\"doctors_signature\\\") %}\\n{% endif %}\\n
\\n
\\n \\n
\\n
\\n\\t \\n\\t
\\n
\\n\"}, {\"fieldtype\": \"Section Break\", \"label\": \"NOTE\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldname\": \"_custom_html\", \"print_hide\": 0, \"label\": \"Custom HTML\", \"fieldtype\": \"HTML\", \"options\": \"

\\n Patient should sign the form after completion of service
\\n Before referring patient to other facility, referring facility should be satisfied for the missing item and its alternative within\\nthe facility.
\\nAny falsified information may subject you to prosecution in accordance with NHIF Act Cap 395 & No. 8 of 1999.\\n

\"}]", + "html": "\n\n \n \n \n \n
\n \n \n
\n CONFIDENTIAL
\n THE JUBILEE - HEALTH PROVIDER IN/OUT PATIENT CLAIM FORM\n
\n 		\n Appendix X
\n Form JUBILEE 2A & B
\n Regulation 18(1)
\n AuthorizationNo {{ doc.authorization_no }}
\n Serial No:
{{ doc.folio_no }}\n
\n
\n\n \n \n \n \n \n \n \n \n
\n A: PARTICULARS\n
\n
\n
\n
\n \n
\n
\n {{ doc.company }} \n
\n
\n
\n
\n \n
\n
\n {{doc.patient_name }}\n
\n
\n
\n
\n \n
\n
\n {{ doc.date_of_birth }}\n
\n
\n
\n
\n \n
\n
\n {{ doc.gender }} \n
\n
\n
\n
\n \n
\n
\n \n
\n
\n
\n
\n \n
\n
\n {### {{frappe.db.get_value(\"Patient\", doc.patient, \"area\")}} ####}\n
\n
\n
\n
\n \n
\n
\n \n
\n
\n
\n 		\n \n
\n
\n
\n \n
\n
\n \n {% set add_details = frappe.db.get_value(\"Company\", doc.company, [\"p_o_box\", \"street\"]) %}\n {{ add_details[0] }} {{add_details[1]}}\n
\n
\n
\n
\n \n
\n
\n {{ doc.cardno }}\n
\n
\n
\n
\n \n
\n
\n {{doc.attendance_date}}\n
\n
\n
\n
\n \n
\n
\n {{ doc.patient_type_code }}\n
\n
\n
\n
\n \n
\n
\n {{ frappe.db.get_value(\"Healthcare Practitioner\", {\"practitioner_name\": doc.practitioner_name}, \"department\") }}\n
\n
\n
\n
\n \n
\n
\n {{ doc.patient }}\n
\n
\n
\n
\n \n
\n
\n {{ doc.authorization_no }}\n
\n
\n
\n
\n
\n\n

\n Diagnosis Code\n

\n\n \n \n \n \n \n
\n Provisional Diagnosis\n \n \n \n \n \n \n \n {% for item in doc.jubilee_patient_claim_disease %}\n {% if item.status == \"Provisional\" %}\n \n \n \n \n {% endif %}\n {% endfor %}\n
Disease CodeDescription
{{item.disease_code }}{{item.description }}
\n 		\n Final Diagnosis\n \n \n \n \n \n \n \n {% for item in doc.jubilee_patient_claim_disease %}\n {% if item.status == \"Final\" %}\n \n \n \n \n {% endif %}\n {% endfor %}\n
Disease CodeDescription
{{item.disease_code }}{{item.description }}
\n
\n
\n\n

\n B: Details / Cost of services\n

\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n {% set total = [0] %}\n {% for item in doc.jubilee_patient_claim_item %}\n {% set total = total.append(total.pop() + item.amount_claimed) %}\n \n \n \n \n \n \n \n \n \n \n {% endfor %}\n \n \n \n \n \n \n
SrRef DocTypeItem NameItem CodeItem QuantityUnit PriceAmount
{{ loop.index }}{{ item.ref_doctype | replace(\" Prescription\",\":\") }}\n {% if item.ref_doctype == \"Drug Prescription\" %}\n {% set drug = frappe.db.get_all(\"Drug Prescription\", \n {\"parent\": item.patient_encounter, \"name\": item.ref_docname, \"drug_code\":item.item_name, \"drug_name\": item.item_name},\n [\"dosage\", \"period\", \"dosage_form\"]) %}\n \n {{item.item_name}},\n {% if drug %}\n {% if drug[0][\"dosage\"] %} Dosage: {{ drug[0][\"dosage\"] }}, {% endif %}\n {% if drug[0][\"period\"] %} Period: {{ drug[0][\"period\"] }}, {% endif %}\n {% if drug[0][\"dosage_form\"] %} Form: {{ drug[0][\"dosage_form\"] }} {% endif %}\n {% endif %}\n\n {% else %}\n {{item.item_name}}\n \n {% endif %}\n {% if item.approval_ref_no %} {{ item.approval_ref_no }} {% endif %}\n {{item.item_code }}{{item.item_quantity }}{{ frappe.utils.fmt_money(item.unit_price, currency=\"TZS\", precision=2) }}{{ frappe.utils.fmt_money(item.amount_claimed, currency='TZS', precision = 2) }}
Total {{ frappe.utils.fmt_money(total[0], currency=\"TZS\", precision = 2) }}
\n
\n\n

\n C: Clinician Information\n

\n\n \n \n \n \n
\n
\n
\n \n \t
\n \t
\n \t\t{{ doc.practitioner_name }}\n \t
\n
\n \n
\n
\n \n \t
\n \t
\n \t\t{{ frappe.db.get_value(\n \"Healthcare Practitioner\", \n {\"practitioner_name\": doc.practitioner_name},\n \"tz_mct_code\")\n \t\t}}\n \t
\n
\n \n
\n
\n \n \t
\n \t
\n \t\t{{ frappe.db.get_value(\n \"NHIF Physician Qualification\",\n frappe.db.get_value(\n \"Healthcare Practitioner\", \n {\"practitioner_name\": doc.practitioner_name}, \n \"nhif_physician_qualification\"),\n \"qualification\")\n \t\t}}\n \t
\n
\n \n
\n
\n \n \t
\n \t
\n \t\t{{ frappe.db.get_value(\n \"Healthcare Practitioner\", \n {\"practitioner_name\": doc.practitioner_name}, \n \"mobile_phone\")\n \t\t}}\n \t
\n
\n 		\n {% set signature = frappe.db.get_value( \n \"Healthcare Practitioner\", \n {\"practitioner_name\": doc.practitioner_name}, \n \"doctors_signature\") \n %}\n {% if not signature %}\n {% set signature = frappe.db.get_value( \"Healthcare Practitioner\", \"Direct Cash\", \"doctors_signature\") %}\n {% endif %}\n
\n
\n
\n \n
\n
\n \t \n \t
\n \t
\n
\n
\n
\n\n

\n D: Patient Certification:\n

\n\n \n \n \n \n
\n I certify that I received the above named services.\n \n
\n
\n \n \t
\n \t
\n \t\t{{ doc.patient_name\t}}\n \t
\n
\n
\n
\n \n
\n
\n \t {{doc.telephone_no }}\n \t
\n
\n 		\n
\n
\n \n \t
\n \t
\n \t\t\n \t
\n
\n
\n
\n\n

\n E: Description of In/Out-patient Management / any other information\n

\n

\n Date of Attendance: {{doc.attendance_date}}\n

\n\n

\n Clinical Notes\n

\n

\n {{ doc.clinical_notes }}\n

\n
\n\n

\n F: Claimant Certification:\n

\n\n \n \n \n \n
\n I certify that I provided the above named services\n \n
\n
\n \n \t
\n \t
\n \t {% set practitioner = frappe.db.get_value( \"Healthcare Practitioner\", {\"user_id\": doc.modified_by}, \"name\") %}\n \t {% if not practitioner %}\n \t {% set practitioner = frappe.db.get_value( \"Healthcare Practitioner\", {\"user_id\": frappe.session.user}, \"name\") %}\n \t {% endif %}\n \t {{ practitioner }}\n \t
\n
\n \n {% if doc.company == \"Shree Hindu Mandal Hospital - Dar es Salaam\" %}\n \n {% elif doc.company == \"Shree Hindu Mandal Super Specialized Polyclinic - Kunduchi\" %}\n \n {% endif %}\n 		\n
\n
\n
\n \n
\n
\n {% set signature = frappe.db.get_value(\"Healthcare Practitioner\", {\"user_id\": doc.modified_by}, \"doctors_signature\") %}\n {% if not signature %}\n {% set signature = frappe.db.get_value( \"Healthcare Practitioner\", {\"user_id\": frappe.session.user}, \"doctors_signature\") %}\n {% endif %}\n {% if not signature %}\n {% set signature = frappe.db.get_value( \"Healthcare Practitioner\", \"Direct Cash\", \"doctors_signature\") %}\n {% endif %}\n \n \t \n \t
\n
\n
\n
\n\n

\n NOTE:\n

\n

\n Patient should sign the form after completion of service
\n Before referring patient to other facility, referring facility should be satisfied for the missing item and its alternative within\nthe facility.
\nAny falsified information may subject you to prosecution in accordance with Jubilee Act No. 8 of 1999.\n

\n\n\n", + "idx": 0, + "line_breaks": 0, + "margin_bottom": 0.0, + "margin_left": 0.0, + "margin_right": 0.0, + "margin_top": 0.0, + "modified": "2024-07-28 15:23:32.864131", + "modified_by": "Administrator", + "module": "Jubilee", + "name": "Jubilee Form 2A & B", + "owner": "Administrator", + "page_number": "Hide", + "print_format_builder": 1, + "print_format_builder_beta": 0, + "print_format_type": "Jinja", + "raw_printing": 0, + "show_section_headings": 0, + "standard": "Yes" +} \ No newline at end of file From 75d3197dbcee5572871c4638bd18709291bee0e7 Mon Sep 17 00:00:00 2001 From: av-dev2 Date: Sun, 28 Jul 2024 21:01:32 +0300 Subject: [PATCH 25/25] feat: pass and use 'insurance_provider' across the system to differential API calls --- README.md | 2 +- hms_tz/jubilee/api/api.py | 12 +++--- hms_tz/jubilee/api/price_package.py | 4 +- hms_tz/jubilee/api/token.py | 12 +++--- .../jubilee_patient_claim.py | 3 -- hms_tz/nhif/api/healthcare_utils.py | 8 ++-- hms_tz/nhif/api/insurance_company.py | 10 +++-- hms_tz/nhif/api/patient.py | 12 ++++-- hms_tz/nhif/api/patient_appointment.py | 8 ++-- hms_tz/nhif/api/token.py | 42 ++++++++++++++++--- .../company_insurance_setting.js | 2 +- .../company_insurance_setting.json | 24 +++++------ .../healthcare_referral.json | 2 +- .../healthcare_referral.py | 4 +- .../nhif_claim_reconciliation.json | 2 +- .../nhif_claim_reconciliation.py | 4 +- .../nhif_custom_excluded_services.json | 2 +- .../nhif_patient_claim/nhif_patient_claim.py | 18 ++++---- .../claims_reconciliation_report.py | 4 +- .../nhif_tracking_claim_change_report.js | 2 +- 20 files changed, 104 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index 094634d7..618f7aa7 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Features in ERPNext can be categorized into several key areas: 2. **Healthcare Provider and Facility Management**: Managing information about healthcare providers, facilities, and practitioner availability. -3. **Insurance and Financial Management**: This involves managing NHIF claims, tracking changes, setting up company NHIF settings, and handling patient discount requests. +3. **Insurance and Financial Management**: This involves managing NHIF claims, tracking changes, setting up company Insurance settings, and handling patient discount requests. 4. **Patient Care and Services**: This covers healthcare package orders, referral management, and tracking of patient care services. diff --git a/hms_tz/jubilee/api/api.py b/hms_tz/jubilee/api/api.py index 6bf57981..911292ff 100644 --- a/hms_tz/jubilee/api/api.py +++ b/hms_tz/jubilee/api/api.py @@ -25,7 +25,7 @@ def get_member_card_detials(card_no, insurance_provider): company = frappe.get_list( "Company Insurance Setting", fields=["company"], - filters={"enable": 1, "api_provider": insurance_provider}, + filters={"enable": 1, "insurance_provider": insurance_provider}, )[0].company if not company: frappe.throw(_("No companies found to connect to Jubilee")) @@ -34,7 +34,7 @@ def get_member_card_detials(card_no, insurance_provider): service_url = frappe.get_cached_value( "Company Insurance Setting", - {"company": company, "api_provider": insurance_provider}, + {"company": company, "insurance_provider": insurance_provider}, "service_url", ) headers = {"Authorization": "Bearer " + token} @@ -56,8 +56,6 @@ def get_member_card_detials(card_no, insurance_provider): ) card = json.loads(r.text) frappe.msgprint(_(card["Status"]), alert=True) - # add_scheme(card.get("SchemeID"), card.get("SchemeName")) - # add_product(card.get("ProductCode"), card.get("ProductName")) return card else: add_jubilee_log( @@ -154,10 +152,10 @@ def get_authorization_number( ): if insurance_provider != "Jubilee": return - + setting_name, service_url = frappe.get_cached_value( "Company Insurance Setting", - {"company": company, "api_provider": insurance_provider, "enable": 1}, + {"company": company, "insurance_provider": insurance_provider, "enable": 1}, ["name", "service_url"], ) if not setting_name: @@ -232,7 +230,7 @@ def get_jubilee_price_packages(company, insurance_provider="Jubilee"): service_url = frappe.get_cached_value( "Company Insurance Setting", - {"company": company, "api_provider": insurance_provider}, + {"company": company, "insurance_provider": insurance_provider}, "service_url", ) headers = {"Authorization": "Bearer " + token} diff --git a/hms_tz/jubilee/api/price_package.py b/hms_tz/jubilee/api/price_package.py index 3dacfce8..5d4ab4f4 100644 --- a/hms_tz/jubilee/api/price_package.py +++ b/hms_tz/jubilee/api/price_package.py @@ -91,7 +91,7 @@ def process_jubilee_coverage(company, coverage_plan=None): "Healthcare Insurance Coverage Plan", fields={"name"}, filters={ - "insurance_company": ["like", "Jubilee%"], + "insurance_company": ["like", "%Jubilee%"], "company": company, "is_active": 1, }, @@ -204,7 +204,7 @@ def process_jubilee_price_list(company, item=None): # update Item Price with the new price frappe.qb.update(itp).set( itp.price_list_rate, flt(item.itemprice) - ).where(itp.name == price.name) + ).where(itp.name == price.name).run() else: item_price_doc = frappe.new_doc("Item Price") item_price_doc.update( diff --git a/hms_tz/jubilee/api/token.py b/hms_tz/jubilee/api/token.py index 1ab2b121..a9ad5b20 100644 --- a/hms_tz/jubilee/api/token.py +++ b/hms_tz/jubilee/api/token.py @@ -61,15 +61,15 @@ def make_jubilee_token_request(doc, url, headers, payload, fields): @frappe.whitelist() -def get_jubilee_service_token(company, api_provider): +def get_jubilee_service_token(company, insurance_provider): setting_name = frappe.get_cached_value( "Company Insurance Setting", - {"company": company, "api_provider": api_provider, "enable": 1}, + {"company": company, "insurance_provider": insurance_provider, "enable": 1}, "name", ) if not setting_name: frappe.throw( - f"Company Insurance Setting not found for company: {company} and API Provider: {api_provider}, please Create or Enable one." + f"Company Insurance Setting not found for company: {company} and Insurance Provider: {insurance_provider}, please Create or Enable one." ) setting_doc = frappe.get_cached_doc("Company Insurance Setting", setting_name) @@ -100,15 +100,15 @@ def get_jubilee_service_token(company, api_provider): @frappe.whitelist() -def get_jubilee_claimsservice_token(company, api_provider): +def get_jubilee_claimsservice_token(company, insurance_provider): setting_name = frappe.get_cached_value( "Company Insurance Setting", - {"company": company, "api_provider": api_provider, "enable": 1}, + {"company": company, "insurance_provider": insurance_provider, "enable": 1}, "name", ) if not setting_name: frappe.throw( - f"Company Insurance Setting not found for company: {company} and API Provider: {api_provider}, please Create or Enable one." + f"Company Insurance Setting not found for company: {company} and Insurance Provider: {insurance_provider}, please Create or Enable one." ) setting_doc = frappe.get_cached_doc("Company Insurance Setting", setting_name) diff --git a/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py b/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py index 2785bd50..a1518496 100644 --- a/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py +++ b/hms_tz/jubilee/doctype/jubilee_patient_claim/jubilee_patient_claim.py @@ -449,9 +449,6 @@ def set_claim_values(self): if not self.folio_id: self.folio_id = str(uuid.uuid1()) - self.facility_code = frappe.get_cached_value( - "Company Insurance Setting", self.company, "facility_code" - ) self.facility_code = frappe.get_cached_value( "Company Insurance Setting", {"enable": 1, "insurance_provider": "Jubilee", "company": self.company}, diff --git a/hms_tz/nhif/api/healthcare_utils.py b/hms_tz/nhif/api/healthcare_utils.py index cfd6a104..ec59cb88 100644 --- a/hms_tz/nhif/api/healthcare_utils.py +++ b/hms_tz/nhif/api/healthcare_utils.py @@ -1370,14 +1370,14 @@ def create_invoiced_items_if_not_created(): def auto_submit_nhif_patient_claim(setting_dict=None): """Routine to submit patient claims and will be triggered: 1. Every 00:01 am at night by cron job - 2. By a button called 'Auto Submit Patient Claim' which is on Company NHIF settings + 2. By a button called 'Auto Submit Patient Claim' which is on Company Insurance setting """ company_setting_detail = [] if not setting_dict: company_setting_detail = frappe.get_all( "Company Insurance Setting", - filters={"enable": 1, "enable_auto_submit_of_claims": 1}, + filters={"insurance_provider": "NHIF", "enable": 1, "enable_auto_submit_of_claims": 1}, fields=["company", "submit_claim_year", "submit_claim_month"], ) else: @@ -1505,7 +1505,7 @@ def get_card_no(appointment=None, encounter=None): validate_service_approval_no, ) = frappe.get_cached_value( "Company Insurance Setting", - company, + {"company": company, "insurance_provider": "NHIF"}, [ "enable", "service_url", @@ -1527,7 +1527,7 @@ def get_card_no(appointment=None, encounter=None): + f"/nhifservice/breeze/verification/GetReferenceNoStatus?CardNo={cardno}&ReferenceNo={approval_number}&ItemCode={item_code}" ) - token = get_nhifservice_token(company) + token = get_nhifservice_token(company, "NHIF") headers = {"Content-Type": "application/json", "Authorization": "Bearer " + token} diff --git a/hms_tz/nhif/api/insurance_company.py b/hms_tz/nhif/api/insurance_company.py index dcb9d272..a30f69a4 100644 --- a/hms_tz/nhif/api/insurance_company.py +++ b/hms_tz/nhif/api/insurance_company.py @@ -37,9 +37,11 @@ def enqueue_get_nhif_price_package(company): def get_nhif_price_package(kwargs): company = kwargs user = frappe.session.user - token = get_claimsservice_token(company) + token = get_claimsservice_token(company, "NHIF") claimsserver_url, facility_code = frappe.get_cached_value( - "Company Insurance Setting", company, ["claimsserver_url", "facility_code"] + "Company Insurance Setting", + {"company": company, "insurance_provider": "NHIF"}, + ["claimsserver_url", "facility_code"], ) headers = {"Authorization": "Bearer " + token} url = ( @@ -194,7 +196,9 @@ def process_nhif_records(company): def process_prices_list(kwargs): company = kwargs facility_code = frappe.get_cached_value( - "Company Insurance Setting", company, "facility_code" + "Company Insurance Setting", + {"company": company, "insurance_provider": "NHIF"}, + "facility_code", ) currency = frappe.get_cached_value("Company", company, "default_currency") schemeid_list = frappe.db.sql( diff --git a/hms_tz/nhif/api/patient.py b/hms_tz/nhif/api/patient.py index 615b502b..fe2c2319 100644 --- a/hms_tz/nhif/api/patient.py +++ b/hms_tz/nhif/api/patient.py @@ -66,14 +66,18 @@ def get_patient_info(card_no=None, insurance_provider=None): company = frappe.defaults.get_user_default("Company") if not company: company = frappe.get_list( - "Company Insurance Setting", fields=["company"], filters={"enable": 1} + "Company Insurance Setting", + fields=["company"], + filters={"enable": 1, "insurance_provider": "NHIF"}, )[0].company if not company: frappe.throw(_("No companies found to connect to NHIF")) - token = get_nhifservice_token(company) + token = get_nhifservice_token(company, "NHIF") service_url = frappe.get_cached_value( - "Company Insurance Setting", company, "service_url" + "Company Insurance Setting", + {"company": company, "insurance_provider": "NHIF"}, + "service_url", ) headers = {"Authorization": "Bearer " + token} url = ( @@ -123,7 +127,7 @@ def update_patient_history(doc): # Remarked till multi company setting is required and feasible from Patient doctype 2021-03-20 19:57:14 # company = get_default_company() # update_history = frappe.get_cached_value( - # "Company Insurance Setting", company, "update_patient_history") + # "Company Insurance Setting", {"company": company, "insurance_provider": "NHIF"}, "update_patient_history") # if not update_history: # return diff --git a/hms_tz/nhif/api/patient_appointment.py b/hms_tz/nhif/api/patient_appointment.py index 202e1c1c..d4005f52 100644 --- a/hms_tz/nhif/api/patient_appointment.py +++ b/hms_tz/nhif/api/patient_appointment.py @@ -358,11 +358,13 @@ def get_authorization_num( remarks="", ): enable_nhif_api, service_url = frappe.get_cached_value( - "Company Insurance Setting", company, ["enable", "service_url"] + "Company Insurance Setting", + {"company": company, "insurance_provider": "NHIF"}, + ["enable", "service_url"], ) if not enable_nhif_api: frappe.msgprint( - _("Company {0} not enabled for NHIF Integration".format(company)) + _(f"Company {company} not enabled for NHIF Integration") ) return @@ -385,7 +387,7 @@ def get_authorization_num( referral_no = "&ReferralNo=" + str(referral_no) remarks = "&Remarks=" + str(remarks) - token = get_nhifservice_token(company) + token = get_nhifservice_token(company, "NHIF") headers = {"Content-Type": "application/json", "Authorization": "Bearer " + token} url = ( diff --git a/hms_tz/nhif/api/token.py b/hms_tz/nhif/api/token.py index 127f9d8b..4a30321a 100644 --- a/hms_tz/nhif/api/token.py +++ b/hms_tz/nhif/api/token.py @@ -58,8 +58,18 @@ def make_token_request(doc, url, headers, payload, fields): raise e -def get_nhifservice_token(company): - setting_doc = frappe.get_cached_doc("Company Insurance Setting", company) +def get_nhifservice_token(company, insurance_provider="NHIF"): + setting_name = frappe.get_cached_value( + "Company Insurance Setting", + {"company": company, "insurance_provider": insurance_provider, "enable": 1}, + "name", + ) + if not setting_name: + frappe.throw( + f"Company Insurance Setting not found for company: {company} and Insurance Provider: {insurance_provider}, please Create or Enable one." + ) + + setting_doc = frappe.get_cached_doc("Company Insurance Setting", setting_name) if ( setting_doc.service_token_expiry and setting_doc.service_token_expiry > now_datetime() @@ -80,8 +90,18 @@ def get_nhifservice_token(company): return make_token_request(setting_doc, url, headers, payload, nhifservice_fields) -def get_claimsservice_token(company): - setting_doc = frappe.get_cached_doc("Company Insurance Setting", company) +def get_claimsservice_token(company, insurance_provider="NHIF"): + setting_name = frappe.get_cached_value( + "Company Insurance Setting", + {"company": company, "insurance_provider": insurance_provider, "enable": 1}, + "name", + ) + if not setting_name: + frappe.throw( + f"Company Insurance Setting not found for company: {company} and Insurance Provider: {insurance_provider}, please Create or Enable one." + ) + + setting_doc = frappe.get_cached_doc("Company Insurance Setting", setting_name) if ( setting_doc.claimsserver_expiry and setting_doc.claimsserver_expiry > now_datetime() @@ -102,8 +122,18 @@ def get_claimsservice_token(company): return make_token_request(setting_doc, url, headers, payload, claimserver_fields) -def get_formservice_token(company): - company_nhif_doc = frappe.get_cached_doc("Company Insurance Setting", company) +def get_formservice_token(company, insurance_provider="NHIF"): + setting_name = frappe.get_cached_value( + "Company Insurance Setting", + {"company": company, "insurance_provider": insurance_provider, "enable": 1}, + "name", + ) + if not setting_name: + frappe.throw( + f"Company Insurance Setting not found for company: {company} and Insurance Provider: {insurance_provider}, please Create or Enable one." + ) + + company_nhif_doc = frappe.get_cached_doc("Company Insurance Setting", setting_name) if not company_nhif_doc.enable: frappe.throw(_("Company {0} not enabled for NHIF Integration".format(company))) diff --git a/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.js b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.js index e428efa3..8a68d798 100644 --- a/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.js +++ b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.js @@ -10,7 +10,7 @@ frappe.ui.form.on('Company Insurance Setting', { frappe.msgprint("Please set submit claim year or submit claim month}"); return } - if (frm.doc.api_provider == "NHIF") { + if (frm.doc.insurance_provider == "NHIF") { frappe.call("hms_tz.nhif.api.healthcare_utils.auto_submit_nhif_patient_claim", { setting_dict: { "company": frm.doc.name, diff --git a/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json index e85197ee..d68055db 100644 --- a/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json +++ b/hms_tz/nhif/doctype/company_insurance_setting/company_insurance_setting.json @@ -1,7 +1,7 @@ { "actions": [], "allow_rename": 1, - "autoname": "format:{api_provider}-{abbr}", + "autoname": "format:{insurance_provider}-{abbr}", "creation": "2020-11-10 16:52:35.894771", "doctype": "DocType", "editable_grid": 1, @@ -13,7 +13,7 @@ "password", "column_break_4", "facility_code", - "api_provider", + "insurance_provider", "providerid", "enable", "validate_service_approval_number_on_lrpmt_documents", @@ -210,13 +210,6 @@ "label": "Form Token", "read_only": 1 }, - { - "fieldname": "api_provider", - "fieldtype": "Select", - "label": "API Provider", - "options": "\nNHIF\nJubilee\nStrategis\nAssemble", - "reqd": 1 - }, { "fetch_from": "company.abbr", "fetch_if_empty": 1, @@ -226,16 +219,23 @@ "read_only": 1 }, { - "depends_on": "eval: doc.api_provider == \"Jubilee\"", + "depends_on": "eval: doc.insurance_provider == \"Jubilee\"", "fieldname": "providerid", "fieldtype": "Data", "label": "ProviderID", - "mandatory_depends_on": "eval: doc.api_provider == \"Jubilee\"" + "mandatory_depends_on": "eval: doc.insurance_provider == \"Jubilee\"" + }, + { + "fieldname": "insurance_provider", + "fieldtype": "Select", + "label": "Insurance Provider", + "options": "\nNHIF\nJubilee\nStrategis\nAssemble", + "reqd": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2024-04-17 19:24:32.362279", + "modified": "2024-07-26 16:36:20.427208", "modified_by": "Administrator", "module": "NHIF", "name": "Company Insurance Setting", diff --git a/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.json b/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.json index 3c85ec5d..0f19a8ec 100644 --- a/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.json +++ b/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.json @@ -180,7 +180,7 @@ "fieldtype": "Link", "in_standard_filter": 1, "label": "Source Facility", - "options": "Company Insurance Setting", + "options": "Company", "read_only": 1 }, { diff --git a/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py b/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py index d4b3529a..a18a9024 100644 --- a/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py +++ b/hms_tz/nhif/doctype/healthcare_referral/healthcare_referral.py @@ -22,10 +22,10 @@ def get_referral_no(name): validate_required_fields(doc) service_url = frappe.get_cached_value( - "Company Insurance Setting", doc.source_facility, "service_url" + "Company Insurance Setting", {"company": doc.source_facility, "insurance_provider": "NHIF"}, "service_url" ) - token = get_nhifservice_token(doc.source_facility) + token = get_nhifservice_token(doc.source_facility, "NHIF") url = str(service_url) + "/nhifservice/breeze/verification/AddReferral" diff --git a/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.json b/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.json index 8696e0f1..bcdaae4b 100644 --- a/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.json +++ b/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.json @@ -30,7 +30,7 @@ "in_list_view": 1, "in_standard_filter": 1, "label": "Company", - "options": "Company Insurance Setting", + "options": "Company", "reqd": 1, "search_index": 1 }, diff --git a/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.py b/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.py index 802d67a2..6568c1e1 100644 --- a/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.py +++ b/hms_tz/nhif/doctype/nhif_claim_reconciliation/nhif_claim_reconciliation.py @@ -30,11 +30,11 @@ def get_submitted_claims(self): doc = frappe.get_doc(frappe.parse_json(self)) doc.validate_reqd_fields() - token = get_claimsservice_token(doc.get("company")) + token = get_claimsservice_token(doc.get("company", "NHIF")) headers = {"Content-Type": "application/json", "Authorization": "Bearer " + token} facility_code, base_url = frappe.get_cached_value( - "Company Insurance Setting", doc.company, ["facility_code", "claimsserver_url"] + "Company Insurance Setting", {"company": doc.company, "insurance_provider": "NHIF"}, ["facility_code", "claimsserver_url"] ) params = "FacilityCode={0}&ClaimYear={1}&ClaimMonth={2}".format( facility_code, doc.claim_year, doc.claim_month diff --git a/hms_tz/nhif/doctype/nhif_custom_excluded_services/nhif_custom_excluded_services.json b/hms_tz/nhif/doctype/nhif_custom_excluded_services/nhif_custom_excluded_services.json index 659cb03f..e3a7b902 100644 --- a/hms_tz/nhif/doctype/nhif_custom_excluded_services/nhif_custom_excluded_services.json +++ b/hms_tz/nhif/doctype/nhif_custom_excluded_services/nhif_custom_excluded_services.json @@ -25,7 +25,7 @@ "fieldtype": "Link", "in_standard_filter": 1, "label": "Company", - "options": "Company Insurance Setting", + "options": "Company", "reqd": 1 }, { diff --git a/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py b/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py index 7003bc48..eae93b47 100644 --- a/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py +++ b/hms_tz/nhif/doctype/nhif_patient_claim/nhif_patient_claim.py @@ -194,7 +194,7 @@ def set_claim_values(self): if not self.folio_id: self.folio_id = str(uuid.uuid1()) self.facility_code = frappe.get_cached_value( - "Company Insurance Setting", self.company, "facility_code" + "Company Insurance Setting", {"company": self.company, "insurance_provider": "NHIF"}, "facility_code" ) self.posting_date = nowdate() self.serial_no = int(self.name[-9:]) @@ -780,9 +780,9 @@ def get_folio_json_data(self): def send_nhif_claim(self): json_data, json_data_wo_files = self.get_folio_json_data() - token = get_claimsservice_token(self.company) + token = get_claimsservice_token(self.company, "NHIF") claimsserver_url = frappe.get_value( - "Company Insurance Setting", self.company, "claimsserver_url" + "Company Insurance Setting", {"company": self.company, "insurance_provider": "NHIF"}, "claimsserver_url" ) headers = { "Authorization": "Bearer " + token, @@ -1025,7 +1025,7 @@ def validate_submit_date(self): submit_claim_month, submit_claim_year = frappe.get_value( "Company Insurance Setting", - self.company, + {"company": self.company, "insurance_provider": "NHIF"}, ["submit_claim_month", "submit_claim_year"], ) @@ -1039,13 +1039,9 @@ def validate_submit_date(self): if self.claim_month != submit_claim_month or self.claim_year != submit_claim_year: frappe.throw( - "Claim Month: {0} or Claim Year: {1} of this document is not same to Submit Claim Month: {2}\ - or Submit Claim Year: {3} on Company Insurance Setting".format( - frappe.bold(calendar.month_name[self.claim_month]), - frappe.bold(self.claim_year), - frappe.bold(calendar.month_name[submit_claim_month]), - frappe.bold(submit_claim_year), - ) + f"Claim Month: {frappe.bold(calendar.month_name[self.claim_month])} or Claim Year: {frappe.bold(self.claim_year)} \ + of this document is not same to Submit Claim Month: {frappe.bold(calendar.month_name[submit_claim_month])} \ + or Submit Claim Year: {frappe.bold(submit_claim_year)} on Company Insurance Setting" ) diff --git a/hms_tz/nhif/report/claims_reconciliation_report/claims_reconciliation_report.py b/hms_tz/nhif/report/claims_reconciliation_report/claims_reconciliation_report.py index c05e7085..95cba028 100644 --- a/hms_tz/nhif/report/claims_reconciliation_report/claims_reconciliation_report.py +++ b/hms_tz/nhif/report/claims_reconciliation_report/claims_reconciliation_report.py @@ -138,10 +138,10 @@ def get_data(filters): def get_nhif_data(filters): - token = get_claimsservice_token(filters.company) + token = get_claimsservice_token(filters.company, "NHIF") claimsserver_url, facility_code = frappe.get_value( "Company Insurance Setting", - filters.company, + {"company": filters.company, "insurance_provider": "NHIF"}, ["claimsserver_url", "facility_code"], ) headers = {"Authorization": "Bearer " + token, "Content-Type": "application/json"} diff --git a/hms_tz/nhif/report/nhif_tracking_claim_change_report/nhif_tracking_claim_change_report.js b/hms_tz/nhif/report/nhif_tracking_claim_change_report/nhif_tracking_claim_change_report.js index d2f24f82..84f3857c 100644 --- a/hms_tz/nhif/report/nhif_tracking_claim_change_report/nhif_tracking_claim_change_report.js +++ b/hms_tz/nhif/report/nhif_tracking_claim_change_report/nhif_tracking_claim_change_report.js @@ -8,7 +8,7 @@ frappe.query_reports["NHIF Tracking Claim Change Report"] = { "fieldname": "company", "label": __("Company"), "fieldtype": "Link", - "options": "Company Insurance Setting", + "options": "Company", "reqd": 1, }, {