From 95d2f6e507483cb2c46bdba3004d57e30cbfcc21 Mon Sep 17 00:00:00 2001 From: Dwi Swandhana Date: Mon, 9 Mar 2026 07:24:56 +0700 Subject: [PATCH] update --- htdocs/app/CriticalValueSample.php | 12 + .../app/Http/Controllers/DokterController.php | 74 + ...08_create_critical_value_samples_table.php | 42 + .../base/partials/header-plain.blade.php | 58 +- .../views/dokter/pemeriksaan-awal.blade.php | 4235 ----------------- .../views/dokter/pemeriksaan.blade.php | 28 +- htdocs/resources/views/dokter/ppds.blade.php | 28 +- .../notifications/critical-values.blade.php | 125 + htdocs/routes/web.php | 3 + 9 files changed, 340 insertions(+), 4265 deletions(-) create mode 100644 htdocs/app/CriticalValueSample.php create mode 100644 htdocs/database/migrations/2026_03_09_000008_create_critical_value_samples_table.php delete mode 100644 htdocs/resources/views/dokter/pemeriksaan-awal.blade.php create mode 100644 htdocs/resources/views/notifications/critical-values.blade.php diff --git a/htdocs/app/CriticalValueSample.php b/htdocs/app/CriticalValueSample.php new file mode 100644 index 00000000..54d22e37 --- /dev/null +++ b/htdocs/app/CriticalValueSample.php @@ -0,0 +1,12 @@ + 'Selesai', ]; $periksa->update($updateData); + if ($this->shouldMarkAsCritical($request)) { + $this->upsertCriticalValueSample($periksa); + } $surat = self::genSurat($periksa->id, 'dengan kop'); Riwayat::create([ 'nofoto' => $nofoto, @@ -710,6 +714,76 @@ class DokterController extends Controller } } } + protected function shouldMarkAsCritical(Request $request): bool + { + $flag = strtolower((string) $request->input('nilai_kritis', '0')); + + return in_array($flag, ['1', 'true', 'on', 'yes'], true); + } + protected function upsertCriticalValueSample(Periksa $periksa): void + { + $now = Carbon::now(); + $criticalSample = CriticalValueSample::firstOrNew(['periksa_id' => $periksa->id]); + $criticalSample->nofoto = $periksa->nofoto; + $criticalSample->noregister = $periksa->noregister; + $criticalSample->nmpasien = $periksa->nmpasien; + $criticalSample->nm_spesimen = $periksa->nm_spesimen; + + // Keep the first critical timestamp intact on repeated clicks. + if (empty($criticalSample->critical_set_at)) { + $criticalSample->critical_set_at = $now; + $criticalSample->critical_set_by_user_id = Session('id'); + $criticalSample->critical_set_by_name = Session('nama'); + } + + $criticalSample->save(); + } + protected function markCriticalValueAsRead(CriticalValueSample $criticalSample): void + { + if (!empty($criticalSample->followed_up_at)) { + return; + } + + $criticalSample->followed_up_at = Carbon::now(); + $criticalSample->followed_up_by_user_id = Session('id'); + $criticalSample->followed_up_by_name = Session('nama'); + $criticalSample->save(); + } + public function criticalValueNotifications(Request $request) + { + $highlightId = $request->query('highlight'); + $items = CriticalValueSample::whereNull('followed_up_at') + ->orderBy('critical_set_at', 'asc') + ->get(); + $followedItems = CriticalValueSample::whereNotNull('followed_up_at') + ->orderBy('followed_up_at', 'desc') + ->limit(100) + ->get(); + + return view('notifications.critical-values', [ + 'items' => $items, + 'followedItems' => $followedItems, + 'highlightId' => $highlightId, + ]); + } + public function criticalValueNotificationOpen($id) + { + $criticalSample = CriticalValueSample::findOrFail($id); + $this->markCriticalValueAsRead($criticalSample); + + return redirect() + ->route('criticalValueNotifications', ['highlight' => $criticalSample->id]) + ->with('success', 'Sample nilai kritis sudah ditandai sudah ditindaklanjuti.'); + } + public function criticalValueNotificationMarkRead($id) + { + $criticalSample = CriticalValueSample::findOrFail($id); + $this->markCriticalValueAsRead($criticalSample); + + return redirect() + ->route('criticalValueNotifications', ['highlight' => $criticalSample->id]) + ->with('success', 'Sample nilai kritis sudah ditandai sudah ditindaklanjuti.'); + } public function cancelOrder(Request $request) { $val01 = $request->input('alasan'); $getsetting = Setting::where('id', '1')->first(); diff --git a/htdocs/database/migrations/2026_03_09_000008_create_critical_value_samples_table.php b/htdocs/database/migrations/2026_03_09_000008_create_critical_value_samples_table.php new file mode 100644 index 00000000..c695ce36 --- /dev/null +++ b/htdocs/database/migrations/2026_03_09_000008_create_critical_value_samples_table.php @@ -0,0 +1,42 @@ +id(); + $table->unsignedBigInteger('periksa_id')->unique(); + $table->string('nofoto', 50)->nullable(); + $table->string('noregister', 150)->nullable(); + $table->string('nmpasien', 200)->nullable(); + $table->string('nm_spesimen', 255)->nullable(); + $table->timestamp('critical_set_at')->nullable(); + $table->unsignedBigInteger('critical_set_by_user_id')->nullable(); + $table->string('critical_set_by_name', 150)->nullable(); + $table->timestamp('followed_up_at')->nullable(); + $table->unsignedBigInteger('followed_up_by_user_id')->nullable(); + $table->string('followed_up_by_name', 150)->nullable(); + $table->timestamps(); + + $table->index('nofoto'); + $table->index('critical_set_at'); + $table->index('followed_up_at'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('critical_value_samples'); + } +}; diff --git a/htdocs/resources/views/base/partials/header-plain.blade.php b/htdocs/resources/views/base/partials/header-plain.blade.php index 1c69616a..a37508b7 100644 --- a/htdocs/resources/views/base/partials/header-plain.blade.php +++ b/htdocs/resources/views/base/partials/header-plain.blade.php @@ -1,3 +1,14 @@ +@php + $criticalNotificationCount = 0; + $criticalNotificationItems = collect(); + if (Session::get('id') !== null) { + $criticalNotificationCount = \App\CriticalValueSample::whereNull('followed_up_at')->count(); + $criticalNotificationItems = \App\CriticalValueSample::whereNull('followed_up_at') + ->orderBy('critical_set_at', 'asc') + ->limit(8) + ->get(); + } +@endphp
@@ -20,21 +31,40 @@
- @if(Session::get('id') !== null) - @if (isset($antrkrmsitu)) -
  • - -
    - - Sync To INSITU - +
  • + + + {{ $criticalNotificationCount }} + +
    • - @endif +
    + @if($criticalNotificationItems->isEmpty()) +
    Tidak ada sample nilai kritis yang perlu dilaporkan.
    + @else + @foreach($criticalNotificationItems as $criticalItem) + +
    +

    + {{ $criticalItem->nofoto ?? '-' }} - {{ $criticalItem->nmpasien ?? 'Tanpa Nama' }} + + Set: {{ $criticalItem->critical_set_at ? \Carbon\Carbon::parse($criticalItem->critical_set_at)->format('d-m-Y H:i:s') : '-' }} + +

    +     + @endforeach + @endif +
    +
    + + @if(Session::get('id') !== null)
  • -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Dokter Pengirim
    Asal Pasien
    Accession Number
    Register Number
    Name
    Gender
    Age
    Status
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    Expertise
    -

    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    - - -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    - -
    -
    -
    -
    -
    - -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    - -
    - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    - -
    - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    - -
    -
    - -
    - - - -
    -
    - - -
    -
    -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -

    Jenis Terduga / Pasien TBC

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    Pemantauan kemajuan pengobatan (Follow up)
    -
    -
    -
    -
    Pemeriksaan ulang
    -
    -
    -
    -
    Pemeriksaan setelah selesai pengobatan
    -
    -
    -
    -
    No.Reg.TBC/TBC RO Fasyankes
    -
    -
    -
    -
    No.Reg.TBC/TBC RO Kab/ Kota
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -

    Secara visual dahak tampak (Sewaktu)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -

    Secara visual dahak tampak (Pagi)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -

    Hasil Pemeriksaan Mikroskopis (BTA/lainnya) (Pagi)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -

    Hasil Pemeriksaan Mikroskopis (BTA/lainnya) (Sewaktu)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -

    Hasil Biakan (MGIT)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -

    Hasil Biakan (LJ)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -

    Hasil Pemeriksaan Mikroskopis (BTA/lainnya) (Sewaktu)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    - - -
    -
    -
    -
    -

    Hasil Pemeriksaan Mikroskopis (BTA/lainnya) (Pagi)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - -
    - -
    - - -
    -
    -
    -
    -
    -

    Hasil Pemeriksaan TCM MTB Rif (Xpert) (Sewaktu)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -

    Hasil Pemeriksaan TCM MTB Rif (Xpert) (Pagi)

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -

    Hasil Pemeriksaan TCM MTB Rif (Xpert) (Pagi)

    -
    -
    -
    -
    Neg
    -
    - -
    -
    -
    -
    H Low
    -
    - -
    -
    -
    -
    H
    -
    - -
    -
    -
    -
    FQ Low
    -
    - -
    -
    -
    -
    FQ
    -
    - -
    -
    -
    -
    Invalid
    -
    - -
    -
    -
    -
    -
    -
    Amk
    -
    - -
    -
    -
    -
    Km
    -
    - -
    -
    -
    -
    Cm
    -
    - -
    -
    -
    -
    Eto
    -
    - -
    -
    -
    -
    Error
    -
    - -
    -
    -
    -
    No Result
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -

    Hasil Pemeriksaan TCM MTB Rif (Xpert) (Sewaktu)

    -
    -
    -
    -
    Neg
    -
    - -
    -
    -
    -
    H Low
    -
    - -
    -
    -
    -
    H
    -
    - -
    -
    -
    -
    FQ Low
    -
    - -
    -
    -
    -
    FQ
    -
    - -
    -
    -
    -
    Invalid
    -
    - -
    -
    -
    -
    -
    -
    Amk
    -
    - -
    -
    -
    -
    Km
    -
    - -
    -
    -
    -
    Cm
    -
    - -
    -
    -
    -
    Eto
    -
    - -
    -
    -
    -
    Error
    -
    - -
    -
    -
    -
    No Result
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - - - - - - - - - - - - - - - -
    - - AntibiotikValueInterpretationPrint Value.?EditDelete
    -
    -
    -
    -
    -
    - - -
    -
    -

    Isian Khusus SPV

    -
    - -
    - - -
    -
    - - -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - -
    -
    - - -
    -
    - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Kv
    mAs
    DLP
    Weight
    Rooms Update - -
    Kv
    mAs
    DLP
    Modality
    Stase / Disease - -
    Stase Sistem Organ
    Weight
    Rooms
    Device - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    - -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    - - -
    - - -
    -
    - -
    -
    -@endsection - -@push('script') - -@endpush diff --git a/htdocs/resources/views/dokter/pemeriksaan.blade.php b/htdocs/resources/views/dokter/pemeriksaan.blade.php index c4ef1c4a..863f6e02 100644 --- a/htdocs/resources/views/dokter/pemeriksaan.blade.php +++ b/htdocs/resources/views/dokter/pemeriksaan.blade.php @@ -2367,19 +2367,30 @@ -
    -
    +
    +
    -
    - @if (Session('previlage') == 'supervisor' OR Session('previlage') == 'developer') - - @else - - @endif +
    + @if (Session('previlage') == 'supervisor' OR Session('previlage') == 'developer') +
    +
    + + +
    +
    +
    + + @else +
    + + @endif +
    @@ -6089,6 +6100,7 @@ formdata.set('addendumketerangan', addendumketerangan); formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain); formdata.set('viralload', viralload); + formdata.set('nilai_kritis', $('#nilai_kritis').is(':checked') ? '1' : '0'); formdata.set('_token', '{{ csrf_token() }}'); $.each(checkboxValues, (key, val) => formdata.set(key, val)); $.ajax({ diff --git a/htdocs/resources/views/dokter/ppds.blade.php b/htdocs/resources/views/dokter/ppds.blade.php index cf3a6c31..3dee108c 100644 --- a/htdocs/resources/views/dokter/ppds.blade.php +++ b/htdocs/resources/views/dokter/ppds.blade.php @@ -2423,19 +2423,30 @@
    -
    -
    +
    +
    -
    - @if (Session('previlage') == 'supervisor' OR Session('previlage') == 'developer') - - @else - - @endif +
    + @if (Session('previlage') == 'supervisor' OR Session('previlage') == 'developer') +
    +
    + + +
    +
    +
    + + @else +
    + + @endif +
    @@ -6131,6 +6142,7 @@ formdata.set('addendumketerangan', addendumketerangan); formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain); formdata.set('viralload', viralload); + formdata.set('nilai_kritis', $('#nilai_kritis').is(':checked') ? '1' : '0'); formdata.set('_token', '{{ csrf_token() }}'); $.each(checkboxValues, (key, val) => formdata.set(key, val)); $.ajax({ diff --git a/htdocs/resources/views/notifications/critical-values.blade.php b/htdocs/resources/views/notifications/critical-values.blade.php new file mode 100644 index 00000000..3c53996b --- /dev/null +++ b/htdocs/resources/views/notifications/critical-values.blade.php @@ -0,0 +1,125 @@ +@extends('base.layout') + +@section('content') +
    +
    +
    +
    +
    +

    Notifikasi Nilai Kritis

    +
    +
    +
    + + @if (session('success')) +
    +
    +
    {{ session('success') }}
    +
    +
    + @endif + +
    +
    +
    +
    +
    Sample Yang Belum Dilaporkan
    + + @if($items->isEmpty()) +
    Tidak ada sample nilai kritis yang perlu dilaporkan.
    + @else +
    + + + + + + + + + + + + + + + @foreach($items as $index => $item) + id) class="table-warning" @endif> + + + + + + + + + + @endforeach + +
    NoNo FotoNo RegisterPasienSpesimenWaktu Set Nilai KritisWaktu DitindaklanjutiAksi
    {{ $index + 1 }}{{ $item->nofoto ?? '-' }}{{ $item->noregister ?? '-' }}{{ $item->nmpasien ?? '-' }}{{ $item->nm_spesimen ?? '-' }} + {{ $item->critical_set_at ? \Carbon\Carbon::parse($item->critical_set_at)->format('d-m-Y H:i:s') : '-' }} + @if(!empty($item->critical_set_by_name)) +
    oleh {{ $item->critical_set_by_name }} + @endif +     		- +
    + @csrf + +
    +
    +
    + @endif +
    +
    +
    +
    + +
    +
    +
    +
    +
    Riwayat Nilai Kritis Yang Sudah Ditindaklanjuti
    + @if($followedItems->isEmpty()) +
    Belum ada riwayat tindak lanjut.
    + @else +
    + + + + + + + + + + + + + + @foreach($followedItems as $index => $item) + id) class="table-warning" @endif> + + + + + + + + + @endforeach + +
    NoNo FotoNo RegisterPasienSpesimenWaktu Set Nilai KritisWaktu Ditindaklanjuti
    {{ $index + 1 }}{{ $item->nofoto ?? '-' }}{{ $item->noregister ?? '-' }}{{ $item->nmpasien ?? '-' }}{{ $item->nm_spesimen ?? '-' }}{{ $item->critical_set_at ? \Carbon\Carbon::parse($item->critical_set_at)->format('d-m-Y H:i:s') : '-' }} + {{ $item->followed_up_at ? \Carbon\Carbon::parse($item->followed_up_at)->format('d-m-Y H:i:s') : '-' }} + @if(!empty($item->followed_up_by_name)) +
    oleh {{ $item->followed_up_by_name }} + @endif +
    +
    + @endif +
    +
    +
    +
    +
    +
    +@endsection diff --git a/htdocs/routes/web.php b/htdocs/routes/web.php index dc4638de..04a5778a 100644 --- a/htdocs/routes/web.php +++ b/htdocs/routes/web.php @@ -111,6 +111,9 @@ Route::group(['middleware' => 'project.ipg'], function() { Route::post('dokter/exsendtoinsitu', [DokterController::class, 'exsendToinsitu'])->name('exsendtoinsitu'); Route::post('dokter/getListadendum', [DokterController::class, 'getListadendum'])->name('getListadendum'); Route::post('dokter/exprinttandaterima', [DokterController::class, 'exTandaTerima'])->name('exTandaTerima'); + Route::get('notifikasi/nilai-kritis', [DokterController::class, 'criticalValueNotifications'])->name('criticalValueNotifications'); + Route::get('notifikasi/nilai-kritis/{id}', [DokterController::class, 'criticalValueNotificationOpen'])->name('criticalValueNotificationOpen'); + Route::post('notifikasi/nilai-kritis/{id}/mark-read', [DokterController::class, 'criticalValueNotificationMarkRead'])->name('criticalValueNotificationMarkRead'); Route::get('pasien', [PasienController::class, 'index']); Route::post('pasien/store', [PasienController::class, 'store']);