fixes for MCI api changes, also some refactoring for DiagnosisMapper - pulled out constants