[OE-3496] Fixes for adding and removing ophthalmic diagnoses
Removed redundant id
Fixed conflicts
[OE-3496] Fixed Systemic Diagnoses