From 9f0d1118b07b649066de965e3e0ddd17562a7a52 Mon Sep 17 00:00:00 2001
From: Dwi Swandhana <swandhana17@gmail.com>
Date: Wed, 21 Jan 2026 19:08:54 +0700
Subject: [PATCH] update

---
 .../views/cetak/ekspertisedefault.blade.php   | 66 +++++++++++++------
 .../views/cetak/ekspertisekultur.blade.php    | 29 ++++----
 .../views/cetak/ekspertisepl.blade.php        | 29 ++++----
 .../views/cetak/ekspertisevl.blade.php        | 66 +++++++++++++------
 4 files changed, 126 insertions(+), 64 deletions(-)

diff --git a/htdocs/resources/views/cetak/ekspertisedefault.blade.php b/htdocs/resources/views/cetak/ekspertisedefault.blade.php
index b371dda7..5bd77108 100644
--- a/htdocs/resources/views/cetak/ekspertisedefault.blade.php
+++ b/htdocs/resources/views/cetak/ekspertisedefault.blade.php
@@ -92,8 +92,9 @@
                     $sudahcetak2= 0;
                     $sudahcetak3= 0;
 					$namakuman 	= '';
+                    $namakuman1 = '';
+                    $namakuman2 = '';
                 @endphp
-
                 @if (isset($antibiotiks) && $antibiotiks->isNotEmpty())
                     @php
                         $grouped = $antibiotiks->filter(function ($row) {
@@ -104,13 +105,16 @@
                                 if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') {
                                 } else {
                                     echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['bakteri'] . "</i></strong> " . ($data['bakterisir'] ?? '') . "</p>";
+                                    $namakuman 	= $data['bakteri'];
                                 }
                             }
-                            if (isset($data['id_bakteri01'])) {
+                            if (isset($data['id_bakteri01']) AND $namakuman != $data['id_bakteri01']) {
                                 echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
+                                $namakuman1 	= $data['id_bakteri01'];
                             }
-                            if (isset($data['id_bakteri02'])) {
+                            if (isset($data['id_bakteri02']) AND $namakuman != $data['id_bakteri02']) {
                                 echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
+                                $namakuman2 	= $data['id_bakteri02'];
                             }
                         }
                     @endphp
@@ -129,13 +133,12 @@
 										<p>Jumlah Koloni : <strong><i>{{ $data['id_bakterihitungkol'] }}</i></strong></p>
 									@endif
 									@php
-                                        $sudahcetak1 = 1;
+                                        $sudahcetak1= 1;
 										$cetakjudul = true; 
 										$namakuman 	= $data['bakteri'];
 									@endphp
                                 @endif
                             @endif
-                        
                         @endif
                         @if (isset($data['id_bakteri01']) AND $data['id_bakteri01'] == $kuman)
                             @if (isset($data['id_bakteri01cetak']) AND $data['id_bakteri01cetak'] == 'TIDAK')
@@ -224,23 +227,44 @@
                             </table>
                         @endif
                     @endforeach
-					@php 
-						if ($namakuman == ''){
-						    if (isset($data['bakteri'])) {
-                                if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') {
-                                } else {
-                                    echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['bakteri'] . "</i></strong> " . ($data['bakterisir'] ?? '') . "</p>";
-                                }
-                            }
-                            if (isset($data['id_bakteri01'])) {
-                                echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
-                            }
-                            if (isset($data['id_bakteri02'])) {
-                                echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
-                            }
-						}
-					@endphp
                 @endif
