update reports

andreiio · andreiio · commit 8389598e4e2a · 2026-02-17T15:28:05.000Z
diff --git a/app/Reports/Queries/Child/C04.php b/app/Reports/Queries/Child/C04.php
@@ -5,10 +5,8 @@
 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 C04 extends ReportQuery
 {
@@ -19,10 +17,9 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
-            })
-            ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->category', 'VSG_BI');
+                $query
+                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03'])
+                    ->whereJsonContains('properties', 'VSG_BI');
             });
     }
 }
diff --git a/app/Reports/Queries/Child/C08.php b/app/Reports/Queries/Child/C08.php
@@ -5,10 +5,8 @@
 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 C08 extends ReportQuery
 {
@@ -19,10 +17,9 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
-            })
-            ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->category', 'VSG_HIV');
+                $query
+                    ->whereJsonContains('properties', 'VSG_HIV')
+                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
             });
     }
 }
diff --git a/app/Reports/Queries/Child/C09.php b/app/Reports/Queries/Child/C09.php
@@ -5,10 +5,8 @@
 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 C09 extends ReportQuery
 {
@@ -19,10 +17,9 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
-            })
-            ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->category', 'VSG_TB');
+                $query
+                    ->whereJsonContains('properties', 'VSG_TB')
+                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
             });
     }
 }
diff --git a/app/Reports/Queries/Child/C10.php b/app/Reports/Queries/Child/C10.php
@@ -5,10 +5,8 @@
 namespace App\Reports\Queries\Child;
 
 use App\Models\Beneficiary;
-use App\Models\Disability;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Query\Builder as QueryBuilder;
 
 class C10 extends ReportQuery
 {
@@ -19,10 +17,9 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
-            })
-            ->whereHasCatagraphyRelation(Disability::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->has_certificate', true);
+                $query
+                    ->whereJsonContains('properties', 'VDH_01')
+                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
             });
     }
 }
diff --git a/app/Reports/Queries/Child/C11.php b/app/Reports/Queries/Child/C11.php
@@ -5,10 +5,8 @@
 namespace App\Reports\Queries\Child;
 
 use App\Models\Beneficiary;
-use App\Models\Disability;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Query\Builder as QueryBuilder;
 
 class C11 extends ReportQuery
 {
@@ -19,10 +17,9 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
-            })
-            ->whereHasCatagraphyRelation(Disability::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->has_certificate', false);
+                $query
+                    ->whereJsonContains('properties', 'VDH_02')
+                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
             });
     }
 }
diff --git a/app/Reports/Queries/Child/C20.php b/app/Reports/Queries/Child/C20.php
@@ -5,10 +5,8 @@
 namespace App\Reports\Queries\Child;
 
 use App\Models\Beneficiary;
-use App\Models\Catagraphy;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Query\Builder as QueryBuilder;
 
 class C20 extends ReportQuery
 {
@@ -20,10 +18,8 @@ public static function query(): Builder
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
                 $query
-                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03'])
-                    ->whereHasCatagraphyRelation(Catagraphy::class, function (QueryBuilder $query) {
-                        $query->whereJsonContains('properties->attributes->cat_ssa', 'VSC_97');
-                    });
+                    ->whereJsonContains('properties', 'VSC_97')
+                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
             });
     }
 }
diff --git a/app/Reports/Queries/Child/C24.php b/app/Reports/Queries/Child/C24.php
@@ -5,7 +5,6 @@
 namespace App\Reports\Queries\Child;
 
 use App\Models\Beneficiary;
-use App\Models\Disability;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -18,8 +17,9 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
-            })
-            ->whereHasCatagraphyRelation(Disability::class);
+                $query
+                    ->whereJsonOverlaps('properties', ['VDH_01', 'VDH_02'])
+                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
+            });
     }
 }
diff --git a/app/Reports/Queries/Child/C25.php b/app/Reports/Queries/Child/C25.php
@@ -5,10 +5,8 @@
 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
 {
@@ -19,10 +17,9 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
-            })
-            ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->category', 'VSG_TMC');
+                $query
+                    ->whereJsonContains('properties', 'VSG_TMC')
+                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
             });
     }
 }
