diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php index f14c51ef..34639e9c 100644 --- a/htdocs/app/Http/Controllers/DokterController.php +++ b/htdocs/app/Http/Controllers/DokterController.php @@ -1222,6 +1222,10 @@ class DokterController extends Controller if ($komponen == 'otomatis' AND $kuman == ''){ $cekada = ResultSample::where('accession_number', 'LIKE', $nofoto.'%')->first(); $kuman = $cekada->organism ?? ''; + if ($kuman == ''){ + $cekkumanotomatis = KomponenJawaban::where('accnumber', $nofoto)->where('komponen', 'bakteri')->first(); + $kuman = $cekkumanotomatis->isidata ?? ''; + } } $data = $data->where('kuman', $kuman); $data = $data->orderByRaw($order)->paginate($limit); diff --git a/htdocs/resources/views/cetak/ekspertisedefault.blade.php b/htdocs/resources/views/cetak/ekspertisedefault.blade.php index 724722c0..c56573c6 100644 --- a/htdocs/resources/views/cetak/ekspertisedefault.blade.php +++ b/htdocs/resources/views/cetak/ekspertisedefault.blade.php @@ -87,71 +87,150 @@ @php $cekketerangan = explode('/table', $keterangan); + $cetakjudul = false; + $sudahcetak1= 0; + $sudahcetak2= 0; + $sudahcetak3= 0; + $namakuman = ''; @endphp - @if (!isset($cekketerangan[1]) && isset($antibiotiks) && $antibiotiks->isNotEmpty()) + @if (isset($antibiotiks) && $antibiotiks->isNotEmpty()) @php - // Filter antibiotik yang printrow == true - $filtered = $antibiotiks->filter(function($row) { - return $row->printrow; - })->values(); // reset index - - $total = $filtered->count(); - $half = ceil($total / 2); - $left = $filtered->slice(0, $half)->values(); - $right = $filtered->slice($half)->values(); + $grouped = $antibiotiks->filter(function ($row) { + return $row->printrow; // hanya yang perlu dicetak + })->groupBy('kuman'); + if (empty($grouped) OR $grouped->isEmpty()) { + if (isset($data['bakteri'])) { + if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') { + } else { + echo "

Bakteri Yang ditemukan : " . $data['bakteri'] . " " . ($data['bakterisir'] ?? '') . "

"; + } + } + if (isset($data['id_bakteri01'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri01'] . " " . ($data['id_bakterisir01'] ?? '') . "

"; + } + if (isset($data['id_bakteri02'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri02'] . " " . ($data['id_bakterisir02'] ?? '') . "

"; + } + } @endphp + @foreach ($grouped as $kuman => $items) + @if (isset($data['bakteri']) AND $data['bakteri'] == $kuman) + @if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') + @else + @if ($sudahcetak1 == 0) +

