This commit is contained in:
Dwi Swandhana
2026-04-10 22:15:49 +07:00
parent 4f7575c7d4
commit 4d025dc57d
7 changed files with 392 additions and 91 deletions
@@ -629,6 +629,33 @@ class DokterController extends Controller
$pesan = 'Expertise Saved';
return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Sukses', 'message' => $pesan]);
}
case 'preliminary':
$updateData = [
'keterangan' => $keterangan,
'dlp' => $dlp,
'analis' => $analis,
'nmanalis' => $cekanalis->nama ?? null,
'dokter_id' => Session('id'),
'nmdokter' => Session('nama'),
'ppdssenior' => $ppds3,
'nmppdssenior' => $cekppds3->nama ?? null,
'tandatangan' => '',
'verifikasi' => $tglverifikasi,
'nmexcutor' => Session('nama'),
'excutor' => Session('id'),
'status' => 'Preliminary Results',
];
$periksa->update($updateData);
$surat = self::genSurat($periksa->id, 'dengan kop');
Riwayat::create([
'nofoto' => $nofoto,
'jawaban' => $surat,
'inputor' => Session('nama'),
'verifikasi' => 'Accepted',
'keterangan' => 'Preliminary Results',
]);
$pesan = 'Preliminary Results Saved';
return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Sukses', 'message' => $pesan]);
case 'Permohonan Verifikasi':
$updateData = [
'keterangan' => $keterangan,
@@ -3649,7 +3676,7 @@ class DokterController extends Controller
$keterangan = $status;
$status = 'Batal';
} else {
if ($status == 'Arsip' OR $status == 'Selesai'){
if ($status == 'Arsip' OR $status == 'Selesai' OR $status == 'Preliminary Results'){
$status = 'Selesai';
} elseif ($status == 'Decliend'){
$status = 'Ulang';
@@ -3695,7 +3722,7 @@ class DokterController extends Controller
$keterangan = $status;
$status = 'Batal';
} else {
if ($status == 'Arsip' OR $status == 'Selesai'){
if ($status == 'Arsip' OR $status == 'Selesai' OR $status == 'Preliminary Results'){
$status = 'Selesai';
} elseif ($status == 'Decliend'){
$status = 'Ulang';
@@ -682,7 +682,7 @@ class FrontpageController extends Controller
if (!Session::has('previlage')) {
return redirect('/login');
}
$periksa = Periksa::select('id', 'poli_id')->find($periksaId);
$periksa = Periksa::select('id', 'poli_id', 'daftar')->find($periksaId);
if (!$periksa) {
abort(404);
}
@@ -693,11 +693,15 @@ class FrontpageController extends Controller
? $requestedMaster
: $this->resolveMikroMasterFromPoliId($periksa->poli_id);
$returnUrl = $this->resolveExpertiseReturnUrl($request, $master);
$periksaDate = $periksa->daftar ? Carbon::parse($periksa->daftar)->format('Y-m-d') : null;
return view($this->mikroExpertiseViewName(), $this->buildMikroViewData($master, [
'focusPeriksaId' => (string) $periksaId,
'expertiseReturnUrl' => $returnUrl,
'openExpertiseOnLoad' => true,
'initialListMode' => 'searchbydate',
'initialStartDate' => $periksaDate,
'initialEndDate' => $periksaDate,
]));
}
public function cancelEarlyWarning(Request $request, $id)