diff --git a/app/Reports/Queries/Child/C30.php b/app/Reports/Queries/Child/C30.php
@@ -5,10 +5,8 @@
 namespace App\Reports\Queries\Child;
 
 use App\Models\Beneficiary;
-use App\Models\Catagraphy;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Query\Builder as QueryBuilder;
 
 class C30 extends ReportQuery
 {
@@ -19,10 +17,9 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
-            })
-            ->whereHasCatagraphyRelation(Catagraphy::class, function (QueryBuilder $query) {
-                $query->whereJsonContains('properties->attributes->cat_mf', 'VSA_97');
+                $query
+                    ->whereJsonContains('properties', 'VSA_97')
+                    ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);
             });
     }
 }
diff --git a/app/Reports/Queries/General/G08.php b/app/Reports/Queries/General/G08.php
@@ -5,10 +5,8 @@
 namespace App\Reports\Queries\General;
 
 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 G08 extends ReportQuery
 {
@@ -19,10 +17,7 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonContains('properties', 'VCV_05');
-            })
-            ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->category', 'VSG_TB');
+                $query->whereJsonContains('properties', ['VCV_05', 'VSG_TB']);
             });
     }
 }
diff --git a/app/Reports/Queries/General/G09.php b/app/Reports/Queries/General/G09.php
@@ -5,10 +5,8 @@
 namespace App\Reports\Queries\General;
 
 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 G09 extends ReportQuery
 {
@@ -19,10 +17,7 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonContains('properties', 'VCV_05');
-            })
-            ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->category', 'VSG_HIV');
+                $query->whereJsonContains('properties', ['VCV_05', 'VSG_HIV']);
             });
     }
 }
diff --git a/app/Reports/Queries/General/G10.php b/app/Reports/Queries/General/G10.php
@@ -5,7 +5,6 @@
 namespace App\Reports\Queries\General;
 
 use App\Models\Beneficiary;
-use App\Models\Disability;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -18,8 +17,9 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonContains('properties', 'VCV_05');
-            })
-            ->whereHasCatagraphyRelation(Disability::class);
+                $query
+                    ->whereJsonOverlaps('properties', ['VDH_01', 'VDH_02'])
+                    ->whereJsonContains('properties', 'VCV_05');
+            });
     }
 }
diff --git a/app/Reports/Queries/General/G16.php b/app/Reports/Queries/General/G16.php
@@ -5,10 +5,8 @@
 namespace App\Reports\Queries\General;
 
 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 G16 extends ReportQuery
 {
@@ -19,10 +17,7 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonContains('properties', 'VCV_06');
-            })
-            ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->category', 'VSG_TB');
+                $query->whereJsonContains('properties', ['VCV_06', 'VSG_TB']);
             });
     }
 }
diff --git a/app/Reports/Queries/General/G17.php b/app/Reports/Queries/General/G17.php
@@ -5,7 +5,6 @@
 namespace App\Reports\Queries\General;
 
 use App\Models\Beneficiary;
-use App\Models\Disability;
 use App\Reports\Queries\ReportQuery;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -18,8 +17,9 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonContains('properties', 'VCV_06');
-            })
-            ->whereHasCatagraphyRelation(Disability::class);
+                $query
+                    ->whereJsonOverlaps('properties', ['VDH_01', 'VDH_02'])
+                    ->whereJsonContains('properties', 'VCV_06');
+            });
     }
 }
diff --git a/app/Reports/Queries/General/G18.php b/app/Reports/Queries/General/G18.php
@@ -5,10 +5,8 @@
 namespace App\Reports\Queries\General;
 
 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 G18 extends ReportQuery
 {
@@ -19,10 +17,7 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonContains('properties', 'VCV_06');
-            })
-            ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->category', 'VSG_TMC');
+                $query->whereJsonContains('properties', ['VCV_06', 'VSG_TMC']);
             });
     }
 }