+                @php 
+                    if (isset($data['bakteri']) AND $namakuman == '') {
+                        if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') {
+                        } else {
+                            echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['bakteri'] . "</i></strong> " . ($data['bakterisir'] ?? '') . "</p>";
+                            if (isset($data['id_bakterihitungkolteks'])){
+			                    echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks']."</i></strong></p>";
+                            } elseif (isset($data['id_bakterihitungkol'])){
+							    echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol']."</i></strong></p>";
+                            }
+                        }
+                    }
+                    if (isset($data['id_bakteri01']) AND $namakuman1 == '') {
+                        if (isset($data['id_bakteri01cetak']) AND $data['id_bakteri01cetak'] == 'TIDAK'){
+
+                        } else {
+                            echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
+                            if (isset($data['id_bakterihitungkolteks01'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks01']."</i></strong></p>";
+                            } elseif (isset($data['id_bakterihitungkol01'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol01']."</i></strong></p>";
+                            }
+                        }
+                    }
+                    if (isset($data['id_bakteri02']) AND $namakuman2 == ''){
+                        if (isset($data['id_bakteri02cetak']) AND $data['id_bakteri02cetak'] == 'TIDAK'){
+
+                        } else{
+                            echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
+                            if (isset($data['id_bakterihitungkolteks02'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks02']."</i></strong></p>";
+                            } elseif (isset($data['id_bakterihitungkol02'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol02']."</i></strong></p>";
+                            }
+                        }
+                    }
+                @endphp
 
             </td>
         </tr>
diff --git a/htdocs/resources/views/cetak/ekspertisekultur.blade.php b/htdocs/resources/views/cetak/ekspertisekultur.blade.php
index 3cbe1747..ad2fd365 100644
--- a/htdocs/resources/views/cetak/ekspertisekultur.blade.php
+++ b/htdocs/resources/views/cetak/ekspertisekultur.blade.php
@@ -353,7 +353,6 @@
                     $namakuman1 = '';
                     $namakuman2 = '';
                 @endphp
-
                 @if (isset($antibiotiks) && $antibiotiks->isNotEmpty())
                     @php
                         $grouped = $antibiotiks->filter(function ($row) {
@@ -500,19 +499,27 @@
                         }
                     }
                     if (isset($data['id_bakteri01']) AND $namakuman1 == '') {
-                        echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
-                        if (isset($data['id_bakterihitungkolteks01'])){
-                            echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks01']."</i></strong></p>";
-                        } elseif (isset($data['id_bakterihitungkol01'])){
-                            echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol01']."</i></strong></p>";
+                        if (isset($data['id_bakteri01cetak']) AND $data['id_bakteri01cetak'] == 'TIDAK'){
+
+                        } else {
+                            echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
+                            if (isset($data['id_bakterihitungkolteks01'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks01']."</i></strong></p>";
+                            } elseif (isset($data['id_bakterihitungkol01'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol01']."</i></strong></p>";
+                            }
                         }
                     }
                     if (isset($data['id_bakteri02']) AND $namakuman2 == ''){
-                        echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
-                        if (isset($data['id_bakterihitungkolteks02'])){
-                            echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks02']."</i></strong></p>";
-                        } elseif (isset($data['id_bakterihitungkol02'])){
-                            echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol02']."</i></strong></p>";
+                        if (isset($data['id_bakteri02cetak']) AND $data['id_bakteri02cetak'] == 'TIDAK'){
+
+                        } else{
+                            echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
+                            if (isset($data['id_bakterihitungkolteks02'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks02']."</i></strong></p>";
+                            } elseif (isset($data['id_bakterihitungkol02'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol02']."</i></strong></p>";
+                            }
                         }
                     }
                 @endphp
diff --git a/htdocs/resources/views/cetak/ekspertisepl.blade.php b/htdocs/resources/views/cetak/ekspertisepl.blade.php
index 17415df0..d6612aae 100644
--- a/htdocs/resources/views/cetak/ekspertisepl.blade.php
+++ b/htdocs/resources/views/cetak/ekspertisepl.blade.php
@@ -331,7 +331,6 @@
                     $namakuman1 = '';
                     $namakuman2 = '';
                 @endphp
-
                 @if (isset($antibiotiks) && $antibiotiks->isNotEmpty())
                     @php
                         $grouped = $antibiotiks->filter(function ($row) {
@@ -478,19 +477,27 @@
                         }
                     }
                     if (isset($data['id_bakteri01']) AND $namakuman1 == '') {
-                        echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
-                        if (isset($data['id_bakterihitungkolteks01'])){
-                            echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks01']."</i></strong></p>";
-                        } elseif (isset($data['id_bakterihitungkol01'])){
-                            echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol01']."</i></strong></p>";
+                        if (isset($data['id_bakteri01cetak']) AND $data['id_bakteri01cetak'] == 'TIDAK'){
+
+                        } else {
+                            echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
+                            if (isset($data['id_bakterihitungkolteks01'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks01']."</i></strong></p>";
+                            } elseif (isset($data['id_bakterihitungkol01'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol01']."</i></strong></p>";
+                            }
                         }
                     }
                     if (isset($data['id_bakteri02']) AND $namakuman2 == ''){
-                        echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
-                        if (isset($data['id_bakterihitungkolteks02'])){
-                            echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks02']."</i></strong></p>";
-                        } elseif (isset($data['id_bakterihitungkol02'])){
-                            echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol02']."</i></strong></p>";
+                        if (isset($data['id_bakteri02cetak']) AND $data['id_bakteri02cetak'] == 'TIDAK'){
+
+                        } else{
+                            echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
+                            if (isset($data['id_bakterihitungkolteks02'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks02']."</i></strong></p>";
+                            } elseif (isset($data['id_bakterihitungkol02'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol02']."</i></strong></p>";
+                            }
                         }
                     }
                 @endphp
diff --git a/htdocs/resources/views/cetak/ekspertisevl.blade.php b/htdocs/resources/views/cetak/ekspertisevl.blade.php
index dc7ec144..a5322394 100644
--- a/htdocs/resources/views/cetak/ekspertisevl.blade.php
+++ b/htdocs/resources/views/cetak/ekspertisevl.blade.php
@@ -176,8 +176,9 @@
                     $sudahcetak2= 0;
                     $sudahcetak3= 0;
 					$namakuman 	= '';
+                    $namakuman1 = '';
+                    $namakuman2 = '';
                 @endphp
-
                 @if (isset($antibiotiks) && $antibiotiks->isNotEmpty())
                     @php
                         $grouped = $antibiotiks->filter(function ($row) {
@@ -188,13 +189,16 @@
                                 if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') {
                                 } else {
                                     echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['bakteri'] . "</i></strong> " . ($data['bakterisir'] ?? '') . "</p>";
+                                    $namakuman 	= $data['bakteri'];
                                 }
                             }
-                            if (isset($data['id_bakteri01'])) {
+                            if (isset($data['id_bakteri01']) AND $namakuman != $data['id_bakteri01']) {
                                 echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
+                                $namakuman1 	= $data['id_bakteri01'];
                             }
-                            if (isset($data['id_bakteri02'])) {
+                            if (isset($data['id_bakteri02']) AND $namakuman != $data['id_bakteri02']) {
                                 echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
+                                $namakuman2 	= $data['id_bakteri02'];
                             }
                         }
                     @endphp
@@ -213,13 +217,12 @@
 										<p>Jumlah Koloni : <strong><i>{{ $data['id_bakterihitungkol'] }}</i></strong></p>
 									@endif
 									@php
-                                        $sudahcetak1 = 1;
+                                        $sudahcetak1= 1;
 										$cetakjudul = true; 
 										$namakuman 	= $data['bakteri'];
 									@endphp
                                 @endif
                             @endif
-                        
                         @endif
                         @if (isset($data['id_bakteri01']) AND $data['id_bakteri01'] == $kuman)
                             @if (isset($data['id_bakteri01cetak']) AND $data['id_bakteri01cetak'] == 'TIDAK')
@@ -308,23 +311,44 @@
                             </table>
                         @endif
                     @endforeach
-					@php 
-						if ($namakuman == ''){
-						    if (isset($data['bakteri'])) {
-                                if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') {
-                                } else {
-                                    echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['bakteri'] . "</i></strong> " . ($data['bakterisir'] ?? '') . "</p>";
-                                }
-                            }
-                            if (isset($data['id_bakteri01'])) {
-                                echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
-                            }
-                            if (isset($data['id_bakteri02'])) {
-                                echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
-                            }
-						}
-					@endphp
                 @endif
+                @php 
+                    if (isset($data['bakteri']) AND $namakuman == '') {
+                        if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') {
+                        } else {
+                            echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['bakteri'] . "</i></strong> " . ($data['bakterisir'] ?? '') . "</p>";
+                            if (isset($data['id_bakterihitungkolteks'])){
+			                    echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks']."</i></strong></p>";
+                            } elseif (isset($data['id_bakterihitungkol'])){
+							    echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol']."</i></strong></p>";
+                            }
+                        }
+                    }
+                    if (isset($data['id_bakteri01']) AND $namakuman1 == '') {
+                        if (isset($data['id_bakteri01cetak']) AND $data['id_bakteri01cetak'] == 'TIDAK'){
+
+                        } else {
+                            echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
+                            if (isset($data['id_bakterihitungkolteks01'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks01']."</i></strong></p>";
+                            } elseif (isset($data['id_bakterihitungkol01'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol01']."</i></strong></p>";
+                            }
+                        }
+                    }
+                    if (isset($data['id_bakteri02']) AND $namakuman2 == ''){
+                        if (isset($data['id_bakteri02cetak']) AND $data['id_bakteri02cetak'] == 'TIDAK'){
+
+                        } else{
+                            echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
+                            if (isset($data['id_bakterihitungkolteks02'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkolteks02']."</i></strong></p>";
+                            } elseif (isset($data['id_bakterihitungkol02'])){
+                                echo "<p>Jumlah Koloni : <strong><i>".$data['id_bakterihitungkol02']."</i></strong></p>";
+                            }
+                        }
+                    }
+                @endphp
 
                 <br />Komentar:<br />
                 @if (isset($data['viralload']))