diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php
index d9db492e..05c06fa0 100644
--- a/htdocs/app/Http/Controllers/DokterController.php
+++ b/htdocs/app/Http/Controllers/DokterController.php
@@ -419,6 +419,20 @@ class DokterController extends Controller
$otheras = $request->input('val20');
$otherppds = $request->input('val21');
$analis = $request->input('analis');
+ if ($keterangan != ''){
+ KomponenJawaban::updateOrCreate(
+ [
+ 'accnumber' => $nofoto,
+ 'template' => $dlp,
+ 'komponen' => 'keterangan',
+ ],
+ [
+ 'isidata' => $keterangan,
+ 'created_by' => Session('nama')
+ ]
+ );
+ }
+
$today = date('Y-m-d H:i:s');
$periksa = Periksa::with(['getPasien', 'getPoli'])->find($idperiksa);
$cekdokter = optional(User::find($iddokter));
@@ -1213,7 +1227,7 @@ class DokterController extends Controller
$isidata .= '';
if ($organism != ''){
- $isidata = 'Organisme yang ditemukan '.$organism.'
'.$isidata;
+ $isidata = 'Organisme yang ditemukan '.$organism.'
'.$isidata;
}
}
if ($isidata == '' OR is_null($isidata)){
@@ -1549,7 +1563,7 @@ class DokterController extends Controller
$iddokter = $request->input('dokter');
$keterangan = $request->input('keterangan');
$kesimpulan = $request->input('kesimpulan');
- $dlp = $request->input('val01');
+ //$dlp = $request->input('val01');
$val02 = $request->input('val02');
$jenisfont = $request->input('val07');
$modality = $request->input('val09');
@@ -1564,6 +1578,19 @@ class DokterController extends Controller
$otheras = $request->input('val20');
$otherppds = $request->input('val21');
$analis = $request->input('analis');
+ if ($keterangan != ''){
+ KomponenJawaban::updateOrCreate(
+ [
+ 'accnumber' => $nofoto,
+ 'template' => $dlp,
+ 'komponen' => 'keterangan',
+ ],
+ [
+ 'isidata' => $keterangan,
+ 'created_by' => Session('nama')
+ ]
+ );
+ }
$junior2 = 0;
$middle2 = 0;
if ($otherppds != ''){
diff --git a/htdocs/app/Http/Controllers/TemplateController.php b/htdocs/app/Http/Controllers/TemplateController.php
index 8cf9d689..d68c8579 100644
--- a/htdocs/app/Http/Controllers/TemplateController.php
+++ b/htdocs/app/Http/Controllers/TemplateController.php
@@ -246,6 +246,7 @@ class TemplateController extends Controller
try {
$id = $request->id;
$tabel = $request->tabel;
+ $data = null;
$pesan = 'Unkown Error';
if ($tabel == 'Organisme'){
if ($id == 'new'){
@@ -312,7 +313,6 @@ class TemplateController extends Controller
} else if ($tabel == 'Parameter'){
$getdatalama = Organisms::where('kelompok', $request->kelompok)->first();
$category = $getdatalama->category ?? $request->kelompok;
-
if ($id == 'new'){
$ceksudah = Organisms::where('name', $request->name)->where('category', $category)->where('kelompok', $request->kelompok)->count();
if ($ceksudah == 0){
diff --git a/htdocs/resources/views/cetak/ekspertisekultur.blade.php b/htdocs/resources/views/cetak/ekspertisekultur.blade.php
index 0c95a080..b81493a5 100644
--- a/htdocs/resources/views/cetak/ekspertisekultur.blade.php
+++ b/htdocs/resources/views/cetak/ekspertisekultur.blade.php
@@ -285,7 +285,7 @@
: |
@if (isset($data['id_bakteri01']))
- {!! $data['id_bakteri01'] !!}
+ {!! $data['id_bakteri01'] !!}
@endif
@if (isset($data['id_bakterisir01']))
( {!! $data['id_bakterisir01'] !!} )
@@ -309,7 +309,7 @@
| : |
@if (isset($data['id_bakteri02']))
- {!! $data['id_bakteri02'] !!}
+ {!! $data['id_bakteri02'] !!}
@endif
@if (isset($data['id_bakterisir02']))
( {!! $data['id_bakterisir02'] !!} )
@@ -335,20 +335,77 @@
@if (isset($data['keterangan']))
@php
+ if (isset($data['id_kbamc'])){
+ $id_kbamc = $data['id_kbamc'];
+ } else {
+ $id_kbamc = '';
+ }
+ if (isset($data['id_kblef'])){
+ $id_kblef = $data['id_kblef'];
+ } else {
+ $id_kblef = '';
+ }
+ if (isset($data['id_kbfos'])){
+ $id_kbfos = $data['id_kbfos'];
+ } else {
+ $id_kbfos = '';
+ }
+ if (isset($data['id_kbscf'])){
+ $id_kbscf = $data['id_kbscf'];
+ } else {
+ $id_kbscf = '';
+ }
+ if (isset($data['id_sirkbamc'])){
+ $id_sirkbamc = $data['id_sirkbamc'];
+ } else {
+ $id_sirkbamc = '';
+ }
+ if (isset($data['id_sirkblef'])){
+ $id_sirkblef = $data['id_sirkblef'];
+ } else {
+ $id_sirkblef = '';
+ }
+ if (isset($data['id_sirkbfos'])){
+ $id_sirkbfos = $data['id_sirkbfos'];
+ } else {
+ $id_sirkbfos = '';
+ }
+ if (isset($data['id_sirkbscf'])){
+ $id_sirkbscf = $data['id_sirkbscf'];
+ } else {
+ $id_sirkbscf = '';
+ }
$keterangan = $data['keterangan'];
$cekadatabel = explode('table', $keterangan);
if (isset($cekadatabel[1])) {
$keterangan = str_replace('', '', $keterangan);
$keterangan = str_replace('', '', $keterangan);
- $keterangan .= ' | | | AMC | ' . ($data['id_kbamc'] ?? '') . ' | ' . ($data['id_sirkbamc'] ?? '') . ' |
';
- $keterangan .= '| | LEV | ' . ($data['id_kblef'] ?? '') . ' | ' . ($data['id_sirkblef'] ?? '') . ' |
';
- $keterangan .= '| | FOS | ' . ($data['id_kbfos'] ?? '') . ' | ' . ($data['id_sirkbfos'] ?? '') . ' |
';
- $keterangan .= '| | SCF | ' . ($data['id_kbscf'] ?? '') . ' | ' . ($data['id_sirkbscf'] ?? '') . ' |
';
+ if ($id_kbamc != '' AND $id_sirkbamc != ''){
+ $keterangan .= '| | Amoxicillin - clavulanic acid | '.$id_kbamc.' | '.$id_sirkbamc.' |
';
+ }
+ if ($id_kblef != '' AND $id_sirkblef != ''){
+ $keterangan .= '| | Levofloxacin | '.$id_kblef.' | '.$id_sirkblef.' |
';
+ }
+ if ($id_kbfos != '' AND $id_sirkbfos != ''){
+ $keterangan .= '| | Fosfomycin | '.$id_kbfos.' | '.$id_sirkbfos.' |
';
+ }
+ if ($id_kbscf != '' AND $id_sirkbscf != ''){
+ $keterangan .= '| | Cefoperazone - Sulbactam | '.$id_kbscf.' | '.$id_sirkbscf.' |
';
+ }
+ $keterangan .= '';
} else {
- $keterangan = $keterangan.'AMC : '.$data['id_kbamc'] ?? ''.' ('.$data['id_sirkbamc'] ?? ''.')
';
- $keterangan = $keterangan.'LEV : '.$data['id_kblef'] ?? ''.' ('.$data['id_sirkblef'] ?? ''.')
';
- $keterangan = $keterangan.'FOS : '.$data['id_kbfos'] ?? ''.' ('.$data['id_sirkbfos'] ?? ''.')
';
- $keterangan = $keterangan.'SCF : '.$data['id_kbscf'] ?? ''.' ('.$data['id_sirkbscf'] ?? ''.')
';
+ if ($id_kbamc != '' AND $id_sirkbamc != ''){
+ $keterangan = $keterangan.'
Amoxicillin - clavulanic acid : '.$id_kbamc.' ('.$id_sirkbamc.')';
+ }
+ if ($id_kblef != '' AND $id_sirkblef != ''){
+ $keterangan = $keterangan.'
Levofloxacin : '.$id_kblef.' ('.$id_sirkblef.')';
+ }
+ if ($id_kbfos != '' AND $id_sirkbfos != ''){
+ $keterangan = $keterangan.'
Fosfomycin : '.$id_kbfos.' ('.$id_sirkbfos.')';
+ }
+ if ($id_kbscf != '' AND $id_sirkbscf != ''){
+ $keterangan = $keterangan.'
Cefoperazone - Sulbactam : '.$id_kbscf.' ('.$id_sirkbscf.')';
+ }
}
echo $keterangan;
@endphp
diff --git a/htdocs/resources/views/dokter/pemeriksaan.blade.php b/htdocs/resources/views/dokter/pemeriksaan.blade.php
index f8b2a177..b08c4cea 100644
--- a/htdocs/resources/views/dokter/pemeriksaan.blade.php
+++ b/htdocs/resources/views/dokter/pemeriksaan.blade.php
@@ -715,9 +715,12 @@
@@ -764,9 +767,12 @@
diff --git a/htdocs/resources/views/dokter/ppds.blade.php b/htdocs/resources/views/dokter/ppds.blade.php
index 2d7715c1..9fcad611 100644
--- a/htdocs/resources/views/dokter/ppds.blade.php
+++ b/htdocs/resources/views/dokter/ppds.blade.php
@@ -760,12 +760,15 @@
-
+
@@ -809,12 +812,15 @@
-
+