fix: wrong query for "Copil cu tulburări mintale și de comportament"

code4romania · Oct 14, 2024 · 38f978b · 38f978b
1 parent c4ae3f5
commit 38f978b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/Reports/Queries/Child/C25.php b/app/Reports/Queries/Child/C25.php
@@ -5,8 +5,10 @@
 namespace App\Reports\Queries\Child;
 
 use App\Models\Beneficiary;
+use App\Models\Disease;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Query\Builder as QueryBuilder;
 
 class C25 extends ReportQuery
 {
@@ -17,8 +19,10 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonContains('properties', 'VSG_TMC')
-                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
+                $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
+            })
+            ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {
+                $query->where('properties->attributes->category', 'VSG_TMC');
             });
     }
 }