[OE-2546] linked benefits and risks to subspecialty rather than service
Merge branch 'jira/2546' into feature/orbis