[#ARCH-97] Adjust query for matching Patient ID to changed Patient Model