Encounter closing for no dr visit
Replaced empty ifs to improve readability
Closing for pharm
Removed unused code and moved some code around
Merge pull request #279 from Cohen-Carlisle/featureEncounterClosing

Encounter closing