refactored all currently implemented metrics for Patient