Update

htdocs/app/Http/Controllers/DokterController.php

@@ -470,9 +470,10 @@ class DokterController extends Controller
 					'created_by'	=> Session('nama')
 				]
 			);
+			KomponenJawaban::where('accnumber', $nofoto)->where('template', $dlp)->delete();
 			$data = $request->except(['_token', 'periksa_id', 'val01', 'val10', 'acc_number']);
 			foreach ($data as $key => $value) {
-				if (empty($value)) continue;
+				if ($value === "" || is_null($value)) continue;
 				if (is_array($value)) {
 					KomponenJawaban::updateOrCreate(
 						[
@@ -738,6 +739,7 @@ class DokterController extends Controller
 			}
 			$cekdatanmaddendum 	= Periksa::where('nofoto', $nofoto)->first();
 			$tgldaftarpasangan  = $cekdatanmaddendum->daftar ?? '';
+			/*
 			$getdatapasangannya = Periksa::whereNotNull('nmadendum')->where('dlp', '!=', $ruangan)->where('daftar', $tgldaftarpasangan)->where('nofoto', '!=', $nofoto)->get();
 			foreach ($getdatapasangannya as $item){
 				$datayangperludicloning = KomponenJawaban::where('accnumber', $item->nofoto)->get();
@@ -790,6 +792,7 @@ class DokterController extends Controller
 					}
 				}
 			}
+			*/
 			KomponenJawaban::where('accnumber', $nofoto)->where('komponen', 'bakteri')->update([
 				'template'		=> $ruangan,
 			]);
@@ -1158,14 +1161,13 @@ class DokterController extends Controller
 			$i 			= 0;
 			$data		= new RekapAntibiotik();
 			$data 		= $data->where('orderid', $id);
-			$limit		= ($request->input('limit') == null ? '30' : $request->input('limit'));
+			$limit		= ($request->input('limit') == null ? '100' : $request->input('limit'));
 			$order		= ($request->input('order') == null ? 'id asc' : $request->input('order'));
 			$komponen	= $request->input('komponen');
 			$kuman		= $request->input('isi');
 			if ($komponen == 'otomatis' AND $kuman == ''){
 				$cekada = ResultSample::where('accession_number', 'LIKE', $nofoto.'%')->first();
 				$kuman 	= $cekada->organism ?? '';
-				
 			}
 			$data 		= $data->where('kuman', $kuman);
 			$data		= $data->orderByRaw($order)->paginate($limit);
@@ -1204,11 +1206,12 @@ class DokterController extends Controller
 				if ($kuman == 'Pilih Salah Satu' OR $kuman == 'undefined' OR $kuman == '' OR is_null($kuman)){
 					return response()->json(['icon' => 'success', 'warna' => '#1dcbbd', 'status' => 'Success', 'message' => 'Data Kuman Manual Dihapus']);
 				} else {
+					$jumlah 		= 0;
 					$cekdulu 		= RekapAntibiotik::where('orderid', $idperiksa)->where('kuman', $kuman)->count();
 					if ($cekdulu == 0){
 						$jsonantibiotikmanual = array(
 									'Amoxycillin',
-									'Amoxycillin & Clavulanic Acid',
+									'Amoxycillin and Clavulanic Acid',
 									'Ampicillin',
 									'Ampicillin/ Sulbactam',
 									'Benzilpenicillin',
@@ -1268,9 +1271,10 @@ class DokterController extends Controller
 									'updated_at'		=> date('Y-m-d H:i:s'),
 								]
 							);
+							$jumlah++;
 						}
 					}
-					return response()->json(['icon' => 'success', 'warna' => '#1dcbbd', 'status' => 'Success', 'message' => 'Data Kuman Manual Disimpan']);
+					return response()->json(['icon' => 'success', 'warna' => '#1dcbbd', 'status' => 'Success', 'message' => 'Data Kuman Manual Disimpan dengan '.$jumlah.' Antibiotik']);
 				}
 			} catch (Exception $e) {
 				$pesan 	= $e->getMessage();

htdocs/resources/views/cetak/ekspertisecci.blade.php

@@ -47,9 +47,9 @@
         </tr>
         <tr>
             <td valign="top">&nbsp;</td>
-            <td valign="top">Jenis Kelamin</td>
+            <td valign="top">No.Rekam Medik</td>
             <td valign="top">:</td>
-            <td valign="top">{{ $periksa->jkpasien }}</td>
+            <td valign="top">{{ $periksa->noregister }}</td>
             <td valign="top">Diagnosa</td>
             <td valign="top">:</td>
             <td valign="top" colspan="2">{!! $periksa->klinis !!}</td>
@@ -57,9 +57,9 @@
 
         <tr>
             <td valign="top">&nbsp;</td>
-            <td valign="top">Usia</td>
+            <td valign="top">Jenis Kelamin / Usia</td>
             <td valign="top">:</td>
-            <td valign="top">{{ $periksa->usia }}</td>
+            <td valign="top">{{ $periksa->jkpasien }} / {{ $periksa->usia }}</td>
             <td valign="top">Jenis Pemeriksaan</td>
             <td valign="top">:</td>
             <td valign="top" colspan="2">{!! $periksa->reques !!}</td>
@@ -205,7 +205,7 @@
                 @endif
 
                 @if (isset($keterangan))
-                    Komentar:<br />
+                    <br />Komentar:<br />
                     {!! $keterangan !!}
                 @endif
             </td>

htdocs/resources/views/cetak/ekspertisekultur.blade.php

@@ -64,9 +64,9 @@
         </tr>
         <tr>
             <td valign="top">&nbsp;</td>
-            <td valign="top">Jenis Kelamin</td>
+            <td valign="top">No.Rekam Medik</td>
             <td valign="top">:</td>
-            <td valign="top">{{ $periksa->jkpasien }}</td>
+            <td valign="top">{{ $periksa->noregister }}</td>
             <td valign="top">Diagnosa</td>
             <td valign="top">:</td>
             <td valign="top" colspan="2">{!! $periksa->klinis !!}</td>
@@ -74,9 +74,9 @@
 
         <tr>
             <td valign="top">&nbsp;</td>
-            <td valign="top">Usia</td>
+            <td valign="top">Jenis Kelamin / Usia</td>
             <td valign="top">:</td>
-            <td valign="top">{{ $periksa->usia }}</td>
+            <td valign="top">{{ $periksa->jkpasien }} / {{ $periksa->usia }}</td>
             <td valign="top">Jenis Pemeriksaan</td>
             <td valign="top">:</td>
             <td valign="top" colspan="2">{!! $periksa->reques !!}</td>
@@ -138,7 +138,7 @@
                             </td>
                         </tr>
                     @endif
-                    @if (isset($data['id_jumlahlactobacillus']) OR isset($data['id_jumlahgardnerella']) OR isset($data['id_jumlahmobiluncus']))
+                    @if (isset($data['id_jumlahlactobacillus']) OR isset($data['id_jumlahgardnerella']) OR isset($data['id_jumlahmobiluncus']) OR isset($data['id_lactobacillus']) OR isset($data['id_gardnerella']) OR isset($data['id_mobiluncus']))
                         <tr>
                             <td valign="top">&nbsp;</td>
                             <td valign="top" colspan="2">
@@ -203,12 +203,14 @@
                                             @php 
                                                 $jumlah = (int)$id_lactobacillus + (int)$id_gardnerella + (int)$id_mobiluncus;
                                                 echo $jumlah;
-                                                if ($jumlah >= 10){
+                                                if ($jumlah >= 0 && $jumlah <= 3) {
-                                                    $keterangan = "Bacterial vaginosis";
-                                                } else if ($jumlah >= 6){
-                                                    $keterangan = "Intermediate";
-                                                } else {
                                                     $keterangan = "Normal";
+                                                } elseif ($jumlah >= 4 && $jumlah <= 6) {
+                                                    $keterangan = "Intermediate";
+                                                } elseif ($jumlah >= 7 && $jumlah <= 10) {
+                                                    $keterangan = "Bacterial vaginosis";
+                                                } else {
+                                                    $keterangan = "Nilai tidak valid";
                                                 }
                                             @endphp
                                         </td>
@@ -226,13 +228,22 @@
                             $nomor++;
                         @endphp
                     <tr>
-                        <td valign="top">{{$nomor}}. Pewarnaan Ziehl Neelsen (Pagi/Sewaktu)</td>
+                        <td valign="top">{{$nomor}}. Pewarnaan Ziehl Neelsen Pagi</td>
                         <td valign="top">:</td>
                         <td valign="top">
                             {!! $data['id_pewarnaanziehlnielsen'] !!}
-                            @if (isset($data['id_pewarnaanziehlnielsensewaktu']))
+                        </td>
-                            / {!! $data['id_pewarnaanziehlnielsensewaktu'] !!}
+                    </tr>
-                            @endif
+                    @endif
+                    @if (isset($data['id_pewarnaanziehlnielsensewaktu']))
+                        @php 
+                            $nomor++;
+                        @endphp
+                    <tr>
+                        <td valign="top">{{$nomor}}. Pewarnaan Ziehl Neelsen Sewaktu</td>
+                        <td valign="top">:</td>
+                        <td valign="top">
+                            {!! $data['id_pewarnaanziehlnielsensewaktu'] !!}
                         </td>
                     </tr>
                     @endif
@@ -316,33 +327,63 @@
                     $cekketerangan = explode('/table', $keterangan);
                 @endphp
 
-                @if (!isset($cekketerangan[1]) && isset($antibiotiks) && $antibiotiks->isNotEmpty())
+                @if (isset($antibiotiks) && $antibiotiks->isNotEmpty())
-                   
-
                     @php
-                        // Kelompokkan antibiotik berdasarkan nama kuman
                         $grouped = $antibiotiks->filter(function ($row) {
                             return $row->printrow; // hanya yang perlu dicetak
                         })->groupBy('kuman');
+                        if (empty($grouped) || $grouped->isEmpty()) {
+                            if (isset($data['bakteri'])) {
+                                if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK') {
+                                } else {
+                                    echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['bakteri'] . "</i></strong> " . ($data['bakterisir'] ?? '') . "</p>";
+                                }
+                            }
+                            if (isset($data['id_bakteri01'])) {
+                                echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri01'] . "</i></strong> " . ($data['id_bakterisir01'] ?? '') . "</p>";
+                            }
+                            if (isset($data['id_bakteri02'])) {
+                                echo "<p>Bakteri Yang ditemukan : <strong><i>" . $data['id_bakteri02'] . "</i></strong> " . ($data['id_bakterisir02'] ?? '') . "</p>";
+                            }
+                        }
                     @endphp
-
-                    {{-- Loop tiap kuman --}}
                     @foreach ($grouped as $kuman => $items)
                         @php
                             $cetakjudul = false;
+                            $sudahcetak1= 0;
+                            $sudahcetak2= 0;
+                            $sudahcetak3= 0;
                         @endphp
                         @if (isset($data['bakteri']) AND $data['bakteri'] == $kuman)
-                            <p>Bakteri Yang ditemukan : <strong><i>{{ $data['bakteri'] }}</i></strong> {{ $data['bakterisir'] ?? '' }}</p>
+                            @if (isset($data['id_baktericetak']) AND $data['id_baktericetak'] == 'TIDAK')
-                            @if (isset($data['id_bakterihitungkol']))
+                            @else
+                                @if ($sudahcetak1 == 0)
+                                    @php
+                                        $sudahcetak1 = 1;
+                                    @endphp
+                                    <p>Bakteri Yang ditemukan : <strong><i>{{ $data['bakteri'] }}</i></strong> {{ $data['bakterisir'] ?? '' }}</p>
+                                @endif
+                            @endif
+                            @if (isset($data['id_bakterihitungkolteks']))
+                                <p>Jumlah Koloni : <strong><i>{{ $data['id_bakterihitungkolteks'] }}</i></strong></p>
+                            @elseif (isset($data['id_bakterihitungkol']))
                                 <p>Jumlah Koloni : <strong><i>{{ $data['id_bakterihitungkol'] }}</i></strong></p>
                             @endif
+                        
                             @php
                                 $cetakjudul = true; 
                             @endphp
                         @endif
                         @if (isset($data['id_bakteri01']) AND $data['id_bakteri01'] == $kuman)
-                            <p>Bakteri Yang ditemukan : <strong><i>{{ $data['id_bakteri01'] }}</i></strong> {{ $data['id_bakterisir01'] ?? '' }}</p>
+                            @if ($sudahcetak2 == 0)
-                            @if (isset($data['id_bakterihitungkol01']))
+                                @php
+                                    $sudahcetak2 = 1;
+                                @endphp
+                                <p>Bakteri Yang ditemukan : <strong><i>{{ $data['id_bakteri01'] }}</i></strong> {{ $data['id_bakterisir01'] ?? '' }}</p>
+                            @endif
+                            @if (isset($data['id_bakterihitungkolteks01']))
+                                <p>Jumlah Koloni : <strong><i>{{ $data['id_bakterihitungkolteks01'] }}</i></strong></p>
+                            @elseif (isset($data['id_bakterihitungkol01']))
                                 <p>Jumlah Koloni : <strong><i>{{ $data['id_bakterihitungkol01'] }}</i></strong></p>
                             @endif
                             @php
@@ -350,8 +391,15 @@
                             @endphp
                         @endif
                         @if (isset($data['id_bakteri02']) AND $data['id_bakteri02'] == $kuman)
-                            <p>Bakteri Yang ditemukan : <strong><i>{{ $data['id_bakteri02'] }}</i></strong> {{ $data['id_bakterisir02'] ?? '' }}</p>
+                            @if ($sudahcetak3 == 0)
-                            @if (isset($data['id_bakterihitungkol02']))
+                                @php
+                                    $sudahcetak3 = 1;
+                                @endphp
+                                <p>Bakteri Yang ditemukan : <strong><i>{{ $data['id_bakteri02'] }}</i></strong> {{ $data['id_bakterisir02'] ?? '' }}</p>
+                            @endif
+                            @if (isset($data['id_bakterihitungkolteks02']))
+                                <p>Jumlah Koloni : <strong><i>{{ $data['id_bakterihitungkolteks02'] }}</i></strong></p>
+                            @elseif (isset($data['id_bakterihitungkol02']))
                                 <p>Jumlah Koloni : <strong><i>{{ $data['id_bakterihitungkol02'] }}</i></strong></p>
                             @endif
                             @php
@@ -413,7 +461,7 @@
 
 
                 @if (isset($data['keterangan']))
-                    Komentar:<br />
+                    <br />Komentar:<br />
                     {!! $data['keterangan'] !!}
                 @endif
             </td>

htdocs/resources/views/cetak/ekspertisepl.blade.php

@@ -46,9 +46,9 @@
         </tr>
         <tr>
             <td valign="top">&nbsp;</td>
-            <td valign="top">Jenis Kelamin</td>
+            <td valign="top">No.Rekam Medik</td>
             <td valign="top">:</td>
-            <td valign="top">{{ $periksa->jkpasien }}</td>
+            <td valign="top">{{ $periksa->noregister }}</td>
             <td valign="top">Diagnosa</td>
             <td valign="top">:</td>
             <td valign="top" colspan="2">{!! $periksa->klinis !!}</td>
@@ -56,9 +56,9 @@
 
         <tr>
             <td valign="top">&nbsp;</td>
-            <td valign="top">Usia</td>
+            <td valign="top">Jenis Kelamin / Usia</td>
             <td valign="top">:</td>
-            <td valign="top">{{ $periksa->usia }}</td>
+            <td valign="top">{{ $periksa->jkpasien }} / {{ $periksa->usia }}</td>
             <td valign="top">Jenis Pemeriksaan</td>
             <td valign="top">:</td>
             <td valign="top" colspan="2">{!! $periksa->reques !!}</td>
@@ -291,7 +291,7 @@
                 @endif
 
                 @if (isset($keterangan))
-                    Komentar:<br />
+                    <br />Komentar:<br />
                     {!! $keterangan !!}
                 @endif
             </td>

htdocs/resources/views/cetak/ekspertisevl.blade.php

@@ -62,9 +62,9 @@
         </tr>
         <tr>
             <td valign="top">&nbsp;</td>
-            <td valign="top">Jenis Kelamin</td>
+            <td valign="top">No.Rekam Medik</td>
             <td valign="top">:</td>
-            <td valign="top">{{ $periksa->jkpasien }}</td>
+            <td valign="top">{{ $periksa->noregister }}</td>
             <td valign="top">Diagnosa</td>
             <td valign="top">:</td>
             <td valign="top" colspan="2">{!! $periksa->klinis !!}</td>
@@ -72,9 +72,9 @@
 
         <tr>
             <td valign="top">&nbsp;</td>
-            <td valign="top">Usia</td>
+            <td valign="top">Jenis Kelamin / Usia</td>
             <td valign="top">:</td>
-            <td valign="top">{{ $periksa->usia }}</td>
+            <td valign="top">{{ $periksa->jkpasien }} / {{ $periksa->usia }}</td>
             <td valign="top">Jenis Pemeriksaan</td>
             <td valign="top">:</td>
             <td valign="top" colspan="2">{!! $periksa->reques !!}</td>
@@ -241,12 +241,11 @@
                     </table>
                 @endif
 
-                Komentar:<br />
+                <br />Komentar:<br />
                 @if (isset($data['viralload']))
                     {!! $data['viralload'] !!}
                 @endif
                 @if (isset($data['keterangan']))
-                    Komentar:<br />
                     {!! $data['keterangan'] !!}
                 @endif
             </td>

htdocs/resources/views/dokter/pemeriksaan.blade.php

@@ -1727,7 +1727,7 @@
 													<div class="form-group col-lg-12 table-responsive p-0">
 														<div class="row">
 															<div class="form-group col-lg-3">
-																<input type="text" id="bakteri" class="form-control ekspertiseteks" readonly>
+																<input type="text" id="bakteri" name="bakteri" class="form-control ekspertiseteks" readonly>
 															</div>
 															<div class="form-group col-lg-3">
 																<select class="form-control ekspertiseseletc" id="bakterisir" name="bakterisir">
@@ -1742,13 +1742,23 @@
 																	<option value="XDR Carbapenem Resistant">XDR Carbapenem Resistant</option>
 																</select>
 															</div>
-															<div class="form-group col-lg-3">
+															<div class="form-group col-lg-3" id="id_bakterihitungkolselect">
 																<select class="form-control ekspertiseseletc" id="id_bakterihitungkol" name="id_bakterihitungkol">
 																	<option value="">Pilih Salah Satu</option>
 																	<option value="&ge; 10⁵ CFU/ml Urine (Bakteriuria bermakna)">&ge; 10⁵ CFU/ml Urine (Bakteriuria bermakna)</option>
 																	<option value="&ge; 10⁵ CFU/ml Urine (Candiduria bermakna)">&ge; 10⁵ CFU/ml Urine (Candiduria bermakna)</option>
 																	<option value="&ge; 10³ CFU/ml Urine (Bakteriuria bermakna)">&ge; 10³ CFU/ml Urine (Bakteriuria bermakna)</option>
 																	<option value="8 x 10³  CFU/ml Urine (Bakteriuria bermakna)">8 x 10³ CFU/ml Urine (Bakteriuria bermakna)</option>
+																	<option value="lainnya">lainnya</option>
+																</select>
+															</div>
+															<div class="form-group col-lg-3" id="id_bakterihitungkolteks">
+																<input type="text" id="id_bakterihitungkolteks" name="id_bakterihitungkolteks" class="form-control ekspertiseteks">
+															</div>
+															<div class="form-group col-lg-3">
+																<select class="form-control ekspertiseseletc" id="id_baktericetak" name="id_baktericetak">
+																	<option value="YA">YA</option>
+																	<option value="TIDAK">TIDAK</option>
 																</select>
 															</div>
 															<div class="form-group col-lg-3">
@@ -1760,6 +1770,7 @@
 														<table class="table table-striped table-valign-middle" id="tblvitek">
 															<thead>
 																<tr>
+																	<th>No</th>
 																	<th>
 																		<button type="button" class="btn btn-primary btn-rounded" id="btnunprintall">
 																			<i class="fa fa-ban"></i>
@@ -1833,13 +1844,13 @@
 																</select>
 															</div>
 															<div class="form-group col-lg-4" id="id_bakterihitungkol01teks">
-																<label for="id_bakterihitungkolteks01" class="col-form-label">Hitung Koloni I</label>
 																<input type="text" id="id_bakterihitungkolteks01" name="id_bakterihitungkolteks01" class="form-control ekspertiseteks">
 															</div>
 														</div>
 														<table class="table table-striped table-valign-middle" id="tblkumanmanual1">
 															<thead>
 																<tr>
+																	<th>No</th>
 																	<th>
 																		<button type="button" class="btn btn-primary btn-rounded" id="btnunprintallkumanmanual1">
 																			<i class="fa fa-ban"></i>
@@ -1913,13 +1924,13 @@
 																</select>
 															</div>
 															<div class="form-group col-lg-4" id="id_bakterihitungkol02teks">
-																<label for="id_bakterihitungkolteks02" class="col-form-label">Hitung Koloni II</label>
 																<input type="text" id="id_bakterihitungkolteks02" name="id_bakterihitungkolteks02" class="form-control ekspertiseteks">
 															</div>
 														</div>
 														<table class="table table-striped table-valign-middle" id="tblkumanmanual2">
 															<thead>
 																<tr>
+																	<th>No</th>
 																	<th>
 																		<button type="button" class="btn btn-primary btn-rounded" id="btnunprintallkumanmanual2">
 																			<i class="fa fa-ban"></i>
@@ -2389,6 +2400,15 @@
 				dataSrc: 'data'
 			},
 			columns: [
+				{
+					data: null,
+					name: 'nomor',
+					orderable: false,
+					searchable: false,
+					render: function (data, type, row, meta) {
+						return meta.row + meta.settings._iDisplayStart + 1;
+					}
+				},
 				{
 					data: null,
 					render: function (data, type, full) {
@@ -2465,6 +2485,15 @@
 				dataSrc: 'data'
 			},
 			columns: [
+				{
+					data: null,
+					name: 'nomor',
+					orderable: false,
+					searchable: false,
+					render: function (data, type, row, meta) {
+						return meta.row + meta.settings._iDisplayStart + 1;
+					}
+				},
 				{
 					data: null,
 					render: function (data, type, full) {
@@ -2541,6 +2570,15 @@
 				dataSrc: 'data'
 			},
 			columns: [
+				{
+					data: null,
+					name: 'nomor',
+					orderable: false,
+					searchable: false,
+					render: function (data, type, row, meta) {
+						return meta.row + meta.settings._iDisplayStart + 1;
+					}
+				},
 				{
 					data: null,
 					render: function (data, type, full) {
@@ -2601,6 +2639,12 @@
 		$('#divtemplate').hide();
 		$('.templatejawaban').hide();
 		$('.setelahdipilihtemplate').show();
+		$('#id_bakterihitungkolselect').show();
+		$('#id_bakterihitungkolteks').hide();
+		$('#id_bakterihitungkol01select').show();
+		$('#id_bakterihitungkol01teks').hide();
+		$('#id_bakterihitungkol02select').show();
+		$('#id_bakterihitungkol02teks').hide();
 		$('input[type="checkbox"]').prop('disabled', false);
 		if (dlp == 'CCI'){
 			$('#templatecci').show();
@@ -2610,10 +2654,6 @@
 			$('#pewarnaangiemsateks').hide();
 			$('#pewarnaankohselect').show();
 			$('#pewarnaankohteks').hide();
-			$('#id_bakterihitungkol01select').show();
-			$('#id_bakterihitungkol01teks').hide();
-			$('#id_bakterihitungkol02select').show();
-			$('#id_bakterihitungkol02teks').hide();
 		} else if (dlp == 'Pewarna Langsung'){
 			$('#lsg_pewarnaankohselect').show();
 			$('#lsg_pewarnaankohteks').hide();
@@ -2710,6 +2750,10 @@
 							$('#lsg_pewarnaangiesmaselect').hide();
 							$('#lsg_pewarnaangiesmateks').show();
 						}
+						if (rows.komponen === 'id_bakterihitungkolteks'){
+							$('#id_bakterihitungkolselect').hide();
+							$('#id_bakterihitungkolteks').show();
+						}
 						if (rows.komponen === 'id_bakterihitungkolteks01'){
 							$('#id_bakterihitungkol01select').hide();
 							$('#id_bakterihitungkol01teks').show();
@@ -2883,6 +2927,7 @@
 						$(".isiandasar").val('');
 						$(".ekspertiseteks").val('');
 						$(".ekspertiseseletc").val('');
+						$(".pilihankirby").val('');
 						$('input[type="checkbox"], input[type="radio"]').prop('checked', false).prop('disabled', false);
 						
 						var goook       	= dataRecord.id;
@@ -3548,9 +3593,7 @@
 						hideAfter	: 5000,
 						stack		: 1
 					});
-					$('#divperiksa').hide();
+					window.location.href = "{{ url('/reportppds') }}";
-					$('#divreadonly').hide();
-					$('#divawal').show();
                     return false;
                 },
                 error: function (xhr, status, error) {
@@ -3922,9 +3965,15 @@
 				} else if (komponen == 'id_pewarnaankoh' && isi == 'lainnya'){
 					$('#pewarnaankohselect').hide();
 					$('#pewarnaankohteks').show();
+				} else if (komponen == 'id_bakterihitungkol' && isi == 'lainnya'){
+					$('#id_bakterihitungkolselect').hide();
+					$('#id_bakterihitungkolteks').show();
 				} else if (komponen == 'id_bakterihitungkol01' && isi == 'lainnya'){
 					$('#id_bakterihitungkol01select').hide();
 					$('#id_bakterihitungkol01teks').show();
+				} else if (komponen == 'id_bakterihitungkol02' && isi == 'lainnya'){
+					$('#id_bakterihitungkol02select').hide();
+					$('#id_bakterihitungkol02teks').show();
 				} else if (komponen == 'lsg_pewarnaankoh' && isi == 'lainnya'){
 					$('#lsg_pewarnaankohselect').hide();
 					$('#lsg_pewarnaankohteks').show();

htdocs/resources/views/dokter/ppds.blade.php

@@ -1783,7 +1783,7 @@
 													<div class="form-group col-lg-12 table-responsive p-0">
 														<div class="row">
 															<div class="form-group col-lg-3">
-																<input type="text" id="bakteri" class="form-control ekspertiseteks" readonly>
+																<input type="text" id="bakteri" name="bakteri" class="form-control ekspertiseteks" readonly>
 															</div>
 															<div class="form-group col-lg-3">
 																<select class="form-control ekspertiseseletc" id="bakterisir" name="bakterisir">
@@ -1798,13 +1798,23 @@
 																	<option value="XDR Carbapenem Resistant">XDR Carbapenem Resistant</option>
 																</select>
 															</div>
-															<div class="form-group col-lg-3">
+															<div class="form-group col-lg-3" id="id_bakterihitungkolselect">
 																<select class="form-control ekspertiseseletc" id="id_bakterihitungkol" name="id_bakterihitungkol">
 																	<option value="">Pilih Salah Satu</option>
 																	<option value="&ge; 10⁵ CFU/ml Urine (Bakteriuria bermakna)">&ge; 10⁵ CFU/ml Urine (Bakteriuria bermakna)</option>
 																	<option value="&ge; 10⁵ CFU/ml Urine (Candiduria bermakna)">&ge; 10⁵ CFU/ml Urine (Candiduria bermakna)</option>
 																	<option value="&ge; 10³ CFU/ml Urine (Bakteriuria bermakna)">&ge; 10³ CFU/ml Urine (Bakteriuria bermakna)</option>
 																	<option value="8 x 10³  CFU/ml Urine (Bakteriuria bermakna)">8 x 10³ CFU/ml Urine (Bakteriuria bermakna)</option>
+																	<option value="lainnya">lainnya</option>
+																</select>
+															</div>
+															<div class="form-group col-lg-3" id="id_bakterihitungkolteks">
+																<input type="text" id="id_bakterihitungkolteks" name="id_bakterihitungkolteks" class="form-control ekspertiseteks">
+															</div>
+															<div class="form-group col-lg-3">
+																<select class="form-control ekspertiseseletc" id="id_baktericetak" name="id_baktericetak">
+																	<option value="YA">YA</option>
+																	<option value="TIDAK">TIDAK</option>
 																</select>
 															</div>
 															<div class="form-group col-lg-3">
@@ -1816,6 +1826,7 @@
 														<table class="table table-striped table-valign-middle" id="tblvitek">
 															<thead>
 																<tr>
+																	<th>No</th>
 																	<th>
 																		<button type="button" class="btn btn-primary btn-rounded" id="btnunprintall">
 																			<i class="fa fa-ban"></i>
@@ -1889,13 +1900,13 @@
 																</select>
 															</div>
 															<div class="form-group col-lg-4" id="id_bakterihitungkol01teks">
-																<label for="id_bakterihitungkolteks01" class="col-form-label">Hitung Koloni I</label>
 																<input type="text" id="id_bakterihitungkolteks01" name="id_bakterihitungkolteks01" class="form-control ekspertiseteks">
 															</div>
 														</div>
 														<table class="table table-striped table-valign-middle" id="tblkumanmanual1">
 															<thead>
 																<tr>
+																	<th>No</th>
 																	<th>
 																		<button type="button" class="btn btn-primary btn-rounded" id="btnunprintallkumanmanual1">
 																			<i class="fa fa-ban"></i>
@@ -1969,13 +1980,13 @@
 																</select>
 															</div>
 															<div class="form-group col-lg-4" id="id_bakterihitungkol02teks">
-																<label for="id_bakterihitungkolteks02" class="col-form-label">Hitung Koloni II</label>
 																<input type="text" id="id_bakterihitungkolteks02" name="id_bakterihitungkolteks02" class="form-control ekspertiseteks">
 															</div>
 														</div>
 														<table class="table table-striped table-valign-middle" id="tblkumanmanual2">
 															<thead>
 																<tr>
+																	<th>No</th>
 																	<th>
 																		<button type="button" class="btn btn-primary btn-rounded" id="btnunprintallkumanmanual2">
 																			<i class="fa fa-ban"></i>
@@ -2293,6 +2304,15 @@
 				dataSrc: 'data'
 			},
 			columns: [
+				{
+					data: null,
+					name: 'nomor',
+					orderable: false,
+					searchable: false,
+					render: function (data, type, row, meta) {
+						return meta.row + meta.settings._iDisplayStart + 1;
+					}
+				},
 				{
 					data: null,
 					render: function (data, type, full) {
@@ -2369,6 +2389,15 @@
 				dataSrc: 'data'
 			},
 			columns: [
+				{
+					data: null,
+					name: 'nomor',
+					orderable: false,
+					searchable: false,
+					render: function (data, type, row, meta) {
+						return meta.row + meta.settings._iDisplayStart + 1;
+					}
+				},
 				{
 					data: null,
 					render: function (data, type, full) {
@@ -2445,6 +2474,15 @@
 				dataSrc: 'data'
 			},
 			columns: [
+				{
+					data: null,
+					name: 'nomor',
+					orderable: false,
+					searchable: false,
+					render: function (data, type, row, meta) {
+						return meta.row + meta.settings._iDisplayStart + 1;
+					}
+				},
 				{
 					data: null,
 					render: function (data, type, full) {
@@ -2506,6 +2544,13 @@
 		$('#divtemplate').hide();
 		$('.templatejawaban').hide();
 		$('.setelahdipilihtemplate').show();
+		$('#id_bakterihitungkolselect').show();
+		$('#id_bakterihitungkolteks').hide();
+		$('#id_bakterihitungkol01select').show();
+		$('#id_bakterihitungkol01teks').hide();
+		$('#id_bakterihitungkol02select').show();
+		$('#id_bakterihitungkol02teks').hide();
+		
 		$('input[type="checkbox"]').prop('disabled', false);
 		if (dlp == 'CCI'){
 			$('#templatecci').show();
@@ -2515,10 +2560,6 @@
 			$('#pewarnaangiemsateks').hide();
 			$('#pewarnaankohselect').show();
 			$('#pewarnaankohteks').hide();
-			$('#id_bakterihitungkol01select').show();
-			$('#id_bakterihitungkol01teks').hide();
-			$('#id_bakterihitungkol02select').show();
-			$('#id_bakterihitungkol02teks').hide();
 		} else if (dlp == 'Pewarna Langsung'){
 			$('#lsg_pewarnaankohselect').show();
 			$('#lsg_pewarnaankohteks').hide();
@@ -2614,6 +2655,10 @@
 							$('#lsg_pewarnaangiesmaselect').hide();
 							$('#lsg_pewarnaangiesmateks').show();
 						}
+						if (rows.komponen === 'id_bakterihitungkolteks'){
+							$('#id_bakterihitungkolselect').hide();
+							$('#id_bakterihitungkolteks').show();
+						}
 						if (rows.komponen === 'id_bakterihitungkolteks01'){
 							$('#id_bakterihitungkol01select').hide();
 							$('#id_bakterihitungkol01teks').show();
@@ -2807,6 +2852,7 @@
 						$(".isiandasar").val('');
 						$(".ekspertiseteks").val('');
 						$(".ekspertiseseletc").val('');
+						$(".pilihankirby").val('');
 						$('input[type="checkbox"], input[type="radio"]').prop('checked', false).prop('disabled', false);
 						
 						var goook       	= dataRecord.id;
@@ -3479,9 +3525,7 @@
 						hideAfter	: 5000,
 						stack		: 1
 					});
-					$('#divperiksa').hide();
+					window.location.href = "{{ url('/mikro') }}";
-					$('#divreadonly').hide();
-					$('#divawal').show();
                     return false;
                 },
                 error: function (xhr, status, error) {
@@ -3955,9 +3999,15 @@
 				} else if (komponen == 'id_pewarnaankoh' && isi == 'lainnya'){
 					$('#pewarnaankohselect').hide();
 					$('#pewarnaankohteks').show();
+				} else if (komponen == 'id_bakterihitungkol' && isi == 'lainnya'){
+					$('#id_bakterihitungkolselect').hide();
+					$('#id_bakterihitungkolteks').show();
 				} else if (komponen == 'id_bakterihitungkol01' && isi == 'lainnya'){
 					$('#id_bakterihitungkol01select').hide();
 					$('#id_bakterihitungkol01teks').show();
+				} else if (komponen == 'id_bakterihitungkol02' && isi == 'lainnya'){
+					$('#id_bakterihitungkol02select').hide();
+					$('#id_bakterihitungkol02teks').show();
 				} else if (komponen == 'lsg_pewarnaankoh' && isi == 'lainnya'){
 					$('#lsg_pewarnaankohselect').hide();
 					$('#lsg_pewarnaankohteks').show();

htdocs/resources/views/dokter/ppdsdeveloper.blade.php

@@ -43,7 +43,7 @@
 			<div class="row">
 				<div class="col-lg-5">
 					<div class="card-box ribbon-box">
-						<div class="ribbon ribbon-danger">Khusus Developer</div>
+						<div class="ribbon ribbon-warning">Search by Date Range</div>
 						<p class="m-b-0"></p>
 						<div class="form-row">
 							<div class="form-group col-lg-4">
@@ -1783,7 +1783,7 @@
 													<div class="form-group col-lg-12 table-responsive p-0">
 														<div class="row">
 															<div class="form-group col-lg-3">
-																<input type="text" id="bakteri" class="form-control ekspertiseteks" readonly>
+																<input type="text" id="bakteri" name="bakteri" class="form-control ekspertiseteks" readonly>
 															</div>
 															<div class="form-group col-lg-3">
 																<select class="form-control ekspertiseseletc" id="bakterisir" name="bakterisir">
@@ -1798,13 +1798,23 @@
 																	<option value="XDR Carbapenem Resistant">XDR Carbapenem Resistant</option>
 																</select>
 															</div>
-															<div class="form-group col-lg-3">
+															<div class="form-group col-lg-3" id="id_bakterihitungkolselect">
 																<select class="form-control ekspertiseseletc" id="id_bakterihitungkol" name="id_bakterihitungkol">
 																	<option value="">Pilih Salah Satu</option>
 																	<option value="&ge; 10⁵ CFU/ml Urine (Bakteriuria bermakna)">&ge; 10⁵ CFU/ml Urine (Bakteriuria bermakna)</option>
 																	<option value="&ge; 10⁵ CFU/ml Urine (Candiduria bermakna)">&ge; 10⁵ CFU/ml Urine (Candiduria bermakna)</option>
 																	<option value="&ge; 10³ CFU/ml Urine (Bakteriuria bermakna)">&ge; 10³ CFU/ml Urine (Bakteriuria bermakna)</option>
 																	<option value="8 x 10³  CFU/ml Urine (Bakteriuria bermakna)">8 x 10³ CFU/ml Urine (Bakteriuria bermakna)</option>
+																	<option value="lainnya">lainnya</option>
+																</select>
+															</div>
+															<div class="form-group col-lg-3" id="id_bakterihitungkolteks">
+																<input type="text" id="id_bakterihitungkolteks" name="id_bakterihitungkolteks" class="form-control ekspertiseteks">
+															</div>
+															<div class="form-group col-lg-3">
+																<select class="form-control ekspertiseseletc" id="id_baktericetak" name="id_baktericetak">
+																	<option value="YA">YA</option>
+																	<option value="TIDAK">TIDAK</option>
 																</select>
 															</div>
 															<div class="form-group col-lg-3">
@@ -1816,6 +1826,7 @@
 														<table class="table table-striped table-valign-middle" id="tblvitek">
 															<thead>
 																<tr>
+																	<th>No</th>
 																	<th>
 																		<button type="button" class="btn btn-primary btn-rounded" id="btnunprintall">
 																			<i class="fa fa-ban"></i>
@@ -1889,13 +1900,13 @@
 																</select>
 															</div>
 															<div class="form-group col-lg-4" id="id_bakterihitungkol01teks">
-																<label for="id_bakterihitungkolteks01" class="col-form-label">Hitung Koloni I</label>
 																<input type="text" id="id_bakterihitungkolteks01" name="id_bakterihitungkolteks01" class="form-control ekspertiseteks">
 															</div>
 														</div>
 														<table class="table table-striped table-valign-middle" id="tblkumanmanual1">
 															<thead>
 																<tr>
+																	<th>No</th>
 																	<th>
 																		<button type="button" class="btn btn-primary btn-rounded" id="btnunprintallkumanmanual1">
 																			<i class="fa fa-ban"></i>
@@ -1969,13 +1980,13 @@
 																</select>
 															</div>
 															<div class="form-group col-lg-4" id="id_bakterihitungkol02teks">
-																<label for="id_bakterihitungkolteks02" class="col-form-label">Hitung Koloni II</label>
 																<input type="text" id="id_bakterihitungkolteks02" name="id_bakterihitungkolteks02" class="form-control ekspertiseteks">
 															</div>
 														</div>
 														<table class="table table-striped table-valign-middle" id="tblkumanmanual2">
 															<thead>
 																<tr>
+																	<th>No</th>
 																	<th>
 																		<button type="button" class="btn btn-primary btn-rounded" id="btnunprintallkumanmanual2">
 																			<i class="fa fa-ban"></i>
@@ -2293,6 +2304,15 @@
 				dataSrc: 'data'
 			},
 			columns: [
+				{
+					data: null,
+					name: 'nomor',
+					orderable: false,
+					searchable: false,
+					render: function (data, type, row, meta) {
+						return meta.row + meta.settings._iDisplayStart + 1;
+					}
+				},
 				{
 					data: null,
 					render: function (data, type, full) {
@@ -2369,6 +2389,15 @@
 				dataSrc: 'data'
 			},
 			columns: [
+				{
+					data: null,
+					name: 'nomor',
+					orderable: false,
+					searchable: false,
+					render: function (data, type, row, meta) {
+						return meta.row + meta.settings._iDisplayStart + 1;
+					}
+				},
 				{
 					data: null,
 					render: function (data, type, full) {
@@ -2445,6 +2474,15 @@
 				dataSrc: 'data'
 			},
 			columns: [
+				{
+					data: null,
+					name: 'nomor',
+					orderable: false,
+					searchable: false,
+					render: function (data, type, row, meta) {
+						return meta.row + meta.settings._iDisplayStart + 1;
+					}
+				},
 				{
 					data: null,
 					render: function (data, type, full) {
@@ -2506,6 +2544,13 @@
 		$('#divtemplate').hide();
 		$('.templatejawaban').hide();
 		$('.setelahdipilihtemplate').show();
+		$('#id_bakterihitungkolselect').show();
+		$('#id_bakterihitungkolteks').hide();
+		$('#id_bakterihitungkol01select').show();
+		$('#id_bakterihitungkol01teks').hide();
+		$('#id_bakterihitungkol02select').show();
+		$('#id_bakterihitungkol02teks').hide();
+		
 		$('input[type="checkbox"]').prop('disabled', false);
 		if (dlp == 'CCI'){
 			$('#templatecci').show();
@@ -2515,10 +2560,6 @@
 			$('#pewarnaangiemsateks').hide();
 			$('#pewarnaankohselect').show();
 			$('#pewarnaankohteks').hide();
-			$('#id_bakterihitungkol01select').show();
-			$('#id_bakterihitungkol01teks').hide();
-			$('#id_bakterihitungkol02select').show();
-			$('#id_bakterihitungkol02teks').hide();
 		} else if (dlp == 'Pewarna Langsung'){
 			$('#lsg_pewarnaankohselect').show();
 			$('#lsg_pewarnaankohteks').hide();
@@ -2614,6 +2655,10 @@
 							$('#lsg_pewarnaangiesmaselect').hide();
 							$('#lsg_pewarnaangiesmateks').show();
 						}
+						if (rows.komponen === 'id_bakterihitungkolteks'){
+							$('#id_bakterihitungkolselect').hide();
+							$('#id_bakterihitungkolteks').show();
+						}
 						if (rows.komponen === 'id_bakterihitungkolteks01'){
 							$('#id_bakterihitungkol01select').hide();
 							$('#id_bakterihitungkol01teks').show();
@@ -2807,6 +2852,7 @@
 						$(".isiandasar").val('');
 						$(".ekspertiseteks").val('');
 						$(".ekspertiseseletc").val('');
+						$(".pilihankirby").val('');
 						$('input[type="checkbox"], input[type="radio"]').prop('checked', false).prop('disabled', false);
 						
 						var goook       	= dataRecord.id;
@@ -3151,19 +3197,10 @@
 								type	: 'warning',
 							})
 						} else if (statuse == 'Selesai' || statuse == 'Arsip') {
-							var hakakses = "{{Session('previlage')}}";
+							$('#divreadonly').hide();
-							if (hakakses == 'supervisor'){
+							$('#divperiksa').show();
-								$('#divreadonly').hide();
+							$('#divawal').hide();
-								$('#divperiksa').show();
+							openlamanekpertise();
-								$('#divawal').hide();
-								openlamanekpertise();
-							} else {
-								swal({
-									title	: 'Ekspertise Final',
-									text	: 'Hanya Akun SPV yang diperkenankan mengubah data Arsip',
-									type	: 'warning',
-								})
-							}
 						} else {
 							$('#divreadonly').hide();
 							$('#divperiksa').show();
@@ -3479,9 +3516,7 @@
 						hideAfter	: 5000,
 						stack		: 1
 					});
-					$('#divperiksa').hide();
+					window.location.href = "{{ url('/mikro') }}";
-					$('#divreadonly').hide();
-					$('#divawal').show();
                     return false;
                 },
                 error: function (xhr, status, error) {
@@ -3548,6 +3583,7 @@
 						hideAfter	: 5000,
 						stack		: 1
 					});
+					window.location.href = "{{ url('/mikro') }}";
                     return false;
                 },
                 error: function (xhr, status, error) {
@@ -3955,9 +3991,15 @@
 				} else if (komponen == 'id_pewarnaankoh' && isi == 'lainnya'){
 					$('#pewarnaankohselect').hide();
 					$('#pewarnaankohteks').show();
+				} else if (komponen == 'id_bakterihitungkol' && isi == 'lainnya'){
+					$('#id_bakterihitungkolselect').hide();
+					$('#id_bakterihitungkolteks').show();
 				} else if (komponen == 'id_bakterihitungkol01' && isi == 'lainnya'){
 					$('#id_bakterihitungkol01select').hide();
 					$('#id_bakterihitungkol01teks').show();
+				} else if (komponen == 'id_bakterihitungkol02' && isi == 'lainnya'){
+					$('#id_bakterihitungkol02select').hide();
+					$('#id_bakterihitungkol02teks').show();
 				} else if (komponen == 'lsg_pewarnaankoh' && isi == 'lainnya'){
 					$('#lsg_pewarnaankohselect').hide();
 					$('#lsg_pewarnaankohteks').show();