Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: capture symptoms, diagnosis in Table Multiselect instead of Small Text

Browse Source
This commit is contained in:
Rucha Mahabal 2020-02-26 17:11:19 +05:30
parent 22351adac5
commit a61bf44328
10 changed files with 102 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/healthcare/doctype/drug_prescription/drug_prescription.json
View File

@ -27,15 +27,15 @@
"ignore_user_permissions": 1,
"in_list_view": 1,
"label": "Drug",
"options": "Item"
"options": "Item",
"reqd": 1
},
{
"fetch_from": "drug_code.item_name",
"fieldname": "drug_name",
"fieldtype": "Data",
"in_list_view": 1,
"label": "Drug Name / Description",
"reqd": 1
"label": "Drug Name / Description"
},
{
"fieldname": "dosage",
@ -104,7 +104,7 @@
],
"istable": 1,
"links": [],
"modified": "2020-02-26 15:33:29.365369",
"modified": "2020-02-26 17:02:42.741338",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Drug Prescription",

5
erpnext/healthcare/doctype/lab_prescription/lab_prescription.json
View File

@ -22,7 +22,8 @@
"ignore_user_permissions": 1,
"in_list_view": 1,
"label": "Lab Test",
"options": "Lab Test Template"
"options": "Lab Test Template",
"reqd": 1
},
{
"fetch_from": "lab_test_code.lab_test_name",
@ -65,7 +66,7 @@
],
"istable": 1,
"links": [],
"modified": "2020-02-26 15:30:29.847503",
"modified": "2020-02-26 17:03:00.255560",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Lab Prescription",

24
erpnext/healthcare/doctype/patient_encounter/patient_encounter.js
View File

@ -219,30 +219,6 @@ let create_procedure = function (frm) {
frappe.new_doc('Clinical Procedure');
};
frappe.ui.form.on('Patient Encounter', 'symptoms_select', function(frm) {
if (frm.doc.symptoms_select) {
let symptoms = null;
if (frm.doc.symptoms)
symptoms = frm.doc.symptoms + '\n' +frm.doc.symptoms_select;
else
symptoms = frm.doc.symptoms_select;
frappe.model.set_value(frm.doctype,frm.docname, 'symptoms', symptoms);
frappe.model.set_value(frm.doctype,frm.docname, 'symptoms_select', null);
}
});
frappe.ui.form.on('Patient Encounter', 'diagnosis_select', function(frm) {
if (frm.doc.diagnosis_select) {
let diagnosis = null;
if(frm.doc.diagnosis)
diagnosis = frm.doc.diagnosis + '\n' +frm.doc.diagnosis_select;
else
diagnosis = frm.doc.diagnosis_select;
frappe.model.set_value(frm.doctype,frm.docname, 'diagnosis', diagnosis);
frappe.model.set_value(frm.doctype,frm.docname, 'diagnosis_select', null);
}
});
frappe.ui.form.on('Drug Prescription', {
dosage: function(frm, cdt, cdn){
frappe.model.set_value(cdt, cdn, 'update_schedule', 1);

36
erpnext/healthcare/doctype/patient_encounter/patient_encounter.json
View File

@ -29,11 +29,9 @@
"column_break_17",
"inpatient_status",
"sb_symptoms",
"symptoms_select",
"symptoms",
"symptoms_in_print",
"physical_examination",
"diagnosis_select",
"diagnosis",
"diagnosis_in_print",
"codification",
@ -157,21 +155,13 @@
"fieldtype": "Section Break",
"label": "Encounter Impression"
},
{
"fieldname": "symptoms_select",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Complaints",
"no_copy": 1,
"options": "Complaint",
"print_hide": 1,
"report_hide": 1
},
{
"fieldname": "symptoms",
"fieldtype": "Small Text",
"fieldtype": "Table MultiSelect",
"ignore_xss_filter": 1,
"no_copy": 1
"label": "Symptoms",
"no_copy": 1,
"options": "Patient Encounter Symptom"
},
{
"default": "0",
@ -187,20 +177,12 @@
"fieldtype": "Column Break"
},
{
"fieldname": "diagnosis_select",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"fieldname": "diagnosis",
"fieldtype": "Table MultiSelect",
"ignore_xss_filter": 1,
"label": "Diagnosis",
"no_copy": 1,
"options": "Diagnosis",
"print_hide": 1,
"report_hide": 1
},
{
"fieldname": "diagnosis",
"fieldtype": "Small Text",
"ignore_xss_filter": 1,
"no_copy": 1
"options": "Patient Encounter Diagnosis"
},
{
"default": "1",
@ -308,7 +290,7 @@
],
"is_submittable": 1,
"links": [],
"modified": "2020-02-26 15:10:33.240817",
"modified": "2020-02-26 16:50:52.141816",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Patient Encounter",

0
erpnext/healthcare/doctype/patient_encounter_diagnosis/__init__.py Normal file
View File

33
erpnext/healthcare/doctype/patient_encounter_diagnosis/patient_encounter_diagnosis.json Normal file
View File

@ -0,0 +1,33 @@
{
"actions": [],
"beta": 1,
"creation": "2020-02-26 16:48:16.835105",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"diagnosis"
],
"fields": [
{
"fieldname": "diagnosis",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Diagnosis",
"options": "Diagnosis",
"reqd": 1
}
],
"istable": 1,
"links": [],
"modified": "2020-02-26 16:58:16.480583",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Patient Encounter Diagnosis",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}

10
erpnext/healthcare/doctype/patient_encounter_diagnosis/patient_encounter_diagnosis.py Normal file
View File

@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document
class PatientEncounterDiagnosis(Document):
pass

0
erpnext/healthcare/doctype/patient_encounter_symptom/__init__.py Normal file
View File

33
erpnext/healthcare/doctype/patient_encounter_symptom/patient_encounter_symptom.json Normal file
View File

@ -0,0 +1,33 @@
{
"actions": [],
"beta": 1,
"creation": "2020-02-26 16:47:00.525657",
"doctype": "DocType",
"editable_grid": 1,
"engine": "InnoDB",
"field_order": [
"complaint"
],
"fields": [
{
"fieldname": "complaint",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Complaint",
"options": "Complaint",
"reqd": 1
}
],
"istable": 1,
"links": [],
"modified": "2020-02-26 16:57:37.997481",
"modified_by": "Administrator",
"module": "Healthcare",
"name": "Patient Encounter Symptom",
"owner": "Administrator",
"permissions": [],
"quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}

10
erpnext/healthcare/doctype/patient_encounter_symptom/patient_encounter_symptom.py Normal file
View File

@ -0,0 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
# import frappe
from frappe.model.document import Document
class PatientEncounterSymptom(Document):
pass