fixed bug for not showing diagnoses rows

was counting procedures instead of diagnoses
minor refactor for supplements
removed unused error flash
Merge branch 'master' into internal