diff --git a/foundation/www/docs/assets/img/healthcare/appointment_1.png b/foundation/www/docs/assets/img/healthcare/appointment_1.png
old mode 100755
new mode 100644
index afd308df..f035651b
Binary files a/foundation/www/docs/assets/img/healthcare/appointment_1.png and b/foundation/www/docs/assets/img/healthcare/appointment_1.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/appointment_2.png b/foundation/www/docs/assets/img/healthcare/appointment_2.png
old mode 100755
new mode 100644
index 104a9197..5189b1c5
Binary files a/foundation/www/docs/assets/img/healthcare/appointment_2.png and b/foundation/www/docs/assets/img/healthcare/appointment_2.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/appointment_3.png b/foundation/www/docs/assets/img/healthcare/appointment_3.png
old mode 100755
new mode 100644
index 004a9788..00114af7
Binary files a/foundation/www/docs/assets/img/healthcare/appointment_3.png and b/foundation/www/docs/assets/img/healthcare/appointment_3.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/appointment_calendar.png b/foundation/www/docs/assets/img/healthcare/appointment_calendar.png
new file mode 100644
index 00000000..e6f83934
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/appointment_calendar.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/consultation_3.png b/foundation/www/docs/assets/img/healthcare/consultation_3.png
deleted file mode 100755
index e2804a91..00000000
Binary files a/foundation/www/docs/assets/img/healthcare/consultation_3.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/healthcare/consultation_4.png b/foundation/www/docs/assets/img/healthcare/consultation_4.png
deleted file mode 100755
index 3f9817ca..00000000
Binary files a/foundation/www/docs/assets/img/healthcare/consultation_4.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/healthcare/consultation_1.png b/foundation/www/docs/assets/img/healthcare/encounter_1.png
similarity index 100%
rename from foundation/www/docs/assets/img/healthcare/consultation_1.png
rename to foundation/www/docs/assets/img/healthcare/encounter_1.png
diff --git a/foundation/www/docs/assets/img/healthcare/consultation_2.png b/foundation/www/docs/assets/img/healthcare/encounter_2.png
similarity index 100%
rename from foundation/www/docs/assets/img/healthcare/consultation_2.png
rename to foundation/www/docs/assets/img/healthcare/encounter_2.png
diff --git a/foundation/www/docs/assets/img/healthcare/encounter_3.png b/foundation/www/docs/assets/img/healthcare/encounter_3.png
new file mode 100644
index 00000000..6ec7abbb
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/encounter_3.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/encounter_4.png b/foundation/www/docs/assets/img/healthcare/encounter_4.png
new file mode 100644
index 00000000..57a76ddc
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/encounter_4.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/get_items.png b/foundation/www/docs/assets/img/healthcare/get_items.png
new file mode 100644
index 00000000..4399c2df
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/get_items.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/item_custom_fields.png b/foundation/www/docs/assets/img/healthcare/item_custom_fields.png
new file mode 100644
index 00000000..46509f59
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/item_custom_fields.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/medical_record_1.png b/foundation/www/docs/assets/img/healthcare/medical_record_1.png
old mode 100755
new mode 100644
index 60586525..275eacf9
Binary files a/foundation/www/docs/assets/img/healthcare/medical_record_1.png and b/foundation/www/docs/assets/img/healthcare/medical_record_1.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/medical_record_2.png b/foundation/www/docs/assets/img/healthcare/medical_record_2.png
old mode 100755
new mode 100644
index a4827041..03c133ec
Binary files a/foundation/www/docs/assets/img/healthcare/medical_record_2.png and b/foundation/www/docs/assets/img/healthcare/medical_record_2.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/patient_1.png b/foundation/www/docs/assets/img/healthcare/patient_1.png
old mode 100755
new mode 100644
index 03728aff..8b3910d0
Binary files a/foundation/www/docs/assets/img/healthcare/patient_1.png and b/foundation/www/docs/assets/img/healthcare/patient_1.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/patient_2.png b/foundation/www/docs/assets/img/healthcare/patient_2.png
index 2a632c7a..738ce2cc 100755
Binary files a/foundation/www/docs/assets/img/healthcare/patient_2.png and b/foundation/www/docs/assets/img/healthcare/patient_2.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/patient_3.png b/foundation/www/docs/assets/img/healthcare/patient_3.png
deleted file mode 100755
index 738ce2cc..00000000
Binary files a/foundation/www/docs/assets/img/healthcare/patient_3.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/healthcare/physician_1.png b/foundation/www/docs/assets/img/healthcare/physician_1.png
deleted file mode 100755
index f5705151..00000000
Binary files a/foundation/www/docs/assets/img/healthcare/physician_1.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/healthcare/physician_2.png b/foundation/www/docs/assets/img/healthcare/physician_2.png
deleted file mode 100755
index 7b3d1edf..00000000
Binary files a/foundation/www/docs/assets/img/healthcare/physician_2.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/healthcare/physician_schedule_1.png b/foundation/www/docs/assets/img/healthcare/physician_schedule_1.png
deleted file mode 100755
index a9102e24..00000000
Binary files a/foundation/www/docs/assets/img/healthcare/physician_schedule_1.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/healthcare/physician_schedule_2.png b/foundation/www/docs/assets/img/healthcare/physician_schedule_2.png
deleted file mode 100755
index d9105688..00000000
Binary files a/foundation/www/docs/assets/img/healthcare/physician_schedule_2.png and /dev/null differ
diff --git a/foundation/www/docs/assets/img/healthcare/practitioner_1.png b/foundation/www/docs/assets/img/healthcare/practitioner_1.png
new file mode 100644
index 00000000..798c99aa
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/practitioner_1.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/practitioner_2.png b/foundation/www/docs/assets/img/healthcare/practitioner_2.png
new file mode 100644
index 00000000..58252edd
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/practitioner_2.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/practitioner_schedule_1.png b/foundation/www/docs/assets/img/healthcare/practitioner_schedule_1.png
new file mode 100644
index 00000000..0c6c2bd6
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/practitioner_schedule_1.png differ
diff --git a/foundation/www/docs/assets/img/healthcare/practitioner_schedule_2.png b/foundation/www/docs/assets/img/healthcare/practitioner_schedule_2.png
new file mode 100644
index 00000000..66ea5ddd
Binary files /dev/null and b/foundation/www/docs/assets/img/healthcare/practitioner_schedule_2.png differ
diff --git a/foundation/www/docs/assets/img/human-resources/attendence-upload.png b/foundation/www/docs/assets/img/human-resources/attendence-upload.png
deleted file mode 100755
index d3394c2f..00000000
Binary files a/foundation/www/docs/assets/img/human-resources/attendence-upload.png and /dev/null differ
diff --git a/foundation/www/docs/user/manual/en/healthcare/appointment.md b/foundation/www/docs/user/manual/en/healthcare/appointment.md
index 3afa7944..b1edde70 100755
--- a/foundation/www/docs/user/manual/en/healthcare/appointment.md
+++ b/foundation/www/docs/user/manual/en/healthcare/appointment.md
@@ -2,35 +2,44 @@
# Patient Appointment
ERPNext Healthcare allows you to book Patient appointments for any date and if configured, send them alerts via Email or SMS.
-You can create a Patient Appointment from
-> Healthcare > Patient Appointment > New Patient Appointment
+
-You can book appointments for a registered Patient by searching and selecting the Patient field. You can search the Patient by Patient ID, Name, Email or Mobile number. You can also register a new Patient from the Appointment screen by selecting "Create a new patient" in the Patient field.
+You can create a Patient Appointment from
+`Healthcare > Patient Appointment > New Patient Appointment`
+
+You can book appointments for a registered Patient by searching and selecting the Patient field. The Patient Appointment form allows you to search the Patient by Patient ID, Name, Email or Mobile number. You can also register a new Patient from the Appointment screen by selecting `Create a new Patient` in the Patient field.
-If you have a front desk executive to manage your appointments, you can configure a user role to have access to Patient Appointment so that she can do the bookings by selecting the Physician whom the Patient wish to consult and the date for booking. "Check Availability" button will pop up all the available time slots with status indicators for the date. She can select a time slot and "Book" the Appointment for the Patient.
+If you have a front desk executive to manage your appointments, you can configure a user role to have access to Patient Appointment so that she can do the bookings by selecting the Physician whom the Patient wish to consult and the date for booking.
+
+Note that, selecting the `Appointment Type` will automatically set the duration of the appointment as configured.
+
+`Check Availability` button will pop up all the available time slots with status indicators for the selected date. She can select a time slot and `Book` the Appointment for the Patient.
-After Booking, the scheduled time of the Appointment and duration will be updated and seved in the document.
+Once booked, the scheduled time of the Appointment and the Service Unit as per the Practitioner and appropriate Status will be set in the document. The More Info section of Patient Appointment, user can add *Notes* and also select a *Referring Practitioner* to help you track manage referrals.
+
+Optionally, you can configure ERPNext to automatically send an SMS alert to the Patient about the booking confirmation -
+
+`Healthcare > Healthcare Settings > Out Patient SMS Alerts`
+
+### Invoicing
+ERPNext Healthcare allows you to automatically create Invoice as you book an Appointment. To enable this option, you can turn on this option
+
+`Healthcare > Healthcare Settings > Out Patient SMS Alerts`
+
+If enabled, the Patient Appointment will prompt you to select the *Mode of Payment* and enter the *Amount* collected as the Consultation Charge.
-You can configure ERPNext to send an SMS alert to the Patient about the booking confirmation or a reminder on the day of Appointment by doing necessary configurations in -
-
-> Healthcare > Healthcare Settings > Out Patient SMS Alerts
-
-The screen also allows the executive to select a Referring Physician so that you can track the source the appointment.
-
### Actions
- * Billing: If you collect the consultation fee while booking the Appointment itself you can do so by using the "Create > Invoice" button. This will take you to the ERPNext Accounts Sales Invoice screen.
+ * Vital Signs: `Create > Vital Signs` button will take you to the new Vital Signs screen to record the vitals of the Patient.
- * Vital Signs: "Create > Vital Signs" button will take you to the new Vital Signs screen to record the vitals of the Patient.
+ * Encounter: From the Appointment screen you can directly create and record the `Patient Encounter` to record the details of the visit.
- * Consultation: From the Appointment screen you can directly create a Consultation to record the details of patient encounter.
-
- * View Patient Medical Record.
+ * View `Patient Medical History`.
> Note: User should have privileges (User Role) to view the buttons
diff --git a/foundation/www/docs/user/manual/en/healthcare/consultation.md b/foundation/www/docs/user/manual/en/healthcare/consultation.md
deleted file mode 100755
index 640ae569..00000000
--- a/foundation/www/docs/user/manual/en/healthcare/consultation.md
+++ /dev/null
@@ -1,29 +0,0 @@
-
-# Consultation
-ERPNext Healthcare allows you to record Patient encounters through the Consultation document. You can create a Consultation based on a previously booked Appointment or directly by creating a new Consultation
->Healthcare > Consultation > Consultation
-
-If you are creating the Consultation document from an Appointment, Patient and other related data will automatically be populated else you can search the Patient by name, email phone number etc. The Patient Details section will list the latest Vital Signs record of the patient and other information captured in the Patient screen.
-
-
-
-### Assessment
-
-Encounter Impression section allows you to select (or create new) Complaints and your assessment based on the presented complaints. You can opt to include the captured data in Consultation print by selecting the "In Print" flag
-
-
-
-### Prescriptions
-
-You can prescribe medicines in the Drug Prescription section by selecting the drug codes (Stock Item) and appropriate dosages. If you are not managing Stock and Items are not configured, you can simply enter the Medicine name and strength in the Strength field which will printed.
-
-Prescribing a laboratory investigation is similar and if you have Lab Tests configured, you can select from the list. Or key in the Lab Test name to be printed as part of the Prescription.
-
-
-
-### Medical Coding
-You can also attach one or more Medical Codes to designate the Diagnosis in the Medical Coding Section. You will have to select the Medical Code Standard you wish to encode the diagnosis and then select the Code by searching the Code itself or the Code Description.
-
-
-
-{next}
diff --git a/foundation/www/docs/user/manual/en/healthcare/healthcare_practitioner.md b/foundation/www/docs/user/manual/en/healthcare/healthcare_practitioner.md
new file mode 100755
index 00000000..121afcd0
--- /dev/null
+++ b/foundation/www/docs/user/manual/en/healthcare/healthcare_practitioner.md
@@ -0,0 +1,21 @@
+
+# Healthcare Practitioner
+ERPNext Healthcare allows you to create multiple practitioners and optionally link to a User with appropriate Roles. You can create a Practitioner here -
+
+`Healthcare > Masters > Healthcare Practitioner`
+
+
+
+To enable access to ERPNext, you may want to attach a User with `Physician` role for the practitioner. Most Patient related documents like the Encounter, Vitals etc. offer only limited access to other roles. It's also possible that you can associate a Healthcare Practitioner to an Employee so as to utilize the many features like Leaves, Payroll etc.
+
+>Note: You should also relate the User to an Employee to utilize the various features of Human Resources module.
+
+### Availability and Charges
+You can select multiple schedules for each practitioner and optionally the service unit at which the practitioner will be available. Also, you can set the consultation charges which are applicable to the practitioner. If required you can select an Income Account for a Physician to book all Consultation charges into separate accounts.
+
+
+
+### Referring Physicians
+You may also want to manage a list of Doctors who refers Patients to your facility. You can manage such data in the Healthcare Practitioner document itself by leaving out the User link.
+
+{next}
diff --git a/foundation/www/docs/user/manual/en/healthcare/index.md b/foundation/www/docs/user/manual/en/healthcare/index.md
index 4a926cf5..413cd58f 100755
--- a/foundation/www/docs/user/manual/en/healthcare/index.md
+++ b/foundation/www/docs/user/manual/en/healthcare/index.md
@@ -1,19 +1,21 @@
# Healthcare
-Life is priceless, and you as a medical practioner needs a best tools to honour it. ERPNext Healthcare domain is a humble initiative to help you serve your patients better.
+Life is priceless, and you, as a healthcare practitioner needs the best of the tools to honor it. ERPNext Healthcare domain is a humble initiative to help you serve your patients better.
### What Healthcare Module Covers
-ERPNext Healthcare helps you manage your clinic or practice efficiently by scheduling **Appointments** and recording **Patient Encounters** (Consultations). You can easily pull out a **Patient's Health Record** anytime to review all the history of treatments assisting you in providing effective, high quality care.
+ERPNext Healthcare helps you manage your hospital, clinic or practice efficiently by scheduling **Appointments** and recording **Patient Encounters**. You can easily pull out a **Patient's Medical History** anytime to review the list of past conditions and treatments assisting you in providing effective, high quality care. It allows to easily search for ICD-10 Medical Codes simplifying the coding process. ERPNext Healthcare also comes with a Laboratory module with predefined templates for recording common Lab Tests.
+With ERPNext version 11, Healthcare module helps you to define templates for Clinical Procedures, schedule appointments for procedures and also record stock consumption while performing the procedure. Inpatient admission scheduling, Transfer, Discharge and related billing features are also made available
+
### Contributors of ERPNext Healthcare module
-The healthcare domain of ERPNext is a first domain to be competely contributed by a ERPNext community member, Earthians. Listen to Anoop, founder of Earthian on what motivated him to venture into Healthcare domain and how it benefit all the stack-holders of the community.
+The healthcare domain of ERPNext is a first domain to be completely contributed by a ERPNext community member, earthians. Listen to Anoop, founder of earthians on what motivated him to venture into Healthcare domain and how it benefit all the stake holders of the community.