From 62dd01964a325de6d31bff4064c3385a491cefee Mon Sep 17 00:00:00 2001
From: Duidev Software House <swandhana17@gmail.com>
Date: Sun, 11 Jan 2026 09:07:49 +0700
Subject: [PATCH] update

---
 .../views/cetak/ekspertisekultur.blade.php    |  2 +-
 .../views/cetak/ekspertisepl.blade.php        | 70 ++++++++++++-------
 2 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/htdocs/resources/views/cetak/ekspertisekultur.blade.php b/htdocs/resources/views/cetak/ekspertisekultur.blade.php
index 850cf05a..c4224d34 100644
--- a/htdocs/resources/views/cetak/ekspertisekultur.blade.php
+++ b/htdocs/resources/views/cetak/ekspertisekultur.blade.php
@@ -373,7 +373,7 @@
                             }
                             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_bakteri01'];
+                                $namakuman2 	= $data['id_bakteri02'];
                             }
                         }
                     @endphp
diff --git a/htdocs/resources/views/cetak/ekspertisepl.blade.php b/htdocs/resources/views/cetak/ekspertisepl.blade.php
index 9f37bfd1..94f8bed7 100644
--- a/htdocs/resources/views/cetak/ekspertisepl.blade.php
+++ b/htdocs/resources/views/cetak/ekspertisepl.blade.php
@@ -321,13 +321,15 @@
                     </tr>
                     @endif
                 </table>
-                @php
+               @php
                     $cekketerangan = explode('/table', $keterangan);
                     $cetakjudul = false;
                     $sudahcetak1= 0;
                     $sudahcetak2= 0;
                     $sudahcetak3= 0;
 					$namakuman 	= '';
+                    $namakuman1 = '';
+                    $namakuman2 = '';
                 @endphp
 
                 @if (isset($antibiotiks) && $antibiotiks->isNotEmpty())
@@ -340,13 +342,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
@@ -362,13 +367,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 ($sudahcetak2 == 0)
@@ -379,9 +383,9 @@
 									<p>Jumlah Koloni : <strong><i>{{ $data['id_bakterihitungkol01'] }}</i></strong></p>
 								@endif
 								@php
-                                    $sudahcetak2 = 1;
+                                    $sudahcetak2= 1;
 									$cetakjudul = true;
-									$namakuman 	= $data['id_bakteri01'];
+									$namakuman1 = $data['id_bakteri01'];
 								@endphp
                             @endif
                         @endif
@@ -396,7 +400,7 @@
 								@php
                                     $sudahcetak3 = 1;
 									$cetakjudul = true;
-									$namakuman 	= $data['id_bakteri02'];
+									$namakuman2 = $data['id_bakteri02'];
 								@endphp
                             @endif
                         @endif
@@ -451,27 +455,39 @@
                             </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
-
-                @if (isset($keterangan))
+                @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 == '') {
+                        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>";
+                        }
+                    }
+                @endphp
+                @if (isset($data['keterangan']))
                     <br />Komentar:<br />
-                    {!! $keterangan !!}
+                    {!! $data['keterangan'] !!}
                 @endif
             </td>
         </tr>