pharmacy diagnosis population
Merge branch 'master' of https://github.com/kevinzurek/femr
merging
Merge branch 'master' of https://github.com/kevinzurek/femr
Merge branch 'master' of https://github.com/kevinzurek/femr
redid layout on Triage
did some clean up of the doo doo
did some clean up of the dookie
Initial layout for change to encounter selection on search.
Created new viewmodel for use on the encounter view page. Added statements in searchcontroller to handle requests.
Modified layout to showEncounter.html to better display info. Added more search calls to return required info.
Added treatment fields and database calls. Added new method in searchservice to return all columns in a row.
Added patient problem list section. Fixed some UI issues.
[#69] Added perscriptions info to encounter view.
[#172]Added patient id and gender to duplicate patient results. Fixed other small issues.
fixed record new vitals
[#69] Layout fixes, Fixed date string.
Changed color of list items.
Fixed search bar.
merge pr 177