dwi_vendor/lis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Dwi Swandhana
2026-05-19 20:34:27 +07:00
parent 714b6ab26d
commit acac1fe3c8
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/app/Http/Controllers/ReportController.php
+20 -1
View File
@@ -354,6 +354,7 @@ class ReportController extends Controller
$page = $request->input('pagenum') ?? 1;
$order = $request->input('order') ?? 'id desc';
$filterscount = $request->input('filterscount') ?? 0;
$isMdrReport = $jenisreport == 'list_hasil_mdr';
if ($jenisreport == 'biorepository'){
if ($bulan == 'ALL'){
$queryBiorepo = DB::table('db_komponenjawaban')
@@ -410,6 +411,16 @@ class ReportController extends Controller
if ($statusFilter === 'Selesai') {
$query->where('status', 'LIKE', '%Selesai%');
}
if ($isMdrReport) {
$query->whereExists(function ($subquery) {
$subquery->select(DB::raw(1))
->from('db_komponenjawaban')
->whereColumn('db_komponenjawaban.accnumber', 'periksa.nofoto')
->whereIn('db_komponenjawaban.komponen', ['bakterisir', 'id_bakterisir01', 'id_bakterisir02'])
->whereNotNull('db_komponenjawaban.isidata')
->where('db_komponenjawaban.isidata', '!=', '');
});
}
/**
* CURSOR → Streaming data, tidak boros memori
@@ -443,7 +454,8 @@ class ReportController extends Controller
->select('accnumber','komponen','isidata')
->whereIn('accnumber', array_unique($acc))
->whereIn('komponen', [
'id_bakteri01','id_bakteri02','bakteri'
'id_bakteri01','id_bakteri02','bakteri',
'bakterisir','id_bakterisir01','id_bakterisir02'
])
->get()
->groupBy('accnumber');
@@ -467,6 +479,13 @@ class ReportController extends Controller
$row->id_bakteri01 = optional($k->firstWhere('komponen','id_bakteri01'))->isidata;
$row->id_bakteri02 = optional($k->firstWhere('komponen','id_bakteri02'))->isidata;
$row->bakteri = optional($k->firstWhere('komponen','bakteri'))->isidata;
$row->hasil_mdr = $k->whereIn('komponen', ['bakterisir', 'id_bakterisir01', 'id_bakterisir02'])
->pluck('isidata')
->filter(function ($value) {
return trim(strip_tags((string) $value)) !== '';
})
->unique()
->implode('; ');
$row->filefoto = "<a href='".url('/hasil/'.$row->nofoto)."'>$row->nofoto</a>";
htdocs/resources/views/admin/report.blade.php
+10 -2
View File
@@ -54,6 +54,9 @@
<div class="form-group col-md-3">
<button type="button" class="btn btn-primary" id="btnReport">Detail</button>
</div>
<div class="form-group col-md-3">
<button type="button" class="btn btn-secondary btn-block" id="btnReportMdr" data-jenisreport="list_hasil_mdr">List Hasil MDR</button>
</div>
<div class="form-group col-md-3">
<button type="button" class="btn btn-success btn-block" id="btnExportDokter">Export Excel Dokter</button>
</div>
@@ -219,6 +222,7 @@
<th>Bakteri I</th>
<th>Bakteri II</th>
<th>Bakteri III</th>
<th>Hasil MDR</th>
<th>Sample Masuk</th>
<th>Verifikasi</th>
<th>Target</th>
@@ -243,12 +247,13 @@ $(document).ready(function () {
$('#divlaporanharian').hide();
$("#tanggal").datepicker({format: 'yyyy-mm-dd'});
$("#tglpenyimpanan").datepicker({format: 'yyyy-mm-dd'});
$('#btnReport').click(function () {
$('#btnReport, #btnReportMdr').click(function () {
var bulan = document.getElementById('bulan').value;
var tahun = document.getElementById('tahun').value;
var dokterId= document.getElementById('dokter_id').value;
var tanggalFilter = document.getElementById('tanggal_filter').value;
var statusFilter = document.getElementById('status_filter').value;
var jenisReport = $(this).data('jenisreport') || '';
var token = document.getElementById('token').value;
if (bulan == '' || tahun == ''){
swal({
@@ -257,7 +262,7 @@ $(document).ready(function () {
type : 'error',
});
} else {
$.post('{{ route("reportPeriksa") }}', { bulan: bulan, tahun: tahun, dokter_id: dokterId, tanggal_filter: tanggalFilter, status_filter: statusFilter, jenisreport: '', _token: token },
$.post('{{ route("reportPeriksa") }}', { bulan: bulan, tahun: tahun, dokter_id: dokterId, tanggal_filter: tanggalFilter, status_filter: statusFilter, jenisreport: jenisReport, _token: token },
function(data){
var sourceawal = {
datatype: "json",
@@ -290,6 +295,7 @@ $(document).ready(function () {
{ name: 'id_bakteri01',type: 'text'},
{ name: 'id_bakteri02',type: 'text'},
{ name: 'bakteri',type: 'text'},
{ name: 'hasil_mdr',type: 'text'},
{ name: 'selisih_hari',type: 'text'},
{ name: 'reques',type: 'text'},
{ name: 'status_target',type: 'text'},
@@ -342,6 +348,7 @@ $(document).ready(function () {
{ text: 'Bakteri I', datafield: 'bakteri', width: 150, cellsalign: 'left', align: 'center'},
{ text: 'Bakteri II', datafield: 'id_bakteri01', width: 150, cellsalign: 'left', align: 'center'},
{ text: 'Bakteri III', datafield: 'id_bakteri02', width: 150, cellsalign: 'left', align: 'center'},
{ text: 'Hasil MDR', datafield: 'hasil_mdr', width: 180, cellsalign: 'left', align: 'center', hidden: jenisReport !== 'list_hasil_mdr'},
{ text: 'Tgl. Sample', datafield: 'mulai', width: 160, cellsalign: 'left', align: 'center' },
{ text: 'Tgl. Hasil', datafield: 'verifikasi', width: 160, cellsalign: 'left', align: 'center' },
{ text: 'Target', datafield: 'modaliti2', width: 100, cellsalign: 'left', align: 'center'},
@@ -382,6 +389,7 @@ $(document).ready(function () {
<td>${row.bakteri ?? ''}</td>
<td>${row.id_bakteri01 ?? ''}</td>
<td>${row.id_bakteri02 ?? ''}</td>
<td>${row.hasil_mdr ?? ''}</td>
<td>${row.mulai ?? ''}</td>
<td>${row.verifikasi ?? ''}</td>
<td>${row.modaliti2 ?? ''}</td>