Fix issue with multiple measures, enable Done button if patient-based