[OES-125] - more conditional waits in PatientViewNewDiagnosis.php to make sure steps are actually executed