diff --git a/app/Reports/Queries/General/G20.php b/app/Reports/Queries/General/G20.php
@@ -5,10 +5,8 @@
 namespace App\Reports\Queries\General;
 
 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 G20 extends ReportQuery
 {
@@ -19,10 +17,7 @@ public static function query(): Builder
     {
         return Beneficiary::query()
             ->whereHasVulnerabilities(function (Builder $query) {
-                $query->whereJsonContains('properties', 'VCV_05');
-            })
-            ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {
-                $query->where('properties->attributes->category', 'VSG_TMC');
+                $query->whereJsonContains('properties', ['VCV_05', 'VSG_TMC']);
             });
     }
 }
diff --git a/app/Reports/Queries/Pregnant/P02.php b/app/Reports/Queries/Pregnant/P02.php
diff --git a/app/Reports/Queries/Pregnant/P03.php b/app/Reports/Queries/Pregnant/P03.php

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,8 @@`
`5`	`5`	`namespace App\Reports\Queries\Child;`
`6`	`6`
`7`	`7`	`use App\Models\Beneficiary;`
`8`		`-use App\Models\Disease;`
`9`	`8`	`use App\Reports\Queries\ReportQuery;`
`10`	`9`	`use Illuminate\Database\Eloquent\Builder;`
`11`		`-use Illuminate\Database\Query\Builder as QueryBuilder;`
`12`	`10`
`13`	`11`	`class C04 extends ReportQuery`
`14`	`12`	`{`
`@@ -19,10 +17,9 @@ public static function query(): Builder`
`19`	`17`	`{`
`20`	`18`	`return Beneficiary::query()`
`21`	`19`	`->whereHasVulnerabilities(function (Builder $query) {`
`22`		`- $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);`
`23`		`- })`
`24`		`- ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {`
`25`		`- $query->where('properties->attributes->category', 'VSG_BI');`
	`20`	`+ $query`
	`21`	`+ ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03'])`
	`22`	`+ ->whereJsonContains('properties', 'VSG_BI');`
`26`	`23`	`});`
`27`	`24`	`}`
`28`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`namespace App\Reports\Queries\Child;`
`6`	`6`
`7`	`7`	`use App\Models\Beneficiary;`
`8`		`-use App\Models\Disability;`
`9`	`8`	`use App\Reports\Queries\ReportQuery;`
`10`	`9`	`use Illuminate\Database\Eloquent\Builder;`
`11`	`10`
`@@ -18,8 +17,9 @@ public static function query(): Builder`
`18`	`17`	`{`
`19`	`18`	`return Beneficiary::query()`
`20`	`19`	`->whereHasVulnerabilities(function (Builder $query) {`
`21`		`- $query->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);`
`22`		`- })`
`23`		`- ->whereHasCatagraphyRelation(Disability::class);`
	`20`	`+ $query`
	`21`	`+ ->whereJsonOverlaps('properties', ['VDH_01', 'VDH_02'])`
	`22`	`+ ->whereJsonOverlaps('properties', ['VCV_01', 'VCV_02', 'VCV_03']);`
	`23`	`+ });`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,8 @@`
`5`	`5`	`namespace App\Reports\Queries\General;`
`6`	`6`
`7`	`7`	`use App\Models\Beneficiary;`
`8`		`-use App\Models\Disease;`
`9`	`8`	`use App\Reports\Queries\ReportQuery;`
`10`	`9`	`use Illuminate\Database\Eloquent\Builder;`
`11`		`-use Illuminate\Database\Query\Builder as QueryBuilder;`
`12`	`10`
`13`	`11`	`class G08 extends ReportQuery`
`14`	`12`	`{`
`@@ -19,10 +17,7 @@ public static function query(): Builder`
`19`	`17`	`{`
`20`	`18`	`return Beneficiary::query()`
`21`	`19`	`->whereHasVulnerabilities(function (Builder $query) {`
`22`		`- $query->whereJsonContains('properties', 'VCV_05');`
`23`		`- })`
`24`		`- ->whereHasCatagraphyRelation(Disease::class, function (QueryBuilder $query) {`
`25`		`- $query->where('properties->attributes->category', 'VSG_TB');`
	`20`	`+ $query->whereJsonContains('properties', ['VCV_05', 'VSG_TB']);`
`26`	`21`	`});`
`27`	`22`	`}`
`28`	`23`	`}`