Bakteri Yang ditemukan : {{ $data['bakteri'] }} {{ $data['bakterisir'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks'] }}

+ @elseif (isset($data['id_bakterihitungkol'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol'] }}

+ @endif + @php + $sudahcetak1 = 1; + $cetakjudul = true; + $namakuman = $data['bakteri']; + @endphp + @endif + @endif + + @endif + @if (isset($data['id_bakteri01']) AND $data['id_bakteri01'] == $kuman) + @if ($sudahcetak2 == 0) +

Bakteri Yang ditemukan : {{ $data['id_bakteri01'] }} {{ $data['id_bakterisir01'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks01'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks01'] }}

+ @elseif (isset($data['id_bakterihitungkol01'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol01'] }}

+ @endif + @php + $sudahcetak2 = 1; + $cetakjudul = true; + $namakuman = $data['id_bakteri01']; + @endphp + @endif + @endif + @if (isset($data['id_bakteri02']) AND $data['id_bakteri02'] == $kuman) + @if ($sudahcetak3 == 0) +

Bakteri Yang ditemukan : {{ $data['id_bakteri02'] }} {{ $data['id_bakterisir02'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks02'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks02'] }}

+ @elseif (isset($data['id_bakterihitungkol02'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol02'] }}

+ @endif + @php + $sudahcetak3 = 1; + $cetakjudul = true; + $namakuman = $data['id_bakteri02']; + @endphp + @endif + @endif + @php + $total = $items->count(); + $half = ceil($total / 2); + $left = $items->slice(0, $half)->values(); + $right = $items->slice($half)->values(); + @endphp + @if ($cetakjudul) + + + + + + + + + + + + + + + + @for ($i = 0; $i < $half; $i++) + + {{-- Kolom kiri --}} + @if (isset($left[$i]) AND $left[$i]->printrow) + + + + + @else + + @endif -
NoAntibiotikValueInterpretation NoAntibiotikValueInterpretation
{{ $i + 1 }}{{ $left[$i]->antibiotic }}{{ $left[$i]->printcol == 1 ? $left[$i]->value : '' }}{{ $left[$i]->interpretation }} 
- - - - - - - - - - - - - - - @for ($i = 0; $i < $half; $i++) - - {{-- Kolom kiri --}} - @if (isset($left[$i])) - - - @if (isset($left[$i]->printcol) && $left[$i]->printcol == 1) - - @else - - @endif - - @else - - @endif + {{-- Pemisah tengah --}} - {{-- Spacer kolom tengah --}} - - {{-- Kolom kanan --}} - @if (isset($right[$i])) - - - @if (isset($right[$i]->printcol) && $right[$i]->printcol == 1) - - @else - - @endif - - @else - - @endif - - @endfor - -
NoAntibiotikValueInterpretation NoAntibiotikValueInterpretation
{{ $i + 1 }}{{ $left[$i]->antibiotic }}{{ $left[$i]->value }} {{ $left[$i]->interpretation }}   {{ $i + 1 + $half }}{{ $right[$i]->antibiotic }}{{ $right[$i]->value }} {{ $right[$i]->interpretation }} 
+ {{-- Kolom kanan --}} + @if (isset($right[$i]) AND $right[$i]->printrow) + {{ $i + 1 + $half }} + {{ $right[$i]->antibiotic }} + {{ $right[$i]->printcol == 1 ? $right[$i]->value : '' }} + {{ $right[$i]->interpretation }} + @else +   + @endif + + @endfor + + + @endif + @endforeach + @php + if ($namakuman == ''){ + if (isset($data['bakteri'])) { + if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') { + } else { + echo "

Bakteri Yang ditemukan : " . $data['bakteri'] . " " . ($data['bakterisir'] ?? '') . "

"; + } + } + if (isset($data['id_bakteri01'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri01'] . " " . ($data['id_bakterisir01'] ?? '') . "

"; + } + if (isset($data['id_bakteri02'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri02'] . " " . ($data['id_bakterisir02'] ?? '') . "

"; + } + } + @endphp @endif diff --git a/htdocs/resources/views/cetak/ekspertisekultur.blade.php b/htdocs/resources/views/cetak/ekspertisekultur.blade.php index f7b3105c..7737b1d4 100644 --- a/htdocs/resources/views/cetak/ekspertisekultur.blade.php +++ b/htdocs/resources/views/cetak/ekspertisekultur.blade.php @@ -300,11 +300,10 @@ {{$nomor}}. Pewarnaan Giemsa : - @if (isset($data['id_pewarnaangiesma'])) - {!! $data['id_pewarnaangiesma'] !!} - @endif - @if (isset($data['id_pewarnaangiesmaoptional'])) -
{!! $data['id_pewarnaangiesmaoptional'] !!} + @if (isset($data['id_pewarnaangiesma']) AND $data['id_pewarnaangiesma'] != 'lainnya') + {!! $data['id_pewarnaangiesma'] !!} + @else + {!! $data['id_pewarnaangiesmaoptional'] ?? '' !!} @endif @@ -325,6 +324,11 @@ @php $cekketerangan = explode('/table', $keterangan); + $cetakjudul = false; + $sudahcetak1= 0; + $sudahcetak2= 0; + $sudahcetak3= 0; + $namakuman = ''; @endphp @if (isset($antibiotiks) && $antibiotiks->isNotEmpty()) @@ -332,79 +336,73 @@ $grouped = $antibiotiks->filter(function ($row) { return $row->printrow; // hanya yang perlu dicetak })->groupBy('kuman'); - if (empty($grouped) || $grouped->isEmpty()) { + if (empty($grouped) OR $grouped->isEmpty()) { if (isset($data['bakteri'])) { if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') { } else { echo "

Bakteri Yang ditemukan : " . $data['bakteri'] . " " . ($data['bakterisir'] ?? '') . "

"; + $namakuman = $data['bakteri']; } } - if (isset($data['id_bakteri01'])) { + if (isset($data['id_bakteri01']) AND $namakuman != $data['id_bakteri01']) { echo "

Bakteri Yang ditemukan : " . $data['id_bakteri01'] . " " . ($data['id_bakterisir01'] ?? '') . "

"; + $namakuman = $data['id_bakteri01']; } - if (isset($data['id_bakteri02'])) { + if (isset($data['id_bakteri02']) AND $namakuman != $data['id_bakteri02']) { echo "

Bakteri Yang ditemukan : " . $data['id_bakteri02'] . " " . ($data['id_bakterisir02'] ?? '') . "

"; + $namakuman = $data['id_bakteri01']; } } @endphp @foreach ($grouped as $kuman => $items) - @php - $cetakjudul = false; - $sudahcetak1= 0; - $sudahcetak2= 0; - $sudahcetak3= 0; - @endphp @if (isset($data['bakteri']) AND $data['bakteri'] == $kuman) @if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') @else @if ($sudahcetak1 == 0) - @php - $sudahcetak1 = 1; - @endphp

Bakteri Yang ditemukan : {{ $data['bakteri'] }} {{ $data['bakterisir'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks'] }}

+ @elseif (isset($data['id_bakterihitungkol'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol'] }}

+ @endif + @php + $sudahcetak1 = 1; + $cetakjudul = true; + $namakuman = $data['bakteri']; + @endphp @endif @endif - @if (isset($data['id_bakterihitungkolteks'])) -

Jumlah Koloni : {{ $data['id_bakterihitungkolteks'] }}

- @elseif (isset($data['id_bakterihitungkol'])) -

Jumlah Koloni : {{ $data['id_bakterihitungkol'] }}

- @endif - @php - $cetakjudul = true; - @endphp @endif @if (isset($data['id_bakteri01']) AND $data['id_bakteri01'] == $kuman) @if ($sudahcetak2 == 0) - @php - $sudahcetak2 = 1; - @endphp

Bakteri Yang ditemukan : {{ $data['id_bakteri01'] }} {{ $data['id_bakterisir01'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks01'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks01'] }}

+ @elseif (isset($data['id_bakterihitungkol01'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol01'] }}

+ @endif + @php + $sudahcetak2 = 1; + $cetakjudul = true; + $namakuman = $data['id_bakteri01']; + @endphp @endif - @if (isset($data['id_bakterihitungkolteks01'])) -

Jumlah Koloni : {{ $data['id_bakterihitungkolteks01'] }}

- @elseif (isset($data['id_bakterihitungkol01'])) -

Jumlah Koloni : {{ $data['id_bakterihitungkol01'] }}

- @endif - @php - $cetakjudul = true; - @endphp @endif @if (isset($data['id_bakteri02']) AND $data['id_bakteri02'] == $kuman) @if ($sudahcetak3 == 0) - @php - $sudahcetak3 = 1; - @endphp

Bakteri Yang ditemukan : {{ $data['id_bakteri02'] }} {{ $data['id_bakterisir02'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks02'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks02'] }}

+ @elseif (isset($data['id_bakterihitungkol02'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol02'] }}

+ @endif + @php + $sudahcetak3 = 1; + $cetakjudul = true; + $namakuman = $data['id_bakteri02']; + @endphp @endif - @if (isset($data['id_bakterihitungkolteks02'])) -

Jumlah Koloni : {{ $data['id_bakterihitungkolteks02'] }}

- @elseif (isset($data['id_bakterihitungkol02'])) -

Jumlah Koloni : {{ $data['id_bakterihitungkol02'] }}

- @endif - @php - $cetakjudul = true; - @endphp @endif @php $total = $items->count(); @@ -431,7 +429,7 @@ @for ($i = 0; $i < $half; $i++) {{-- Kolom kiri --}} - @if (isset($left[$i])) + @if (isset($left[$i]) AND $left[$i]->printrow) {{ $i + 1 }} {{ $left[$i]->antibiotic }} {{ $left[$i]->printcol == 1 ? $left[$i]->value : '' }} @@ -443,7 +441,7 @@   {{-- Pemisah tengah --}} {{-- Kolom kanan --}} - @if (isset($right[$i])) + @if (isset($right[$i]) AND $right[$i]->printrow) {{ $i + 1 + $half }} {{ $right[$i]->antibiotic }} {{ $right[$i]->printcol == 1 ? $right[$i]->value : '' }} @@ -457,9 +455,26 @@ @endif @endforeach + @php + if ($namakuman == ''){ + if (isset($data['bakteri'])) { + if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') { + } else { + echo "

Bakteri Yang ditemukan : " . $data['bakteri'] . " " . ($data['bakterisir'] ?? '') . "

"; + $namakuman = $data['bakteri']; + } + } + if (isset($data['id_bakteri01']) AND $namakuman != $data['id_bakteri01']) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri01'] . " " . ($data['id_bakterisir01'] ?? '') . "

"; + $namakuman = $data['id_bakteri01']; + } + if (isset($data['id_bakteri02']) AND $namakuman != $data['id_bakteri02']) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri02'] . " " . ($data['id_bakterisir02'] ?? '') . "

"; + $namakuman = $data['id_bakteri01']; + } + } + @endphp @endif - - @if (isset($data['keterangan']))
Komentar:
{!! $data['keterangan'] !!} diff --git a/htdocs/resources/views/cetak/ekspertisepl.blade.php b/htdocs/resources/views/cetak/ekspertisepl.blade.php index 10cb61e9..c496ac16 100644 --- a/htdocs/resources/views/cetak/ekspertisepl.blade.php +++ b/htdocs/resources/views/cetak/ekspertisepl.blade.php @@ -98,6 +98,7 @@ $lsg_pewarnaanneisser = ''; $lsg_pewarnaannegatif = ''; $lsg_pewarnaangiesma = ''; + $lsg_pewarnaangiesmaoptional= ''; $lsg_pewarnaanspora = ''; $lsg_pewarnaanlain = ''; $lsg_ditemukanmorfologi = ''; @@ -115,6 +116,7 @@ if (trim($rows->komponen) == 'lsg_pewarnaanneisser') {$lsg_pewarnaanneisser = $rows->isidata; } if (trim($rows->komponen) == 'lsg_pewarnaannegatif') {$lsg_pewarnaannegatif = $rows->isidata; } if (trim($rows->komponen) == 'lsg_pewarnaangiesma') {$lsg_pewarnaangiesma = $rows->isidata; } + if (trim($rows->komponen) == 'lsg_pewarnaangiesmaoptional') {$lsg_pewarnaangiesmaoptional = $rows->isidata; } if (trim($rows->komponen) == 'lsg_pewarnaanspora') {$lsg_pewarnaanspora = $rows->isidata; } if (trim($rows->komponen) == 'lsg_pewarnaanlain') {$lsg_pewarnaanlain = $rows->isidata; } if (trim($rows->komponen) == 'lsg_ditemukanmorfologi') {$lsg_ditemukanmorfologi = $rows->isidata; } @@ -191,7 +193,13 @@ Pewarnaan Giemsa : - {!! $lsg_pewarnaangiesma !!} + + @if ($lsg_pewarnaangiesma != 'lainnya') + {!! $lsg_pewarnaangiesma !!} + @else + {!! $lsg_pewarnaangiesmaoptional ?? '' !!} + @endif + @endif @if ($lsg_pewarnaanspora != '') @@ -220,74 +228,150 @@ @php $cekketerangan = explode('/table', $keterangan); + $cetakjudul = false; + $sudahcetak1= 0; + $sudahcetak2= 0; + $sudahcetak3= 0; + $namakuman = ''; @endphp - @if (!isset($cekketerangan[1]) && isset($antibiotiks) && $antibiotiks->isNotEmpty()) - @if ($bakteri != '') -

Bakteri Yang ditemukan : {{$bakteri}} {{$data['bakterisir'] ?? ''}}

- @endif + @if (isset($antibiotiks) && $antibiotiks->isNotEmpty()) @php - // Filter antibiotik yang printrow == true - $filtered = $antibiotiks->filter(function($row) { - return $row->printrow; - })->values(); // reset index - - $total = $filtered->count(); - $half = ceil($total / 2); - $left = $filtered->slice(0, $half)->values(); - $right = $filtered->slice($half)->values(); + $grouped = $antibiotiks->filter(function ($row) { + return $row->printrow; // hanya yang perlu dicetak + })->groupBy('kuman'); + if (empty($grouped) OR $grouped->isEmpty()) { + if (isset($data['bakteri'])) { + if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') { + } else { + echo "

Bakteri Yang ditemukan : " . $data['bakteri'] . " " . ($data['bakterisir'] ?? '') . "

"; + } + } + if (isset($data['id_bakteri01'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri01'] . " " . ($data['id_bakterisir01'] ?? '') . "

"; + } + if (isset($data['id_bakteri02'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri02'] . " " . ($data['id_bakterisir02'] ?? '') . "

"; + } + } @endphp + @foreach ($grouped as $kuman => $items) + @if (isset($data['bakteri']) AND $data['bakteri'] == $kuman) + @if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') + @else + @if ($sudahcetak1 == 0) +

Bakteri Yang ditemukan : {{ $data['bakteri'] }} {{ $data['bakterisir'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks'] }}

+ @elseif (isset($data['id_bakterihitungkol'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol'] }}

+ @endif + @php + $sudahcetak1 = 1; + $cetakjudul = true; + $namakuman = $data['bakteri']; + @endphp + @endif + @endif + + @endif + @if (isset($data['id_bakteri01']) AND $data['id_bakteri01'] == $kuman) + @if ($sudahcetak2 == 0) +

Bakteri Yang ditemukan : {{ $data['id_bakteri01'] }} {{ $data['id_bakterisir01'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks01'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks01'] }}

+ @elseif (isset($data['id_bakterihitungkol01'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol01'] }}

+ @endif + @php + $sudahcetak2 = 1; + $cetakjudul = true; + $namakuman = $data['id_bakteri01']; + @endphp + @endif + @endif + @if (isset($data['id_bakteri02']) AND $data['id_bakteri02'] == $kuman) + @if ($sudahcetak3 == 0) +

Bakteri Yang ditemukan : {{ $data['id_bakteri02'] }} {{ $data['id_bakterisir02'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks02'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks02'] }}

+ @elseif (isset($data['id_bakterihitungkol02'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol02'] }}

+ @endif + @php + $sudahcetak3 = 1; + $cetakjudul = true; + $namakuman = $data['id_bakteri02']; + @endphp + @endif + @endif + @php + $total = $items->count(); + $half = ceil($total / 2); + $left = $items->slice(0, $half)->values(); + $right = $items->slice($half)->values(); + @endphp + @if ($cetakjudul) + + + + + + + + + + + + + + + + @for ($i = 0; $i < $half; $i++) + + {{-- Kolom kiri --}} + @if (isset($left[$i]) AND $left[$i]->printrow) + + + + + @else + + @endif -
NoAntibiotikValueInterpretation NoAntibiotikValueInterpretation
{{ $i + 1 }}{{ $left[$i]->antibiotic }}{{ $left[$i]->printcol == 1 ? $left[$i]->value : '' }}{{ $left[$i]->interpretation }} 
- - - - - - - - - - - - - - - @for ($i = 0; $i < $half; $i++) - - {{-- Kolom kiri --}} - @if (isset($left[$i])) - - @if (isset($left[$i]->printcol) && $left[$i]->printcol == 1) - - @else - - @endif - - - @else - - @endif + {{-- Pemisah tengah --}} - {{-- Spacer kolom tengah --}} - - {{-- Kolom kanan --}} - @if (isset($right[$i])) - - - @if (isset($right[$i]->printcol) && $right[$i]->printcol == 1) - - @else - - @endif - - @else - - @endif - - @endfor - -
NoAntibiotikValueInterpretation NoAntibiotikValueInterpretation
{{ $i + 1 }}{{ $left[$i]->value }} {{ $left[$i]->value }}{{ $left[$i]->interpretation }}   {{ $i + 1 + $half }}{{ $right[$i]->antibiotic }}{{ $right[$i]->value }} {{ $right[$i]->interpretation }} 
+ {{-- Kolom kanan --}} + @if (isset($right[$i]) AND $right[$i]->printrow) + {{ $i + 1 + $half }} + {{ $right[$i]->antibiotic }} + {{ $right[$i]->printcol == 1 ? $right[$i]->value : '' }} + {{ $right[$i]->interpretation }} + @else +   + @endif + + @endfor + + + @endif + @endforeach + @php + if ($namakuman == ''){ + if (isset($data['bakteri'])) { + if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') { + } else { + echo "

Bakteri Yang ditemukan : " . $data['bakteri'] . " " . ($data['bakterisir'] ?? '') . "

"; + } + } + if (isset($data['id_bakteri01'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri01'] . " " . ($data['id_bakterisir01'] ?? '') . "

"; + } + if (isset($data['id_bakteri02'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri02'] . " " . ($data['id_bakterisir02'] ?? '') . "

"; + } + } + @endphp @endif @if (isset($keterangan)) diff --git a/htdocs/resources/views/cetak/ekspertisetbbiakan.blade.php b/htdocs/resources/views/cetak/ekspertisetbbiakan.blade.php index 74b6e82a..dc41c275 100644 --- a/htdocs/resources/views/cetak/ekspertisetbbiakan.blade.php +++ b/htdocs/resources/views/cetak/ekspertisetbbiakan.blade.php @@ -1470,22 +1470,23 @@   @php - if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Diagnosis TBS'){ + $d1 = ' '; + $d3 = ' '; + $d2 = ' '; + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Diagnosis TBC'){ $d2 = ' '; $d1 = '√'; $d3 = ' '; - } else if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Diagnosis Baseline TBC'){ + } + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Diagnosis Baseline TBC'){ $d1 = ' '; $d2 = '√'; $d3 = ' '; - } else if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Akhir Pengobatan'){ + } + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Akhir Pengobatan'){ $d1 = ' '; $d3 = '√'; $d2 = ' '; - } else { - $d1 = ' '; - $d3 = ' '; - $d2 = ' '; } echo $d1; @endphp @@ -1649,12 +1650,15 @@ $j9 = ' '; $j1 = ' '; } - if (isset($data['tekslokasianatomi']) && $data['tekslokasianatomi'] != ''){ - $p2 = '√'; + if (isset($data['id_lokasianatomi']) && $data['id_lokasianatomi'] == 'Ekstraparu'){ $p1 = ' '; - } else { + $p2 = '√'; + } else if (isset($data['id_lokasianatomi']) && $data['id_lokasianatomi'] == 'Paru'){ $p1 = '√'; $p2 = ' '; + } else { + $p1 = ' '; + $p2 = ' '; } @endphp diff --git a/htdocs/resources/views/cetak/ekspertisetbmikroskopis.blade.php b/htdocs/resources/views/cetak/ekspertisetbmikroskopis.blade.php index 483b4fb4..6d7a0df1 100644 --- a/htdocs/resources/views/cetak/ekspertisetbmikroskopis.blade.php +++ b/htdocs/resources/views/cetak/ekspertisetbmikroskopis.blade.php @@ -1470,22 +1470,23 @@   @php - if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Diagnosis TBS'){ + $d1 = ' '; + $d3 = ' '; + $d2 = ' '; + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Diagnosis TBC'){ $d2 = ' '; $d1 = '√'; $d3 = ' '; - } else if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Diagnosis Baseline TBC'){ + } + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Diagnosis Baseline TBC'){ $d1 = ' '; $d2 = '√'; $d3 = ' '; - } else if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Akhir Pengobatan'){ + } + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Akhir Pengobatan'){ $d1 = ' '; $d3 = '√'; $d2 = ' '; - } else { - $d1 = ' '; - $d3 = ' '; - $d2 = ' '; } echo $d1; @endphp @@ -1649,12 +1650,15 @@ $j9 = ' '; $j1 = ' '; } - if (isset($data['tekslokasianatomi']) && $data['tekslokasianatomi'] != ''){ - $p2 = '√'; + if (isset($data['id_lokasianatomi']) && $data['id_lokasianatomi'] == 'Ekstraparu'){ $p1 = ' '; - } else { + $p2 = '√'; + } else if (isset($data['id_lokasianatomi']) && $data['id_lokasianatomi'] == 'Paru'){ $p1 = '√'; $p2 = ' '; + } else { + $p1 = ' '; + $p2 = ' '; } @endphp diff --git a/htdocs/resources/views/cetak/ekspertisetbtcmmtb.blade.php b/htdocs/resources/views/cetak/ekspertisetbtcmmtb.blade.php index cfcad08a..04221331 100644 --- a/htdocs/resources/views/cetak/ekspertisetbtcmmtb.blade.php +++ b/htdocs/resources/views/cetak/ekspertisetbtcmmtb.blade.php @@ -796,26 +796,27 @@ :     - Alasan Pemeriksaan : + Alasan Pemeriksaan : {{ $data['id_alasanpemeriksaan'] ?? ''}}   @php - if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Diagnosis TBS'){ + $d1 = ' '; + $d3 = ' '; + $d2 = ' '; + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Diagnosis TBC'){ $d2 = ' '; $d1 = '√'; $d3 = ' '; - } else if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Diagnosis Baseline TBC'){ + } + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Diagnosis Baseline TBC'){ $d1 = ' '; $d2 = '√'; $d3 = ' '; - } else if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Akhir Pengobatan'){ + } + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Akhir Pengobatan'){ $d1 = ' '; $d3 = '√'; $d2 = ' '; - } else { - $d1 = ' '; - $d3 = ' '; - $d2 = ' '; } @endphp @@ -957,12 +958,15 @@ $j9 = ' '; $j1 = ' '; } - if (isset($data['tekslokasianatomi']) && $data['tekslokasianatomi'] != ''){ - $p2 = '√'; + if (isset($data['id_lokasianatomi']) && $data['id_lokasianatomi'] == 'Ekstraparu'){ $p1 = ' '; - } else { + $p2 = '√'; + } else if (isset($data['id_lokasianatomi']) && $data['id_lokasianatomi'] == 'Paru'){ $p1 = '√'; $p2 = ' '; + } else { + $p1 = ' '; + $p2 = ' '; } @endphp diff --git a/htdocs/resources/views/cetak/ekspertisetbtcmxdr.blade.php b/htdocs/resources/views/cetak/ekspertisetbtcmxdr.blade.php index 518eddf6..baa23017 100644 --- a/htdocs/resources/views/cetak/ekspertisetbtcmxdr.blade.php +++ b/htdocs/resources/views/cetak/ekspertisetbtcmxdr.blade.php @@ -799,22 +799,23 @@   @php - if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Diagnosis TBS'){ + $d1 = ' '; + $d3 = ' '; + $d2 = ' '; + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Diagnosis TBC'){ $d2 = ' '; $d1 = '√'; $d3 = ' '; - } else if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Diagnosis Baseline TBC'){ + } + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Diagnosis Baseline TBC'){ $d1 = ' '; $d2 = '√'; $d3 = ' '; - } else if (isset($data['id_alasanpemeriksaan']) && $data['id_alasanpemeriksaan'] == 'Akhir Pengobatan'){ + } + if (isset($data['id_alasanpemeriksaan']) AND $data['id_alasanpemeriksaan'] == 'Akhir Pengobatan'){ $d1 = ' '; $d3 = '√'; $d2 = ' '; - } else { - $d1 = ' '; - $d3 = ' '; - $d2 = ' '; } @endphp @@ -956,12 +957,15 @@ $j9 = ' '; $j1 = ' '; } - if (isset($data['tekslokasianatomi']) && $data['tekslokasianatomi'] != ''){ - $p2 = '√'; + if (isset($data['id_lokasianatomi']) && $data['id_lokasianatomi'] == 'Ekstraparu'){ $p1 = ' '; - } else { + $p2 = '√'; + } else if (isset($data['id_lokasianatomi']) && $data['id_lokasianatomi'] == 'Paru'){ $p1 = '√'; $p2 = ' '; + } else { + $p1 = ' '; + $p2 = ' '; } @endphp diff --git a/htdocs/resources/views/cetak/ekspertisevl.blade.php b/htdocs/resources/views/cetak/ekspertisevl.blade.php index 73face5d..640b102e 100644 --- a/htdocs/resources/views/cetak/ekspertisevl.blade.php +++ b/htdocs/resources/views/cetak/ekspertisevl.blade.php @@ -171,74 +171,150 @@ @php $cekketerangan = explode('/table', $keterangan); + $cetakjudul = false; + $sudahcetak1= 0; + $sudahcetak2= 0; + $sudahcetak3= 0; + $namakuman = ''; @endphp - @if (!isset($cekketerangan[1]) && isset($antibiotiks) && $antibiotiks->isNotEmpty()) - @if (isset($data['bakteri'])) -

Bakteri Yang ditemukan : {{$data['bakteri']}} {{$data['bakterisir'] ?? ''}}

- @endif + @if (isset($antibiotiks) && $antibiotiks->isNotEmpty()) @php - // Filter antibiotik yang printrow == true - $filtered = $antibiotiks->filter(function($row) { - return $row->printrow; - })->values(); // reset index - - $total = $filtered->count(); - $half = ceil($total / 2); - $left = $filtered->slice(0, $half)->values(); - $right = $filtered->slice($half)->values(); + $grouped = $antibiotiks->filter(function ($row) { + return $row->printrow; // hanya yang perlu dicetak + })->groupBy('kuman'); + if (empty($grouped) OR $grouped->isEmpty()) { + if (isset($data['bakteri'])) { + if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') { + } else { + echo "

Bakteri Yang ditemukan : " . $data['bakteri'] . " " . ($data['bakterisir'] ?? '') . "

"; + } + } + if (isset($data['id_bakteri01'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri01'] . " " . ($data['id_bakterisir01'] ?? '') . "

"; + } + if (isset($data['id_bakteri02'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri02'] . " " . ($data['id_bakterisir02'] ?? '') . "

"; + } + } @endphp + @foreach ($grouped as $kuman => $items) + @if (isset($data['bakteri']) AND $data['bakteri'] == $kuman) + @if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') + @else + @if ($sudahcetak1 == 0) +

Bakteri Yang ditemukan : {{ $data['bakteri'] }} {{ $data['bakterisir'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks'] }}

+ @elseif (isset($data['id_bakterihitungkol'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol'] }}

+ @endif + @php + $sudahcetak1 = 1; + $cetakjudul = true; + $namakuman = $data['bakteri']; + @endphp + @endif + @endif + + @endif + @if (isset($data['id_bakteri01']) AND $data['id_bakteri01'] == $kuman) + @if ($sudahcetak2 == 0) +

Bakteri Yang ditemukan : {{ $data['id_bakteri01'] }} {{ $data['id_bakterisir01'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks01'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks01'] }}

+ @elseif (isset($data['id_bakterihitungkol01'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol01'] }}

+ @endif + @php + $sudahcetak2 = 1; + $cetakjudul = true; + $namakuman = $data['id_bakteri01']; + @endphp + @endif + @endif + @if (isset($data['id_bakteri02']) AND $data['id_bakteri02'] == $kuman) + @if ($sudahcetak3 == 0) +

Bakteri Yang ditemukan : {{ $data['id_bakteri02'] }} {{ $data['id_bakterisir02'] ?? '' }}

+ @if (isset($data['id_bakterihitungkolteks02'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkolteks02'] }}

+ @elseif (isset($data['id_bakterihitungkol02'])) +

Jumlah Koloni : {{ $data['id_bakterihitungkol02'] }}

+ @endif + @php + $sudahcetak3 = 1; + $cetakjudul = true; + $namakuman = $data['id_bakteri02']; + @endphp + @endif + @endif + @php + $total = $items->count(); + $half = ceil($total / 2); + $left = $items->slice(0, $half)->values(); + $right = $items->slice($half)->values(); + @endphp + @if ($cetakjudul) + + + + + + + + + + + + + + + + @for ($i = 0; $i < $half; $i++) + + {{-- Kolom kiri --}} + @if (isset($left[$i]) AND $left[$i]->printrow) + + + + + @else + + @endif -
NoAntibiotikValueInterpretation NoAntibiotikValueInterpretation
{{ $i + 1 }}{{ $left[$i]->antibiotic }}{{ $left[$i]->printcol == 1 ? $left[$i]->value : '' }}{{ $left[$i]->interpretation }} 
- - - - - - - - - - - - - - - @for ($i = 0; $i < $half; $i++) - - {{-- Kolom kiri --}} - @if (isset($left[$i])) - - - @if (isset($left[$i]->printcol) && $left[$i]->printcol == 1) - - @else - - @endif - - @else - - @endif + {{-- Pemisah tengah --}} - {{-- Spacer kolom tengah --}} - - {{-- Kolom kanan --}} - @if (isset($right[$i])) - - - @if (isset($right[$i]->printcol) && $right[$i]->printcol == 1) - - @else - - @endif - - @else - - @endif - - @endfor - -
NoAntibiotikValueInterpretation NoAntibiotikValueInterpretation
{{ $i + 1 }}{{ $left[$i]->antibiotic }}{{ $left[$i]->value }} {{ $left[$i]->interpretation }}   {{ $i + 1 + $half }}{{ $right[$i]->antibiotic }}{{ $right[$i]->value }} {{ $right[$i]->interpretation }} 
+ {{-- Kolom kanan --}} + @if (isset($right[$i]) AND $right[$i]->printrow) + {{ $i + 1 + $half }} + {{ $right[$i]->antibiotic }} + {{ $right[$i]->printcol == 1 ? $right[$i]->value : '' }} + {{ $right[$i]->interpretation }} + @else +   + @endif + + @endfor + + + @endif + @endforeach + @php + if ($namakuman == ''){ + if (isset($data['bakteri'])) { + if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') { + } else { + echo "

Bakteri Yang ditemukan : " . $data['bakteri'] . " " . ($data['bakterisir'] ?? '') . "

"; + } + } + if (isset($data['id_bakteri01'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri01'] . " " . ($data['id_bakterisir01'] ?? '') . "

"; + } + if (isset($data['id_bakteri02'])) { + echo "

Bakteri Yang ditemukan : " . $data['id_bakteri02'] . " " . ($data['id_bakterisir02'] ?? '') . "

"; + } + } + @endphp @endif
Komentar:
diff --git a/htdocs/resources/views/dokter/pemeriksaan.blade.php b/htdocs/resources/views/dokter/pemeriksaan.blade.php index fe013ae5..d9151f3d 100644 --- a/htdocs/resources/views/dokter/pemeriksaan.blade.php +++ b/htdocs/resources/views/dokter/pemeriksaan.blade.php @@ -1159,6 +1159,7 @@ + @@ -1405,7 +1406,7 @@
-

Hasil Pemeriksaan TCM MTB Rif (Xpert) (Pagi)

+

Hasil Pemeriksaan TCM XDR (Xpert) (Pagi)

@@ -1588,7 +1589,7 @@
-

Hasil Pemeriksaan TCM MTB Rif (Xpert) (Sewaktu)

+

Hasil Pemeriksaan TCM XDR (Xpert) (Sewaktu)

diff --git a/htdocs/resources/views/dokter/ppds.blade.php b/htdocs/resources/views/dokter/ppds.blade.php index b87c4329..7a48da7b 100644 --- a/htdocs/resources/views/dokter/ppds.blade.php +++ b/htdocs/resources/views/dokter/ppds.blade.php @@ -1215,6 +1215,7 @@ +
@@ -1461,7 +1462,7 @@
-

Hasil Pemeriksaan TCM MTB Rif (Xpert) (Pagi)

+

Hasil Pemeriksaan TCM XDR (Xpert) (Pagi)

@@ -1644,7 +1645,7 @@
-

Hasil Pemeriksaan TCM MTB Rif (Xpert) (Sewaktu)

+

Hasil Pemeriksaan TCM XDR (Xpert) (Sewaktu)

diff --git a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php index 92fe585e..3fc903f1 100644 --- a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php +++ b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php @@ -1461,7 +1461,7 @@
-

Hasil Pemeriksaan TCM MTB Rif (Xpert) (Pagi)

+

Hasil Pemeriksaan TCM XDR (Xpert) (Pagi)

@@ -1644,7 +1644,7 @@
-

Hasil Pemeriksaan TCM MTB Rif (Xpert) (Sewaktu)

+

Hasil Pemeriksaan TCM XDR (Xpert) (Sewaktu)

@@ -2943,6 +2943,7 @@ { name: 'kesimpulan', type: 'text'}, { name: 'idruangan', type: 'text'}, { name: 'iddokter', type: 'text'}, + { name: 'dokter_id', type: 'text'}, { name: 'ppdssenior', type: 'text'}, { name: 'middleppds', type: 'text'}, { name: 'ppdsjunior', type: 'text'}, @@ -2962,7 +2963,6 @@ { name: 'nmanalis', type: 'text'}, { name: 'modality', type: 'text'}, { name: 'dokter', type: 'text'}, - { name: 'dokter_id', type: 'text'}, { name: 'ppds1', type: 'text'}, { name: 'ppds2', type: 'text'}, { name: 'updated_at', type: 'date'}, @@ -3388,10 +3388,19 @@ type : 'warning', }) } else if (statuse == 'Selesai' || statuse == 'Arsip') { - $('#divreadonly').hide(); - $('#divperiksa').show(); - $('#divawal').hide(); - openlamanekpertise(); + var hakakses = "{{Session('previlage')}}"; + if (hakakses == 'supervisor'){ + $('#divreadonly').hide(); + $('#divperiksa').show(); + $('#divawal').hide(); + openlamanekpertise(); + } else { + swal({ + title : 'Ekspertise Final', + text : 'Hanya Akun SPV yang diperkenankan mengubah data Arsip', + type : 'warning', + }) + } } else { $('#divreadonly').hide(); $('#divperiksa').show(); @@ -3774,7 +3783,6 @@ hideAfter : 5000, stack : 1 }); - window.location.href = "{{ url('/mikro') }}"; return false; }, error: function (xhr, status, error) {