diff --git a/.DS_Store b/.DS_Store index aba3a07f..7403d6a4 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/htdocs/.DS_Store b/htdocs/.DS_Store index 9374ae0e..f4843195 100644 Binary files a/htdocs/.DS_Store and b/htdocs/.DS_Store differ diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php index 30b6ccd3..91c946f3 100644 --- a/htdocs/app/Http/Controllers/DokterController.php +++ b/htdocs/app/Http/Controllers/DokterController.php @@ -1981,10 +1981,25 @@ class DokterController extends Controller 'marking' => '', ]); } - Periksa::where('id', $idperiksa)->update([ - 'status' => $request->input('komponen') ?? ''.' '.$request->input('status') ?? '', + if ($status == 'Proses identifikasi dan uji kepekaan vitek'){ + $status = 'Sedang ID+AST'; + } + if ($status == 'Proses identifikasi dan uji kepekaan manual'){ + $status = 'Sedang ID+AST'; + } + if ($status == 'Proses identifikasi malditof+ uji kepekaan vitek'){ + $status = 'Sedang ID+AST'; + } + if ($status == 'Proses identifikasi malditof+ uji kepekaan manual'){ + $status = 'Sedang ID+AST'; + } + if ($status == 'Proses identifikasi manual+ uji kepekaan vitek'){ + $status = 'Sedang ID+AST'; + } + Periksa::where('id', $nofoto)->update([ + 'status' => $status, ]); - return response()->json(['icon' => 'success', 'warna' => '#1dcbbd', 'status' => 'Success', 'message' => $request->input('komponen') ?? ''.' '.$request->input('status') ?? '']); + return response()->json(['icon' => 'success', 'warna' => '#1dcbbd', 'status' => 'Success', 'message' => $request->input('komponen') ?? ''.' '.$status]); } catch (Exception $e) { $pesan = $e->getMessage(); Log::error('Gagal Input Pertumbuhan Koloni', [ @@ -2016,10 +2031,9 @@ class DokterController extends Controller return back(); } } else if ($worklist == 'copydatabaptocap'){ - $getdataawal = Periksa::where('nofoto', $nofoto)->first(); - $id = $getdataawal->id ?? $nofoto; + $idtabel = $request->input('id'); try { - $ceksek = DB::table('pertumkolomni')->where('orderid', $id)->first(); + $ceksek = DB::table('pertumkolomni')->where('id', $idtabel)->first(); DB::table('pertumkolomni')->insert([ 'orderid' => $ceksek->orderid ?? $id, 'tglpenyimpanan' => date('Y-m-d'), diff --git a/htdocs/app/Http/Controllers/GudangController.php b/htdocs/app/Http/Controllers/GudangController.php index 9361046f..63c7d533 100644 --- a/htdocs/app/Http/Controllers/GudangController.php +++ b/htdocs/app/Http/Controllers/GudangController.php @@ -183,6 +183,13 @@ class GudangController extends Controller $yy = $rdata->tahun; $pengeluaran = $rdata->pengeluaran; $pemasukan = $rdata->pemasukan; + $deskripsiGabungan = trim((string) ($rdata->deskripsi ?? '')); + $keteranganGabungan = trim((string) ($rdata->keterangan ?? '')); + if ($keteranganGabungan !== '') { + $deskripsiGabungan = $deskripsiGabungan !== '' + ? $deskripsiGabungan.' | '.$keteranganGabungan + : $keteranganGabungan; + } if ($mm < 10){ $tgllengkap = $dd.'-0'.$mm.'-'.$yy; } else { @@ -196,7 +203,7 @@ class GudangController extends Controller 'tanggal' => $rdata->tanggal, 'bulan' => $rdata->bulan, 'tahun' => $rdata->tahun, - 'deskripsi' => $rdata->deskripsi, + 'deskripsi' => $deskripsiGabungan, 'pemasukan' => number_format( $pemasukan , 0 , '.' , ',' ), 'pengeluaran' => number_format( $pengeluaran , 0 , '.' , ',' ), 'jenis' => $rdata->jenis, @@ -508,6 +515,38 @@ class GudangController extends Controller ]); } + } else if ($jenis == 'opname_pengurangan'){ + if (($satuanTransaksi ?: 'besar') === 'kecil' && !$unitSetting['has_breakdown']) { + return response()->json(['icon' => 'error', 'warna' => '#bf441d', 'status' => 'Gagal', 'message' => 'Pengurangan satuan kecil tidak tersedia untuk barang ini']); + } + + $kategori = strtolower(trim((string) $deskripsi)); + if (!in_array($kategori, ['rusak', 'hilang'], true)) { + return response()->json(['icon' => 'error', 'warna' => '#bf441d', 'status' => 'Gagal', 'message' => 'Kategori opname pengurangan tidak valid']); + } + + $label = ($kategori === 'hilang') ? 'Barang Hilang' : 'Barang Rusak'; + $deskripsi = 'Stok Opname - ' . $label; + $qtyBase = $this->calculateBaseQty($pos, $total, $satuanTransaksi ?: 'besar'); + $stokSaatIni = $this->getStockBaseByJenis($pos); + if ($qtyBase > $stokSaatIni){ + return response()->json(['icon' => 'error', 'warna' => '#bf441d', 'status' => 'Gagal', 'message' => 'Nominal Melebihi Stok']); + } else { + $bayar = SIMBHPReport::create([ + 'tanggal' => $dino, + 'bulan' => $wulan, + 'tahun' => $tahun, + 'deskripsi' => $deskripsi, + 'pemasukan' => null, + 'pengeluaran' => $total, + 'qty_base' => $qtyBase, + 'satuan_transaksi' => $satuanTransaksi ?: 'besar', + 'jenis' => $pos, + 'keterangan' => trim((string) $alasan), + 'marking' => '', + ]); + } + } else if ($jenis == 'editor'){ if ($alasan == ''){ return response()->json(['icon' => 'error', 'warna' => '#bf441d', 'status' => 'Gagal', 'message' => 'Alasan Perubahan Data Wajib Di Isi!!!']); diff --git a/htdocs/app/Livewire/GudangPos.php b/htdocs/app/Livewire/GudangPos.php index ead1e972..83dcb6eb 100644 --- a/htdocs/app/Livewire/GudangPos.php +++ b/htdocs/app/Livewire/GudangPos.php @@ -23,6 +23,7 @@ class GudangPos extends Component public string $selectedKode = ''; public string $satuanTransaksi = 'besar'; public int $qty = 1; + public string $keterangan = ''; public string $search = ''; @@ -70,6 +71,7 @@ class GudangPos extends Component $this->selectedKode = (string) ($jenis->kodejenis ?? ''); $this->qty = 1; + $this->keterangan = ''; $this->satuanTransaksi = (string) ($parsed['satuan_transaksi'] ?? 'besar'); $this->syncSatuanAvailability(); $this->dispatch('gudangpos-open-modal'); @@ -95,6 +97,7 @@ class GudangPos extends Component $this->selectedKode = (string) ($jenis->kodejenis ?? ''); $this->qty = 1; + $this->keterangan = ''; $this->syncSatuanAvailability(); $this->dispatch('gudangpos-open-modal'); } @@ -122,6 +125,7 @@ class GudangPos extends Component } $qty = (int) $this->qty; + $keterangan = trim((string) $this->keterangan); if ($qty <= 0) { $this->toast('error', 'Jumlah harus lebih dari 0.'); return; @@ -135,7 +139,11 @@ class GudangPos extends Component $found = false; foreach ($this->cart as $i => $line) { - if (($line['kode'] ?? '') === $kode && ($line['satuan_transaksi'] ?? '') === $this->satuanTransaksi) { + if ( + ($line['kode'] ?? '') === $kode + && ($line['satuan_transaksi'] ?? '') === $this->satuanTransaksi + && trim((string) ($line['keterangan'] ?? '')) === $keterangan + ) { $this->cart[$i]['qty'] = ((int) ($this->cart[$i]['qty'] ?? 0)) + $qty; $found = true; break; @@ -148,10 +156,12 @@ class GudangPos extends Component 'jenis' => (string) ($jenis->jenis ?? ''), 'qty' => $qty, 'satuan_transaksi' => $this->satuanTransaksi, + 'keterangan' => $keterangan, ]; } $this->qty = 1; + $this->keterangan = ''; $this->dispatch('gudangpos-close-modal'); $this->dispatch('gudangpos-focus', field: 'scan'); } @@ -204,6 +214,7 @@ class GudangPos extends Component $kode = $service->sanitizeKode((string) ($line['kode'] ?? '')); $qty = (int) ($line['qty'] ?? 0); $satuan = (string) ($line['satuan_transaksi'] ?? 'besar'); + $keterangan = trim((string) ($line['keterangan'] ?? '')); if ($kode === '' || $qty <= 0) { $this->toast('error', 'Ada item keranjang yang tidak valid.'); return; @@ -241,6 +252,7 @@ class GudangPos extends Component 'qty' => $qty, 'qty_base' => $qtyBase, 'satuan_transaksi' => $satuan, + 'keterangan' => $keterangan, ]; } @@ -259,7 +271,7 @@ class GudangPos extends Component 'satuan_transaksi' => (string) $row['satuan_transaksi'], 'masa_expired' => null, 'jenis' => (string) ($jenis->jenis ?? ''), - 'keterangan' => '', + 'keterangan' => (string) ($row['keterangan'] ?? ''), 'marking' => '', ]); } @@ -267,6 +279,7 @@ class GudangPos extends Component $this->cart = []; $this->qty = 1; + $this->keterangan = ''; $this->toast('success', 'Barang keluar berhasil diproses.'); $this->dispatch('gudang-refresh'); $this->dispatch('gudangpos-close-modal'); diff --git a/htdocs/resources/views/admin/gudang.blade.php b/htdocs/resources/views/admin/gudang.blade.php index 14f32536..c2981660 100644 --- a/htdocs/resources/views/admin/gudang.blade.php +++ b/htdocs/resources/views/admin/gudang.blade.php @@ -25,6 +25,9 @@ + @@ -155,6 +158,88 @@ +
+
+
+
+

