2165: Fixing defect and refactoring radiology records mapper