Merge pull request #21290 from akurungadam/multi_company
feat(Healthcare): support for Multi Company
This commit is contained in:
Rucha Mahabal
GitHub
commit
b6a605864b
@ -924,7 +924,7 @@ var get_healthcare_services_to_invoice = function(frm) {
|
||||
if(patient && patient!=selected_patient){
|
||||
selected_patient = patient;
|
||||
var method = "erpnext.healthcare.utils.get_healthcare_services_to_invoice";
|
||||
var args = {patient: patient};
|
||||
var args = {patient: patient, company: frm.doc.company};
|
||||
var columns = (["service", "reference_name", "reference_type"]);
|
||||
get_healthcare_items(frm, true, $results, $placeholder, method, args, columns);
|
||||
}
|
||||
@ -1068,7 +1068,11 @@ var get_drugs_to_invoice = function(frm) {
|
||||
description:'Quantity will be calculated only for items which has "Nos" as UoM. You may change as required for each invoice item.',
|
||||
get_query: function(doc) {
|
||||
return {
|
||||
filters: { patient: dialog.get_value("patient"), docstatus: 1 }
|
||||
filters: {
|
||||
patient: dialog.get_value("patient"),
|
||||
company: frm.doc.company,
|
||||
docstatus: 1
|
||||
}
|
||||
};
|
||||
}
|
||||
},
|
||||
|
||||
@ -43,7 +43,8 @@ frappe.ui.form.on('Clinical Procedure', {
|
||||
return {
|
||||
filters: {
|
||||
'is_group': false,
|
||||
'allow_appointments': true
|
||||
'allow_appointments': true,
|
||||
'company': frm.doc.company
|
||||
}
|
||||
};
|
||||
});
|
||||
@ -158,11 +159,13 @@ frappe.ui.form.on('Clinical Procedure', {
|
||||
age = __('{0} as on {1}', [age, data.message.age_as_on]);
|
||||
}
|
||||
}
|
||||
frm.set_value('patient_name', data.message.patient_name);
|
||||
frm.set_value('patient_age', age);
|
||||
frm.set_value('patient_sex', data.message.sex);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
frm.set_value('patient_name', '');
|
||||
frm.set_value('patient_age', '');
|
||||
frm.set_value('patient_sex', '');
|
||||
}
|
||||
@ -177,15 +180,35 @@ frappe.ui.form.on('Clinical Procedure', {
|
||||
name: frm.doc.appointment
|
||||
},
|
||||
callback: function(data) {
|
||||
frm.set_value('patient', data.message.patient);
|
||||
frm.set_value('procedure_template', data.message.procedure_template);
|
||||
frm.set_value('medical_department', data.message.department);
|
||||
frm.set_value('start_date', data.message.appointment_date);
|
||||
frm.set_value('start_time', data.message.appointment_time);
|
||||
frm.set_value('notes', data.message.notes);
|
||||
frm.set_value('service_unit', data.message.service_unit);
|
||||
let values = {
|
||||
'patient':data.message.patient,
|
||||
'procedure_template': data.message.procedure_template,
|
||||
'medical_department': data.message.department,
|
||||
'practitioner': data.message.practitioner,
|
||||
'start_date': data.message.appointment_date,
|
||||
'start_time': data.message.appointment_time,
|
||||
'notes': data.message.notes,
|
||||
'service_unit': data.message.service_unit,
|
||||
'company': data.message.company
|
||||
};
|
||||
frm.set_value(values);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
let values = {
|
||||
'patient': '',
|
||||
'patient_name': '',
|
||||
'patient_sex': '',
|
||||
'patient_age': '',
|
||||
'medical_department': '',
|
||||
'procedure_template': '',
|
||||
'start_date': '',
|
||||
'start_time': '',
|
||||
'notes': '',
|
||||
'service_unit': '',
|
||||
'inpatient_record': ''
|
||||
};
|
||||
frm.set_value(values);
|
||||
}
|
||||
},
|
||||
|
||||
@ -234,9 +257,11 @@ frappe.ui.form.on('Clinical Procedure', {
|
||||
name: frm.doc.practitioner
|
||||
},
|
||||
callback: function (data) {
|
||||
frappe.model.set_value(frm.doctype,frm.docname, 'medical_department',data.message.department);
|
||||
frappe.model.set_value(frm.doctype,frm.docname, 'practitioner_name', data.message.practitioner_name);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
frappe.model.set_value(frm.doctype,frm.docname, 'practitioner_name', '');
|
||||
}
|
||||
},
|
||||
|
||||
@ -284,14 +309,6 @@ frappe.ui.form.on('Clinical Procedure', {
|
||||
|
||||
});
|
||||
|
||||
cur_frm.set_query('procedure_template', function(doc) {
|
||||
return {
|
||||
filters: {
|
||||
'medical_department': doc.medical_department
|
||||
}
|
||||
};
|
||||
});
|
||||
|
||||
frappe.ui.form.on('Clinical Procedure Item', {
|
||||
qty: function(frm, cdt, cdn) {
|
||||
let d = locals[cdt][cdn];
|
||||
|
||||
@ -7,28 +7,32 @@
|
||||
"editable_grid": 1,
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"inpatient_record",
|
||||
"naming_series",
|
||||
"procedure_template",
|
||||
"title",
|
||||
"appointment",
|
||||
"procedure_template",
|
||||
"column_break_30",
|
||||
"company",
|
||||
"invoiced",
|
||||
"section_break_6",
|
||||
"patient",
|
||||
"patient_name",
|
||||
"patient_sex",
|
||||
"patient_age",
|
||||
"prescription",
|
||||
"medical_department",
|
||||
"practitioner",
|
||||
"inpatient_record",
|
||||
"notes",
|
||||
"column_break_7",
|
||||
"status",
|
||||
"practitioner",
|
||||
"practitioner_name",
|
||||
"medical_department",
|
||||
"service_unit",
|
||||
"warehouse",
|
||||
"start_date",
|
||||
"start_time",
|
||||
"sample",
|
||||
"invoiced",
|
||||
"notes",
|
||||
"company",
|
||||
"consumables_section",
|
||||
"consume_stock",
|
||||
"warehouse",
|
||||
"items",
|
||||
"section_break_24",
|
||||
"invoice_separately_as_consumables",
|
||||
@ -36,6 +40,9 @@
|
||||
"consumable_total_amount",
|
||||
"column_break_27",
|
||||
"consumption_details",
|
||||
"sb_refs",
|
||||
"column_break_34",
|
||||
"prescription",
|
||||
"amended_from"
|
||||
],
|
||||
"fields": [
|
||||
@ -56,15 +63,15 @@
|
||||
{
|
||||
"fieldname": "appointment",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Appointment",
|
||||
"options": "Patient Appointment"
|
||||
"options": "Patient Appointment",
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "inpatient_record.patient",
|
||||
"fieldname": "patient",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Patient",
|
||||
"options": "Patient",
|
||||
"reqd": 1
|
||||
@ -88,17 +95,20 @@
|
||||
"fieldtype": "Link",
|
||||
"hidden": 1,
|
||||
"label": "Procedure Prescription",
|
||||
"options": "Procedure Prescription"
|
||||
"options": "Procedure Prescription",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "medical_department",
|
||||
"fieldtype": "Link",
|
||||
"in_standard_filter": 1,
|
||||
"label": "Medical Department",
|
||||
"options": "Medical Department"
|
||||
},
|
||||
{
|
||||
"fieldname": "practitioner",
|
||||
"fieldtype": "Link",
|
||||
"in_standard_filter": 1,
|
||||
"label": "Healthcare Practitioner",
|
||||
"options": "Healthcare Practitioner"
|
||||
},
|
||||
@ -208,6 +218,7 @@
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"depends_on": "eval:!doc.__islocal",
|
||||
"fieldname": "status",
|
||||
"fieldtype": "Select",
|
||||
"in_list_view": 1,
|
||||
@ -226,6 +237,8 @@
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"collapsible": 1,
|
||||
"collapsible_depends_on": "consume_stock",
|
||||
"fieldname": "consumables_section",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Consumables"
|
||||
@ -237,11 +250,51 @@
|
||||
{
|
||||
"fieldname": "section_break_24",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_30",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_6",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"collapsible": 1,
|
||||
"fieldname": "sb_refs",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "patient_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Patient Name",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "practitioner_name",
|
||||
"fieldtype": "Data",
|
||||
"in_list_view": 1,
|
||||
"label": "Practitioner Name",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_34",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"allow_on_submit": 1,
|
||||
"fieldname": "title",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 1,
|
||||
"label": "Title",
|
||||
"no_copy": 1,
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"is_submittable": 1,
|
||||
"links": [],
|
||||
"modified": "2020-03-02 11:44:27.970651",
|
||||
"modified": "2020-04-27 21:36:23.796924",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Healthcare",
|
||||
"name": "Clinical Procedure",
|
||||
@ -257,11 +310,27 @@
|
||||
"report": 1,
|
||||
"role": "Nursing User",
|
||||
"share": 1,
|
||||
"submit": 1,
|
||||
"write": 1
|
||||
},
|
||||
{
|
||||
"cancel": 1,
|
||||
"create": 1,
|
||||
"delete": 1,
|
||||
"email": 1,
|
||||
"export": 1,
|
||||
"print": 1,
|
||||
"read": 1,
|
||||
"report": 1,
|
||||
"role": "Physician",
|
||||
"share": 1,
|
||||
"submit": 1,
|
||||
"write": 1
|
||||
}
|
||||
],
|
||||
"restrict_to_domain": "Healthcare",
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"title_field": "title",
|
||||
"track_changes": 1
|
||||
}
|
||||
@ -16,6 +16,7 @@ from frappe.model.mapper import get_mapped_doc
|
||||
class ClinicalProcedure(Document):
|
||||
def validate(self):
|
||||
self.set_status()
|
||||
self.set_title()
|
||||
if self.consume_stock:
|
||||
self.set_actual_qty()
|
||||
|
||||
@ -37,7 +38,7 @@ class ClinicalProcedure(Document):
|
||||
template = frappe.get_doc('Clinical Procedure Template', self.procedure_template)
|
||||
if template.sample:
|
||||
patient = frappe.get_doc('Patient', self.patient)
|
||||
sample_collection = create_sample_doc(template, patient, None)
|
||||
sample_collection = create_sample_doc(template, patient, None, self.company)
|
||||
frappe.db.set_value('Clinical Procedure', self.name, 'sample', sample_collection.name)
|
||||
self.reload()
|
||||
|
||||
@ -50,6 +51,9 @@ class ClinicalProcedure(Document):
|
||||
elif self.docstatus == 2:
|
||||
self.status = 'Cancelled'
|
||||
|
||||
def set_title(self):
|
||||
self.title = _('{0} - {1}').format(self.patient_name or self.patient, self.procedure_template)[:100]
|
||||
|
||||
def complete_procedure(self):
|
||||
if self.consume_stock and self.items:
|
||||
stock_entry = make_stock_entry(self)
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{
|
||||
"actions": [],
|
||||
"allow_copy": 1,
|
||||
"allow_import": 1,
|
||||
"allow_rename": 1,
|
||||
"autoname": "naming_series:",
|
||||
@ -51,17 +50,20 @@
|
||||
"fieldname": "first_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "First Name",
|
||||
"no_copy": 1,
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "middle_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Middle Name (Optional)"
|
||||
"label": "Middle Name (Optional)",
|
||||
"no_copy": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "last_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Last Name"
|
||||
"label": "Last Name",
|
||||
"no_copy": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "image",
|
||||
@ -226,6 +228,7 @@
|
||||
"in_list_view": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Full Name",
|
||||
"no_copy": 1,
|
||||
"read_only": 1,
|
||||
"search_index": 1
|
||||
},
|
||||
@ -233,6 +236,7 @@
|
||||
"fieldname": "naming_series",
|
||||
"fieldtype": "Select",
|
||||
"label": "Series",
|
||||
"no_copy": 1,
|
||||
"options": "HLC-PRAC-.YYYY.-",
|
||||
"report_hide": 1,
|
||||
"set_only_once": 1
|
||||
|
||||
@ -240,7 +240,7 @@
|
||||
"label": "Patient Registration"
|
||||
},
|
||||
{
|
||||
"default": "Hello {{doc.patient}}, Thank you for registering with {{doc.company}}. Your ID is {{doc.id}} . Please note this ID for future reference. \nThank You, Get well soon!",
|
||||
"default": "Hello {{doc.patient}}, Thank you for registering with {{doc.company}}. Your ID is {{doc.name}} . Please note this ID for future reference. \nThank You!",
|
||||
"depends_on": "send_registration_msg",
|
||||
"fieldname": "registration_msg",
|
||||
"fieldtype": "Small Text",
|
||||
@ -254,7 +254,7 @@
|
||||
"label": "Appointment Confirmation"
|
||||
},
|
||||
{
|
||||
"default": "Hello {{doc.patient}}, You have scheduled an appointment with {{doc.practitioner}} by {{doc.start_dt}} at {{doc.company}}.\nThank you, Good day!",
|
||||
"default": "Hello {{doc.patient}}, You have scheduled an appointment with {{doc.practitioner}} on {{doc.appointment_datetime}} at {{doc.company}}.\nThank you, Good day!",
|
||||
"depends_on": "send_appointment_confirmation",
|
||||
"fieldname": "appointment_confirmation_msg",
|
||||
"fieldtype": "Small Text",
|
||||
@ -276,7 +276,7 @@
|
||||
"label": "Appointment Reminder"
|
||||
},
|
||||
{
|
||||
"default": "Hello {{doc.patient}}, You have an appointment with {{doc.practitioner}} by {{doc.appointment_time}} at {{doc.company}}.\nThank you, Good day!\n",
|
||||
"default": "Hello {{doc.patient}}, You have an appointment with {{doc.practitioner}} by {{doc.appointment_datetime}} at {{doc.company}}.\nThank you, Good day!\n",
|
||||
"depends_on": "send_appointment_reminder",
|
||||
"fieldname": "appointment_reminder_msg",
|
||||
"fieldtype": "Small Text",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -8,7 +8,6 @@ import unittest
|
||||
from frappe.utils import now_datetime, today
|
||||
from frappe.utils.make_random import get_random
|
||||
from erpnext.healthcare.doctype.inpatient_record.inpatient_record import admit_patient, discharge_patient, schedule_discharge
|
||||
from erpnext.healthcare.doctype.patient_appointment.test_patient_appointment import create_patient
|
||||
|
||||
class TestInpatientRecord(unittest.TestCase):
|
||||
def test_admit_and_discharge(self):
|
||||
@ -112,3 +111,13 @@ def get_service_unit_type():
|
||||
service_unit_type.save(ignore_permissions = True)
|
||||
return service_unit_type.name
|
||||
return service_unit_type
|
||||
|
||||
def create_patient():
|
||||
patient = frappe.db.exists('Patient', '_Test IPD Patient')
|
||||
if not patient:
|
||||
patient = frappe.new_doc('Patient')
|
||||
patient.first_name = '_Test IPD Patient'
|
||||
patient.sex = 'Female'
|
||||
patient.save(ignore_permissions=True)
|
||||
patient = patient.name
|
||||
return patient
|
||||
|
||||
@ -137,13 +137,13 @@ var get_lab_test_prescribed = function(frm){
|
||||
});
|
||||
}
|
||||
else{
|
||||
frappe.msgprint(__("Please select Patient to get Lab Tests"));
|
||||
frappe.msgprint(__("Please select a Patient to get Lab Tests"));
|
||||
}
|
||||
};
|
||||
|
||||
var show_lab_tests = function(frm, result){
|
||||
var d = new frappe.ui.Dialog({
|
||||
title: __("Lab Test Prescriptions"),
|
||||
title: __("Lab Tests"),
|
||||
fields: [
|
||||
{
|
||||
fieldtype: "HTML", fieldname: "lab_test"
|
||||
@ -161,7 +161,7 @@ var show_lab_tests = function(frm, result){
|
||||
<div class="col-xs-1">\
|
||||
<a data-name="%(name)s" data-lab-test="%(lab_test)s"\
|
||||
data-encounter="%(encounter)s" data-practitioner="%(practitioner)s"\
|
||||
data-invoiced="%(invoiced)s" href="#"><button class="btn btn-default btn-xs">Get Lab Test\
|
||||
data-invoiced="%(invoiced)s" href="#"><button class="btn btn-default btn-xs">Get Lab Tests\
|
||||
</button></a></div></div>', {name:y[0], lab_test: y[1], encounter:y[2], invoiced:y[3], practitioner:y[4], date:y[5]})).appendTo(html_field);
|
||||
row.find("a").click(function() {
|
||||
frm.doc.template = $(this).attr("data-lab-test");
|
||||
@ -180,9 +180,10 @@ var show_lab_tests = function(frm, result){
|
||||
return false;
|
||||
});
|
||||
});
|
||||
if(!result){
|
||||
var msg = "There are no Lab Test prescribed for "+frm.doc.patient;
|
||||
$(repl('<div class="col-xs-12" style="padding-top:20px;" >%(msg)s</div></div>', {msg: msg})).appendTo(html_field);
|
||||
if(!result.length){
|
||||
var msg = __("No Lab Tests found for the Patient {0}", [frm.doc.patient_name.bold()]);
|
||||
html_field.empty();
|
||||
$(repl('<div class="col-xs-12" style="padding-top:0px;" >%(msg)s</div>', {msg: msg})).appendTo(html_field);
|
||||
}
|
||||
d.show();
|
||||
};
|
||||
|
||||
@ -9,18 +9,18 @@
|
||||
"document_type": "Document",
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"inpatient_record",
|
||||
"naming_series",
|
||||
"invoiced",
|
||||
"patient",
|
||||
"patient_name",
|
||||
"patient_age",
|
||||
"patient_sex",
|
||||
"practitioner",
|
||||
"report_preference",
|
||||
"email",
|
||||
"mobile",
|
||||
"company",
|
||||
"practitioner",
|
||||
"c_b",
|
||||
"inpatient_record",
|
||||
"company",
|
||||
"department",
|
||||
"status",
|
||||
"submitted_date",
|
||||
@ -31,7 +31,7 @@
|
||||
"employee_name",
|
||||
"employee_designation",
|
||||
"user",
|
||||
"report_preference",
|
||||
"invoiced",
|
||||
"sb_first",
|
||||
"lab_test_name",
|
||||
"column_break_26",
|
||||
@ -153,7 +153,7 @@
|
||||
{
|
||||
"fieldname": "company",
|
||||
"fieldtype": "Link",
|
||||
"hidden": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Company",
|
||||
"options": "Company",
|
||||
"print_hide": 1,
|
||||
@ -168,6 +168,7 @@
|
||||
"fieldname": "department",
|
||||
"fieldtype": "Link",
|
||||
"ignore_user_permissions": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Department",
|
||||
"options": "Medical Department",
|
||||
"search_index": 1
|
||||
@ -427,7 +428,7 @@
|
||||
],
|
||||
"is_submittable": 1,
|
||||
"links": [],
|
||||
"modified": "2020-03-23 19:37:06.617764",
|
||||
"modified": "2020-04-04 19:16:29.131168",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Healthcare",
|
||||
"name": "Lab Test",
|
||||
|
||||
@ -69,9 +69,9 @@ def create_multiple(doctype, docname):
|
||||
lab_test_created = create_lab_test_from_encounter(docname)
|
||||
|
||||
if lab_test_created:
|
||||
frappe.msgprint(_("Lab Test(s) "+lab_test_created+" created."))
|
||||
frappe.msgprint(_("Lab Test(s) {0} created".format(lab_test_created)))
|
||||
else:
|
||||
frappe.msgprint(_("No Lab Test created"))
|
||||
frappe.msgprint(_("No Lab Tests created"))
|
||||
|
||||
def create_lab_test_from_encounter(encounter_id):
|
||||
lab_test_created = False
|
||||
@ -87,7 +87,7 @@ def create_lab_test_from_encounter(encounter_id):
|
||||
for lab_test_id in lab_test_ids:
|
||||
template = get_lab_test_template(lab_test_id[1])
|
||||
if template:
|
||||
lab_test = create_lab_test_doc(lab_test_id[2], encounter.practitioner, patient, template)
|
||||
lab_test = create_lab_test_doc(lab_test_id[2], encounter.practitioner, patient, template, encounter.company)
|
||||
lab_test.save(ignore_permissions = True)
|
||||
frappe.db.set_value("Lab Prescription", lab_test_id[0], "lab_test_created", 1)
|
||||
if not lab_test_created:
|
||||
@ -111,7 +111,7 @@ def create_lab_test_from_invoice(invoice_name):
|
||||
if lab_test_created != 1:
|
||||
template = get_lab_test_template(item.item_code)
|
||||
if template:
|
||||
lab_test = create_lab_test_doc(True, invoice.ref_practitioner, patient, template)
|
||||
lab_test = create_lab_test_doc(True, invoice.ref_practitioner, patient, template, invoice.company)
|
||||
if item.reference_dt == "Lab Prescription":
|
||||
lab_test.prescription = item.reference_dn
|
||||
lab_test.save(ignore_permissions = True)
|
||||
@ -121,7 +121,7 @@ def create_lab_test_from_invoice(invoice_name):
|
||||
if not lab_tests_created:
|
||||
lab_tests_created = lab_test.name
|
||||
else:
|
||||
lab_tests_created += ", "+lab_test.name
|
||||
lab_tests_created += ", " + lab_test.name
|
||||
return lab_tests_created
|
||||
|
||||
def get_lab_test_template(item):
|
||||
@ -141,7 +141,7 @@ def check_template_exists(item):
|
||||
return template_exists
|
||||
return False
|
||||
|
||||
def create_lab_test_doc(invoiced, practitioner, patient, template):
|
||||
def create_lab_test_doc(invoiced, practitioner, patient, template, company):
|
||||
lab_test = frappe.new_doc("Lab Test")
|
||||
lab_test.invoiced = invoiced
|
||||
lab_test.practitioner = practitioner
|
||||
@ -150,11 +150,12 @@ def create_lab_test_doc(invoiced, practitioner, patient, template):
|
||||
lab_test.patient_sex = patient.sex
|
||||
lab_test.email = patient.email
|
||||
lab_test.mobile = patient.mobile
|
||||
lab_test.report_preference = patient.report_preference
|
||||
lab_test.department = template.department
|
||||
lab_test.template = template.name
|
||||
lab_test.lab_test_group = template.lab_test_group
|
||||
lab_test.result_date = getdate()
|
||||
lab_test.report_preference = patient.report_preference
|
||||
lab_test.company = company
|
||||
return lab_test
|
||||
|
||||
def create_normals(template, lab_test):
|
||||
@ -190,7 +191,7 @@ def create_specials(template, lab_test):
|
||||
special.require_result_value = 1
|
||||
special.template = template.name
|
||||
|
||||
def create_sample_doc(template, patient, invoice):
|
||||
def create_sample_doc(template, patient, invoice, company = None):
|
||||
if template.sample:
|
||||
sample_exists = frappe.db.exists({
|
||||
"doctype": "Sample Collection",
|
||||
@ -221,6 +222,8 @@ def create_sample_doc(template, patient, invoice):
|
||||
sample_collection.sample = template.sample
|
||||
sample_collection.sample_uom = template.sample_uom
|
||||
sample_collection.sample_qty = template.sample_qty
|
||||
sample_collection.company = company
|
||||
|
||||
if(template.sample_details):
|
||||
sample_collection.sample_details = "Test :" + (template.get("lab_test_name") or template.get("template")) +"\n"+"Collection Detials:\n\t"+template.sample_details
|
||||
sample_collection.save(ignore_permissions=True)
|
||||
@ -229,7 +232,7 @@ def create_sample_doc(template, patient, invoice):
|
||||
|
||||
def create_sample_collection(lab_test, template, patient, invoice):
|
||||
if(frappe.db.get_value("Healthcare Settings", None, "create_sample_collection_for_lab_test") == "1"):
|
||||
sample_collection = create_sample_doc(template, patient, invoice)
|
||||
sample_collection = create_sample_doc(template, patient, invoice, lab_test.company)
|
||||
if(sample_collection):
|
||||
lab_test.sample = sample_collection.name
|
||||
return lab_test
|
||||
|
||||
@ -10,6 +10,8 @@ frappe.ui.form.on('Patient', {
|
||||
]
|
||||
};
|
||||
});
|
||||
frm.set_query('customer_group', {'is_group': 0});
|
||||
frm.set_query('default_price_list', { 'selling': 1});
|
||||
|
||||
if (frappe.defaults.get_default('patient_name_by') != 'Naming Series') {
|
||||
frm.toggle_display('naming_series', false);
|
||||
@ -40,6 +42,7 @@ frappe.ui.form.on('Patient', {
|
||||
frm.add_custom_button(__('Patient Encounter'), function () {
|
||||
create_encounter(frm);
|
||||
}, 'Create');
|
||||
frm.toggle_enable(['customer'], 0); // ToDo, allow change only if no transactions booked or better, add merge option
|
||||
}
|
||||
},
|
||||
onload: function (frm) {
|
||||
|
||||
@ -24,13 +24,20 @@
|
||||
"image",
|
||||
"column_break_14",
|
||||
"status",
|
||||
"inpatient_status",
|
||||
"inpatient_record",
|
||||
"customer",
|
||||
"inpatient_status",
|
||||
"report_preference",
|
||||
"mobile",
|
||||
"email",
|
||||
"phone",
|
||||
"report_preference",
|
||||
"customer_details_section",
|
||||
"customer",
|
||||
"customer_group",
|
||||
"territory",
|
||||
"column_break_24",
|
||||
"default_currency",
|
||||
"default_price_list",
|
||||
"language",
|
||||
"personal_and_social_history",
|
||||
"occupation",
|
||||
"column_break_25",
|
||||
@ -52,9 +59,7 @@
|
||||
"surrounding_factors",
|
||||
"other_risk_factors",
|
||||
"more_info",
|
||||
"patient_details",
|
||||
"ac_sb",
|
||||
"default_currency"
|
||||
"patient_details"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
@ -67,6 +72,7 @@
|
||||
{
|
||||
"fieldname": "inpatient_status",
|
||||
"fieldtype": "Select",
|
||||
"in_preview": 1,
|
||||
"label": "Inpatient Status",
|
||||
"options": "\nAdmission Scheduled\nAdmitted\nDischarge Scheduled",
|
||||
"read_only": 1
|
||||
@ -101,6 +107,7 @@
|
||||
{
|
||||
"fieldname": "sex",
|
||||
"fieldtype": "Link",
|
||||
"in_preview": 1,
|
||||
"label": "Gender",
|
||||
"options": "Gender",
|
||||
"reqd": 1
|
||||
@ -109,6 +116,7 @@
|
||||
"bold": 1,
|
||||
"fieldname": "blood_group",
|
||||
"fieldtype": "Select",
|
||||
"in_preview": 1,
|
||||
"label": "Blood Group",
|
||||
"options": "\nA Positive\nA Negative\nAB Positive\nAB Negative\nB Positive\nB Negative\nO Positive\nO Negative"
|
||||
},
|
||||
@ -116,6 +124,7 @@
|
||||
"bold": 1,
|
||||
"fieldname": "dob",
|
||||
"fieldtype": "Date",
|
||||
"in_preview": 1,
|
||||
"label": "Date of birth"
|
||||
},
|
||||
{
|
||||
@ -142,6 +151,7 @@
|
||||
"fieldname": "image",
|
||||
"fieldtype": "Attach Image",
|
||||
"hidden": 1,
|
||||
"in_preview": 1,
|
||||
"label": "Image",
|
||||
"no_copy": 1,
|
||||
"print_hide": 1,
|
||||
@ -157,7 +167,8 @@
|
||||
"fieldtype": "Link",
|
||||
"ignore_user_permissions": 1,
|
||||
"label": "Customer",
|
||||
"options": "Customer"
|
||||
"options": "Customer",
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "report_preference",
|
||||
@ -171,7 +182,8 @@
|
||||
"fieldtype": "Data",
|
||||
"in_list_view": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Mobile"
|
||||
"label": "Mobile",
|
||||
"options": "Phone"
|
||||
},
|
||||
{
|
||||
"bold": 1,
|
||||
@ -186,7 +198,8 @@
|
||||
"fieldname": "phone",
|
||||
"fieldtype": "Data",
|
||||
"in_filter": 1,
|
||||
"label": "Phone"
|
||||
"label": "Phone",
|
||||
"options": "Phone"
|
||||
},
|
||||
{
|
||||
"collapsible": 1,
|
||||
@ -268,25 +281,25 @@
|
||||
"fieldname": "tobacco_past_use",
|
||||
"fieldtype": "Data",
|
||||
"ignore_xss_filter": 1,
|
||||
"label": "Tobacco Consumption Habbits (Past)"
|
||||
"label": "Tobacco Consumption (Past)"
|
||||
},
|
||||
{
|
||||
"fieldname": "tobacco_current_use",
|
||||
"fieldtype": "Data",
|
||||
"ignore_xss_filter": 1,
|
||||
"label": "Tobacco Consumption Habbits (Present)"
|
||||
"label": "Tobacco Consumption (Present)"
|
||||
},
|
||||
{
|
||||
"fieldname": "alcohol_past_use",
|
||||
"fieldtype": "Data",
|
||||
"ignore_xss_filter": 1,
|
||||
"label": "Alcohol Consumption Habbits (Past)"
|
||||
"label": "Alcohol Consumption (Past)"
|
||||
},
|
||||
{
|
||||
"fieldname": "alcohol_current_use",
|
||||
"fieldtype": "Data",
|
||||
"ignore_user_permissions": 1,
|
||||
"label": "Alcohol Consumption Habbits (Present)"
|
||||
"label": "Alcohol Consumption (Present)"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_32",
|
||||
@ -320,20 +333,11 @@
|
||||
"ignore_xss_filter": 1,
|
||||
"label": "Patient Details"
|
||||
},
|
||||
{
|
||||
"collapsible": 1,
|
||||
"fieldname": "ac_sb",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Account Details"
|
||||
},
|
||||
{
|
||||
"fieldname": "default_currency",
|
||||
"fieldtype": "Link",
|
||||
"hidden": 1,
|
||||
"ignore_xss_filter": 1,
|
||||
"label": "Default Currency",
|
||||
"options": "Currency",
|
||||
"print_hide": 1
|
||||
"label": "Billing Currency",
|
||||
"options": "Currency"
|
||||
},
|
||||
{
|
||||
"fieldname": "last_name",
|
||||
@ -351,13 +355,47 @@
|
||||
"fieldname": "middle_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Middle Name (optional)"
|
||||
},
|
||||
{
|
||||
"collapsible": 1,
|
||||
"fieldname": "customer_details_section",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Customer Details"
|
||||
},
|
||||
{
|
||||
"fieldname": "customer_group",
|
||||
"fieldtype": "Link",
|
||||
"label": "Customer Group",
|
||||
"options": "Customer Group"
|
||||
},
|
||||
{
|
||||
"fieldname": "territory",
|
||||
"fieldtype": "Link",
|
||||
"label": "Territory",
|
||||
"options": "Territory"
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_24",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "default_price_list",
|
||||
"fieldtype": "Link",
|
||||
"label": "Default Price List",
|
||||
"options": "Price List"
|
||||
},
|
||||
{
|
||||
"fieldname": "language",
|
||||
"fieldtype": "Link",
|
||||
"label": "Print Language",
|
||||
"options": "Language"
|
||||
}
|
||||
],
|
||||
"icon": "fa fa-user",
|
||||
"image_field": "image",
|
||||
"links": [],
|
||||
"max_attachments": 50,
|
||||
"modified": "2020-04-06 12:55:30.807744",
|
||||
"modified": "2020-04-25 17:24:32.146415",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Healthcare",
|
||||
"name": "Patient",
|
||||
|
||||
@ -10,6 +10,7 @@ from frappe.utils import cint, cstr, getdate
|
||||
import dateutil
|
||||
from frappe.model.naming import set_name_by_naming_series
|
||||
from frappe.utils.nestedset import get_root_of
|
||||
from erpnext import get_default_currency
|
||||
from erpnext.healthcare.doctype.healthcare_settings.healthcare_settings import get_receivable_account, get_income_account, send_registration_sms
|
||||
|
||||
class Patient(Document):
|
||||
@ -17,6 +18,9 @@ class Patient(Document):
|
||||
self.set_full_name()
|
||||
self.add_as_website_user()
|
||||
|
||||
def before_insert(self):
|
||||
self.set_missing_customer_details()
|
||||
|
||||
def after_insert(self):
|
||||
self.add_as_website_user()
|
||||
self.reload()
|
||||
@ -26,6 +30,25 @@ class Patient(Document):
|
||||
frappe.db.set_value('Patient', self.name, 'status', 'Disabled')
|
||||
else:
|
||||
send_registration_sms(self)
|
||||
self.reload() # self.notify_update()
|
||||
|
||||
def on_update(self):
|
||||
if self.customer:
|
||||
customer = frappe.get_doc('Customer', self.customer)
|
||||
if self.customer_group:
|
||||
customer.customer_group = self.customer_group
|
||||
if self.territory:
|
||||
customer.territory = self.territory
|
||||
|
||||
customer.customer_name = self.patient_name
|
||||
customer.default_price_list = self.default_price_list
|
||||
customer.default_currency = self.default_currency
|
||||
customer.language = self.language
|
||||
customer.ignore_mandatory = True
|
||||
customer.save(ignore_permissions=True)
|
||||
else:
|
||||
if frappe.db.get_single_value('Healthcare Settings', 'link_customer_to_patient'):
|
||||
create_customer(self)
|
||||
|
||||
def set_full_name(self):
|
||||
if self.last_name:
|
||||
@ -33,6 +56,22 @@ class Patient(Document):
|
||||
else:
|
||||
self.patient_name = self.first_name
|
||||
|
||||
def set_missing_customer_details(self):
|
||||
if not self.customer_group:
|
||||
self.customer_group = frappe.db.get_single_value('Selling Settings', 'customer_group') or get_root_of('Customer Group')
|
||||
if not self.territory:
|
||||
self.territory = frappe.db.get_single_value('Selling Settings', 'territory') or get_root_of('Territory')
|
||||
if not self.default_price_list:
|
||||
self.default_price_list = frappe.db.get_single_value('Selling Settings', 'selling_price_list')
|
||||
|
||||
if not self.customer_group or not self.territory or not self.default_price_list:
|
||||
frappe.msgprint(_('Please set defaults for Customer Group, Territory and Selling Price List in Selling Settings'), alert=True)
|
||||
|
||||
if not self.default_currency:
|
||||
self.default_currency = get_default_currency()
|
||||
if not self.language:
|
||||
self.language = frappe.db.get_single_value('System Settings', 'language')
|
||||
|
||||
def add_as_website_user(self):
|
||||
if self.email:
|
||||
if not frappe.db.exists ('User', self.email):
|
||||
@ -86,19 +125,15 @@ class Patient(Document):
|
||||
return {'invoice': sales_invoice.name}
|
||||
|
||||
def create_customer(doc):
|
||||
customer_group = frappe.db.get_single_value('Selling Settings', 'customer_group')
|
||||
territory = frappe.db.get_single_value('Selling Settings', 'territory')
|
||||
if not (customer_group and territory):
|
||||
customer_group = get_root_of('Customer Group')
|
||||
territory = get_root_of('Territory')
|
||||
frappe.msgprint(_('Please set default customer group and territory in Selling Settings'), alert=True)
|
||||
|
||||
customer = frappe.get_doc({
|
||||
'doctype': 'Customer',
|
||||
'customer_name': doc.patient_name,
|
||||
'customer_group': customer_group,
|
||||
'territory' : territory,
|
||||
'customer_type': 'Individual'
|
||||
'customer_group': doc.customer_group or frappe.db.get_single_value('Selling Settings', 'customer_group'),
|
||||
'territory' : doc.territory or frappe.db.get_single_value('Selling Settings', 'territory'),
|
||||
'customer_type': 'Individual',
|
||||
'default_currency': doc.default_currency,
|
||||
'default_price_list': doc.default_price_list,
|
||||
'language': doc.language
|
||||
}).insert(ignore_permissions=True, ignore_mandatory=True)
|
||||
|
||||
frappe.db.set_value('Patient', doc.name, 'customer', customer.name)
|
||||
|
||||
@ -32,8 +32,9 @@ frappe.ui.form.on('Patient Appointment', {
|
||||
frm.set_query('service_unit', function(){
|
||||
return {
|
||||
filters: {
|
||||
'is_group': 0,
|
||||
'allow_appointments': 1
|
||||
'is_group': false,
|
||||
'allow_appointments': true,
|
||||
'company': frm.doc.company
|
||||
}
|
||||
};
|
||||
});
|
||||
@ -127,6 +128,11 @@ frappe.ui.form.on('Patient Appointment', {
|
||||
patient: function(frm) {
|
||||
if (frm.doc.patient) {
|
||||
frm.trigger('toggle_payment_fields');
|
||||
} else {
|
||||
frm.set_value('patient_name', '');
|
||||
frm.set_value('patient_sex', '');
|
||||
frm.set_value('patient_age', '');
|
||||
frm.set_value('inpatient_record', '');
|
||||
}
|
||||
},
|
||||
|
||||
@ -230,7 +236,6 @@ let check_and_set_availability = function(frm) {
|
||||
d.hide();
|
||||
frm.enable_save();
|
||||
frm.save();
|
||||
frm.enable_save();
|
||||
d.get_primary_btn().attr('disabled', true);
|
||||
}
|
||||
});
|
||||
@ -481,6 +486,7 @@ let create_vital_signs = function(frm) {
|
||||
frappe.route_options = {
|
||||
'patient': frm.doc.patient,
|
||||
'appointment': frm.doc.name,
|
||||
'company': frm.doc.company
|
||||
};
|
||||
frappe.new_doc('Vital Signs');
|
||||
};
|
||||
@ -513,6 +519,7 @@ frappe.ui.form.on('Patient Appointment', 'practitioner', function(frm) {
|
||||
callback: function (data) {
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'department', data.message.department);
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'paid_amount', data.message.op_consulting_charge);
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'billing_item', data.message.op_consulting_charge_item);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -10,40 +10,44 @@
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"naming_series",
|
||||
"title",
|
||||
"status",
|
||||
"patient",
|
||||
"patient_name",
|
||||
"patient_sex",
|
||||
"patient_age",
|
||||
"inpatient_record",
|
||||
"column_break_1",
|
||||
"status",
|
||||
"company",
|
||||
"service_unit",
|
||||
"procedure_template",
|
||||
"get_procedure_from_encounter",
|
||||
"procedure_prescription",
|
||||
"therapy_type",
|
||||
"get_prescribed_therapies",
|
||||
"therapy_plan",
|
||||
"service_unit",
|
||||
"section_break_12",
|
||||
"practitioner",
|
||||
"practitioner_name",
|
||||
"department",
|
||||
"section_break_12",
|
||||
"appointment_type",
|
||||
"duration",
|
||||
"column_break_17",
|
||||
"appointment_date",
|
||||
"appointment_time",
|
||||
"appointment_datetime",
|
||||
"duration",
|
||||
"section_break_16",
|
||||
"mode_of_payment",
|
||||
"paid_amount",
|
||||
"company",
|
||||
"billing_item",
|
||||
"column_break_2",
|
||||
"paid_amount",
|
||||
"invoiced",
|
||||
"ref_sales_invoice",
|
||||
"section_break_3",
|
||||
"notes",
|
||||
"referring_practitioner",
|
||||
"reminded"
|
||||
"reminded",
|
||||
"column_break_36",
|
||||
"notes"
|
||||
],
|
||||
"fields": [
|
||||
{
|
||||
@ -55,7 +59,6 @@
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "inpatient_record.patient",
|
||||
"fieldname": "patient",
|
||||
"fieldtype": "Link",
|
||||
"ignore_user_permissions": 1,
|
||||
@ -79,7 +82,8 @@
|
||||
"fieldname": "duration",
|
||||
"fieldtype": "Int",
|
||||
"in_filter": 1,
|
||||
"label": "Duration (In Minutes)"
|
||||
"label": "Duration (In Minutes)",
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_1",
|
||||
@ -98,6 +102,7 @@
|
||||
"search_index": 1
|
||||
},
|
||||
{
|
||||
"depends_on": "eval:doc.patient;",
|
||||
"fieldname": "procedure_template",
|
||||
"fieldtype": "Link",
|
||||
"label": "Clinical Procedure Template",
|
||||
@ -117,7 +122,8 @@
|
||||
"label": "Procedure Prescription",
|
||||
"no_copy": 1,
|
||||
"options": "Procedure Prescription",
|
||||
"print_hide": 1
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "service_unit",
|
||||
@ -128,7 +134,8 @@
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_12",
|
||||
"fieldtype": "Section Break"
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Appointment Details"
|
||||
},
|
||||
{
|
||||
"fieldname": "practitioner",
|
||||
@ -143,6 +150,7 @@
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "practitioner.department",
|
||||
"fieldname": "department",
|
||||
"fieldtype": "Link",
|
||||
"ignore_user_permissions": 1,
|
||||
@ -173,11 +181,13 @@
|
||||
"fieldtype": "Time",
|
||||
"in_list_view": 1,
|
||||
"label": "Time",
|
||||
"read_only": 1
|
||||
"read_only": 1,
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "section_break_16",
|
||||
"fieldtype": "Section Break"
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Payments"
|
||||
},
|
||||
{
|
||||
"fetch_from": "patient.patient_name",
|
||||
@ -206,6 +216,7 @@
|
||||
{
|
||||
"fieldname": "appointment_datetime",
|
||||
"fieldtype": "Datetime",
|
||||
"hidden": 1,
|
||||
"label": "Appointment Datetime",
|
||||
"print_hide": 1,
|
||||
"read_only": 1,
|
||||
@ -237,12 +248,12 @@
|
||||
{
|
||||
"fieldname": "company",
|
||||
"fieldtype": "Link",
|
||||
"hidden": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Company",
|
||||
"no_copy": 1,
|
||||
"options": "Company",
|
||||
"print_hide": 1,
|
||||
"report_hide": 1
|
||||
"reqd": 1,
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"collapsible": 1,
|
||||
@ -307,10 +318,37 @@
|
||||
"label": "Series",
|
||||
"options": "HLC-APP-.YYYY.-",
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "billing_item",
|
||||
"fieldtype": "Link",
|
||||
"label": "Billing Item",
|
||||
"options": "Item",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_36",
|
||||
"fieldtype": "Column Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "title",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 1,
|
||||
"label": "Title",
|
||||
"no_copy": 1,
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "practitioner.practitioner_name",
|
||||
"fieldname": "practitioner_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Practitioner Name",
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"links": [],
|
||||
"modified": "2020-03-31 16:16:32.116865",
|
||||
"modified": "2020-04-27 21:36:06.404062",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Healthcare",
|
||||
"name": "Patient Appointment",
|
||||
@ -358,7 +396,7 @@
|
||||
"show_name_in_global_search": 1,
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"title_field": "patient",
|
||||
"title_field": "title",
|
||||
"track_changes": 1,
|
||||
"track_seen": 1
|
||||
}
|
||||
@ -21,6 +21,7 @@ class PatientAppointment(Document):
|
||||
self.set_appointment_datetime()
|
||||
self.validate_customer_created()
|
||||
self.set_status()
|
||||
self.set_title()
|
||||
|
||||
def after_insert(self):
|
||||
self.update_prescription_details()
|
||||
@ -28,6 +29,10 @@ class PatientAppointment(Document):
|
||||
self.update_fee_validity()
|
||||
send_confirmation_msg(self)
|
||||
|
||||
def set_title(self):
|
||||
self.title = _('{0} with {1}').format(self.patient_name or self.patient,
|
||||
self.practitioner_name or self.practitioner)
|
||||
|
||||
def set_status(self):
|
||||
today = getdate()
|
||||
appointment_date = getdate(self.appointment_date)
|
||||
@ -119,25 +124,28 @@ def invoice_appointment(appointment_doc):
|
||||
|
||||
if automate_invoicing and not appointment_invoiced and not fee_validity:
|
||||
sales_invoice = frappe.new_doc('Sales Invoice')
|
||||
sales_invoice.patient = appointment_doc.patient
|
||||
sales_invoice.customer = frappe.get_value('Patient', appointment_doc.patient, 'customer')
|
||||
sales_invoice.appointment = appointment_doc.name
|
||||
sales_invoice.due_date = getdate()
|
||||
sales_invoice.is_pos = 1
|
||||
sales_invoice.company = appointment_doc.company
|
||||
sales_invoice.debit_to = get_receivable_account(appointment_doc.company)
|
||||
|
||||
item = sales_invoice.append('items', {})
|
||||
item = get_appointment_item(appointment_doc, item)
|
||||
|
||||
payment = sales_invoice.append('payments', {})
|
||||
payment.mode_of_payment = appointment_doc.mode_of_payment
|
||||
payment.amount = appointment_doc.paid_amount
|
||||
# Add payments if payment details are supplied else proceed to create invoice as Unpaid
|
||||
if appointment_doc.mode_of_payment and appointment_doc.paid_amount:
|
||||
sales_invoice.is_pos = 1
|
||||
payment = sales_invoice.append('payments', {})
|
||||
payment.mode_of_payment = appointment_doc.mode_of_payment
|
||||
payment.amount = appointment_doc.paid_amount
|
||||
|
||||
sales_invoice.set_missing_values(for_validate=True)
|
||||
sales_invoice.flags.ignore_mandatory = True
|
||||
sales_invoice.save(ignore_permissions=True)
|
||||
sales_invoice.submit()
|
||||
frappe.msgprint(_('Sales Invoice {0} created as paid'.format(sales_invoice.name)), alert=True)
|
||||
frappe.msgprint(_('Sales Invoice {0} created'.format(sales_invoice.name)), alert=True)
|
||||
frappe.db.set_value('Patient Appointment', appointment_doc.name, 'invoiced', 1)
|
||||
frappe.db.set_value('Patient Appointment', appointment_doc.name, 'ref_sales_invoice', sales_invoice.name)
|
||||
|
||||
@ -343,8 +351,8 @@ def make_encounter(source_name, target_doc=None):
|
||||
['practitioner', 'practitioner'],
|
||||
['medical_department', 'department'],
|
||||
['patient_sex', 'patient_sex'],
|
||||
['encounter_date', 'appointment_date'],
|
||||
['invoiced', 'invoiced']
|
||||
['invoiced', 'invoiced'],
|
||||
['company', 'company']
|
||||
]
|
||||
}
|
||||
}, target_doc)
|
||||
@ -370,17 +378,19 @@ def send_appointment_reminder():
|
||||
frappe.db.set_value('Patient Appointment', doc.name, 'reminded', 1)
|
||||
|
||||
def send_message(doc, message):
|
||||
patient = frappe.get_doc('Patient', doc.patient)
|
||||
if patient.mobile:
|
||||
patient_mobile = frappe.db.get_value('Patient', doc.patient, 'mobile')
|
||||
if patient_mobile:
|
||||
context = {'doc': doc, 'alert': doc, 'comments': None}
|
||||
if doc.get('_comments'):
|
||||
context['comments'] = json.loads(doc.get('_comments'))
|
||||
|
||||
# jinja to string convertion happens here
|
||||
message = frappe.render_template(message, context)
|
||||
number = [patient.mobile]
|
||||
send_sms(number, message)
|
||||
|
||||
number = [patient_mobile]
|
||||
try:
|
||||
send_sms(number, message)
|
||||
except Exception as e:
|
||||
frappe.msgprint(_('SMS not sent, please check SMS Settings'), alert=True)
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_events(start, end, filters=None):
|
||||
|
||||
@ -4,14 +4,15 @@
|
||||
from __future__ import unicode_literals
|
||||
import unittest
|
||||
import frappe
|
||||
from erpnext.healthcare.doctype.patient_appointment.patient_appointment import update_status
|
||||
from erpnext.healthcare.doctype.patient_appointment.patient_appointment import update_status, make_encounter
|
||||
from frappe.utils import nowdate, add_days
|
||||
from frappe.utils.make_random import get_random
|
||||
|
||||
class TestPatientAppointment(unittest.TestCase):
|
||||
def setUp(self):
|
||||
frappe.db.sql("""delete from `tabPatient Appointment`""")
|
||||
frappe.db.sql("""delete from `tabFee Validity""")
|
||||
frappe.db.sql("""delete from `tabFee Validity`""")
|
||||
frappe.db.sql("""delete from `tabPatient Encounter`""")
|
||||
|
||||
def test_status(self):
|
||||
patient, medical_department, practitioner = create_healthcare_docs()
|
||||
@ -23,6 +24,19 @@ class TestPatientAppointment(unittest.TestCase):
|
||||
create_encounter(appointment)
|
||||
self.assertEquals(frappe.db.get_value('Patient Appointment', appointment.name, 'status'), 'Closed')
|
||||
|
||||
def test_start_encounter(self):
|
||||
patient, medical_department, practitioner = create_healthcare_docs()
|
||||
frappe.db.set_value('Healthcare Settings', None, 'automate_appointment_invoicing', 1)
|
||||
appointment = create_appointment(patient, practitioner, add_days(nowdate(), 4), invoice = 1)
|
||||
self.assertEqual(frappe.db.get_value('Patient Appointment', appointment.name, 'invoiced'), 1)
|
||||
encounter = make_encounter(appointment.name)
|
||||
self.assertTrue(encounter)
|
||||
self.assertEqual(encounter.company, appointment.company)
|
||||
self.assertEqual(encounter.practitioner, appointment.practitioner)
|
||||
self.assertEqual(encounter.patient, appointment.patient)
|
||||
# invoiced flag mapped from appointment
|
||||
self.assertEqual(encounter.invoiced, frappe.db.get_value('Patient Appointment', appointment.name, 'invoiced'))
|
||||
|
||||
def test_invoicing(self):
|
||||
patient, medical_department, practitioner = create_healthcare_docs()
|
||||
frappe.db.set_value('Healthcare Settings', None, 'enable_free_follow_ups', 0)
|
||||
@ -33,7 +47,11 @@ class TestPatientAppointment(unittest.TestCase):
|
||||
frappe.db.set_value('Healthcare Settings', None, 'automate_appointment_invoicing', 1)
|
||||
appointment = create_appointment(patient, practitioner, add_days(nowdate(), 2), invoice=1)
|
||||
self.assertEqual(frappe.db.get_value('Patient Appointment', appointment.name, 'invoiced'), 1)
|
||||
self.assertTrue(frappe.db.get_value('Patient Appointment', appointment.name, 'ref_sales_invoice'))
|
||||
sales_invoice_name = frappe.db.get_value('Sales Invoice Item', {'reference_dn': appointment.name}, 'parent')
|
||||
self.assertTrue(sales_invoice_name)
|
||||
self.assertEqual(frappe.db.get_value('Sales Invoice', sales_invoice_name, 'company'), appointment.company)
|
||||
self.assertEqual(frappe.db.get_value('Sales Invoice', sales_invoice_name, 'patient'), appointment.patient)
|
||||
self.assertEqual(frappe.db.get_value('Sales Invoice', sales_invoice_name, 'paid_amount'), appointment.paid_amount)
|
||||
|
||||
def test_appointment_cancel(self):
|
||||
patient, medical_department, practitioner = create_healthcare_docs()
|
||||
@ -53,8 +71,8 @@ class TestPatientAppointment(unittest.TestCase):
|
||||
appointment = create_appointment(patient, practitioner, nowdate(), invoice=1)
|
||||
update_status(appointment.name, 'Cancelled')
|
||||
# check invoice cancelled
|
||||
sales_invoice = frappe.db.get_value('Patient Appointment', appointment.name, 'ref_sales_invoice')
|
||||
self.assertEqual(frappe.db.get_value('Sales Invoice', sales_invoice, 'status'), 'Cancelled')
|
||||
sales_invoice_name = frappe.db.get_value('Sales Invoice Item', {'reference_dn': appointment.name}, 'parent')
|
||||
self.assertEqual(frappe.db.get_value('Sales Invoice', sales_invoice_name, 'status'), 'Cancelled')
|
||||
|
||||
|
||||
def create_healthcare_docs():
|
||||
@ -90,14 +108,15 @@ def create_patient():
|
||||
patient = patient.name
|
||||
return patient
|
||||
|
||||
def create_encounter(appointment=None):
|
||||
encounter = frappe.new_doc('Patient Encounter')
|
||||
def create_encounter(appointment):
|
||||
if appointment:
|
||||
encounter = frappe.new_doc('Patient Encounter')
|
||||
encounter.appointment = appointment.name
|
||||
encounter.patient = appointment.patient
|
||||
encounter.practitioner = appointment.practitioner
|
||||
encounter.encounter_date = appointment.appointment_date
|
||||
encounter.encounter_time = appointment.appointment_time
|
||||
encounter.company = appointment.company
|
||||
encounter.save()
|
||||
encounter.submit()
|
||||
return encounter
|
||||
|
||||
@ -25,15 +25,16 @@ frappe.ui.form.on('Patient Encounter', {
|
||||
refresh_field('lab_test_prescription');
|
||||
|
||||
if (!frm.doc.__islocal) {
|
||||
|
||||
if (frm.doc.inpatient_status == 'Admission Scheduled' || frm.doc.inpatient_status == 'Admitted') {
|
||||
frm.add_custom_button(__('Schedule Discharge'), function() {
|
||||
schedule_discharge(frm);
|
||||
});
|
||||
} else if (frm.doc.inpatient_status != 'Discharge Scheduled') {
|
||||
frm.add_custom_button(__('Schedule Admission'), function() {
|
||||
schedule_inpatient(frm);
|
||||
});
|
||||
if (frm.doc.docstatus === 1) {
|
||||
if (frm.doc.inpatient_status == 'Admission Scheduled' || frm.doc.inpatient_status == 'Admitted') {
|
||||
frm.add_custom_button(__('Schedule Discharge'), function() {
|
||||
schedule_discharge(frm);
|
||||
});
|
||||
} else if (frm.doc.inpatient_status != 'Discharge Scheduled') {
|
||||
frm.add_custom_button(__('Schedule Admission'), function() {
|
||||
schedule_inpatient(frm);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
frm.add_custom_button(__('Patient History'), function() {
|
||||
@ -101,6 +102,11 @@ frappe.ui.form.on('Patient Encounter', {
|
||||
frm.events.set_patient_info(frm);
|
||||
},
|
||||
|
||||
practitioner: function(frm) {
|
||||
if (!frm.doc.practitioner) {
|
||||
frm.set_value('practitioner_name', '');
|
||||
}
|
||||
},
|
||||
set_appointment_fields: function(frm) {
|
||||
if (frm.doc.appointment) {
|
||||
frappe.call({
|
||||
@ -114,9 +120,11 @@ frappe.ui.form.on('Patient Encounter', {
|
||||
'patient':data.message.patient,
|
||||
'type': data.message.appointment_type,
|
||||
'practitioner': data.message.practitioner,
|
||||
'invoiced': data.message.invoiced
|
||||
'invoiced': data.message.invoiced,
|
||||
'company': data.message.company
|
||||
};
|
||||
frm.set_value(values);
|
||||
frm.set_df_property('patient', 'read_only', 1);
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -133,6 +141,7 @@ frappe.ui.form.on('Patient Encounter', {
|
||||
'inpatient_status': ''
|
||||
};
|
||||
frm.set_value(values);
|
||||
frm.set_df_property('patient', 'read_only', 0);
|
||||
}
|
||||
},
|
||||
|
||||
@ -148,19 +157,25 @@ frappe.ui.form.on('Patient Encounter', {
|
||||
if (data.message.dob) {
|
||||
age = calculate_age(data.message.dob);
|
||||
}
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'patient_age', age);
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'patient_sex', data.message.sex);
|
||||
if (data.message.inpatient_record) {
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'inpatient_record', data.message.inpatient_record);
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'inpatient_status', data.message.inpatient_status);
|
||||
}
|
||||
let values = {
|
||||
'patient_age': age,
|
||||
'patient_name':data.message.patient_name,
|
||||
'patient_sex': data.message.sex,
|
||||
'inpatient_record': data.message.inpatient_record,
|
||||
'inpatient_status': data.message.inpatient_status
|
||||
};
|
||||
frm.set_value(values);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'patient_sex', '');
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'patient_age', '');
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'inpatient_record', '');
|
||||
frappe.model.set_value(frm.doctype, frm.docname, 'inpatient_status', '');
|
||||
let values = {
|
||||
'patient_age': '',
|
||||
'patient_name':'',
|
||||
'patient_sex': '',
|
||||
'inpatient_record': '',
|
||||
'inpatient_status': ''
|
||||
};
|
||||
frm.set_value(values);
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -212,8 +227,8 @@ let create_vital_signs = function (frm) {
|
||||
}
|
||||
frappe.route_options = {
|
||||
'patient': frm.doc.patient,
|
||||
'appointment': frm.doc.appointment,
|
||||
'encounter': frm.doc.name
|
||||
'encounter': frm.doc.name,
|
||||
'company': frm.doc.company
|
||||
};
|
||||
frappe.new_doc('Vital Signs');
|
||||
};
|
||||
@ -224,7 +239,8 @@ let create_procedure = function (frm) {
|
||||
}
|
||||
frappe.route_options = {
|
||||
'patient': frm.doc.patient,
|
||||
'medical_department': frm.doc.medical_department
|
||||
'medical_department': frm.doc.medical_department,
|
||||
'company': frm.doc.company
|
||||
};
|
||||
frappe.new_doc('Clinical Procedure');
|
||||
};
|
||||
|
||||
@ -11,23 +11,23 @@
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"naming_series",
|
||||
"title",
|
||||
"appointment",
|
||||
"appointment_type",
|
||||
"patient",
|
||||
"patient_name",
|
||||
"patient_sex",
|
||||
"patient_age",
|
||||
"company",
|
||||
"inpatient_record",
|
||||
"inpatient_status",
|
||||
"column_break_6",
|
||||
"practitioner",
|
||||
"medical_department",
|
||||
"company",
|
||||
"encounter_date",
|
||||
"encounter_time",
|
||||
"practitioner",
|
||||
"practitioner_name",
|
||||
"medical_department",
|
||||
"invoiced",
|
||||
"section_break_1",
|
||||
"inpatient_record",
|
||||
"column_break_17",
|
||||
"inpatient_status",
|
||||
"sb_symptoms",
|
||||
"symptoms",
|
||||
"symptoms_in_print",
|
||||
@ -47,6 +47,7 @@
|
||||
"therapies",
|
||||
"section_break_33",
|
||||
"encounter_comment",
|
||||
"sb_refs",
|
||||
"amended_from"
|
||||
],
|
||||
"fields": [
|
||||
@ -57,12 +58,6 @@
|
||||
"options": "Inpatient Record",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"collapsible": 1,
|
||||
"fieldname": "section_break_1",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Inpatient Details"
|
||||
},
|
||||
{
|
||||
"fieldname": "naming_series",
|
||||
"fieldtype": "Select",
|
||||
@ -77,14 +72,13 @@
|
||||
"ignore_user_permissions": 1,
|
||||
"label": "Appointment",
|
||||
"options": "Patient Appointment",
|
||||
"search_index": 1
|
||||
"search_index": 1,
|
||||
"set_only_once": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "inpatient_record.patient",
|
||||
"fieldname": "patient",
|
||||
"fieldtype": "Link",
|
||||
"ignore_user_permissions": 1,
|
||||
"in_list_view": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Patient",
|
||||
"options": "Patient",
|
||||
@ -92,7 +86,6 @@
|
||||
"search_index": 1
|
||||
},
|
||||
{
|
||||
"fetch_from": "patient.patient_name",
|
||||
"fieldname": "patient_name",
|
||||
"fieldtype": "Data",
|
||||
"label": "Patient Name",
|
||||
@ -114,7 +107,6 @@
|
||||
{
|
||||
"fieldname": "company",
|
||||
"fieldtype": "Link",
|
||||
"hidden": 1,
|
||||
"label": "Company",
|
||||
"options": "Company"
|
||||
},
|
||||
@ -125,7 +117,6 @@
|
||||
{
|
||||
"fieldname": "practitioner",
|
||||
"fieldtype": "Link",
|
||||
"in_list_view": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Healthcare Practitioner",
|
||||
"options": "Healthcare Practitioner",
|
||||
@ -207,29 +198,29 @@
|
||||
{
|
||||
"fieldname": "codification_table",
|
||||
"fieldtype": "Table",
|
||||
"label": "Medical Coding",
|
||||
"label": "Medical Codes",
|
||||
"options": "Codification Table"
|
||||
},
|
||||
{
|
||||
"fieldname": "sb_drug_prescription",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Medication"
|
||||
"label": "Medications"
|
||||
},
|
||||
{
|
||||
"fieldname": "drug_prescription",
|
||||
"fieldtype": "Table",
|
||||
"label": "Drug Prescription",
|
||||
"label": "Items",
|
||||
"options": "Drug Prescription"
|
||||
},
|
||||
{
|
||||
"fieldname": "sb_test_prescription",
|
||||
"fieldtype": "Section Break",
|
||||
"label": "Investigation"
|
||||
"label": "Investigations"
|
||||
},
|
||||
{
|
||||
"fieldname": "lab_test_prescription",
|
||||
"fieldtype": "Table",
|
||||
"label": "Lab Prescription",
|
||||
"label": "Lab Tests",
|
||||
"options": "Lab Prescription"
|
||||
},
|
||||
{
|
||||
@ -240,7 +231,7 @@
|
||||
{
|
||||
"fieldname": "procedure_prescription",
|
||||
"fieldtype": "Table",
|
||||
"label": "Procedure Prescription",
|
||||
"label": "Clinical Procedures",
|
||||
"no_copy": 1,
|
||||
"options": "Procedure Prescription"
|
||||
},
|
||||
@ -299,7 +290,6 @@
|
||||
"fieldname": "medical_department",
|
||||
"fieldtype": "Link",
|
||||
"ignore_user_permissions": 1,
|
||||
"in_list_view": 1,
|
||||
"in_standard_filter": 1,
|
||||
"label": "Department",
|
||||
"options": "Medical Department",
|
||||
@ -312,13 +302,31 @@
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_17",
|
||||
"fieldtype": "Column Break"
|
||||
"fieldname": "sb_refs",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fetch_from": "practitioner.practitioner_name",
|
||||
"fieldname": "practitioner_name",
|
||||
"fieldtype": "Data",
|
||||
"in_list_view": 1,
|
||||
"label": "Practitioner Name",
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"allow_on_submit": 1,
|
||||
"fieldname": "title",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 1,
|
||||
"label": "Title",
|
||||
"no_copy": 1,
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"is_submittable": 1,
|
||||
"links": [],
|
||||
"modified": "2020-04-14 16:18:08.180457",
|
||||
"modified": "2020-04-27 21:58:29.789797",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Healthcare",
|
||||
"name": "Patient Encounter",
|
||||
@ -345,7 +353,7 @@
|
||||
"show_name_in_global_search": 1,
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"title_field": "patient",
|
||||
"title_field": "title",
|
||||
"track_changes": 1,
|
||||
"track_seen": 1
|
||||
}
|
||||
@ -10,6 +10,9 @@ from frappe.utils import cstr
|
||||
from frappe import _
|
||||
|
||||
class PatientEncounter(Document):
|
||||
def validate(self):
|
||||
self.set_title()
|
||||
|
||||
def on_update(self):
|
||||
if self.appointment:
|
||||
frappe.db.set_value('Patient Appointment', self.appointment, 'status', 'Closed')
|
||||
@ -29,6 +32,10 @@ class PatientEncounter(Document):
|
||||
def on_submit(self):
|
||||
create_therapy_plan(self)
|
||||
|
||||
def set_title(self):
|
||||
self.title = _('{0} with {1}').format(self.patient_name or self.patient,
|
||||
self.practitioner_name or self.practitioner)[:100]
|
||||
|
||||
def create_therapy_plan(encounter):
|
||||
if len(encounter.therapies):
|
||||
doc = frappe.new_doc('Therapy Plan')
|
||||
|
||||
@ -9,14 +9,14 @@
|
||||
"document_type": "Document",
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"inpatient_record",
|
||||
"naming_series",
|
||||
"invoiced",
|
||||
"patient",
|
||||
"column_break_4",
|
||||
"patient_age",
|
||||
"patient_sex",
|
||||
"column_break_4",
|
||||
"inpatient_record",
|
||||
"company",
|
||||
"invoiced",
|
||||
"section_break_6",
|
||||
"sample",
|
||||
"sample_uom",
|
||||
@ -167,7 +167,7 @@
|
||||
],
|
||||
"is_submittable": 1,
|
||||
"links": [],
|
||||
"modified": "2020-03-25 16:55:52.376834",
|
||||
"modified": "2020-04-04 19:17:02.707203",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Healthcare",
|
||||
"name": "Sample Collection",
|
||||
|
||||
@ -9,6 +9,16 @@ frappe.ui.form.on('Therapy Session', {
|
||||
{fieldname: 'counts_completed', columns: 1},
|
||||
{fieldname: 'assistance_level', columns: 1}
|
||||
];
|
||||
|
||||
frm.set_query('service_unit', function() {
|
||||
return {
|
||||
filters: {
|
||||
'is_group': false,
|
||||
'allow_appointments': true,
|
||||
'company': frm.doc.company
|
||||
}
|
||||
};
|
||||
});
|
||||
},
|
||||
|
||||
refresh: function(frm) {
|
||||
|
||||
@ -2,18 +2,22 @@
|
||||
"actions": [],
|
||||
"allow_copy": 1,
|
||||
"allow_import": 1,
|
||||
"autoname": "naming_series:",
|
||||
"beta": 1,
|
||||
"creation": "2017-02-02 11:00:24.853005",
|
||||
"doctype": "DocType",
|
||||
"editable_grid": 1,
|
||||
"engine": "InnoDB",
|
||||
"field_order": [
|
||||
"inpatient_record",
|
||||
"naming_series",
|
||||
"title",
|
||||
"patient",
|
||||
"patient_name",
|
||||
"inpatient_record",
|
||||
"appointment",
|
||||
"encounter",
|
||||
"column_break_2",
|
||||
"company",
|
||||
"signs_date",
|
||||
"signs_time",
|
||||
"sb_vs",
|
||||
@ -34,7 +38,7 @@
|
||||
"bmi",
|
||||
"column_break_14",
|
||||
"nutrition_note",
|
||||
"company",
|
||||
"sb_references",
|
||||
"amended_from"
|
||||
],
|
||||
"fields": [
|
||||
@ -68,7 +72,8 @@
|
||||
"fieldname": "appointment",
|
||||
"fieldtype": "Link",
|
||||
"in_filter": 1,
|
||||
"label": "Appointment",
|
||||
"label": "Patient Appointment",
|
||||
"no_copy": 1,
|
||||
"options": "Patient Appointment",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
@ -81,8 +86,7 @@
|
||||
"no_copy": 1,
|
||||
"options": "Patient Encounter",
|
||||
"print_hide": 1,
|
||||
"read_only": 1,
|
||||
"report_hide": 1
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"fieldname": "column_break_2",
|
||||
@ -217,7 +221,6 @@
|
||||
{
|
||||
"fieldname": "company",
|
||||
"fieldtype": "Link",
|
||||
"hidden": 1,
|
||||
"label": "Company",
|
||||
"options": "Company"
|
||||
},
|
||||
@ -229,11 +232,34 @@
|
||||
"options": "Vital Signs",
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
},
|
||||
{
|
||||
"collapsible": 1,
|
||||
"fieldname": "sb_references",
|
||||
"fieldtype": "Section Break"
|
||||
},
|
||||
{
|
||||
"fieldname": "naming_series",
|
||||
"fieldtype": "Select",
|
||||
"label": "Series",
|
||||
"options": "HLC-VTS-.YYYY.-",
|
||||
"reqd": 1
|
||||
},
|
||||
{
|
||||
"allow_on_submit": 1,
|
||||
"columns": 5,
|
||||
"fieldname": "title",
|
||||
"fieldtype": "Data",
|
||||
"hidden": 1,
|
||||
"label": "Title",
|
||||
"no_copy": 1,
|
||||
"print_hide": 1,
|
||||
"read_only": 1
|
||||
}
|
||||
],
|
||||
"is_submittable": 1,
|
||||
"links": [],
|
||||
"modified": "2020-03-04 17:19:29.549889",
|
||||
"modified": "2020-05-17 22:23:24.632286",
|
||||
"modified_by": "Administrator",
|
||||
"module": "Healthcare",
|
||||
"name": "Vital Signs",
|
||||
@ -273,7 +299,7 @@
|
||||
"show_name_in_global_search": 1,
|
||||
"sort_field": "modified",
|
||||
"sort_order": "DESC",
|
||||
"title_field": "patient",
|
||||
"title_field": "title",
|
||||
"track_changes": 1,
|
||||
"track_seen": 1
|
||||
}
|
||||
@ -9,12 +9,19 @@ from frappe.utils import cstr
|
||||
from frappe import _
|
||||
|
||||
class VitalSigns(Document):
|
||||
def validate(self):
|
||||
self.set_title()
|
||||
|
||||
def on_submit(self):
|
||||
insert_vital_signs_to_medical_record(self)
|
||||
|
||||
def on_cancel(self):
|
||||
delete_vital_signs_from_medical_record(self)
|
||||
|
||||
def set_title(self):
|
||||
self.title = _('{0} on {1}').format(self.patient_name or self.patient,
|
||||
frappe.utils.format_date(self.signs_date))[:100]
|
||||
|
||||
def insert_vital_signs_to_medical_record(doc):
|
||||
subject = set_subject_field(doc)
|
||||
medical_record = frappe.new_doc('Patient Medical Record')
|
||||
|
||||
@ -3,83 +3,84 @@
|
||||
# For license information, please see license.txt
|
||||
|
||||
from __future__ import unicode_literals
|
||||
import math
|
||||
import frappe
|
||||
from frappe import _
|
||||
import math
|
||||
from frappe.utils import time_diff_in_hours, rounded
|
||||
from erpnext.healthcare.doctype.healthcare_settings.healthcare_settings import get_income_account
|
||||
from erpnext.healthcare.doctype.fee_validity.fee_validity import create_fee_validity
|
||||
from erpnext.healthcare.doctype.lab_test.lab_test import create_multiple
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_healthcare_services_to_invoice(patient):
|
||||
def get_healthcare_services_to_invoice(patient, company):
|
||||
patient = frappe.get_doc('Patient', patient)
|
||||
items_to_invoice = []
|
||||
if patient:
|
||||
validate_customer_created(patient)
|
||||
items_to_invoice = []
|
||||
patient_appointments = frappe.get_list(
|
||||
'Patient Appointment',
|
||||
fields='*',
|
||||
filters={'patient': patient.name, 'invoiced': 0},
|
||||
order_by='appointment_date'
|
||||
)
|
||||
if patient_appointments:
|
||||
items_to_invoice = get_fee_validity(patient_appointments)
|
||||
# Customer validated, build a list of billable services
|
||||
items_to_invoice += get_appointments_to_invoice(patient, company)
|
||||
items_to_invoice += get_encounters_to_invoice(patient, company)
|
||||
items_to_invoice += get_lab_tests_to_invoice(patient, company)
|
||||
items_to_invoice += get_clinical_procedures_to_invoice(patient, company)
|
||||
items_to_invoice += get_inpatient_services_to_invoice(patient, company)
|
||||
items_to_invoice += get_therapy_sessions_to_invoice(patient, company)
|
||||
|
||||
encounters = get_encounters_to_invoice(patient)
|
||||
lab_tests = get_lab_tests_to_invoice(patient)
|
||||
clinical_procedures = get_clinical_procedures_to_invoice(patient)
|
||||
inpatient_services = get_inpatient_services_to_invoice(patient)
|
||||
therapy_sessions = get_therapy_sessions_to_invoice(patient)
|
||||
|
||||
items_to_invoice += encounters + lab_tests + clinical_procedures + inpatient_services + therapy_sessions
|
||||
return items_to_invoice
|
||||
|
||||
|
||||
def validate_customer_created(patient):
|
||||
if not frappe.db.get_value('Patient', patient.name, 'customer'):
|
||||
msg = _("Please set a Customer linked to the Patient")
|
||||
msg += " <b><a href='#Form/Patient/{0}'>{0}</a></b>".format(patient.name)
|
||||
frappe.throw(msg, title=_('Customer Not Found'))
|
||||
|
||||
def get_fee_validity(patient_appointments):
|
||||
if not frappe.db.get_single_value('Healthcare Settings', 'enable_free_follow_ups'):
|
||||
return []
|
||||
def get_appointments_to_invoice(patient, company):
|
||||
appointments_to_invoice = []
|
||||
patient_appointments = frappe.get_list(
|
||||
'Patient Appointment',
|
||||
fields = '*',
|
||||
filters = {'patient': patient.name, 'company': company, 'invoiced': 0},
|
||||
order_by = 'appointment_date'
|
||||
)
|
||||
|
||||
items_to_invoice = []
|
||||
for appointment in patient_appointments:
|
||||
# Procedure Appointments
|
||||
if appointment.procedure_template:
|
||||
if frappe.db.get_value('Clinical Procedure Template', appointment.procedure_template, 'is_billable'):
|
||||
items_to_invoice.append({
|
||||
appointments_to_invoice.append({
|
||||
'reference_type': 'Patient Appointment',
|
||||
'reference_name': appointment.name,
|
||||
'service': appointment.procedure_template
|
||||
})
|
||||
# Consultation Appointments, should check fee validity
|
||||
else:
|
||||
fee_validity = frappe.db.exists('Fee Validity Reference', {'appointment': appointment.name})
|
||||
if not fee_validity:
|
||||
practitioner_charge = 0
|
||||
income_account = None
|
||||
service_item = None
|
||||
if appointment.practitioner:
|
||||
service_item, practitioner_charge = get_service_item_and_practitioner_charge(appointment)
|
||||
income_account = get_income_account(appointment.practitioner, appointment.company)
|
||||
items_to_invoice.append({
|
||||
'reference_type': 'Patient Appointment',
|
||||
'reference_name': appointment.name,
|
||||
'service': service_item,
|
||||
'rate': practitioner_charge,
|
||||
'income_account': income_account
|
||||
})
|
||||
if frappe.db.get_single_value('Healthcare Settings', 'enable_free_follow_ups') and \
|
||||
frappe.db.exists('Fee Validity Reference', {'appointment': appointment.name}):
|
||||
continue # Skip invoicing, fee validty present
|
||||
practitioner_charge = 0
|
||||
income_account = None
|
||||
service_item = None
|
||||
if appointment.practitioner:
|
||||
service_item, practitioner_charge = get_service_item_and_practitioner_charge(appointment)
|
||||
income_account = get_income_account(appointment.practitioner, appointment.company)
|
||||
appointments_to_invoice.append({
|
||||
'reference_type': 'Patient Appointment',
|
||||
'reference_name': appointment.name,
|
||||
'service': service_item,
|
||||
'rate': practitioner_charge,
|
||||
'income_account': income_account
|
||||
})
|
||||
|
||||
return items_to_invoice
|
||||
return appointments_to_invoice
|
||||
|
||||
|
||||
def get_encounters_to_invoice(patient):
|
||||
def get_encounters_to_invoice(patient, company):
|
||||
encounters_to_invoice = []
|
||||
encounters = frappe.get_list(
|
||||
'Patient Encounter',
|
||||
fields=['*'],
|
||||
filters={'patient': patient.name, 'invoiced': False, 'docstatus': 1}
|
||||
filters={'patient': patient.name, 'company': company, 'invoiced': False, 'docstatus': 1}
|
||||
)
|
||||
if encounters:
|
||||
for encounter in encounters:
|
||||
@ -102,12 +103,12 @@ def get_encounters_to_invoice(patient):
|
||||
return encounters_to_invoice
|
||||
|
||||
|
||||
def get_lab_tests_to_invoice(patient):
|
||||
def get_lab_tests_to_invoice(patient, company):
|
||||
lab_tests_to_invoice = []
|
||||
lab_tests = frappe.get_list(
|
||||
'Lab Test',
|
||||
fields=['name', 'template'],
|
||||
filters={'patient': patient.name, 'invoiced': False, 'docstatus': 1}
|
||||
filters={'patient': patient.name, 'company': company, 'invoiced': False, 'docstatus': 1}
|
||||
)
|
||||
for lab_test in lab_tests:
|
||||
item, is_billable = frappe.get_cached_value('Lab Test Template', lab_test.template, ['item', 'is_billable'])
|
||||
@ -143,12 +144,12 @@ def get_lab_tests_to_invoice(patient):
|
||||
return lab_tests_to_invoice
|
||||
|
||||
|
||||
def get_clinical_procedures_to_invoice(patient):
|
||||
def get_clinical_procedures_to_invoice(patient, company):
|
||||
clinical_procedures_to_invoice = []
|
||||
procedures = frappe.get_list(
|
||||
'Clinical Procedure',
|
||||
fields='*',
|
||||
filters={'patient': patient.name, 'invoiced': False}
|
||||
filters={'patient': patient.name, 'company': company, 'invoiced': False}
|
||||
)
|
||||
for procedure in procedures:
|
||||
if not procedure.appointment:
|
||||
@ -204,7 +205,7 @@ def get_clinical_procedures_to_invoice(patient):
|
||||
return clinical_procedures_to_invoice
|
||||
|
||||
|
||||
def get_inpatient_services_to_invoice(patient):
|
||||
def get_inpatient_services_to_invoice(patient, company):
|
||||
services_to_invoice = []
|
||||
inpatient_services = frappe.db.sql(
|
||||
'''
|
||||
@ -214,10 +215,11 @@ def get_inpatient_services_to_invoice(patient):
|
||||
`tabInpatient Record` ip, `tabInpatient Occupancy` io
|
||||
WHERE
|
||||
ip.patient=%s
|
||||
and ip.company=%s
|
||||
and io.parent=ip.name
|
||||
and io.left=1
|
||||
and io.invoiced=0
|
||||
''', (patient.name), as_dict=1)
|
||||
''', (patient.name, company), as_dict=1)
|
||||
|
||||
for inpatient_occupancy in inpatient_services:
|
||||
service_unit_type = frappe.db.get_value('Healthcare Service Unit', inpatient_occupancy.service_unit, 'service_unit_type')
|
||||
@ -244,12 +246,12 @@ def get_inpatient_services_to_invoice(patient):
|
||||
return services_to_invoice
|
||||
|
||||
|
||||
def get_therapy_sessions_to_invoice(patient):
|
||||
def get_therapy_sessions_to_invoice(patient, company):
|
||||
therapy_sessions_to_invoice = []
|
||||
therapy_sessions = frappe.get_list(
|
||||
'Therapy Session',
|
||||
fields='*',
|
||||
filters={'patient': patient.name, 'invoiced': False}
|
||||
filters={'patient': patient.name, 'invoiced': 0, 'company': company}
|
||||
)
|
||||
for therapy in therapy_sessions:
|
||||
if not therapy.appointment:
|
||||
@ -396,6 +398,7 @@ def check_fee_validity(appointment):
|
||||
|
||||
def manage_fee_validity(appointment):
|
||||
fee_validity = check_fee_validity(appointment)
|
||||
|
||||
if fee_validity:
|
||||
if appointment.status == 'Cancelled' and fee_validity.visited > 0:
|
||||
fee_validity.visited -= 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user