Feature/reversing distribution

Reversing distribution to patient and to service