Last Commit
Update

Fix Patient Info when doctor dept and encounter dept is same or not
Merge branch 'master' of https://github.com/alvinjay/DoctorsDashboard into editable
Update

Patient List based on Department of Doctor
Merge with xian

Conflicts:
	CalculationsActivity.java
calculations updates