Fix column order of Symptom and Diagnosis

The dimension joiner was not applying any ordering
so it was only using the baseDetailsQuery which
returns rows in a non-guaranteed order.  Adjust
the base query to include the order_id column.