Fix patient_entry behavior, Add alias for diagnosis