From 78b9d8a4ee06e53ce75b4f830dd492060ec985b8 Mon Sep 17 00:00:00 2001
From: Duidev Software House <swandhana17@gmail.com>
Date: Fri, 12 Dec 2025 13:02:00 +0700
Subject: [PATCH] update

---
 .../app/Http/Controllers/ReportController.php  |  4 +---
 .../views/cetak/ekspertisevl.blade.php         | 18 +++++++++---------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/htdocs/app/Http/Controllers/ReportController.php b/htdocs/app/Http/Controllers/ReportController.php
index 8f4f1ccc..58280fc8 100644
--- a/htdocs/app/Http/Controllers/ReportController.php
+++ b/htdocs/app/Http/Controllers/ReportController.php
@@ -347,7 +347,7 @@ class ReportController extends Controller
 				->select('accnumber','komponen','isidata')
 				->whereIn('accnumber', array_unique($acc))
 				->whereIn('komponen', [
-					'id_bakteri01','id_bakteri02','id_mikroorganisme'
+					'id_bakteri01','id_bakteri02','bakteri'
 				])
 				->get()
 				->groupBy('accnumber');
@@ -548,7 +548,6 @@ class ReportController extends Controller
 		}
     	return view('admin.glassreport', compact('orderbydate', 'jsonantibiotik', 'bulan', 'tahun'));
   	}
-	
 	public function genZNreport(Request $request) {
 		$data 				= [];
 		$bulan 				= $request->input('bulan');
@@ -643,7 +642,6 @@ class ReportController extends Controller
 		));
 
 	}
-
 	public function genTATreport(Request $request) {
 		$data 				= [];
 		$bulan 				= $request->input('bulan');
diff --git a/htdocs/resources/views/cetak/ekspertisevl.blade.php b/htdocs/resources/views/cetak/ekspertisevl.blade.php
index 640b102e..b699ccf6 100644
--- a/htdocs/resources/views/cetak/ekspertisevl.blade.php
+++ b/htdocs/resources/views/cetak/ekspertisevl.blade.php
@@ -109,11 +109,7 @@
         <tr>
             <td width="45">&nbsp;</td>
             <td valign="top" colspan="7" width="755">
-                @if (isset($data['vl_parameter01']) && $data['vl_parameter01'] == 'TCM-HCV VL')
-                    <strong>Pemeriksaan TCM-HCV Viral Load</strong>
-                @else 
-                    <strong>Pemeriksaan PCR-HIV Viral Load</strong>
-                @endif
+                <strong>Pemeriksaan {{$data['vl_parameter01'] ?? ''}}</strong>
                 <table cellpadding="0" cellspacing="0" width="100%" border="1">
                     <tr>
                         <td align="center" width="5%"><strong>No</strong></td>
@@ -130,8 +126,10 @@
                             @endif
                         </td>
                         <td align="center">
-                            @if (isset($data['vl_hasil01']))
-                                {!! $data['vl_hasil01'] !!}
+                            @if (isset($data['vl_hasil01']) AND $data['vl_hasil01'] == 'lainnya')
+                                {!! $data['vl_hasil01teks'] ?? '' !!}
+                            @else
+                                {!! $data['vl_hasil01'] ?? '' !!} 
                             @endif
                         </td>
                         <td align="center">
@@ -153,8 +151,10 @@
                             @endif
                         </td>
                         <td align="center">
-                            @if (isset($data['vl_hasil02']))
-                                {!! $data['vl_hasil02'] !!}
+                            @if (isset($data['vl_hasil02']) AND $data['vl_hasil02'] == 'lainnya')
+                                {!! $data['vl_hasil02teks'] ?? '' !!}
+                            @else
+                                {!! $data['vl_hasil02'] ?? '' !!} 
                             @endif
                         </td>
                         <td align="center">