[OE-4660] advanced patient search
[OE-4660] advanced patient search refactor