Added forgotten services and first attempt to correct medicalAnalysis logic