Diagnosis list on any screen should show up first primary and then secondary