-
diff --git a/erpnext/healthcare/page/medical_record/patient_select.html b/erpnext/healthcare/page/medical_record/patient_select.html
deleted file mode 100644
index 321baf738d7..00000000000
--- a/erpnext/healthcare/page/medical_record/patient_select.html
+++ /dev/null
@@ -1,5 +0,0 @@
-
- {%= date_sep || "" %}
-
-
-
-
-
diff --git a/erpnext/healthcare/page/patient_history/__init__.py b/erpnext/healthcare/page/patient_history/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/healthcare/page/medical_record/medical_record.css b/erpnext/healthcare/page/patient_history/patient_history.css
similarity index 62%
rename from erpnext/healthcare/page/medical_record/medical_record.css
rename to erpnext/healthcare/page/patient_history/patient_history.css
index 977625bbd17..865d6abee00 100644
--- a/erpnext/healthcare/page/medical_record/medical_record.css
+++ b/erpnext/healthcare/page/patient_history/patient_history.css
@@ -14,6 +14,10 @@
margin-bottom: -4px;
}
+.medical_record-row > * {
+ z-index: -999;
+}
+
.date-indicator {
background:none;
font-size:12px;
@@ -35,6 +39,61 @@
color: #5e64ff;
}
+.div-bg-color {
+ background: #fafbfc;
+}
+
+.bg-color-white {
+ background: #FFFFFF;
+}
+
+.d-flex {
+ display: flex;
+}
+
+.width-full {
+ width: 100%;
+}
+
+.p-3 {
+ padding: 16px;
+}
+
+.mt-2 {
+ margin-top: 8px;
+}
+
+.mr-3 {
+ margin-right: 16px;
+}
+
+.Box {
+ background-color: #fff;
+ border: 1px solid #d1d5da;
+ border-radius: 3px;
+}
+
+.flex-column {
+ flex-direction: column;
+}
+
+.avatar {
+ display: inline-block;
+ overflow: hidden;
+ line-height: 1;
+ vertical-align: middle;
+ border-radius: 3px;
+}
+
+.py-3 {
+ padding-top: 16px;
+ padding-bottom: 16px;
+}
+
+.border-bottom {
+ border-bottom: 1px #e1e4e8 solid;
+}
+
.date-indicator.blue::after {
background: #5e64ff;
}
@@ -65,8 +124,3 @@
#page-medical_record .list-filters {
display: none ;
}
-
-#page-medical_record .octicon-heart {
- color: #ff5858;
- margin: 0px 5px;
-}
diff --git a/erpnext/healthcare/page/patient_history/patient_history.html b/erpnext/healthcare/page/patient_history/patient_history.html
new file mode 100644
index 00000000000..7a9446dffd7
--- /dev/null
+++ b/erpnext/healthcare/page/patient_history/patient_history.html
@@ -0,0 +1,20 @@
+{%= __("Select Patient") %}
- -
+
\ No newline at end of file
diff --git a/erpnext/healthcare/page/patient_history/patient_history.js b/erpnext/healthcare/page/patient_history/patient_history.js
new file mode 100644
index 00000000000..87fe7edd297
--- /dev/null
+++ b/erpnext/healthcare/page/patient_history/patient_history.js
@@ -0,0 +1,300 @@
+frappe.provide("frappe.patient_history");
+frappe.pages['patient_history'].on_page_load = function(wrapper) {
+ var me = this;
+ var page = frappe.ui.make_app_page({
+ parent: wrapper,
+ title: 'Patient History',
+ single_column: true
+ });
+
+ frappe.breadcrumbs.add("Healthcare");
+ let pid = '';
+ page.main.html(frappe.render_template("patient_history", {}));
+ var patient = frappe.ui.form.make_control({
+ parent: page.main.find(".patient"),
+ df: {
+ fieldtype: "Link",
+ options: "Patient",
+ fieldname: "patient",
+ change: function(){
+ if(pid != patient.get_value() && patient.get_value()){
+ me.start = 0;
+ me.page.main.find(".patient_documents_list").html("");
+ get_documents(patient.get_value(), me);
+ show_patient_info(patient.get_value(), me);
+ show_patient_vital_charts(patient.get_value(), me, "bp", "mmHg", "Blood Pressure");
+ }
+ pid = patient.get_value();
+ }
+ },
+ only_input: true,
+ });
+ patient.refresh();
+
+ if (frappe.route_options){
+ patient.set_value(frappe.route_options.patient);
+ }
+
+ this.page.main.on("click", ".btn-show-chart", function() {
+ var btn_show_id = $(this).attr("data-show-chart-id"), pts = $(this).attr("data-pts");
+ var title = $(this).attr("data-title");
+ show_patient_vital_charts(patient.get_value(), me, btn_show_id, pts, title);
+ });
+
+ this.page.main.on("click", ".btn-more", function() {
+ var doctype = $(this).attr("data-doctype"), docname = $(this).attr("data-docname");
+ if(me.page.main.find("."+docname).parent().find('.document-html').attr('data-fetched') == "1"){
+ me.page.main.find("."+docname).hide();
+ me.page.main.find("."+docname).parent().find('.document-html').show();
+ }else{
+ if(doctype && docname){
+ let exclude = ["patient", "patient_name", 'patient_sex', "encounter_date"];
+ frappe.call({
+ method: "erpnext.healthcare.utils.render_doc_as_html",
+ args:{
+ doctype: doctype,
+ docname: docname,
+ exclude_fields: exclude
+ },
+ callback: function(r) {
+ if (r.message){
+ me.page.main.find("."+docname).hide();
+ me.page.main.find("."+docname).parent().find('.document-html').html(r.message.html+"\
+ ");
+ me.page.main.find("."+docname).parent().find('.document-html').show();
+ me.page.main.find("."+docname).parent().find('.document-html').attr('data-fetched', "1");
+ }
+ },
+ freeze: true
+ });
+ }
+ }
+ });
+
+ this.page.main.on("click", ".btn-less", function() {
+ var docname = $(this).attr("data-docname");
+ me.page.main.find("."+docname).parent().find('.document-id').show();
+ me.page.main.find("."+docname).parent().find('.document-html').hide();
+ });
+ me.start = 0;
+ me.page.main.on("click", ".btn-get-records", function(){
+ get_documents(patient.get_value(), me);
+ });
+};
+
+var get_documents = function(patient, me){
+ frappe.call({
+ "method": "erpnext.healthcare.page.patient_history.patient_history.get_feed",
+ args: {
+ name: patient,
+ start: me.start,
+ page_length: 20
+ },
+ callback: function (r) {
+ var data = r.message;
+ if(data.length){
+ add_to_records(me, data);
+ }else{
+ me.page.main.find(".patient_documents_list").append("
+
+ {%= __("Select Patient") %}
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+ No more records..
- ";
+ var i;
+ for(i=0; i
`;
+ if (data[i].imgsrc){
+ details += `
+ 
+
+ `;
+ }else{
+ details += `
+ `;
+ }
+ }
+ details += "${data[i].practitioner ? data[i].practitioner.charAt(0) : "U"}
`;
+ }
+ details += `
+
+
+ `+time_line_heading+` on
+
+ ${data[i].date_sep}
+
+
+
+ ${label}
+
+
+
+
+
+
+
+
+ No more records..
" + data.sex; + if(data.email) details += "
" + data.email; + if(data.mobile) details += "
" + data.mobile; + if(data.occupation) details += "
Occupation : " + data.occupation; + if(data.blood_group) details += "
Blood group : " + data.blood_group; + if(data.allergies) details += "
Allergies : "+ data.allergies.replace("\n", "
"); + if(data.medication) details += "
Medication : "+ data.medication.replace("\n", "
"); + if(data.alcohol_current_use) details += "
Alcohol use : "+ data.alcohol_current_use; + if(data.alcohol_past_use) details += "
Alcohol past use : "+ data.alcohol_past_use; + if(data.tobacco_current_use) details += "
Tobacco use : "+ data.tobacco_current_use; + if(data.tobacco_past_use) details += "
Tobacco past use : "+ data.tobacco_past_use; + if(data.medical_history) details += "
Medical history : "+ data.medical_history.replace("\n", "
"); + if(data.surgical_history) details += "
Surgical history : "+ data.surgical_history.replace("\n", "
"); + if(data.surrounding_factors) details += "
Occupational hazards : "+ data.surrounding_factors.replace("\n", "
"); + if(data.other_risk_factors) details += "
Other risk factors : " + data.other_risk_factors.replace("\n", "
"); + if(data.patient_details) details += "
More info : " + data.patient_details.replace("\n", "
"); + + if(details){ + details = "
" + details + "
";
+ }
+ me.page.main.find(".patient_details").html(details);
+ }
+ });
+};
+
+var show_patient_vital_charts = function(patient, me, btn_show_id, pts, title) {
+ frappe.call({
+ method: "erpnext.healthcare.utils.get_patient_vitals",
+ args:{
+ patient: patient
+ },
+ callback: function(r) {
+ if (r.message){
+ var show_chart_btns_html = "";
+ me.page.main.find(".show_chart_btns").html(show_chart_btns_html);
+ var data = r.message;
+ let labels = [], datasets = [];
+ let bp_systolic = [], bp_diastolic = [], temperature = [];
+ let pulse = [], respiratory_rate = [], bmi = [], height = [], weight = [];
+ for(var i=0; i"
+ for doc in docs:
+ docs_html += render_doc_as_html(doc['doctype'], doc['docname'])['html'] + "
" + return {'html': docs_html} + +@frappe.whitelist() +def render_doc_as_html(doctype, docname, exclude_fields = []): + #render document as html, three column layout will break + doc = frappe.get_doc(doctype, docname) + meta = frappe.get_meta(doctype) + doc_html = ""
+ while col_on:
+ doc_html += "
"
+ col_on -= 1
+ sec_on = True
+ has_data= False
+ col_on = 0
+ section_html = ""
+ html = ""
+ if df.label:
+ section_label = df.label
+ continue
+ #on column break append html to section html or doc html
+ if df.fieldtype == "Column Break":
+ if sec_on and has_data:
+ section_html += "" + return {'html': docs_html} + +@frappe.whitelist() +def render_doc_as_html(doctype, docname, exclude_fields = []): + #render document as html, three column layout will break + doc = frappe.get_doc(doctype, docname) + meta = frappe.get_meta(doctype) + doc_html = "
"
+ section_html = ""
+ section_label = ""
+ html = ""
+ sec_on = False
+ col_on = 0
+ has_data = False
+ for df in meta.fields:
+ #on section break append append previous section and html to doc html
+ if df.fieldtype == "Section Break":
+ if has_data and col_on and sec_on:
+ doc_html += section_html + html + "
"
+ elif has_data and not col_on and sec_on:
+ doc_html += "" \
+ + section_html + html +"
" + section_label + "" + html + "
"
+ elif has_data:
+ doc_html += ""
+ if doc_html:
+ doc_html = ""
+
+ return {'html': doc_html}
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 571c2dc75b4..a29378547ea 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -605,6 +605,7 @@ erpnext.patches.v11_1.delete_scheduling_tool
erpnext.patches.v12_0.make_custom_fields_for_bank_remittance #14-06-2019
execute:frappe.delete_doc_if_exists("Page", "support-analytics")
erpnext.patches.v12_0.make_item_manufacturer
+erpnext.patches.v12_0.remove_patient_medical_record_page
erpnext.patches.v11_1.move_customer_lead_to_dynamic_column
erpnext.patches.v11_1.set_default_action_for_quality_inspection
erpnext.patches.v11_1.delete_bom_browser
diff --git a/erpnext/patches/v12_0/remove_patient_medical_record_page.py b/erpnext/patches/v12_0/remove_patient_medical_record_page.py
new file mode 100644
index 00000000000..904bfe4bf19
--- /dev/null
+++ b/erpnext/patches/v12_0/remove_patient_medical_record_page.py
@@ -0,0 +1,7 @@
+# Copyright (c) 2019
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ frappe.delete_doc("Page", "medical_record")
" + html + "
"
+ elif sec_on and not col_on:
+ section_html += "
"
+ elif sec_on and not col_on and has_data:
+ doc_html += ""
+ html = ""
+ col_on += 1
+ if df.label:
+ html += '
' + df.label + continue + #on table iterate in items and create table based on in_list_view, append to section html or doc html + if df.fieldtype == "Table": + items = doc.get(df.fieldname) + if not items: continue + child_meta = frappe.get_meta(df.options) + if not has_data : has_data = True + table_head = "" + table_row = "" + create_head = True + for item in items: + table_row += ''
+ for cdf in child_meta.fields:
+ if cdf.in_list_view:
+ if create_head:
+ table_head += '' + cdf.label + ' '
+ if item.get(cdf.fieldname):
+ table_row += '' + str(item.get(cdf.fieldname)) \
+ + ' '
+ else:
+ table_row += ' '
+ if sec_on:
+ section_html += '' + table_head + table_row + '
'
+ else:
+ html += '' \
+ + table_head + table_row + '
'
+ continue
+ #on other field types add label and value to html
+ if not df.hidden and not df.print_hide and doc.get(df.fieldname) and df.fieldname not in exclude_fields:
+ html += "
{0} : {1}".format(df.label or df.fieldname, \ + doc.get(df.fieldname)) + if not has_data : has_data = True + if sec_on and col_on and has_data: + doc_html += section_html + html + "
' + df.label + continue + #on table iterate in items and create table based on in_list_view, append to section html or doc html + if df.fieldtype == "Table": + items = doc.get(df.fieldname) + if not items: continue + child_meta = frappe.get_meta(df.options) + if not has_data : has_data = True + table_head = "" + table_row = "" + create_head = True + for item in items: + table_row += '
{0} : {1}".format(df.label or df.fieldname, \ + doc.get(df.fieldname)) + if not has_data : has_data = True + if sec_on and col_on and has_data: + doc_html += section_html + html + "
" \
+ + section_html + html +"