Stok Opname Barang Hilang

+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + Scan akan otomatis memilih barang & set satuan (besar/kecil) sesuai barcode. +
+
+ + +
+
+ + +
+
+ +
+
+
+
+
+

Daftar Barang Hilang

+
+ + + + + + + + + + + + + + +
KodeBarangKeteranganQtySatuanAksi
Belum ada item.
+
+ Catatan: item di daftar ini akan mengurangi stok sebagai hasil opname barang hilang. +
+ +
+
+
+
+
+
@@ -675,11 +760,12 @@ $(function () { $("#in_tanggal").datepicker({format: 'yyyy-mm-dd'}); $("#out_tanggal").datepicker({format: 'yyyy-mm-dd'}); - $("#edit_tanggal").datepicker({format: 'yyyy-mm-dd'}); - $("#op_in_tanggal").datepicker({format: 'yyyy-mm-dd'}); - $("#in_masa_expired").datepicker({format: 'dd-mm-yyyy'}); - $("#op_in_masa_expired").datepicker({format: 'dd-mm-yyyy'}); - $("#edit_masa_expired").datepicker({format: 'dd-mm-yyyy'}); + $("#edit_tanggal").datepicker({format: 'yyyy-mm-dd'}); + $("#op_in_tanggal").datepicker({format: 'yyyy-mm-dd'}); + $("#op_adj_tanggal").datepicker({format: 'yyyy-mm-dd'}); + $("#in_masa_expired").datepicker({format: 'dd-mm-yyyy'}); + $("#op_in_masa_expired").datepicker({format: 'dd-mm-yyyy'}); + $("#edit_masa_expired").datepicker({format: 'dd-mm-yyyy'}); }); function openedpage( jQuery ){ var set01=document.getElementById('cekbln').value; @@ -797,6 +883,7 @@ var jenisRows = @json($jenisRows ?? []); var opInLines = []; + var opAdjLines = []; var currentDetail = null; function escapeHtml(value){ @@ -1032,6 +1119,15 @@ } syncOpInSelected(); + var currentAdj = $('#op_adj_pos').val(); + var htmlAdj = ''; + items.forEach(function(r){ htmlAdj += makeOption(r); }); + $('#op_adj_pos').html(htmlAdj); + if(currentAdj){ + $('#op_adj_pos').val(currentAdj); + } + syncOpAdjSelected(); + // Legacy selects (modal lama / editor) var legacyIds = ['#in_pos', '#out_pos']; legacyIds.forEach(function(sel){ @@ -1226,9 +1322,11 @@ $('#in_pos').on('change', function(){ syncSatuanMode('#in_pos', '#in_satuan_transaksi'); }); $('#out_pos').on('change', function(){ syncSatuanMode('#out_pos', '#out_satuan_transaksi'); }); $('#op_in_pos').on('change', function(){ syncSatuanMode('#op_in_pos', '#op_in_satuan_transaksi'); }); + $('#op_adj_pos').on('change', function(){ syncSatuanMode('#op_adj_pos', '#op_adj_satuan_transaksi'); }); syncSatuanMode('#in_pos', '#in_satuan_transaksi'); syncSatuanMode('#out_pos', '#out_satuan_transaksi'); syncSatuanMode('#op_in_pos', '#op_in_satuan_transaksi'); + syncSatuanMode('#op_adj_pos', '#op_adj_satuan_transaksi'); function syncOpInSelected(){ var val = $('#op_in_pos').val(); @@ -1260,6 +1358,19 @@ }); syncOpInSelected(); + function syncOpAdjSelected(){ + var selected = $('#op_adj_pos option:selected'); + syncSatuanMode('#op_adj_pos', '#op_adj_satuan_transaksi'); + var jenisId = parseInt(selected.data('jenisid') || 0, 10); + var mode = $('#op_adj_satuan_transaksi').val() || 'besar'; + $('#op_adj_barcode').val(buildBarcodeValueById(jenisId, mode)); + } + + $('#op_adj_pos').on('change', function(){ + syncOpAdjSelected(); + }); + syncOpAdjSelected(); + $('#op_in_kode_barang').on('input', function(){ if($('#op_in_pos').val() !== '__NEW__'){ return; } $(this).val(normalizeKode($(this).val())); @@ -1287,6 +1398,13 @@ $('#op_in_barcode').val(buildBarcodeValueById(jenisId, mode)); }); + $('#op_adj_satuan_transaksi').on('change', function(){ + var selected = $('#op_adj_pos option:selected'); + var jenisId = parseInt(selected.data('jenisid') || 0, 10); + var mode = $('#op_adj_satuan_transaksi').val() || 'besar'; + $('#op_adj_barcode').val(buildBarcodeValueById(jenisId, mode)); + }); + $("#topbtntambahjenis").click(function(){ $("#jenis_idne").val('new'); $("#jenis_deskripsi").val(''); @@ -1594,6 +1712,7 @@ $("#in_total").autoNumeric( 'init', {aSep: ',', mDec: '0', vMax: '99999999999999999999999999'} ); $("#out_total").autoNumeric( 'init', {aSep: ',', mDec: '0', vMax: '99999999999999999999999999'} ); $("#op_in_total").autoNumeric( 'init', {aSep: ',', mDec: '0', vMax: '99999999999999999999999999'} ); + $("#op_adj_total").autoNumeric( 'init', {aSep: ',', mDec: '0', vMax: '99999999999999999999999999'} ); function renderOpInLines(){ if(!opInLines.length){ @@ -1614,6 +1733,25 @@ $('#op_in_lines').html(html); } + function renderOpAdjLines(){ + if(!opAdjLines.length){ + $('#op_adj_lines').html('Belum ada item.'); + return; + } + var html = ''; + opAdjLines.forEach(function(line, idx){ + html += '' + + '' + (line.barcode_value || line.kode || '') + '' + + '' + escapeHtml(line.jenis || '') + '' + + '' + escapeHtml(line.note || '-') + '' + + '' + escapeHtml(line.qty || '') + '' + + '' + escapeHtml(line.satuan_transaksi || '') + '' + + '' + + ''; + }); + $('#op_adj_lines').html(html); + } + function getSelectedKode(selectId){ var selected = $(selectId).find('option:selected'); return normalizeKode(selected.data('kodejenis') || ''); @@ -1637,6 +1775,24 @@ } }); + $('#op_adj_scan').on('keypress', function(e){ + if(e.which === 13){ + e.preventDefault(); + var scanVal = $(this).val(); + var ok = setSelectByKode('#op_adj_pos', scanVal); + $(this).val(''); + if(ok){ + if(ok.mode){ + $('#op_adj_satuan_transaksi').val(ok.mode); + } + syncOpAdjSelected(); + setTimeout(function(){ $('#op_adj_total').focus(); }, 100); + }else{ + $.toast({ heading: 'Gagal', text: 'Kode barang tidak ditemukan', position: 'top-right', loaderBg: '#bf441d', icon: 'error', hideAfter: 3000, stack: 1 }); + } + } + }); + $('#btn_op_in_addline').on('click', function(){ var jenisSelect = $('#op_in_pos').val(); var jenis = jenisSelect; @@ -1716,6 +1872,38 @@ if(!isNaN(idx)){ opInLines.splice(idx, 1); renderOpInLines(); } }); + $('#btn_op_adj_addline').on('click', function(){ + var jenis = $('#op_adj_pos').val(); + var qty = $('#op_adj_total').val(); + var satuanTransaksi = $('#op_adj_satuan_transaksi').val(); + var note = ($('#op_adj_note').val() || '').toString().trim(); + var kode = getSelectedKode('#op_adj_pos'); + var selected = $('#op_adj_pos option:selected'); + var jenisId = parseInt(selected.data('jenisid') || 0, 10); + var barcodeValue = buildBarcodeValueById(jenisId, satuanTransaksi); + + if(!jenis || !qty){ + $.toast({ heading: 'Gagal', text: 'Barang dan jumlah wajib diisi', position: 'top-right', loaderBg: '#bf441d', icon: 'error', hideAfter: 3000, stack: 1 }); + return; + } + + opAdjLines.push({ + jenis: jenis, + kode: kode, + barcode_value: barcodeValue, + qty: qty, + satuan_transaksi: satuanTransaksi, + note: note + }); + $('#op_adj_total').val(''); + renderOpAdjLines(); + }); + + $(document).on('click', '.btn_op_adj_remove', function(){ + var idx = parseInt($(this).data('index'), 10); + if(!isNaN(idx)){ opAdjLines.splice(idx, 1); renderOpAdjLines(); } + }); + function runBatchPost(lines, buildPayload, onDone){ var i = 0; function next(){ @@ -1835,7 +2023,68 @@ next(); }); + $('#btn_op_adj_commit').on('click', function(){ + if(!opAdjLines.length){ + $.toast({ heading: 'Info', text: 'Daftar pengurangan stok masih kosong', position: 'top-right', loaderBg: '#3b98b5', icon: 'info', hideAfter: 2500, stack: 1 }); + return; + } + + var tanggal = $('#op_adj_tanggal').val(); + var $btn = $(this); + $btn.prop('disabled', true).text('Menyimpan...'); + + var i = 0; + function nextAdj(){ + if(i >= opAdjLines.length){ + $btn.prop('disabled', false).text('Simpan Semua Pengurangan Stok'); + $.toast({ heading: 'Success', text: 'Pengurangan stok opname berhasil disimpan', position: 'top-right', loaderBg: '#5ba035', icon: 'success', hideAfter: 2500, stack: 1 }); + opAdjLines = []; + renderOpAdjLines(); + if(typeof window.gudangRefresh === 'function'){ + window.gudangRefresh(); + } + return; + } + + var line = opAdjLines[i]; + i++; + + $.ajax({ + url: 'simbhp/exaddbarang', + method: 'POST', + data: { + _token: token, + set01: 'hilang', + set02: line.jenis, + set03: tanggal, + set04: line.qty, + set05: 'opname_pengurangan', + set06: '', + set07: line.note, + set08: '', + set09: '', + set10: '', + set11: line.satuan_transaksi, + set12: '' + } + }).done(function(resp){ + if(resp && resp.status && resp.status.toString().toLowerCase() !== 'success'){ + $btn.prop('disabled', false).text('Simpan Semua Pengurangan Stok'); + $.toast({ heading: 'Gagal', text: (resp && resp.message) ? resp.message : 'Gagal menyimpan', position: 'top-right', loaderBg: '#bf441d', icon: 'error', hideAfter: 4500, stack: 1 }); + return; + } + nextAdj(); + }).fail(function(){ + $btn.prop('disabled', false).text('Simpan Semua Pengurangan Stok'); + $.toast({ heading: 'Gagal', text: 'Request gagal', position: 'top-right', loaderBg: '#bf441d', icon: 'error', hideAfter: 4500, stack: 1 }); + }); + } + + nextAdj(); + }); + renderOpInLines(); + renderOpAdjLines(); $('#btnexportreport').click(function(){ var bln = $('#cekbln').val(); var thn = $('#cekthn').val(); diff --git a/htdocs/resources/views/dokter/pemeriksaan.blade.php b/htdocs/resources/views/dokter/pemeriksaan.blade.php index 2f69ed29..a1c3518a 100644 --- a/htdocs/resources/views/dokter/pemeriksaan.blade.php +++ b/htdocs/resources/views/dokter/pemeriksaan.blade.php @@ -2624,10 +2624,13 @@ + +
-
- +
+

*Isikan keterangan jika memilih status "Tidak Lanjut Identifikasi" atau "Menunggu kultur yg lain"

+
-
- +
+

*Isikan keterangan jika memilih status "Tidak Lanjut Identifikasi" atau "Menunggu kultur yg lain"

+
- +
@@ -2729,6 +2750,7 @@ +
@@ -2758,7 +2780,25 @@
- +
@@ -2776,6 +2816,7 @@ +
@@ -2805,7 +2846,25 @@
- +
@@ -2823,6 +2882,7 @@ +
@@ -2852,7 +2912,25 @@
- +
@@ -2870,6 +2948,7 @@ +
@@ -4262,7 +4341,7 @@ var offset = $("#gridmediasdar1").offset(); var dataRecord = $("#gridmediasdar1").jqxGrid('getrowdata', editrowjabatan); $('#idpertumbuhankoloni').val(dataRecord.id); - $('#sdar1_media').val(dataRecord.kuman); + $('#sdar1_media').select2('val', dataRecord.kuman).trigger('change'); $('#sdar1_pemeriksaanhemolisa').val(dataRecord.hemolisa); $('#sdar1_mediakuman').val(dataRecord.tindaklanjut); $('#sdar1_status').val(dataRecord.status); @@ -4310,7 +4389,7 @@ }) } else { $('#idpertumbuhankoloni').val('new'); - $('#sdar1_media').val(dataRecord.kuman); + $('#sdar1_media').select2('val', dataRecord.kuman).trigger('change'); $('#sdar1_mediakuman').val(dataRecord.tindaklanjut); $('#sdar1_pemeriksaanhemolisa').val(dataRecord.hemolisa); $('#sdar1_status').val(dataRecord.status); @@ -4343,7 +4422,7 @@ var offset = $("#gridmediasdar2").offset(); var dataRecord = $("#gridmediasdar2").jqxGrid('getrowdata', editrowjabatan); $('#idpertumbuhankoloni').val(dataRecord.id); - $('#sdar2_media').val(dataRecord.kuman); + $('#sdar2_media').select2('val', dataRecord.kuman).trigger('change'); $('#sdar2_pemeriksaanhemolisa').val(dataRecord.hemolisa); $('#sdar2_mediakuman').val(dataRecord.tindaklanjut); $('#sdar2_status').val(dataRecord.status); @@ -4391,7 +4470,7 @@ }) } else { $('#idpertumbuhankoloni').val('new'); - $('#sdar2_media').val(dataRecord.kuman); + $('#sdar2_media').select2('val', dataRecord.kuman).trigger('change'); $('#sdar2_mediakuman').val(dataRecord.tindaklanjut); $('#sdar2_pemeriksaanhemolisa').val(dataRecord.hemolisa); $('#sdar2_status').val(dataRecord.status); @@ -4424,7 +4503,7 @@ var offset = $("#gridmediasdai1").offset(); var dataRecord = $("#gridmediasdai1").jqxGrid('getrowdata', editrowjabatan); $('#idpertumbuhankoloni').val(dataRecord.id); - $('#sdai1_media').val(dataRecord.kuman); + $('#sdai1_media').select2().val(dataRecord.kuman).trigger('change'); $('#sdai1_pemeriksaanhemolisa').val(dataRecord.hemolisa); $('#sdai1_mediakuman').val(dataRecord.tindaklanjut); $('#sdai1_status').val(dataRecord.status); @@ -4472,7 +4551,7 @@ }) } else { $('#idpertumbuhankoloni').val('new'); - $('#sdai1_media').val(dataRecord.kuman); + $('#sdai1_media').select2('val', dataRecord.kuman).trigger('change'); $('#sdai1_mediakuman').val(dataRecord.tindaklanjut); $('#sdai1_pemeriksaanhemolisa').val(dataRecord.hemolisa); $('#sdai1_status').val(dataRecord.status); @@ -4505,7 +4584,7 @@ var offset = $("#gridmediasdai2").offset(); var dataRecord = $("#gridmediasdai2").jqxGrid('getrowdata', editrowjabatan); $('#idpertumbuhankoloni').val(dataRecord.id); - $('#sdai2_media').val(dataRecord.kuman); + $('#sdai2_media').select2('val', dataRecord.kuman).trigger('change'); $('#sdai2_pemeriksaanhemolisa').val(dataRecord.hemolisa); $('#sdai2_mediakuman').val(dataRecord.tindaklanjut); $('#sdai2_status').val(dataRecord.status); @@ -4553,7 +4632,7 @@ }) } else { $('#idpertumbuhankoloni').val('new'); - $('#sdai2_media').val(dataRecord.kuman); + $('#sdai2_media').select2('val', dataRecord.kuman).trigger('change'); $('#sdai2_mediakuman').val(dataRecord.tindaklanjut); $('#sdai2_pemeriksaanhemolisa').val(dataRecord.hemolisa); $('#sdai2_status').val(dataRecord.status); @@ -6015,7 +6094,7 @@ var id = document.getElementById('periksa_id').value; var idtabel = document.getElementById('idpertumbuhankoloni').value; var media = 'Media SDA R1'; - var kuman = document.getElementById('sdar1_media').value; + var kuman = $('#sdar1_media').val(); var hemolisa = document.getElementById('sdar1_pemeriksaanhemolisa').value; var katalase = ''; var koagulase = ''; @@ -6046,7 +6125,7 @@ var id = document.getElementById('periksa_id').value; var idtabel = document.getElementById('idpertumbuhankoloni').value; var media = 'Media SDA R2'; - var kuman = document.getElementById('sdar2_media').value; + var kuman = $('#sdar2_media').val(); var hemolisa = document.getElementById('sdar2_pemeriksaanhemolisa').value; var katalase = ''; var koagulase = ''; @@ -6077,7 +6156,7 @@ var id = document.getElementById('periksa_id').value; var idtabel = document.getElementById('idpertumbuhankoloni').value; var media = 'Media SDA I1'; - var kuman = document.getElementById('sdai1_media').value; + var kuman = $('#sdai1_media').val(); var hemolisa = document.getElementById('sdai1_pemeriksaanhemolisa').value; var katalase = ''; var koagulase = ''; @@ -6108,7 +6187,7 @@ var id = document.getElementById('periksa_id').value; var idtabel = document.getElementById('idpertumbuhankoloni').value; var media = 'Media SDA I2'; - var kuman = document.getElementById('sdai2_media').value; + var kuman = $('#sdai2_media').val(); var hemolisa = document.getElementById('sdai2_pemeriksaanhemolisa').value; var katalase = ''; var koagulase = ''; diff --git a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php index ee38357d..3486cc25 100644 --- a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php +++ b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php @@ -2685,10 +2685,13 @@ + + -
- +
+

*Isikan keterangan jika memilih status "Tidak Lanjut Identifikasi" atau "Menunggu kultur yg lain"

+
+
+ + +