From 72041e07ce10fd393ed5168c1e2b6f891b9f5d1b Mon Sep 17 00:00:00 2001 From: Dwi Swandhana Date: Wed, 4 Mar 2026 20:17:46 +0700 Subject: [PATCH] update --- .../app/Http/Controllers/DokterController.php | 44 +++++++++---------- .../Http/Controllers/FrontpageController.php | 2 +- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php index 80ac574c..a1b4e8e1 100644 --- a/htdocs/app/Http/Controllers/DokterController.php +++ b/htdocs/app/Http/Controllers/DokterController.php @@ -2265,29 +2265,27 @@ class DokterController extends Controller $idpemeriksa = Session('id'); $arrnofoto = explode('-', $nofoto); $nofoto = $arrnofoto[0]; - if ($statuse != 'Selesai'){ - if ($statuse == 'Pemeriksaan awal'){ - Periksa::where('id', $id)->where('status', 'Pemeriksaan awal')->update([ - 'status' => 'Pemeriksaan Sampel', - 'excutor' => $idpemeriksa, - ]); - return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Success', 'message' => 'Status Updated']); - return back(); - } else if ($statuse == 'Pemeriksaan Sampel'){ - Periksa::where('id', $id)->whereNull('status')->update([ - 'status' => 'Pemeriksaan awal', - 'excutor' => $idpemeriksa, - ]); - return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Success', 'message' => 'Status Updated']); - return back(); - } else { - Periksa::where('id', $id)->whereNull('status')->update([ - 'status' => 'Pemeriksaan awal', - 'excutor' => $idpemeriksa, - ]); - return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Success', 'message' => 'Status Updated']); - return back(); - } + if ($statuse == 'Pemeriksaan awal' OR $statuse == 'Penerimaan Sampel'){ + Periksa::where('id', $id)->update([ + 'status' => 'Pemeriksaan Sampel', + 'excutor' => $idpemeriksa, + ]); + return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Success', 'message' => 'Status Updated']); + return back(); + } else if ($statuse == 'Pemeriksaan Sampel'){ + Periksa::where('id', $id)->update([ + 'status' => 'Pemeriksaan awal', + 'excutor' => $idpemeriksa, + ]); + return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Success', 'message' => 'Status Updated']); + return back(); + } else { + Periksa::where('id', $id)->whereNull('status')->update([ + 'status' => 'Pemeriksaan awal', + 'excutor' => $idpemeriksa, + ]); + return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Success', 'message' => 'Status Updated']); + return back(); } } public function getFoto(Request $request) { diff --git a/htdocs/app/Http/Controllers/FrontpageController.php b/htdocs/app/Http/Controllers/FrontpageController.php index b624d55d..30e32eca 100644 --- a/htdocs/app/Http/Controllers/FrontpageController.php +++ b/htdocs/app/Http/Controllers/FrontpageController.php @@ -1098,7 +1098,7 @@ class FrontpageController extends Controller } } public function registerApi(Request $request) { - //Log::info(' Incomming '.json_encode($request->input())); + Log::info(' Incomming '.json_encode($request->input())); $decodedData = $request->json()->all(); $norm = $decodedData['norm'] ?? null; $nama = $decodedData['nama'] ?? null;