diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php index e4ee61c3..9fc3b95c 100644 --- a/htdocs/app/Http/Controllers/DokterController.php +++ b/htdocs/app/Http/Controllers/DokterController.php @@ -52,7 +52,7 @@ class DokterController extends Controller { protected static function genSurat($id, $tabel){ - if ($tabel == 'dengan kop' OR $tabel == 'PDF'){ + if ($tabel == 'GenerateHTMLFinal' OR $tabel == 'dengan kop' OR $tabel == 'PDF'){ $kopsurat = url('/kopsurat.png'); } else { $kopsurat = ''; @@ -157,6 +157,7 @@ class DokterController extends Controller $data['kopsurat'] = $kopsurat; $data['nik'] = $nik; $data['bpjs'] = $bpjs; + $data['tabel'] = $tabel; if ($dlp == 'TBC'){ $cekjenis = KomponenJawaban::where('accnumber', $periksa->nofoto)->where('komponen', 'id_jenispemeriksaantb')->first(); $template = $cekjenis->isidata ?? ''; @@ -751,6 +752,19 @@ class DokterController extends Controller 'keterangan' => 'Draft', ]); return response()->json(['icon' => 'success', 'status' => 'Success', 'message' => 'Draft Expertise Saved']); + case 'GenerateHTMLFinal': + $periksa->update([ + 'keterangan' => $keterangan, + 'dlp' => $dlp, + 'analis' => $analis, + 'nmanalis' => $cekanalis->nama ?? null, + 'nmdrafter' => Session('nama'), + 'nmexcutor' => Session('nama'), + 'excutor' => Session('id'), + 'status' => $statusdraft + ]); + $surat = self::genSurat($periksa->id, 'GenerateHTMLFinal'); + return response()->json(['icon' => 'success', 'status' => 'Success', 'message' => 'Draft Expertise Saved']); case 'terimadendum': $getid = Riwayat::where('keterangan', 'Adendum')->where('nofoto', $nofoto)->whereNull('verifikasi')->first(); if (isset($getid->id)){ diff --git a/htdocs/resources/views/cetak/ekspertisekultur.blade.php b/htdocs/resources/views/cetak/ekspertisekultur.blade.php index a2de0ed5..ede42a07 100644 --- a/htdocs/resources/views/cetak/ekspertisekultur.blade.php +++ b/htdocs/resources/views/cetak/ekspertisekultur.blade.php @@ -449,7 +449,7 @@ $left = $items->slice(0, $half)->values(); $right = $items->slice($half)->values(); @endphp - @if ($statuspemeriksaan == 'Preliminary Results') + @if ($statuspemeriksaan == 'Preliminary Results' AND $tabel != 'GenerateHTMLFinal')

Uji Kepekaan antibiotik on going

@else @if ($cetakjudul) diff --git a/htdocs/resources/views/dokter/pemeriksaan.blade.php b/htdocs/resources/views/dokter/pemeriksaan.blade.php index 8e0ea519..d500f4b6 100644 --- a/htdocs/resources/views/dokter/pemeriksaan.blade.php +++ b/htdocs/resources/views/dokter/pemeriksaan.blade.php @@ -6655,7 +6655,7 @@ var formdata = new FormData($('#kt_form')[0]); formdata.set('periksa_id', periksa_id); formdata.set('acc_number', acc_number); - formdata.set('val01', 'Draft'); + formdata.set('val01', 'GenerateHTMLFinal'); formdata.set('val10', template_jenis); formdata.set('keterangan', keterangan); formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain); diff --git a/htdocs/resources/views/dokter/ppds.blade.php b/htdocs/resources/views/dokter/ppds.blade.php index fb44249f..77750d38 100644 --- a/htdocs/resources/views/dokter/ppds.blade.php +++ b/htdocs/resources/views/dokter/ppds.blade.php @@ -6713,7 +6713,7 @@ var formdata = new FormData($('#kt_form')[0]); formdata.set('periksa_id', periksa_id); formdata.set('acc_number', acc_number); - formdata.set('val01', 'Draft'); + formdata.set('val01', 'GenerateHTMLFinal'); formdata.set('val10', template_jenis); formdata.set('keterangan', keterangan); formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain); diff --git a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php index a38588a4..b4d75f5e 100644 --- a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php +++ b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php @@ -6865,7 +6865,7 @@ var formdata = new FormData($('#kt_form')[0]); formdata.set('periksa_id', periksa_id); formdata.set('acc_number', acc_number); - formdata.set('val01', 'Draft'); + formdata.set('val01', 'GenerateHTMLFinal'); formdata.set('val10', template_jenis); formdata.set('keterangan', keterangan); formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain);