Vinay | Consume new service for active drugs

Conflicts:
	ui/app/clinical/controllers/patientDashboardTreatmentController.js
	ui/app/clinical/services/treatmentService.js