resolved conflicts

docker/statistics/Modules/ClinicalData/Services/Drugs/DrugFormsService.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Modules\ClinicalData\Services\Drugs;
+
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use Streamline\Models\DrugForm;
+
+class DrugFormsService
+{
+    public function __construct()
+    {
+    }
+
+    public function pluckAvailableDrugForms(string $valueColumn): Collection
+    {
+        return DB::table('drug_forms')->whereNull('deleted_at')
+            ->pluck($valueColumn, 'id');
+    }
+
+    public function pluckAvailableDrugFormsModels(): DrugForm
+    {
+        return DrugForm::pluck('name', 'id');
+    }
+}