From ba6cb8ae4be8bccb0b7abe36c351653b1dcd885c Mon Sep 17 00:00:00 2001
From: Shreya Shah <shreyashah115@gmail.com>
Date: Mon, 14 May 2018 14:06:31 +0530
Subject: [PATCH] [Healthcare] Fix UI (#14011)

* Fix UI

* Fix Calendar View
---
 erpnext/healthcare/doctype/patient/patient.js              | 7 +++++--
 .../patient_appointment/patient_appointment_calendar.js    | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/erpnext/healthcare/doctype/patient/patient.js b/erpnext/healthcare/doctype/patient/patient.js
index b1150abb3a..b40f78d383 100644
--- a/erpnext/healthcare/doctype/patient/patient.js
+++ b/erpnext/healthcare/doctype/patient/patient.js
@@ -40,7 +40,7 @@ frappe.ui.form.on('Patient', {
 	},
 	onload: function (frm) {
 		if(!frm.doc.dob){
-			$(frm.fields_dict['age_html'].wrapper).html("Age not specified");
+			$(frm.fields_dict['age_html'].wrapper).html("");
 		}
 		if(frm.doc.dob){
 			$(frm.fields_dict['age_html'].wrapper).html("AGE : " + get_age(frm.doc.dob));
@@ -49,7 +49,7 @@ frappe.ui.form.on('Patient', {
 });
 
 frappe.ui.form.on("Patient", "dob", function(frm) {
-	if(frm.doc.dob){
+	if(frm.doc.dob) {
 		var today = new Date();
 		var birthDate = new Date(frm.doc.dob);
 		if(today < birthDate){
@@ -61,6 +61,9 @@ frappe.ui.form.on("Patient", "dob", function(frm) {
 			$(frm.fields_dict['age_html'].wrapper).html("AGE : " + age_str);
 		}
 	}
+	else {
+		$(frm.fields_dict['age_html'].wrapper).html("");
+	}
 });
 
 var create_medical_record = function (frm) {
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment_calendar.js b/erpnext/healthcare/doctype/patient_appointment/patient_appointment_calendar.js
index c35e397801..dfff5a4f6e 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment_calendar.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment_calendar.js
@@ -1,8 +1,8 @@
 
 frappe.views.calendar["Patient Appointment"] = {
 	field_map: {
-		"start": "appointment_date",
-		"end": "appointment_datetime",
+		"start": "start",
+		"end": "end",
 		"id": "name",
 		"title": "patient",
 		"allDay": "allDay",
@@ -43,4 +43,4 @@ frappe.views.calendar["Patient Appointment"] = {
 			'label': __('Status')
 		}
 	]
-};
+};
\ No newline at end of file