diff --git a/htdocs/app/Http/Controllers/FrontpageController.php b/htdocs/app/Http/Controllers/FrontpageController.php index fc9e9f2d..5b2ba909 100644 --- a/htdocs/app/Http/Controllers/FrontpageController.php +++ b/htdocs/app/Http/Controllers/FrontpageController.php @@ -40,15 +40,10 @@ class FrontpageController extends Controller { protected $lisServiceUrl; - public function __construct() - { - // Mengambil URL service dari file .env, dengan fallback default - $this->lisServiceUrl = env('LIS_SERVICE_URL', 'http://10.10.120.14:5000'); + public function __construct() { + $this->lisServiceUrl = env('LIS_SERVICE_URL', 'http://10.10.120.72:5000'); } - private function sendRegistrationToLis(array $data) - { - // Memetakan data dari fungsi register Anda ke format yang dibutuhkan LIS service - // PENTING: Pastikan pemetaan ini benar, terutama 'test_code'. + private function sendRegistrationToLis(array $data){ $payload = [ 'command' => 'register_patient', 'data' => [ @@ -185,7 +180,7 @@ class FrontpageController extends Controller $result = Dokter::where('nama', 'LIKE', '%'.$search.'%')->get(); return response()->json($result); } - public function viewMikro() { + public function viewMikro($master) { if (!Session::has('previlage')) { return redirect('/login'); } @@ -194,7 +189,7 @@ class FrontpageController extends Controller 'allppds' => User::where('previlage', 'ppds')->get(), 'allanalis' => User::where('previlage', 'analis')->get(), 'lokasi' => 'Lab Mikrobiologi', - 'master' => 'mikro', + 'master' => $master, 'antrkrmsitu' => 0, ]; $allOrganisms = Organisms::orderBy('name', 'ASC')->get(); @@ -226,51 +221,42 @@ class FrontpageController extends Controller }; $biakankulturData = $groupOrganisms('biakankultur'); - $mikroorganismeData = $groupOrganisms('mikroorganisme'); - - // Gabungkan data - $data = array_merge($data, [ - 'organismes' => $biakankulturData['organismes'], - 'bacterycateggories' => $biakankulturData['categories'], - 'mikroorganismes' => $mikroorganismeData['organismes'], - 'mikroorganismestlist' => $mikroorganismeData['categories'], - ]); - - // Mapping nama kelompok di array dengan nama kelompok di tabel database - $kelompokMapping = [ - 'jsonsputum' => 'Sputum', - 'jsonswabtenggorok' => 'Swab Tenggorok', - 'jsonurine' => 'Urine', - 'jsonswabperineum' => 'Swab perineum', - 'jsonselepitel' => 'Sel Epitel', - 'jsonselradang' => 'Sel Radang', - 'jsonmikroorganisme' => 'Q Mikroorganisme', - 'jsonjumlahlactobacillus' => 'Lactobacillus', - 'jsonjumlahgardnerella' => 'Gardnerella', - 'jsonjumlahmobiluncus' => 'Mobiluncus', + $mikroorganismeData = $groupOrganisms('mikroorganisme'); + $data = array_merge($data, [ + 'organismes' => $biakankulturData['organismes'], + 'bacterycateggories' => $biakankulturData['categories'], + 'mikroorganismes' => $mikroorganismeData['organismes'], + 'mikroorganismestlist' => $mikroorganismeData['categories'], + ]); + $kelompokMapping = [ + 'jsonsputum' => 'Sputum', + 'jsonswabtenggorok' => 'Swab Tenggorok', + 'jsonurine' => 'Urine', + 'jsonswabperineum' => 'Swab perineum', + 'jsonselepitel' => 'Sel Epitel', + 'jsonselradang' => 'Sel Radang', + 'jsonmikroorganisme' => 'Q Mikroorganisme', + 'jsonjumlahlactobacillus' => 'Lactobacillus', + 'jsonjumlahgardnerella' => 'Gardnerella', + 'jsonjumlahmobiluncus' => 'Mobiluncus', 'jsonpewarnaanziehlnielsen' => 'Pewarnaan Ziehl Nielsen', - 'jsonpewarnaanneisser' => 'Pewarnaan Neisser', - 'jsonpewarnaannegatif' => 'Pewarnaan Negatif', - 'jsonpewarnaanspora' => 'Pewarnaan Spora', - 'jsonmediabap' => 'Media BAP', - 'jsonmediacap' => 'Media CAP', - 'jsonmediamcconkey' => 'Media Mc Conkey', - 'jsonpemeriksaantl' => 'Pemeriksaan Tambahan Lainnya', - 'jsonbiakankultur' => 'Biakan Kultur', - ]; - - // Ambil data tambahan untuk kelompok organisme dari koleksi yang sudah diambil + 'jsonpewarnaanneisser' => 'Pewarnaan Neisser', + 'jsonpewarnaannegatif' => 'Pewarnaan Negatif', + 'jsonpewarnaanspora' => 'Pewarnaan Spora', + 'jsonmediabap' => 'Media BAP', + 'jsonmediacap' => 'Media CAP', + 'jsonmediamcconkey' => 'Media Mc Conkey', + 'jsonpemeriksaantl' => 'Pemeriksaan Tambahan Lainnya', + 'jsonbiakankultur' => 'Biakan Kultur', + ]; foreach ($kelompokMapping as $key => $kelompok) { $data[$key] = $allOrganisms->where('kelompok', $kelompok)->values(); - } - - // Kembalikan view dengan data + } if (Session::get('previlage') == 'developer'){ return view('dokter.ppdsdeveloper', $data); } else { return view('dokter.ppds', $data); } - } public function pengambilan() { if (Session::get('previlage') == ''){ @@ -295,7 +281,7 @@ class FrontpageController extends Controller 'telpon' => $hape ]); $alamathasil = url('/').'/hasil/'.$nofoto; - $linke = 'Berikut%20kami%20kirimkan%20hasil%20dari%20pemeriksaan​%20foto%20anda,%20silahkan%20klik%20tautan%20dibawah%20ini​%0a'.$alamathasil; + $linke = 'Berikut%20kami%20kirimkan%20hasil%20dari%20pemeriksaan%20foto%20anda,%20silahkan%20klik%20tautan%20dibawah%20ini%0a'.$alamathasil; $linke = 'https://api.whatsapp.com/send?phone='.$hape.'&text='.$linke; echo $linke; } @@ -449,7 +435,7 @@ class FrontpageController extends Controller 'Content-type: application/json', 'Authorization: Bearer '.$api_access_key, ); - $url = 'https://insitu.fk.ub.ac.id/api/auth/listallpejabat'; + $url = 'https://radiology.duidev.com/api/auth/listallpejabat'; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_POST, false); //POST Set True @@ -463,7 +449,7 @@ class FrontpageController extends Controller curl_close($ch); $response = json_decode($result); $data['dosens'] = $response; - $url = 'https://insitu.fk.ub.ac.id/api/auth/listallkegiatan'; + $url = 'https://radiology.duidev.com/api/auth/listallkegiatan'; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_POST, false); //POST Set True @@ -586,7 +572,7 @@ class FrontpageController extends Controller 'Authorization: Bearer '.$api_access_key, ); - $url = 'https://insitu.fk.ub.ac.id/api/auth/synckegiatandrris'; + $url = 'https://radiology.duidev.com/api/auth/synckegiatandrris'; $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_POST, true); //POST Set True @@ -1554,7 +1540,7 @@ class FrontpageController extends Controller $tabel = ''; $lists = DB::table('periksa') ->select('periksa.*', 'organisms.satuan as satuanperspesimen', 'organisms.nilai as nilaiperspesimen') - ->leftJoin('periksa', 'organisms.category', 'periksa.kd_spesimen') + ->leftJoin('organisms', 'organisms.category', '=', 'periksa.kd_spesimen') ->where('periksa.noregister', $noregister) ->where('periksa.tgllahirpasien', $tgllahir) ->get(); diff --git a/htdocs/app/Http/Controllers/ListController.php b/htdocs/app/Http/Controllers/ListController.php index a7babe57..9c4f1cd5 100644 --- a/htdocs/app/Http/Controllers/ListController.php +++ b/htdocs/app/Http/Controllers/ListController.php @@ -158,6 +158,7 @@ class ListController extends Controller DB::raw("CASE WHEN status IS NULL THEN 'NEW' + WHEN status = '' THEN 'NEW' WHEN status LIKE '%Dibatalkan%' THEN 'Batal' WHEN status LIKE '%Pemeriksaan Sampel%' THEN 'Pemeriksaan Sampel' WHEN status LIKE '%Proses Analisis Sampel%' THEN 'Diperiksa' @@ -166,9 +167,9 @@ class ListController extends Controller WHEN status LIKE '%Decliend%' THEN 'Decliend' WHEN status LIKE '%Selesai%' THEN 'Selesai' WHEN status LIKE '%Arsip%' THEN 'Arsip' - ELSE 'Unkown' + WHEN status LIKE '%Data Vitek di Terima%' THEN 'Data Vitek di Terima' + ELSE CONCAT('', status::text, '') END AS tlsstatus"), - DB::raw("CASE WHEN status IS NULL THEN CONCAT('', nofoto::text, '') WHEN status LIKE '%Dibatalkan%' THEN CONCAT('', nofoto::text, '') @@ -230,6 +231,7 @@ class ListController extends Controller } $arraylist = $arraylist->get(); } else { + $arraylist = Periksa::select( 'id', 'mulai', 'akhir', 'orderid', 'noloket', 'nofoto', 'noregister', 'asalpasien', 'nmrs', 'pasien_id', 'nmpasien', 'jkpasien', 'tgllahirpasien', 'tlppasien', 'alamatpasien', 'reques', 'usia', 'berat', 'ktp', 'bpjs', 'ruangan_id', @@ -331,7 +333,33 @@ class ListController extends Controller ); - + if ($master == 'ABSES'){ + $arraylist = $arraylist->where('nm_spesimen', 'ABSES HEPAR'); + } else if ($master == 'PERITONEUM'){ + $arraylist = $arraylist->where('nm_spesimen', 'C. PERITONEUM'); + } else if ($master == 'PLEURA'){ + $arraylist = $arraylist->where('nm_spesimen', 'C. PLEURA'); + } else if ($master == 'SENDI'){ + $arraylist = $arraylist->where('nm_spesimen', 'C. SENDI'); + } else if ($master == 'PERITONEUM'){ + $arraylist = $arraylist->where('nm_spesimen', 'C. PERITONEUM'); + } else if ($master == 'ASPIRASI'){ + $arraylist = $arraylist->where('nm_spesimen', 'CAIRAN ASPIRASI'); + } else if ($master == 'HIDUNG'){ + $arraylist = $arraylist->where('nm_spesimen', 'SWAB HIDUNG'); + } else if ($master == 'SWABLAIN'){ + $arraylist = $arraylist->where('nm_spesimen', 'SWAB LAIN LAIN<'); + } else if ($master == 'TELINGA'){ + $arraylist = $arraylist->where('nm_spesimen', 'SWAB TELINGA'); + } else if ($master == 'TENGGOROKAN'){ + $arraylist = $arraylist->where('nm_spesimen', 'SWAB TENGGOROKAN'); + } else if ($master == 'TUBO'){ + $arraylist = $arraylist->where('nm_spesimen', 'TUBO O'); + } else if ($master == '' OR $master == 'all'){ + // no filter + } else { + $arraylist = $arraylist->where('nm_spesimen', $master); + } if ($jenis == 'ThisDay') { $arraylist = $arraylist->where(function($q) { $q->where(function($sub) { diff --git a/htdocs/resources/views/base/partials/header-plain.blade.php b/htdocs/resources/views/base/partials/header-plain.blade.php index ed38ece2..46989aef 100644 --- a/htdocs/resources/views/base/partials/header-plain.blade.php +++ b/htdocs/resources/views/base/partials/header-plain.blade.php @@ -68,9 +68,44 @@ @if(Session::get('previlage') == 'developer')
  • SPV Verification
  • Registration
    • -
  • Expertise
    • +
  • + Specimen + +
  • Patient
  • Report
    • +
  • Pengambilan
  • Logbook