refactored Doctor service