From 98d6b688e9ee1bfb72e5e0c32ea3f42fcdc4f849 Mon Sep 17 00:00:00 2001
From: Duidev Software <swandhana17@gmail.com>
Date: Fri, 2 Jan 2026 13:25:45 +0700
Subject: [PATCH] Update

---
 .../app/Http/Controllers/DokterController.php |  116 +-
 .../Http/Controllers/FrontpageController.php  |    5 +-
 .../views/dokter/pemeriksaan.blade.php        | 1479 +++++++++++++----
 htdocs/resources/views/dokter/ppds.blade.php  |   30 +-
 .../views/dokter/ppdsdeveloper.blade.php      |   29 +-
 5 files changed, 1230 insertions(+), 429 deletions(-)

diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php
index ec49336e..d3fc5f85 100644
--- a/htdocs/app/Http/Controllers/DokterController.php
+++ b/htdocs/app/Http/Controllers/DokterController.php
@@ -1325,62 +1325,7 @@ class DokterController extends Controller
 			];
 			return response()->json($response, 500);
 		} else if ($worklist == 'kumanmanual'){
-			try {
-				$kuman 		= $request->input('isi');
-				$komponen 	= $request->input('komponen');
-				$astmanual 	= $request->input('astmanual');
-				if ($kuman == 'Pilih Salah Satu' OR $kuman == 'undefined' OR $kuman == '' OR is_null($kuman)){
-					KomponenJawaban::where('accnumber', $nofoto)->where('template', $dlp)->where('komponen', $komponen)->delete();
-					Riwayat::create([
-						'nofoto'		=> $nofoto,
-						'jawaban'		=> $kuman,
-						'inputor'		=> Session('nama'),
-						'keterangan'	=> 'Delete Kuman Manual ('.$komponen.')',
-						'verifikasi'	=> '',
-					]);
-					return response()->json(['icon' => 'success', 'warna' => '#1dcbbd', 'status' => 'Success', 'message' => 'Data Kuman Manual Dihapus']);
-				} else {
-					KomponenJawaban::updateOrCreate(
-						[
-							'accnumber'		=> $nofoto,
-							'template'		=> $dlp,
-							'komponen'		=> $komponen,
-						],
-						[
-							'isidata'		=> $kuman,
-							'created_by'	=> Session('nama')
-						]
-					);
-					if (isset($astmanual) AND $astmanual != 'default'){
-						$getsirab 	= SiraB::where('setmanual', 'LIKE', $astmanual.'%')->get();
-						
-						$jumlah 	= count($getsirab);
-						foreach($getsirab as $rsira){
-							$ceksudah = RekapAntibiotik::where('orderid', $idperiksa)->where('kuman', $kuman)->where('antibiotic', $rsira->subantibiotik)->count();
-							if ($ceksudah == 0){
-								RekapAntibiotik::create([
-										'orderid'			=> $idperiksa,
-										'kuman'				=> $kuman,
-										'antibiotic'		=> $rsira->subantibiotik,
-										'resistance'		=> null,
-										'value'				=> null,
-										'interpretation'	=> null,
-										'glassreportname'	=> in_array($rsira->subantibiotik, $jsonantibiotik),
-										'printrow' 			=> false,
-										'printcol'			=> false,
-										'batasatas'			=> $rsira->batasatas,
-										'midrange'			=> $rsira->midrange,
-										'batasbawah'		=> $rsira->batasbawah,
-										'created_at'		=> date('Y-m-d H:i:s'),
-										'updated_at'		=> date('Y-m-d H:i:s'),
-									]
-								);
-								$jumlah++;
-							}
-						}
-					} else {
-						$jumlah 				= 0;
-						$jsonantibiotikmanual 	= array(
+			$jsonantibiotikmanual 	= array(
 										'Amoxycillin',
 										'Amoxycillin and Clavulanic Acid',
 										'Ampicillin',
@@ -1424,6 +1369,65 @@ class DokterController extends Controller
 										'Caspofungin',
 										'Flucytosine'
 						);
+			try {
+				$kuman 		= $request->input('isi');
+				$komponen 	= $request->input('komponen');
+				$astmanual 	= $request->input('astmanual');
+				if ($kuman == 'Pilih Salah Satu' OR $kuman == 'undefined' OR $kuman == '' OR is_null($kuman)){
+					KomponenJawaban::where('accnumber', $nofoto)->where('template', $dlp)->where('komponen', $komponen)->delete();
+					Riwayat::create([
+						'nofoto'		=> $nofoto,
+						'jawaban'		=> $kuman,
+						'inputor'		=> Session('nama'),
+						'keterangan'	=> 'Delete Kuman Manual ('.$komponen.')',
+						'verifikasi'	=> '',
+					]);
+					return response()->json(['icon' => 'success', 'warna' => '#1dcbbd', 'status' => 'Success', 'message' => 'Data Kuman Manual Dihapus']);
+				} else {
+					KomponenJawaban::updateOrCreate(
+						[
+							'accnumber'		=> $nofoto,
+							'template'		=> $dlp,
+							'komponen'		=> $komponen,
+						],
+						[
+							'isidata'		=> $kuman,
+							'created_by'	=> Session('nama')
+						]
+					);
+					if (isset($astmanual) AND $astmanual != 'default'){
+						$getsirab 	= SiraB::where('setmanual', 'LIKE', $astmanual.'%')->get();
+						
+						$jumlah 	= count($getsirab);
+						foreach($getsirab as $rsira){
+							$ceksudah = RekapAntibiotik::where('orderid', $idperiksa)->where('kuman', $kuman)->where('antibiotic', $rsira->subantibiotik)->count();
+							if ($ceksudah == 0){
+								if (in_array($rsira->subantibiotik, $jsonantibiotikmanual)){
+									RekapAntibiotik::create([
+										'orderid'			=> $idperiksa,
+										'kuman'				=> $kuman,
+										'antibiotic'		=> $rsira->subantibiotik,
+										'resistance'		=> null,
+										'value'				=> null,
+										'interpretation'	=> null,
+										'glassreportname'	=> in_array($rsira->subantibiotik, $jsonantibiotik),
+										'printrow' 			=> false,
+										'printcol'			=> false,
+										'batasatas'			=> $rsira->batasatas,
+										'midrange'			=> $rsira->midrange,
+										'batasbawah'		=> $rsira->batasbawah,
+										'created_at'		=> date('Y-m-d H:i:s'),
+										'updated_at'		=> date('Y-m-d H:i:s'),
+									]);
+									$jumlah++;
+								}
+								
+								
+							}
+						}
+					} else {
+						$jumlah 				= 0;
+						
 						foreach($jsonantibiotikmanual as $antibiotic_name){
 							$ceksudah = RekapAntibiotik::where('orderid', $idperiksa)->where('kuman', $kuman)->where('antibiotic', $antibiotic_name)->count();
 							if ($ceksudah == 0){
diff --git a/htdocs/app/Http/Controllers/FrontpageController.php b/htdocs/app/Http/Controllers/FrontpageController.php
index 641a6a21..c70f6893 100644
--- a/htdocs/app/Http/Controllers/FrontpageController.php
+++ b/htdocs/app/Http/Controllers/FrontpageController.php
@@ -537,7 +537,6 @@ class FrontpageController extends Controller
 				'categories' => $categories,
 			];
 		};
-	
 		$biakankulturData 	= $groupOrganisms('biakankultur');
 		$mikroorganismeData = $groupOrganisms('mikroorganisme');	
 		$data 				= array_merge($data, [
@@ -545,7 +544,7 @@ class FrontpageController extends Controller
 			'bacterycateggories' 		=> $biakankulturData['categories'],
 			'mikroorganismes' 			=> $mikroorganismeData['organismes'],
 			'mikroorganismestlist' 		=> $mikroorganismeData['categories'],
-		]);	
+		]);
 		$kelompokMapping 	= [
 			'jsonsputum' 				=> 'Sputum',
 			'jsonswabtenggorok' 		=> 'Swab Tenggorok',
@@ -566,7 +565,7 @@ class FrontpageController extends Controller
 			'jsonmediamcconkey' 		=> 'Media Mc Conkey',
 			'jsonpemeriksaantl' 		=> 'Pemeriksaan Tambahan Lainnya',
 			'jsonbiakankultur' 			=> 'Biakan Kultur',
-		];	
+		];
 		foreach ($kelompokMapping as $key => $kelompok) {
 			$data[$key] = $allOrganisms->where('kelompok', $kelompok)->values();
 		}
diff --git a/htdocs/resources/views/dokter/pemeriksaan.blade.php b/htdocs/resources/views/dokter/pemeriksaan.blade.php
index a1133e6c..01e80b02 100644
--- a/htdocs/resources/views/dokter/pemeriksaan.blade.php
+++ b/htdocs/resources/views/dokter/pemeriksaan.blade.php
@@ -185,6 +185,10 @@
 								<input type="text" id="klinis" name="klinis" class="form-control isiandasar">
 							</div>
 							<div class="form-row">
+								<div class="form-group col-lg-2">
+									<label for="modaliti" class="col-form-label"><strong>Asal Sample</strong></label>
+									<input type="text" id="modaliti" name="modaliti" class="form-control isiandasar">
+								</div>
 								<div class="form-group col-lg-2">
 									<label for="bhp_media" class="col-form-label">Media</label>
 									<input type="text" id="bhp_media" name="bhp_media" class="form-control isiandasar">
@@ -523,6 +527,7 @@
 									<span class="badge badge-primary">B. Biakan Kultur</span>
 								</div>
 								<div class="form-group col-lg-12">
+									<span class="badge badge-danger">Khusus Kultur Darah dan Cairan Steril</span>
 									<div class="row">
 										<div class="form-group col-lg-6">
 											<label for="bd_result" class="col-form-label">BD Result</label>
@@ -537,126 +542,6 @@
 								<div class="form-group col-lg-12">
 									<label class="col-form-label">Pertumbuhan Koloni (Kultur Primer):</label>
 								</div>
-								<div class="form-group col-lg-12">
-									<ul class="nav nav-tabs tabs-bordered nav-justified">
-										<li class="nav-item">
-											<a href="#media_bap" data-toggle="tab" aria-expanded="false" class="nav-link active">
-												<i class="fi-monitor mr-2"></i> Media BAP
-											</a>
-										</li>
-										<li class="nav-item">
-											<a href="#media_cap" data-toggle="tab" aria-expanded="true" class="nav-link">
-												<i class="fi-monitor mr-2"></i> Media CAP
-											</a>
-										</li>
-										<li class="nav-item">
-											<a href="#media_mcconkey" data-toggle="tab" aria-expanded="true" class="nav-link">
-												<i class="fi-monitor mr-2"></i> Media Mc Conkey 
-											</a>
-										</li>
-										<li class="nav-item">
-											<a href="#media_sda" data-toggle="tab" aria-expanded="true" class="nav-link">
-												<i class="fi-monitor mr-2"></i> Media SDA
-											</a>
-										</li>
-										<li class="nav-item">
-											<a href="#media_sellainnya" data-toggle="tab" aria-expanded="true" class="nav-link">
-												<i class="fi-monitor mr-2"></i> Media Selektif lainnya 
-											</a>
-										</li>
-										<li class="nav-item">
-											<a href="#media_tamlainnya" data-toggle="tab" aria-expanded="true" class="nav-link">
-												<i class="fi-monitor mr-2"></i> Pemeriksaan Tambahan Lainnya  
-											</a>
-										</li>
-									</ul>
-									<div class="tab-content">
-										<div class="tab-pane active" id="media_bap">
-											<div class="card">
-												<div class="card-box">
-													<div class="card-header">
-														<button type="button" class="btn btn-primary" id="btnuntukgridmediabap">
-															<i class="fa fa-plus mr-1"></i> Tambah Data
-														</button>
-													</div>
-													<div class="card-body">
-														<div id="gridmediabap"></div>
-													</div>
-												</div>
-											</div>
-										</div>
-										<div class="tab-pane" id="media_cap">
-											<div class="card">
-												<div class="card-box">
-													<div class="card-header">
-														<button type="button" class="btn btn-primary" id="btnuntukgridmediacap">
-															<i class="fa fa-plus mr-1"></i> Tambah Data
-														</button>
-													</div>
-													<div class="card-body">
-														<div id="gridmediacap"></div>
-													</div>
-												</div>
-											</div>
-										</div>
-										<div class="tab-pane" id="media_mcconkey">
-											<div class="card">
-												<div class="card-box">
-													<div class="card-header">
-														<button type="button" class="btn btn-primary" id="btnuntukgridmediamcconkey">
-															<i class="fa fa-plus mr-1"></i> Tambah Data
-														</button>
-													</div>
-													<div class="card-body">
-														<div id="gridmediamcconkey"></div>
-													</div>
-												</div>
-											</div>
-										</div>
-										<div class="tab-pane" id="media_sda">
-											<div class="card">
-												<div class="card-box">
-													<div class="card-header">
-														<button type="button" class="btn btn-primary" id="btnuntukgridmediasda">
-															<i class="fa fa-plus mr-1"></i> Tambah Data
-														</button>
-													</div>
-													<div class="card-body">
-														<div id="gridmediasda"></div>
-													</div>
-												</div>
-											</div>
-										</div>
-										<div class="tab-pane" id="media_sellainnya">
-											<div class="card">
-												<div class="card-box">
-													<div class="card-header">
-														<button type="button" class="btn btn-primary" id="btnuntukgridmediasellainnya">
-															<i class="fa fa-plus mr-1"></i> Tambah Data
-														</button>
-													</div>
-													<div class="card-body">
-														<div id="gridmediasellainnya"></div>
-													</div>
-												</div>
-											</div>
-										</div>
-										<div class="tab-pane" id="media_tamlainnya">
-											<div class="card">
-												<div class="card-box">
-													<div class="card-header">
-														<button type="button" class="btn btn-primary" id="btnuntukgridmediatamlainnya">
-															<i class="fa fa-plus mr-1"></i> Tambah Data
-														</button>
-													</div>
-													<div class="card-body">
-														<div id="gridmediatamlainnya"></div>
-													</div>
-												</div>
-											</div>
-										</div>
-									</div>
-								</div>
 								<div class="form-group col-lg-12">
 									<label class="col-form-label">Kirby bauer :</label>
 									<div class="form-row">
@@ -782,6 +667,145 @@
 								<div class="form-group account-btn text-center m-t-10">
 									<span class="badge badge-primary">C. Tes Kepekaan Antibiotika: (S: Sensitif ; I : Intermediate ; R: Resisten)</span>
 								</div>
+								<div class="form-group col-lg-12">
+									<ul class="nav nav-tabs tabs-bordered nav-justified">
+										<li class="nav-item">
+											<a href="#media_bap" data-toggle="tab" aria-expanded="false" class="nav-link active">
+												<i class="fi-monitor mr-2"></i> Media BAP
+											</a>
+										</li>
+										<li class="nav-item">
+											<a href="#media_cap" data-toggle="tab" aria-expanded="true" class="nav-link">
+												<i class="fi-monitor mr-2"></i> Media CAP
+											</a>
+										</li>
+										<li class="nav-item">
+											<a href="#media_mcconkey" data-toggle="tab" aria-expanded="true" class="nav-link">
+												<i class="fi-monitor mr-2"></i> Media Mc Conkey 
+											</a>
+										</li>
+										<li class="nav-item">
+											<a href="#media_sda" data-toggle="tab" aria-expanded="true" class="nav-link">
+												<i class="fi-monitor mr-2"></i> Media SDA
+											</a>
+										</li>
+										<li class="nav-item">
+											<a href="#media_sellainnya" data-toggle="tab" aria-expanded="true" class="nav-link">
+												<i class="fi-monitor mr-2"></i> Media Selektif lainnya 
+											</a>
+										</li>
+										<li class="nav-item">
+											<a href="#media_tamlainnya" data-toggle="tab" aria-expanded="true" class="nav-link">
+												<i class="fi-monitor mr-2"></i> Pemeriksaan Tambahan Lainnya  
+											</a>
+										</li>
+									</ul>
+									<div class="tab-content">
+										<div class="tab-pane active" id="media_bap">
+											<div class="card">
+												<div class="card-box">
+													<div class="card-header">
+														<div class="form-row">
+															<div class="form-group col-lg-3">
+																<button type="button" class="btn btn-primary" id="btnuntukgridmediabap">
+																	<i class="fa fa-calendar-check-o mr-1"></i> Ada Pertumbuhan
+																</button>
+															</div>
+															<div class="form-group col-lg-3">
+																<button type="button" class="btn btn-primary" id="btnbapkosong">
+																	<i class="fa fa-calendar-times-o mr-1"></i> Tidak Ada Pertumbuhan
+																</button>
+															</div>
+														</div>
+													</div>
+													<div class="card-body">
+														<div id="gridmediabap"></div>
+													</div>
+												</div>
+											</div>
+										</div>
+										<div class="tab-pane" id="media_cap">
+											<div class="card">
+												<div class="card-box">
+													<div class="card-header">
+														<button type="button" class="btn btn-primary" id="btnuntukgridmediacap">
+															<i class="fa fa-calendar-check-o mr-1"></i> Ada Pertumbuhan
+														</button>
+														<button type="button" class="btn btn-primary" id="btncapkosong">
+															<i class="fa fa-calendar-times-o mr-1"></i> Tidak Ada Pertumbuhan
+														</button>
+													</div>
+													<div class="card-body">
+														<div id="gridmediacap"></div>
+													</div>
+												</div>
+											</div>
+										</div>
+										<div class="tab-pane" id="media_mcconkey">
+											<div class="card">
+												<div class="card-box">
+													<div class="card-header row">
+														<div class="form-group col-lg-3">
+															<button type="button" class="btn btn-primary" id="btnuntukgridmediamcconkey">
+																<i class="fa fa-calendar-check-o mr-1"></i> Ada Pertumbuhan
+															</button>
+														</div>
+														<div class="form-group col-lg-3">
+															<button type="button" class="btn btn-primary" id="btnmckonkeykosong">
+																<i class="fa fa-calendar-times-o mr-1"></i> Tidak Ada Pertumbuhan
+															</button>
+														</div>
+													</div>
+													<div class="card-body">
+														<div id="gridmediamcconkey"></div>
+													</div>
+												</div>
+											</div>
+										</div>
+										<div class="tab-pane" id="media_sda">
+											<div class="card">
+												<div class="card-box">
+													<div class="card-header">
+														<button type="button" class="btn btn-primary" id="btnuntukgridmediasda">
+															<i class="fa fa-plus mr-1"></i> Tambah Data
+														</button>
+													</div>
+													<div class="card-body">
+														<div id="gridmediasda"></div>
+													</div>
+												</div>
+											</div>
+										</div>
+										<div class="tab-pane" id="media_sellainnya">
+											<div class="card">
+												<div class="card-box">
+													<div class="card-header">
+														<button type="button" class="btn btn-primary" id="btnuntukgridmediasellainnya">
+															<i class="fa fa-plus mr-1"></i> Tambah Data
+														</button>
+													</div>
+													<div class="card-body">
+														<div id="gridmediasellainnya"></div>
+													</div>
+												</div>
+											</div>
+										</div>
+										<div class="tab-pane" id="media_tamlainnya">
+											<div class="card">
+												<div class="card-box">
+													<div class="card-header">
+														<button type="button" class="btn btn-primary" id="btnuntukgridmediatamlainnya">
+															<i class="fa fa-plus mr-1"></i> Tambah Data
+														</button>
+													</div>
+													<div class="card-body">
+														<div id="gridmediatamlainnya"></div>
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+								</div>
 							</div>
 							<div class="form-row templatejawaban" id="templatepewarnaanlangsung">
 								<div class="form-group account-btn text-center m-t-10">
@@ -942,6 +966,93 @@
 									<label for="lsg_pewarnaanlain" class="col-form-label">8. Pewarnaan Lain-Lain</label>
 									<textarea id="lsg_pewarnaanlain" style="width: 100%; height: 200px; font-size: 12px; line-height: 18px; border: 1px solid #dddddd; padding: 10px;"></textarea>
 								</div>
+								<div class="form-group col-lg-12">
+									<label>Nuggent Score</label>
+									<div class="form-row">
+										<div class="form-group col-lg-4">
+											<label for="lsg_lactobacillus" class="col-form-label">Lactobacillus</label>
+											<div class="form-row">
+												<div class="form-group col-lg-6">
+													<select class="form-control ekspertiseseletc" id="lsg_jumlahlactobacillus" name="lsg_jumlahlactobacillus">
+														<option value="">Pilih Jumlah Per Lapang</option>
+														@if(isset($jsonjumlahlactobacillus) && !empty($jsonjumlahlactobacillus))
+															@foreach($jsonjumlahlactobacillus as $rows)
+																<option value="{!! $rows->name !!}">{!! $rows->name !!}</option>
+															@endforeach
+														@endif
+													</select>
+												</div>
+												<div class="form-group col-lg-6">
+													<select class="form-control ekspertiseseletc" id="lsg_lactobacillus" name="lsg_lactobacillus">
+														<option value="">Pilih Skore</option>
+														@php
+															$mulai = 0;
+															while ($mulai != 5){
+																echo '<option value="'.$mulai.'">'.$mulai.'</option>';
+																$mulai++;
+															}
+														@endphp
+													</select>
+												</div>
+											</div>
+										</div>
+										<div class="form-group col-lg-4">
+											<label for="lsg_gardnerella" class="col-form-label">Gardnerella</label>
+											<div class="form-row">
+												<div class="form-group col-lg-6">
+													<select class="form-control ekspertiseseletc" id="lsg_jumlahgardnerella" name="lsg_jumlahgardnerella">
+														<option value="">Pilih Jumlah Per Lapang</option>
+														@if(isset($jsonjumlahgardnerella) && !empty($jsonjumlahgardnerella))
+															@foreach($jsonjumlahgardnerella as $rows)
+																<option value="{!! $rows->name !!}">{!! $rows->name !!}</option>
+															@endforeach
+														@endif
+													</select>
+												</div>
+												<div class="form-group col-lg-6">
+													<select class="form-control ekspertiseseletc" id="lsg_gardnerella" name="lsg_gardnerella">
+														<option value="">Pilih Skore</option>
+														@php
+															$mulai = 0;
+															while ($mulai != 5){
+																echo '<option value="'.$mulai.'">'.$mulai.'</option>';
+																$mulai++;
+															}
+														@endphp
+													</select>
+												</div>
+											</div>
+										</div>
+										<div class="form-group col-lg-4">
+											<label for="lsg_mobiluncus" class="col-form-label">Mobiluncus</label>
+											<div class="form-row">
+												<div class="form-group col-lg-6">
+													<select class="form-control ekspertiseseletc" id="lsg_jumlahmobiluncus" name="lsg_jumlahmobiluncus">
+														<option value="">Pilih Jumlah Per Lapang</option>
+														@if(isset($jsonjumlahmobiluncus) && !empty($jsonjumlahmobiluncus))
+															@foreach($jsonjumlahmobiluncus as $rows)
+																<option value="{!! $rows->name !!}">{!! $rows->name !!}</option>
+															@endforeach
+														@endif
+													</select>
+												</div>
+												<div class="form-group col-lg-6">
+													<select class="form-control ekspertiseseletc" id="lsg_mobiluncus" name="lsg_mobiluncus">
+														<option value="">Pilih Skore</option>
+														@php
+															$mulai = 0;
+															while ($mulai != 5){
+																echo '<option value="'.$mulai.'">'.$mulai.'</option>';
+																$mulai++;
+															}
+														@endphp
+													</select>
+												</div>
+											</div>
+											
+										</div>
+									</div>
+								</div>
 							</div>
 							<div class="form-row templatejawaban" id="templatetbc">
 								<div class="form-group col-lg-12">
@@ -1574,10 +1685,11 @@
 										<option value="">Pilih Salah Satu</option>
 										<option value="TCM-RNA HIV">TCM-RNA HIV</option>
 										<option value="TCM-HCV VL">TCM-HCV VL</option>
+										<option value="PCR HIV Viral load">PCR HIV Viral load</option>
 										<option value="EID PCR DNA HIV">EID PCR DNA HIV</option>
 									</select>
 								</div>
-								<div class="form-group col-lg-3">
+								<div class="form-group col-lg-3" id="vl_hasildiv1select">
 									<label for="vl_hasil01" class="col-form-label">Hasil</label>
 									<select class="form-control ekspertiseseletc" id="vl_hasil01" name="vl_hasil01">
 										<option value="">Pilih Salah Satu</option>
@@ -1599,9 +1711,13 @@
 											<option value="144">144</option>
 											<option value="211">211</option>
 										</optgroup>
-										<option value="...">...</option>
+										<option value="lainnya">lainnya</option>
 									</select>
 								</div>
+								<div class="form-group col-lg-3" id="vl_hasildiv1teks">
+									<label for="vl_hasil01teks" class="col-form-label">Hasil</label>
+									<input type="text" name="vl_hasil01teks" id="vl_hasil01teks" class="form-control ekspertiseteks">
+								</div>
 								<div class="form-group col-lg-3">
 									<label for="vl_satuan01" class="col-form-label">Satuan</label>
 									<select class="form-control ekspertiseseletc" id="vl_satuan01" name="vl_satuan01">
@@ -1625,7 +1741,7 @@
 										<option value="LOG">LOG</option>
 									</select>
 								</div>
-								<div class="form-group col-lg-3">
+								<div class="form-group col-lg-3" id="vl_hasildiv2select">
 									<label for="vl_hasil02" class="col-form-label">Hasil 02</label>
 									<select class="form-control ekspertiseseletc" id="vl_hasil02" name="vl_hasil02">
 										<option value="">Pilih Salah Satu</option>
@@ -1647,9 +1763,13 @@
 											<option value="2,16">2,16</option>
 											<option value="2,34">2,34</option>
 										</optgroup>
-										<option value="...">...</option>
+										<option value="lainnya">lainnya</option>
 									</select>
 								</div>
+								<div class="form-group col-lg-3" id="vl_hasildiv2teks">
+									<label for="vl_hasil02teks" class="col-form-label">Hasil 02</label>
+									<input type="text" name="vl_hasil02teks" id="vl_hasil02teks" class="form-control ekspertiseteks">
+								</div>
 								<div class="form-group col-lg-3">
 									<label for="vl_satuan02" class="col-form-label">Satuan 02</label>
 									<select class="form-control ekspertiseseletc" id="vl_satuan02" name="vl_satuan02">
@@ -1828,11 +1948,11 @@
 																</select>
 															</div>
 															<div class="form-group col-lg-3">
-																<select class="form-control" id="id_antibiotikmanual1" name="id_antibiotikmanual1">
+																<select class="form-control ekspertiseseletc" id="id_antibiotikmanual1" name="id_antibiotikmanual1">
 																	<option value="default">Default</option>
 																	@if(isset($antibiotics) && count($antibiotics) > 0)
 																		@foreach($antibiotics as $antibiotic)
-																			<option value="{{ $antibiotic->setmanual }}">{{ $antibiotic->setmanual }}</option>
+																			<option value="{{ trim($antibiotic->setmanual) }}">{{ trim($antibiotic->setmanual) }}</option>
 																		@endforeach
 																	@endif
 																</select>
@@ -1925,11 +2045,11 @@
 																</select>
 															</div>
 															<div class="form-group col-lg-3">
-																<select class="form-control" id="id_antibiotikmanual2" name="id_antibiotikmanual2">
+																<select class="form-control ekspertiseseletc" id="id_antibiotikmanual2" name="id_antibiotikmanual2">
 																	<option value="default">Default</option>
 																	@if(isset($antibiotics) && count($antibiotics) > 0)
 																		@foreach($antibiotics as $antibiotic)
-																			<option value="{{ $antibiotic->setmanual }}">{{ $antibiotic->setmanual }}</option>
+																			<option value="{{ trim($antibiotic->setmanual) }}">{{ trim($antibiotic->setmanual) }}</option>
 																		@endforeach
 																	@endif
 																</select>
@@ -2002,6 +2122,10 @@
 									<label for="keterangan" class="col-form-label">Expertise</label>
 									<textarea id="keterangan" style="width: 100%; height: 300px;"></textarea>
 								</div>
+								<div class="form-group col-lg-12" id="divadendumketerangan">
+									<label for="addendumketerangan" class="col-form-label"><strong><font color="red">Alasan Kenapa Di Edit</font></strong></label>
+									<textarea id="addendumketerangan" style="width: 100%; height: 300px;"></textarea>
+								</div>
 							</div>
 							<div class="form-row">
 								<div class="form-group col-lg-3">
@@ -2118,38 +2242,50 @@
 				<h4 class="modal-title">Media BAP</h4>
 			</div>
 			<div class="modal-body">
-				<div class="form-group">
-					<select class="form-control" id="id_mediabap">
-						<option>Pilih Salah Satu</option>
-						@if(isset($jsonmediabap) && !empty($jsonmediabap))
-							@foreach($jsonmediabap as $rows)
-								<option value="{!! $rows->name !!}">{!! $rows->name !!}</option>
-							@endforeach
-						@endif
-					</select>
+				<div class="form-row">
+					<div class="form-group col-lg-6">
+						<select class="form-control" id="id_mediabapkuman">
+							<option>Kuman 1</option>
+							<option>Kuman 2</option>
+							<option>Kuman 3</option>
+							<option>Kuman 4</option>
+							<option>Kuman 5</option>
+						</select>
+					</div>
+					<div class="form-group col-lg-6">
+						<select class="form-control" id="id_mediabap">
+							<option>Pilih Salah Satu</option>
+							@if(isset($jsonmediabap) && !empty($jsonmediabap))
+								@foreach($jsonmediabap as $rows)
+									<option value="{!! $rows->name !!}">{!! $rows->name !!}</option>
+								@endforeach
+							@endif
+						</select>
+					</div>
 				</div>
 				<div class="form-group">
 					<label for="id_pemeriksaanhemolisa" class="col-form-label">Hemolisa</label>
 					<select class="form-control ekspertiseseletc" id="id_pemeriksaanhemolisa" name="id_pemeriksaanhemolisa">
 						<option value="">Pilih Salah Satu</option>
-						<option value="&#646; hemolisa">&#646; hemolisa</option>
-						<option value="&#946; hemolisa">&#946; hemolisa</option>
+						<option value="Alpha">Alpha</option>
+						<option value="Beta">Beta</option>
+						<option value="Gamma">Gamma</option>
 					</select>
 				</div>
 				<div class="form-group">
 					<label for="id_pemeriksaankatalase" class="col-form-label">Katalase</label>
 					<select class="form-control ekspertiseseletc" id="id_pemeriksaankatalase" name="id_pemeriksaankatalase">
 						<option value="">Pilih Salah Satu</option>
-						<option value="Katalase +">Katalase +</option>
-						<option value="Katalase -">Katalase -</option>
+						<option value="POS">POS</option>
+						<option value="NEG">NEG</option>
 					</select>
 				</div>
 				<div class="form-group">
 					<label for="id_pemeriksaankabulase" class="col-form-label">Koagulase</label>
 					<select class="form-control ekspertiseseletc" id="id_pemeriksaankabulase" name="id_pemeriksaankabulase">
 						<option value="">Pilih Salah Satu</option>
-						<option value="Koagulase +">Koagulase +</option>
-						<option value="Koagulase -">Koagulase -</option>
+						<option value="POS">POS</option>
+						<option value="NEG">NEG</option>
 					</select>
 				</div>
 				<div class="form-group">
@@ -2162,9 +2298,11 @@
 						<option value="">Pilih Salah Satu</option>
 						<option value="Inkubasi Lanjutan">Inkubasi Lanjutan</option>
 						<option value="Sub Kultur">Sub Kultur</option>
-						<option value="Proses Vitek">Proses Vitek</option>
-						<option value="Proses Manual">Proses Manual</option>
-						<option value="Proses Malditof">Proses Malditof</option>
+						<option value="Proses identifikasi dan uji kepekaan vitek">Proses identifikasi dan uji kepekaan vitek</option>
+						<option value="Proses identifikasi dan uji kepekaan manual">Proses identifikasi dan uji kepekaan manual</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan vitek">Proses identifikasi malditof+ uji kepekaan vitek</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan manual">Proses identifikasi malditof+ uji kepekaan manual</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan vitek">Proses identifikasi malditof+ uji kepekaan vitek</option>
 						<option value="Tidak Lanjut Identifikasi">Tidak Lanjut Identifikasi</option>
 					</select>
 				</div>
@@ -2184,30 +2322,41 @@
 				<h4 class="modal-title">Media CAP</h4>
 			</div>
 			<div class="modal-body">
-				<div class="form-group">
-					<select class="form-control" id="id_mediacap">
-						<option>Pilih Salah Satu</option>
-						@if(isset($jsonmediacap) && !empty($jsonmediacap))
-							@foreach($jsonmediacap as $rows)
-								<option value="{!! $rows->name !!}">{!! $rows->name !!}</option>
-							@endforeach
-						@endif
-					</select>
+				<div class="form-row">
+					<div class="form-group col-lg-6">
+						<select class="form-control" id="id_mediacapkuman">
+							<option>Kuman 1</option>
+							<option>Kuman 2</option>
+							<option>Kuman 3</option>
+							<option>Kuman 4</option>
+							<option>Kuman 5</option>
+						</select>
+					</div>
+					<div class="form-group col-lg-6">
+						<select class="form-control" id="id_mediacap">
+							<option>Pilih Salah Satu</option>
+							@if(isset($jsonmediacap) && !empty($jsonmediacap))
+								@foreach($jsonmediacap as $rows)
+									<option value="{!! $rows->name !!}">{!! $rows->name !!}</option>
+								@endforeach
+							@endif
+						</select>
+					</div>
 				</div>
 				<div class="form-group">
 					<label for="cap_pemeriksaankatalase" class="col-form-label">Katalase</label>
 					<select class="form-control ekspertiseseletc" id="cap_pemeriksaankatalase" name="cap_pemeriksaankatalase">
 						<option value="">Pilih Salah Satu</option>
-						<option value="Katalase +">Katalase +</option>
-						<option value="Katalase -">Katalase -</option>
+						<option value="POS">POS</option>
+						<option value="NEG">NEG</option>
 					</select>
 				</div>
 				<div class="form-group">
 					<label for="cap_pemeriksaankabulase" class="col-form-label">Koagulase</label>
 					<select class="form-control ekspertiseseletc" id="cap_pemeriksaankabulase" name="cap_pemeriksaankabulase">
 						<option value="">Pilih Salah Satu</option>
-						<option value="Koagulase +">Koagulase +</option>
-						<option value="Koagulase -">Koagulase -</option>
+						<option value="POS">POS</option>
+						<option value="NEG">NEG</option>
 					</select>
 				</div>
 				<div class="form-group">
@@ -2220,9 +2369,11 @@
 						<option value="">Pilih Salah Satu</option>
 						<option value="Inkubasi Lanjutan">Inkubasi Lanjutan</option>
 						<option value="Sub Kultur">Sub Kultur</option>
-						<option value="Proses Vitek">Proses Vitek</option>
-						<option value="Proses Manual">Proses Manual</option>
-						<option value="Proses Malditof">Proses Malditof</option>
+						<option value="Proses identifikasi dan uji kepekaan vitek">Proses identifikasi dan uji kepekaan vitek</option>
+						<option value="Proses identifikasi dan uji kepekaan manual">Proses identifikasi dan uji kepekaan manual</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan vitek">Proses identifikasi malditof+ uji kepekaan vitek</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan manual">Proses identifikasi malditof+ uji kepekaan manual</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan vitek">Proses identifikasi malditof+ uji kepekaan vitek</option>
 						<option value="Tidak Lanjut Identifikasi">Tidak Lanjut Identifikasi</option>
 					</select>
 				</div>
@@ -2242,19 +2393,34 @@
 				<h4 class="modal-title">Media Mc Conkey</h4>
 			</div>
 			<div class="modal-body">
-				<div class="form-group">
-					<select class="form-control" id="id_mediamcconkey">
-						<option>Pilih Salah Satu</option>
-						@if(isset($jsonmediamcconkey) && !empty($jsonmediamcconkey))
-							@foreach($jsonmediamcconkey as $rows)
-								<option value="{!! $rows->name !!}">{!! $rows->name !!}</option>
-							@endforeach
-						@endif
-					</select>
+				<div class="form-row">
+					<div class="form-group col-lg-6">
+						<select class="form-control" id="id_mediamcconkeykuman">
+							<option>Kuman 1</option>
+							<option>Kuman 2</option>
+							<option>Kuman 3</option>
+							<option>Kuman 4</option>
+							<option>Kuman 5</option>
+						</select>
+					</div>
+					<div class="form-group col-lg-6">
+						<select class="form-control" id="id_mediamcconkey">
+							<option>Pilih Salah Satu</option>
+							@if(isset($jsonmediamcconkey) && !empty($jsonmediamcconkey))
+								@foreach($jsonmediamcconkey as $rows)
+									<option value="{!! $rows->name !!}">{!! $rows->name !!}</option>
+								@endforeach
+							@endif
+						</select>
+					</div>
 				</div>
 				<div class="form-group">
 					<label for="id_ujioksidasemcconkey" class="col-form-label">Oksidase</label>
-					<input type="text" id="id_ujioksidasemcconkey" name="id_ujioksidasemcconkey" class="form-control ekspertiseteks">
+					<select class="form-control ekspertiseseletc" id="id_ujioksidasemcconkey" name="id_ujioksidasemcconkey">
+						<option value="">Pilih Salah Satu</option>
+						<option value="POS">POS</option>
+						<option value="NEG">NEG</option>
+					</select>
 				</div>
 				<div class="form-group">
 					<label for="id_ujialainnyamcconkey" class="col-form-label">Uji Lainnya</label>
@@ -2267,9 +2433,11 @@
 						<option value="">Pilih Salah Satu</option>
 						<option value="Inkubasi Lanjutan">Inkubasi Lanjutan</option>
 						<option value="Sub Kultur">Sub Kultur</option>
-						<option value="Proses Vitek">Proses Vitek</option>
-						<option value="Proses Manual">Proses Manual</option>
-						<option value="Proses Malditof">Proses Malditof</option>
+						<option value="Proses identifikasi dan uji kepekaan vitek">Proses identifikasi dan uji kepekaan vitek</option>
+						<option value="Proses identifikasi dan uji kepekaan manual">Proses identifikasi dan uji kepekaan manual</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan vitek">Proses identifikasi malditof+ uji kepekaan vitek</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan manual">Proses identifikasi malditof+ uji kepekaan manual</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan vitek">Proses identifikasi malditof+ uji kepekaan vitek</option>
 						<option value="Tidak Lanjut Identifikasi">Tidak Lanjut Identifikasi</option>
 					</select>
 				</div>
@@ -2348,6 +2516,7 @@
 						<option value="PATOGEN (Lanjut Identifikasi Manual)">PATOGEN (Lanjut Identifikasi Manual)</option>
 						<option value="Kontaminasi (Tidak ada pertumbuhan jamur patogen)">Kontaminasi (Tidak ada pertumbuhan jamur patogen)</option>
 						<option value="Kolonisasi (Tidak ada pertumbuhan jamur patogen)">Kolonisasi (Tidak ada pertumbuhan jamur patogen)</option>
+						<option value="Steril (Tidak didapatkan pertumbuhan jamur patogen)">Steril (Tidak didapatkan pertumbuhan jamur patogen)</option>
 					</select>
 				</div>
 			</div>	
@@ -2373,24 +2542,25 @@
 					<label for="sellainnya_pemeriksaanhemolisa" class="col-form-label">Hemolisa</label>
 					<select class="form-control ekspertiseseletc" id="sellainnya_pemeriksaanhemolisa" name="sellainnya_pemeriksaanhemolisa">
 						<option value="">Pilih Salah Satu</option>
-						<option value="&#646; hemolisa">&#646; hemolisa</option>
-						<option value="&#946; hemolisa">&#946; hemolisa</option>
+						<option value="Alpha">Alpha</option>
+						<option value="Beta">Beta</option>
+						<option value="Gamma">Gamma</option>
 					</select>
 				</div>
 				<div class="form-group">
 					<label for="sellainnya_pemeriksaankatalase" class="col-form-label">Katalase</label>
 					<select class="form-control ekspertiseseletc" id="sellainnya_pemeriksaankatalase" name="sellainnya_pemeriksaankatalase">
 						<option value="">Pilih Salah Satu</option>
-						<option value="Katalase +">Katalase +</option>
-						<option value="Katalase -">Katalase -</option>
+						<option value="POS">POS</option>
+						<option value="NEG">NEG</option>
 					</select>
 				</div>
 				<div class="form-group">
 					<label for="sellainnya_pemeriksaankabulase" class="col-form-label">Koagulase</label>
 					<select class="form-control ekspertiseseletc" id="sellainnya_pemeriksaankabulase" name="sellainnya_pemeriksaankabulase">
 						<option value="">Pilih Salah Satu</option>
-						<option value="Koagulase +">Koagulase +</option>
-						<option value="Koagulase -">Koagulase -</option>
+						<option value="POS">POS</option>
+						<option value="NEG">NEG</option>
 					</select>
 				</div>
 				<div class="form-group">
@@ -2407,9 +2577,11 @@
 						<option value="">Pilih Salah Satu</option>
 						<option value="Inkubasi Lanjutan">Inkubasi Lanjutan</option>
 						<option value="Sub Kultur">Sub Kultur</option>
-						<option value="Proses Vitek">Proses Vitek</option>
-						<option value="Proses Manual">Proses Manual</option>
-						<option value="Proses Malditof">Proses Malditof</option>
+						<option value="Proses identifikasi dan uji kepekaan vitek">Proses identifikasi dan uji kepekaan vitek</option>
+						<option value="Proses identifikasi dan uji kepekaan manual">Proses identifikasi dan uji kepekaan manual</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan vitek">Proses identifikasi malditof+ uji kepekaan vitek</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan manual">Proses identifikasi malditof+ uji kepekaan manual</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan vitek">Proses identifikasi malditof+ uji kepekaan vitek</option>
 						<option value="Tidak Lanjut Identifikasi">Tidak Lanjut Identifikasi</option>
 					</select>
 				</div>
@@ -2443,24 +2615,25 @@
 					<label for="tamlainnya_pemeriksaanhemolisa" class="col-form-label">Hemolisa</label>
 					<select class="form-control ekspertiseseletc" id="tamlainnya_pemeriksaanhemolisa" name="tamlainnya_pemeriksaanhemolisa">
 						<option value="">Pilih Salah Satu</option>
-						<option value="&#646; hemolisa">&#646; hemolisa</option>
-						<option value="&#946; hemolisa">&#946; hemolisa</option>
+						<option value="Alpha">Alpha</option>
+						<option value="Beta">Beta</option>
+						<option value="Gamma">Gamma</option>
 					</select>
 				</div>
 				<div class="form-group">
 					<label for="tamlainnya_pemeriksaankatalase" class="col-form-label">Katalase</label>
 					<select class="form-control ekspertiseseletc" id="tamlainnya_pemeriksaankatalase" name="tamlainnya_pemeriksaankatalase">
 						<option value="">Pilih Salah Satu</option>
-						<option value="Katalase +">Katalase +</option>
-						<option value="Katalase -">Katalase -</option>
+						<option value="POS">POS</option>
+						<option value="NEG">NEG</option>
 					</select>
 				</div>
 				<div class="form-group">
 					<label for="tamlainnya_pemeriksaankabulase" class="col-form-label">Koagulase</label>
 					<select class="form-control ekspertiseseletc" id="tamlainnya_pemeriksaankabulase" name="tamlainnya_pemeriksaankabulase">
 						<option value="">Pilih Salah Satu</option>
-						<option value="Koagulase +">Koagulase +</option>
-						<option value="Koagulase -">Koagulase -</option>
+						<option value="POS">POS</option>
+						<option value="NEG">NEG</option>
 					</select>
 				</div>
 				<div class="form-group">
@@ -2477,9 +2650,11 @@
 						<option value="">Pilih Salah Satu</option>
 						<option value="Inkubasi Lanjutan">Inkubasi Lanjutan</option>
 						<option value="Sub Kultur">Sub Kultur</option>
-						<option value="Proses Vitek">Proses Vitek</option>
-						<option value="Proses Manual">Proses Manual</option>
-						<option value="Proses Malditof">Proses Malditof</option>
+						<option value="Proses identifikasi dan uji kepekaan vitek">Proses identifikasi dan uji kepekaan vitek</option>
+						<option value="Proses identifikasi dan uji kepekaan manual">Proses identifikasi dan uji kepekaan manual</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan vitek">Proses identifikasi malditof+ uji kepekaan vitek</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan manual">Proses identifikasi malditof+ uji kepekaan manual</option>
+						<option value="Proses identifikasi malditof+ uji kepekaan vitek">Proses identifikasi malditof+ uji kepekaan vitek</option>
 						<option value="Tidak Lanjut Identifikasi">Tidak Lanjut Identifikasi</option>
 					</select>
 				</div>
@@ -2509,23 +2684,34 @@
 		</div>
 	</div>
 </div>
-<input type="hidden" id="master_judul" name="master_judul" value="{{ $lokasi }}">
-<input type="hidden" id="master_lokasi" name="master_lokasi" value="{{ $master }}">
-<input type="hidden" id="master_userid" name="master_userid" value="{{ Session('id') }}">
-<input type="hidden" id="master_kelompok" name="master_kelompok" value="{{ Session('previlage') }}">
-<input type="hidden" id="master_set01" name="master_set01" value="verificationppds">
-<input type="hidden" id="master_set02" name="master_set02" value="">
-<input type="hidden" id="master_set03" name="master_set03" value="">
-<input type="hidden" id="master_set04" name="master_set04" value="">
-<input type="hidden" name="id_nmfile" id="id_nmfile">
-<input type="hidden" name="id_ukfile" id="id_ukfile">
-<input type="hidden" name="id_jnfile" id="id_jnfile">
-<input type="hidden" name="dlp" id="dlp">
-<input type="hidden" name="upload_idne" id="upload_idne">
-<input type="hidden" name="idpertumbuhankoloni" id="idpertumbuhankoloni">
-<input type="hidden" name="template_jenis" id="template_jenis">
-<input type="hidden" name="_token" id="token" value="{{ csrf_token() }}">
 <div style="overflow: hidden; display: none;">
+	<div id="timeremaining"></div>
+	<div class="form-group col-lg-3">
+		<select class="form-control ekspertiseseletc" id="bakterimediabap" name="bakterimediabap">
+			<option value="">Pilih Salah Satu</option>
+			<option value="ESBL">ESBL</option>
+			<option value="MRSA">MRSA</option>
+			<option value="MDR">MDR</option>
+			<option value="XDR">XDR</option>
+			<option value="PDR">PDR</option>
+			<option value="Carbapenem Resistant">Carbapenem Resistant</option>
+			<option value="MDR Carbapenem Resistant">MDR Carbapenem Resistant</option>
+			<option value="XDR Carbapenem Resistant">XDR Carbapenem Resistant</option>
+		</select>
+	</div>
+	<div class="form-group col-lg-3" id="id_bakterimediabapselect">
+		<select class="form-control ekspertiseseletc" id="id_bakterihitungkolmediabap" name="id_bakterihitungkolmediabap">
+			<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_bakterimediabapteks">
+		<input type="text" id="id_bakterihitungkolmediabapteks" name="id_bakterihitungkolmediabapteks" class="form-control ekspertiseteks">
+	</div>
 	<div class="form-group col-lg-12">
 		<label for="hasilpemeriksaanttcmmtbrifxpert_pagi" class="col-form-label">Pagi</label>
 		<input type="text" id="hasilpemeriksaanttcmmtbrifxpert_pagi" class="form-control ekspertiseteks">
@@ -2566,21 +2752,31 @@
 		</select>
 	</div>
 </div>
+<input type="hidden" id="master_judul" name="master_judul" value="{{ $lokasi }}">
+<input type="hidden" id="master_lokasi" name="master_lokasi" value="{{ $master }}">
+<input type="hidden" id="master_userid" name="master_userid" value="{{ Session('id') }}">
+<input type="hidden" id="master_kelompok" name="master_kelompok" value="{{ Session('previlage') }}">
+<input type="hidden" id="master_set01" name="master_set01" value="verificationppds">
+<input type="hidden" id="master_set02" name="master_set02" value="">
+<input type="hidden" id="master_set03" name="master_set03" value="">
+<input type="hidden" id="master_set04" name="master_set04" value="">
+<input type="hidden" name="id_nmfile" id="id_nmfile">
+<input type="hidden" name="id_ukfile" id="id_ukfile">
+<input type="hidden" name="id_jnfile" id="id_jnfile">
+<input type="hidden" name="dlp" id="dlp">
+<input type="hidden" name="upload_idne" id="upload_idne">
+<input type="hidden" name="idpertumbuhankoloni" id="idpertumbuhankoloni">
+<input type="hidden" name="template_jenis" id="template_jenis">
+<input type="hidden" name="_token" id="token" value="{{ csrf_token() }}">
 @endsection
-
 @push('script')
 <script type="text/javascript">
 	document.addEventListener('DOMContentLoaded', function () {
         const refreshBtn = document.getElementById('refresh-btn');
-
-        // Hapus hash (#) dari URL bila ada
         if (window.location.hash) {
             history.replaceState("", document.title, window.location.pathname + window.location.search);
         }
-
-        // Event klik tombol → reload halaman tanpa cache
         refreshBtn.addEventListener('click', function () {
-            //window.location.reload(true);
 			$('#divperiksa').hide();
 			$('#divreadonly').hide();
 			$('#divawal').show();
@@ -2641,7 +2837,7 @@
 		$('#micvalue_id').val(id);
 		$('#modaleditormic').modal('show');
     }
-	function updateValue(id, value) {
+	function updateValueManOne(id, value) {
 		$.ajax({
 			url: '{{ route("getResult") }}',
 			type: 'POST',
@@ -2653,6 +2849,24 @@
 				_token: '{{ csrf_token() }}'
 			},
 			success: function(res) {
+				$("#tblkumanmanual1").DataTable().ajax.reload();
+				console.log("Value updated", res);
+			}
+		});
+	}
+	function updateValueManTwo(id, value) {
+		$.ajax({
+			url: '{{ route("getResult") }}',
+			type: 'POST',
+			data: {
+				nofoto: id,
+				isi: 'updatevaluemic',
+				keterangan: 'printunprinttblantibiotik',
+				komponen: value,
+				_token: '{{ csrf_token() }}'
+			},
+			success: function(res) {
+				$("#tblkumanmanual2").DataTable().ajax.reload();
 				console.log("Value updated", res);
 			}
 		});
@@ -2674,11 +2888,16 @@
 		});
 	}
 	function btncreateantibiotikkumanmanual1(jQuery){
-		var idne	= document.getElementById('periksa_id').value;
+		var idne	= $('#periksa_id').val();
 		var kuman01	= $('#id_bakteri01').val();
+		var antibio1= $('#id_antibiotikmanual1').val();
+		if (kuman01 == '' || kuman01 == null) {
+			return;
+		}
 		if ( $.fn.DataTable.isDataTable('#tblkumanmanual1') ) {
 			$('#tblkumanmanual1').DataTable().clear().destroy();
 		}
+		console.log('Creating DataTable for kuman manual 1 with kuman ID:'+kuman01+antibio1);
 		$('#tblkumanmanual1').DataTable({
 			ajax: {
 				url: '{{ route("getResult") }}',
@@ -2723,7 +2942,7 @@
 					render: function (data, type, full) {
 						return `<input type="text" class="form-control form-control-sm"
 									value="${data ?? ''}"
-									onblur="updateValue(${full.id}, this.value)">`;
+									onblur="updateValueManOne(${full.id}, this.value)">`;
 					}
 				},
 				{
@@ -2778,11 +2997,17 @@
 		});
     }
 	function btncreateantibiotikkumanmanual2(jQuery){
-		var idne	= document.getElementById('periksa_id').value;
+		var idne	= $('#periksa_id').val();
 		var kuman02	= $('#id_bakteri02').val();
+		var antibio2= $('#id_antibiotikmanual2').val();
+		
+		if (kuman02 == '' || kuman02 == null) {
+			return;
+		}
 		if ( $.fn.DataTable.isDataTable('#tblkumanmanual2') ) {
 			$('#tblkumanmanual2').DataTable().clear().destroy();
 		}
+		console.log('Creating DataTable for kuman manual 2 with kuman ID:'+kuman02+antibio2);
 		$('#tblkumanmanual2').DataTable({
 			ajax: {
 				url: '{{ route("getResult") }}',
@@ -2827,7 +3052,7 @@
 					render: function (data, type, full) {
 						return `<input type="text" class="form-control form-control-sm"
 									value="${data ?? ''}"
-									onblur="updateValue(${full.id}, this.value)">`;
+									onblur="updateValueManTwo(${full.id}, this.value)">`;
 					}
 				},
 				{
@@ -2968,6 +3193,7 @@
 	}
 	function jQueryCreateTabelPertumbuhanKoloni(jQuery){
 		var idne			= document.getElementById('periksa_id').value;
+		var nofoto			= document.getElementById('nofoto').value;
 		var srcjsonbap 		= {
 			datatype: "json",
 			datafields: [
@@ -3110,27 +3336,90 @@
 			altrows					: true,
 			columns					: [
 				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '10%', cellsalign: 'left', align: 'center' },
-				{ text: 'Petugas', datafield: 'created_by', width: '15%', cellsalign: 'left', align: 'center' },
-				{ text: 'Kuman', datafield: 'kuman', width: '10%', cellsalign: 'left', align: 'center' },
+				{ text: 'Petugas', datafield: 'created_by', width: '11%', cellsalign: 'left', align: 'center' },
+				{ text: 'Kuman', datafield: 'tindaklanjut', width: '9%', cellsalign: 'left', align: 'center' },
+				{ text: 'Media', datafield: 'kuman', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Hemolisa', datafield: 'hemolisa', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Katalase', datafield: 'katalase', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Koagulase', datafield: 'koagulase', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Lainnya', datafield: 'lainnya', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Status', datafield: 'status', width: '15%', cellsalign: 'left', align: 'center' },
-				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '10%', cellsrenderer: function () {
+				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '7%', cellsrenderer: function () {
 					return "Edit";
 					}, buttonclick: function (row) {        
 						editrowjabatan  = row;   
 						var offset      = $("#gridmediabap").offset();       
 						var dataRecord  = $("#gridmediabap").jqxGrid('getrowdata', editrowjabatan);
-						$('#idpertumbuhankoloni').val(dataRecord.id);
-						$('#id_mediabap').val(dataRecord.kuman);
-						$('#id_pemeriksaanhemolisa').val(dataRecord.hemolisa);
-						$('#id_pemeriksaankatalase').val(dataRecord.katalase);
-						$('#id_pemeriksaankabulase').val(dataRecord.koagulase);
-						$('#id_ujialainnyabap').val(dataRecord.lainnya);
-						$('#id_statusmediabap').val(dataRecord.status);
-						$('#modalgridmediabap').modal('show');
+						var tanggal   = dataRecord.tglpenyimpanan;
+						if (tanggal == '{{date("Y-m-d")}}') {
+							$('#idpertumbuhankoloni').val(dataRecord.id);
+							$('#id_mediabap').val(dataRecord.kuman);
+							$('#id_pemeriksaanhemolisa').val(dataRecord.hemolisa);
+							$('#id_pemeriksaankatalase').val(dataRecord.katalase);
+							$('#id_pemeriksaankabulase').val(dataRecord.koagulase);
+							$('#id_ujialainnyabap').val(dataRecord.lainnya);
+							$('#id_statusmediabap').val(dataRecord.status);
+							$('#modalgridmediabap').modal('show');
+						} else {
+							swal({
+								title	: 'Maaf',
+								text	: 'Data hanya bisa di edit pada hari yang sama',
+								type	: 'warning',
+							})
+						}
+						
+					}
+				},
+				{ text: 'Del', editable: false, sortable: false, filterable: false, columntype: 'button', width: '7%', cellsrenderer: function () {
+                    return "Del";
+                    }, buttonclick: function (row) {
+                        editrow = row;	
+                        var offset 		= $("#gridmediabap").offset();		
+                        var dataRecord 	= $("#gridmediabap").jqxGrid('getrowdata', editrow);
+                        swal({
+                            title: 'Apakah anda yakin ?',
+                            text: "Perhatian, data yang sudah di hapus tidak bisa di Undo, apakah anda yakin ingin menghapus",
+                            type: 'warning',
+                            showCancelButton: true,
+                            confirmButtonClass: 'btn btn-confirm mt-2',
+                            cancelButtonClass: 'btn btn-cancel ml-2 mt-2',
+                            confirmButtonText: 'Yes'
+                        }).then(function () {
+							$.post('{{ route("getResult") }}', { 
+								id: dataRecord.id,
+								nofoto: nofoto,
+								keterangan: 'hapusdatapertumbuhankoloni',
+								_token: '{{ csrf_token() }}' },
+							function(data){
+								$("#gridmediabap").jqxGrid('updatebounddata','filter');
+							});
+                        });
+                    }
+                },
+				{ text: 'Next', filterable: false, columntype: 'button', align: 'center', width: '7%', cellsrenderer: function () {
+					return "Next";
+					}, buttonclick: function (row) {        
+						editrowjabatan  = row;   
+						var offset      = $("#gridmediabap").offset();       
+						var dataRecord  = $("#gridmediabap").jqxGrid('getrowdata', editrowjabatan);
+						var tanggal   = dataRecord.tglpenyimpanan;
+						if (tanggal == '{{date("Y-m-d")}}') {
+							swal({
+								title	: 'Maaf',
+								text	: 'Data hanya bisa di edit pada hari berikutnya',
+								type	: 'warning',
+							})
+						} else {
+							$('#idpertumbuhankoloni').val('new');
+							$('#id_mediabap').val(dataRecord.kuman);
+							$('#id_pemeriksaanhemolisa').val(dataRecord.hemolisa);
+							$('#id_pemeriksaankatalase').val(dataRecord.katalase);
+							$('#id_pemeriksaankabulase').val(dataRecord.koagulase);
+							$('#id_ujialainnyabap').val(dataRecord.lainnya);
+							$('#id_statusmediabap').val(dataRecord.status);
+							$('#modalgridmediabap').modal('show');
+						}
+						
 					}
 				},
 			]
@@ -3144,26 +3433,88 @@
 			pageable				: true,
 			altrows					: true,
 			columns					: [
-				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '20%', cellsalign: 'left', align: 'center' },
-				{ text: 'Petugas', datafield: 'created_by', width: '20%', cellsalign: 'left', align: 'center' },
-				{ text: 'Kuman', datafield: 'kuman', width: '10%', cellsalign: 'left', align: 'center' },
+				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '9%', cellsalign: 'left', align: 'center' },
+				{ text: 'Petugas', datafield: 'created_by', width: '10%', cellsalign: 'left', align: 'center' },
+				{ text: 'Kuman', datafield: 'tindaklanjut', width: '10%', cellsalign: 'left', align: 'center' },
+				{ text: 'Media', datafield: 'kuman', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Katalase', datafield: 'katalase', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Koagulase', datafield: 'koagulase', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Lainnya', datafield: 'lainnya', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Status', datafield: 'status', width: '10%', cellsalign: 'left', align: 'center' },
-				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '10%', cellsrenderer: function () {
+				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '7%', cellsrenderer: function () {
 					return "Edit";
 					}, buttonclick: function (row) {        
 						editrowjabatan  = row;   
 						var offset      = $("#gridmediacap").offset();       
 						var dataRecord  = $("#gridmediacap").jqxGrid('getrowdata', editrowjabatan);
-						$('#idpertumbuhankoloni').val(dataRecord.id);
-						$('#id_mediacap').val(dataRecord.kuman);
-						$('#cap_pemeriksaankatalase').val(dataRecord.katalase);
-						$('#cap_pemeriksaankabulase').val(dataRecord.koagulase);
-						$('#id_ujialainnyacap').val(dataRecord.lainnya);
-						$('#id_statusmediacap').val(dataRecord.status);
-						$('#modalgridmediacap').modal('show');
+						var tanggal   = dataRecord.tglpenyimpanan;
+						if (tanggal == '{{date("Y-m-d")}}') {
+							$('#idpertumbuhankoloni').val(dataRecord.id);
+							$('#id_mediacap').val(dataRecord.kuman);
+							$('#cap_pemeriksaankatalase').val(dataRecord.katalase);
+							$('#cap_pemeriksaankabulase').val(dataRecord.koagulase);
+							$('#id_ujialainnyacap').val(dataRecord.lainnya);
+							$('#id_statusmediacap').val(dataRecord.status);
+							$('#modalgridmediacap').modal('show');
+						} else {
+							swal({
+								title	: 'Maaf',
+								text	: 'Data hanya bisa di edit pada hari yang sama',
+								type	: 'warning',
+							})
+						}
+						
+					}
+				},
+				{ text: 'Del', editable: false, sortable: false, filterable: false, columntype: 'button', width: '7%', cellsrenderer: function () {
+                    return "Del";
+                    }, buttonclick: function (row) {
+                        editrow = row;	
+                        var offset 		= $("#gridmediacap").offset();		
+                        var dataRecord 	= $("#gridmediacap").jqxGrid('getrowdata', editrow);
+                        swal({
+                            title: 'Apakah anda yakin ?',
+                            text: "Perhatian, data yang sudah di hapus tidak bisa di Undo, apakah anda yakin ingin menghapus",
+                            type: 'warning',
+                            showCancelButton: true,
+                            confirmButtonClass: 'btn btn-confirm mt-2',
+                            cancelButtonClass: 'btn btn-cancel ml-2 mt-2',
+                            confirmButtonText: 'Yes'
+                        }).then(function () {
+							$.post('{{ route("getResult") }}', { 
+								id: dataRecord.id,
+								nofoto: nofoto,
+								keterangan: 'hapusdatapertumbuhankoloni',
+								_token: '{{ csrf_token() }}' },
+							function(data){
+								$("#gridmediacap").jqxGrid('updatebounddata','filter');
+							});
+                        });
+                    }
+                },
+				{ text: 'Next', filterable: false, columntype: 'button', align: 'center', width: '7%', cellsrenderer: function () {
+					return "Next";
+					}, buttonclick: function (row) {        
+						editrowjabatan  = row;   
+						var offset      = $("#gridmediacap").offset();       
+						var dataRecord  = $("#gridmediacap").jqxGrid('getrowdata', editrowjabatan);
+						var tanggal   = dataRecord.tglpenyimpanan;
+						if (tanggal == '{{date("Y-m-d")}}') {
+							swal({
+								title	: 'Maaf',
+								text	: 'Data hanya bisa di edit pada hari berikutnya',
+								type	: 'warning',
+							})
+						} else {
+							$('#idpertumbuhankoloni').val('new');
+							$('#id_mediacap').val(dataRecord.kuman);
+							$('#cap_pemeriksaankatalase').val(dataRecord.katalase);
+							$('#cap_pemeriksaankabulase').val(dataRecord.koagulase);
+							$('#id_ujialainnyacap').val(dataRecord.lainnya);
+							$('#id_statusmediacap').val(dataRecord.status);
+							$('#modalgridmediacap').modal('show');
+						}
+						
 					}
 				},
 			]
@@ -3177,26 +3528,86 @@
 			pageable				: true,
 			altrows					: true,
 			columns					: [
-				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '20%', cellsalign: 'left', align: 'center' },
-				{ text: 'Petugas', datafield: 'created_by', width: '20%', cellsalign: 'left', align: 'center' },
-				{ text: 'Kuman', datafield: 'kuman', width: '10%', cellsalign: 'left', align: 'center' },
+				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '9%', cellsalign: 'left', align: 'center' },
+				{ text: 'Petugas', datafield: 'created_by', width: '10%', cellsalign: 'left', align: 'center' },
+				{ text: 'Kuman', datafield: 'tindaklanjut', width: '10%', cellsalign: 'left', align: 'center' },
+				{ text: 'Media', datafield: 'kuman', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Oksidase', datafield: 'oksidase', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Lainnya', datafield: 'lainnya', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Status', datafield: 'status', width: '20%', cellsalign: 'left', align: 'center' },
-				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '10%', cellsrenderer: function () {
+				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '7%', cellsrenderer: function () {
 					return "Edit";
 					}, buttonclick: function (row) {        
-						editrowjabatan  = row;   
+						editrowjabatan  = row;
 						var offset      = $("#gridmediamcconkey").offset();       
 						var dataRecord  = $("#gridmediamcconkey").jqxGrid('getrowdata', editrowjabatan);
-						$('#idpertumbuhankoloni').val(dataRecord.id);
-						$('#id_mediamcconkey').val(dataRecord.kuman);
-						$('#id_ujialainnyamcconkey').val(dataRecord.lainnya);
-						$('#id_ujioksidasemcconkey').val(dataRecord.oksidase);
-						$('#id_statusmediamcconkey').val(dataRecord.status);
-						$('#modalgridmediamcconkey').modal('show');
+						var tanggal   = dataRecord.tglpenyimpanan;
+						if (tanggal == '{{date("Y-m-d")}}') {
+							$('#idpertumbuhankoloni').val(dataRecord.id);
+							$('#id_mediamcconkey').val(dataRecord.kuman);
+							$('#id_ujialainnyamcconkey').val(dataRecord.lainnya);
+							$('#id_ujioksidasemcconkey').val(dataRecord.oksidase);
+							$('#id_statusmediamcconkey').val(dataRecord.status);
+							$('#modalgridmediamcconkey').modal('show');
+						} else {
+							swal({
+								title	: 'Maaf',
+								text	: 'Data hanya bisa di edit pada hari yang sama',
+								type	: 'warning',
+							})
+						}
 					}
 				},
+				{ text: 'Del', editable: false, sortable: false, filterable: false, columntype: 'button', width: '7%', cellsrenderer: function () {
+                    return "Del";
+                    }, buttonclick: function (row) {
+                        editrow = row;	
+                        var offset 		= $("#gridmediamcconkey").offset();		
+                        var dataRecord 	= $("#gridmediamcconkey").jqxGrid('getrowdata', editrow);
+                        swal({
+                            title: 'Apakah anda yakin ?',
+                            text: "Perhatian, data yang sudah di hapus tidak bisa di Undo, apakah anda yakin ingin menghapus",
+                            type: 'warning',
+                            showCancelButton: true,
+                            confirmButtonClass: 'btn btn-confirm mt-2',
+                            cancelButtonClass: 'btn btn-cancel ml-2 mt-2',
+                            confirmButtonText: 'Yes'
+                        }).then(function () {
+							$.post('{{ route("getResult") }}', { 
+								id: dataRecord.id,
+								nofoto: nofoto,
+								keterangan: 'hapusdatapertumbuhankoloni',
+								_token: '{{ csrf_token() }}' },
+							function(data){
+								$("#gridmediamcconkey").jqxGrid('updatebounddata','filter');
+							});
+                        });
+                    }
+                },
+				{ text: 'Next', editable: false, sortable: false, filterable: false, columntype: 'button', width: '7%', cellsrenderer: function () {
+                    return "Next";
+                    }, buttonclick: function (row) {
+                        editrow 		= row;
+                        var offset 		= $("#gridmediamcconkey").offset();		
+                        var dataRecord 	= $("#gridmediamcconkey").jqxGrid('getrowdata', editrow);
+						var tanggal   = dataRecord.tglpenyimpanan;
+						if (tanggal == '{{date("Y-m-d")}}') {
+							swal({
+								title	: 'Maaf',
+								text	: 'Data hanya bisa di edit pada hari berikutnya',
+								type	: 'warning',
+							})
+						} else {
+							$('#idpertumbuhankoloni').val('new');
+							$('#id_mediamcconkey').val(dataRecord.kuman);
+							$('#id_ujialainnyamcconkey').val(dataRecord.lainnya);
+							$('#id_ujioksidasemcconkey').val(dataRecord.oksidase);
+							$('#id_statusmediamcconkey').val(dataRecord.status);
+							$('#modalgridmediamcconkey').modal('show');
+						}
+						
+                    }
+                },
 			]
 		});
 		$("#gridmediasda").jqxGrid({
@@ -3208,8 +3619,8 @@
 			pageable				: true,
 			altrows					: true,
 			columns					: [
-				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '10%', cellsalign: 'left', align: 'center' },
-				{ text: 'Petugas', datafield: 'created_by', width: '10%', cellsalign: 'left', align: 'center' },
+				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '8%', cellsalign: 'left', align: 'center' },
+				{ text: 'Petugas', datafield: 'created_by', width: '8%', cellsalign: 'left', align: 'center' },
 				{ text: 'Kuman', datafield: 'kuman', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'R1', datafield: 'hemolisa', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'R2', datafield: 'katalase', width: '10%', cellsalign: 'left', align: 'center' },
@@ -3217,7 +3628,7 @@
 				{ text: 'I2', datafield: 'oksidase', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Inokulasi', datafield: 'lainnya', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Status', datafield: 'status', width: '10%', cellsalign: 'left', align: 'center' },
-				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '10%', cellsrenderer: function () {
+				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '7%', cellsrenderer: function () {
 					return "Edit";
 					}, buttonclick: function (row) {        
 						editrowjabatan  = row;   
@@ -3234,6 +3645,32 @@
 						$('#modalgridmediasda').modal('show');
 					}
 				},
+				{ text: 'Del', editable: false, sortable: false, filterable: false, columntype: 'button', width: '7%', cellsrenderer: function () {
+                    return "Del";
+                    }, buttonclick: function (row) {
+                        editrow = row;	
+                        var offset 		= $("#gridmediasda").offset();		
+                        var dataRecord 	= $("#gridmediasda").jqxGrid('getrowdata', editrow);
+                        swal({
+                            title: 'Apakah anda yakin ?',
+                            text: "Perhatian, data yang sudah di hapus tidak bisa di Undo, apakah anda yakin ingin menghapus",
+                            type: 'warning',
+                            showCancelButton: true,
+                            confirmButtonClass: 'btn btn-confirm mt-2',
+                            cancelButtonClass: 'btn btn-cancel ml-2 mt-2',
+                            confirmButtonText: 'Yes'
+                        }).then(function () {
+							$.post('{{ route("getResult") }}', { 
+								id: dataRecord.id,
+								nofoto: nofoto,
+								keterangan: 'hapusdatapertumbuhankoloni',
+								_token: '{{ csrf_token() }}' },
+							function(data){
+								$("#gridmediasda").jqxGrid('updatebounddata','filter');
+							});
+                        });
+                    }
+                },
 			]
 		});
 		$("#gridmediasellainnya").jqxGrid({
@@ -3245,8 +3682,8 @@
 			pageable				: true,
 			altrows					: true,
 			columns					: [
-				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '10%', cellsalign: 'left', align: 'center' },
-				{ text: 'Petugas', datafield: 'created_by', width: '10%', cellsalign: 'left', align: 'center' },
+				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '8%', cellsalign: 'left', align: 'center' },
+				{ text: 'Petugas', datafield: 'created_by', width: '8%', cellsalign: 'left', align: 'center' },
 				{ text: 'Kuman', datafield: 'kuman', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Hemolisa', datafield: 'hemolisa', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Katalase', datafield: 'katalase', width: '10%', cellsalign: 'left', align: 'center' },
@@ -3254,7 +3691,7 @@
 				{ text: 'Oksidase', datafield: 'oksidase', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Lainnya', datafield: 'lainnya', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Status', datafield: 'status', width: '10%', cellsalign: 'left', align: 'center' },
-				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '10%', cellsrenderer: function () {
+				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '7%', cellsrenderer: function () {
 					return "Edit";
 					}, buttonclick: function (row) {        
 						editrowjabatan  = row;   
@@ -3271,6 +3708,32 @@
 						$('#modalgridmediaselektif').modal('show');
 					}
 				},
+				{ text: 'Del', editable: false, sortable: false, filterable: false, columntype: 'button', width: '7%', cellsrenderer: function () {
+                    return "Del";
+                    }, buttonclick: function (row) {
+                        editrow = row;	
+                        var offset 		= $("#gridmediasellainnya").offset();		
+                        var dataRecord 	= $("#gridmediasellainnya").jqxGrid('getrowdata', editrow);
+                        swal({
+                            title: 'Apakah anda yakin ?',
+                            text: "Perhatian, data yang sudah di hapus tidak bisa di Undo, apakah anda yakin ingin menghapus",
+                            type: 'warning',
+                            showCancelButton: true,
+                            confirmButtonClass: 'btn btn-confirm mt-2',
+                            cancelButtonClass: 'btn btn-cancel ml-2 mt-2',
+                            confirmButtonText: 'Yes'
+                        }).then(function () {
+							$.post('{{ route("getResult") }}', { 
+								id: dataRecord.id,
+								nofoto: nofoto,
+								keterangan: 'hapusdatapertumbuhankoloni',
+								_token: '{{ csrf_token() }}' },
+							function(data){
+								$("#gridmediasellainnya").jqxGrid('updatebounddata','filter');
+							});
+                        });
+                    }
+                },
 			]
 		});
 		$("#gridmediatamlainnya").jqxGrid({
@@ -3282,8 +3745,8 @@
 			pageable				: true,
 			altrows					: true,
 			columns					: [
-				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '10%', cellsalign: 'left', align: 'center' },
-				{ text: 'Petugas', datafield: 'created_by', width: '10%', cellsalign: 'left', align: 'center' },
+				{ text: 'Tanggal', datafield: 'tglpenyimpanan', width: '8%', cellsalign: 'left', align: 'center' },
+				{ text: 'Petugas', datafield: 'created_by', width: '8%', cellsalign: 'left', align: 'center' },
 				{ text: 'Kuman', datafield: 'kuman', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Hemolisa', datafield: 'hemolisa', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Katalase', datafield: 'katalase', width: '10%', cellsalign: 'left', align: 'center' },
@@ -3291,7 +3754,7 @@
 				{ text: 'Oksidase', datafield: 'oksidase', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Lainnya', datafield: 'lainnya', width: '10%', cellsalign: 'left', align: 'center' },
 				{ text: 'Status', datafield: 'status', width: '10%', cellsalign: 'left', align: 'center' },
-				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '10%', cellsrenderer: function () {
+				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: '7%', cellsrenderer: function () {
 					return "Edit";
 					}, buttonclick: function (row) {        
 						editrowjabatan  = row;   
@@ -3308,6 +3771,32 @@
 						$('#modalgridmediatamlainnya').modal('show');
 					}
 				},
+				{ text: 'Del', editable: false, sortable: false, filterable: false, columntype: 'button', width: '7%', cellsrenderer: function () {
+                    return "Del";
+                    }, buttonclick: function (row) {
+                        editrow = row;	
+                        var offset 		= $("#gridmediatamlainnya").offset();		
+                        var dataRecord 	= $("#gridmediatamlainnya").jqxGrid('getrowdata', editrow);
+                        swal({
+                            title: 'Apakah anda yakin ?',
+                            text: "Perhatian, data yang sudah di hapus tidak bisa di Undo, apakah anda yakin ingin menghapus",
+                            type: 'warning',
+                            showCancelButton: true,
+                            confirmButtonClass: 'btn btn-confirm mt-2',
+                            cancelButtonClass: 'btn btn-cancel ml-2 mt-2',
+                            confirmButtonText: 'Yes'
+                        }).then(function () {
+							$.post('{{ route("getResult") }}', { 
+								id: dataRecord.id,
+								nofoto: nofoto,
+								keterangan: 'hapusdatapertumbuhankoloni',
+								_token: '{{ csrf_token() }}' },
+							function(data){
+								$("#gridmediatamlainnya").jqxGrid('updatebounddata','filter');
+							});
+                        });
+                    }
+                },
 			]
 		});
 	}
@@ -3325,31 +3814,14 @@
 		$('#id_bakterihitungkol01teks').hide();
 		$('#id_bakterihitungkol02select').show();
 		$('#id_bakterihitungkol02teks').hide();
-		
+		$('#id_bakterimediabapselect').show();
+		$('#id_bakterimediabapteks').hide();
+		$('#vl_hasildiv1select').show();
+		$('#vl_hasildiv1teks').hide();
+		$('#vl_hasildiv2select').show();
+		$('#vl_hasildiv2teks').hide();
 		$('input[type="checkbox"]').prop('disabled', false);
-		if (dlp == 'CCI'){
-			$('#templatecci').show();
-		} else if (dlp == 'Kultur'){
-			$('#templatekultur').show();
-			$('#pewarnaangiemsaselect').show();
-			$('#pewarnaangiemsateks').hide();
-			$('#pewarnaankohselect').show();
-			$('#pewarnaankohteks').hide();
-			jQueryCreateTabelPertumbuhanKoloni();
-		} else if (dlp == 'Pewarna Langsung'){
-			$('#lsg_pewarnaankohselect').show();
-			$('#lsg_pewarnaankohteks').hide();
-			$('#lsg_pewarnaangiesmaselect').show();
-			$('#lsg_pewarnaangiesmateks').hide();
-			$('#templatepewarnaanlangsung').show();
-		} else if (dlp == 'TBC'){
-			$('#templatetbc').show();
-			$('.hasilpemeriksaantb').hide();
-		} else if (dlp == 'Viral Load'){
-			$('#templateviralload').show();
-		} else if (dlp == 'IgM IgG Leptospira'){
-			$('#templateleptospira').show();
-		}
+		console.log('Loading komponen jawaban for DLP: '+dlp+' | No.Foto: '+nofoto+' | ID Periksa: '+idne);
 		var form_data = new FormData();
 			form_data.append('nofoto', nofoto);
 			form_data.append('ruangan', dlp);
@@ -3364,6 +3836,7 @@
 			success		: function (response) {
 				var komponens = response.komponens || JSON.parse(response);
 				komponens.forEach(function(rows) {
+					console.log(rows.komponen+' | '+rows.isidata);
 					if (rows.komponen === 'lsg_pewarnaanlain') {
 						CKEDITOR.instances['lsg_pewarnaanlain'].setData(rows.isidata);
 					} else if (rows.komponen === 'lsg_ditemukanmorfologi') {
@@ -3379,6 +3852,12 @@
 					} else if (rows.komponen.includes("id_bakteri01") || rows.komponen.includes("id_bakteri02")) {
 						var isidataString 	= rows.isidata;
 						$("#"+rows.komponen).val(isidataString).select2().trigger('change');
+						if (rows.komponen === 'id_bakteri01') {
+							btncreateantibiotikkumanmanual1();
+						}
+						if (rows.komponen === 'id_bakteri02') {
+							btncreateantibiotikkumanmanual2();
+						}
 					} else if (rows.komponen.includes("inlineCheckbox")) {
 						if (rows.isidata === '' || rows.isidata === null) {
 							$("#" + rows.komponen).prop('checked', false);
@@ -3406,6 +3885,9 @@
 						}
 					} else {
 						$("#" + rows.komponen).val(rows.isidata);
+						if (rows.komponen === 'bakteri'){
+							btncreateantibiotikvitek();
+						}
 						if (rows.komponen === 'id_jenispemeriksaantb') {
 							if (rows.isidata === 'TCM MTB Rif (Xpert)' || rows.isidata === 'TCM MTB Rif (Truenat)' || rows.isidata === 'TCM MTB Rif INH (BDMAX)' || rows.isidata === 'LPA lini 2' || rows.isidata === 'LPA lini 1') {
 								$('#hasilpemeriksaanttcmmtbrifxpert').show();
@@ -3417,34 +3899,46 @@
 								$('#hasilpemeriksaantmikroskopis').show();
 							}
 						}
-						if (rows.komponen === 'id_pewarnaangiesmaoptional'){
+						if (rows.komponen === 'id_bakterihitungkolmediabap' && rows.isidata === 'lainnya'){
+							$('#id_bakterimediabapselect').hide();
+							$('#id_bakterimediabapteks').show();
+						}
+						if (rows.komponen === 'id_pewarnaangiesma' && rows.isidata === 'lainnya'){
 							$('#pewarnaangiemsaselect').hide();
 							$('#pewarnaangiemsateks').show();
 						}
-						if (rows.komponen === 'id_pewarnaankohoptional'){
+						if (rows.komponen === 'id_pewarnaankoh' && rows.isidata === 'lainnya'){
 							$('#pewarnaankohselect').hide();
 							$('#pewarnaankohteks').show();
 						}
-						if (rows.komponen === 'lsg_pewarnaankohoptional'){
+						if (rows.komponen === 'lsg_pewarnaankoh' && rows.isidata === 'lainnya'){
 							$('#lsg_pewarnaankohselect').hide();
 							$('#lsg_pewarnaankohteks').show();
 						}
-						if (rows.komponen === 'lsg_pewarnaangiesmaoptional'){
+						if (rows.komponen === 'lsg_pewarnaangiesma' && rows.isidata === 'lainnya'){
 							$('#lsg_pewarnaangiesmaselect').hide();
 							$('#lsg_pewarnaangiesmateks').show();
 						}
-						if (rows.komponen === 'id_bakterihitungkolteks'){
+						if (rows.komponen === 'id_bakterihitungkol' && rows.isidata === 'lainnya'){
 							$('#id_bakterihitungkolselect').hide();
 							$('#id_bakterihitungkolteks').show();
 						}
-						if (rows.komponen === 'id_bakterihitungkolteks01'){
+						if (rows.komponen === 'id_bakterihitungkol01' && rows.isidata === 'lainnya'){
 							$('#id_bakterihitungkol01select').hide();
 							$('#id_bakterihitungkol01teks').show();
 						}
-						if (rows.komponen === 'id_bakterihitungkolteks02'){
+						if (rows.komponen === 'id_bakterihitungkol02' && rows.isidata === 'lainnya'){
 							$('#id_bakterihitungkol02select').hide();
 							$('#id_bakterihitungkol02teks').show();
 						}
+						if (rows.komponen === 'vl_hasil01' && rows.isidata === 'lainnya'){
+							$('#vl_hasildiv1select').hide();
+            				$('#vl_hasildiv1teks').show();
+						}
+						if (rows.komponen === 'vl_hasil02' && rows.isidata === 'lainnya'){
+							$('#vl_hasildiv2select').hide();
+            				$('#vl_hasildiv2teks').show();
+						}
 					}
 				});
 			},
@@ -3454,9 +3948,31 @@
 				console.log(traceText);
 			}
 		});
-		btncreateantibiotikvitek();
-		btncreateantibiotikkumanmanual1();
-		btncreateantibiotikkumanmanual2();
+		console.log('Displaying template for DLP: '+dlp);
+		if (dlp == 'CCI'){
+			$('#templatecci').show();
+		} else if (dlp == 'Kultur'){
+			$('#templatekultur').show();
+			$('#pewarnaangiemsaselect').show();
+			$('#pewarnaangiemsateks').hide();
+			$('#pewarnaankohselect').show();
+			$('#pewarnaankohteks').hide();
+			jQueryCreateTabelPertumbuhanKoloni();
+		} else if (dlp == 'Pewarna Langsung'){
+			$('#lsg_pewarnaankohselect').show();
+			$('#lsg_pewarnaankohteks').hide();
+			$('#lsg_pewarnaangiesmaselect').show();
+			$('#lsg_pewarnaangiesmateks').hide();
+			$('#templatepewarnaanlangsung').show();
+		} else if (dlp == 'TBC'){
+			$('#templatetbc').show();
+			$('.hasilpemeriksaantb').hide();
+		} else if (dlp == 'Viral Load'){
+			$('#templateviralload').show();
+		} else if (dlp == 'IgM IgG Leptospira'){
+			$('#templateleptospira').show();
+		}
+		console.log('Finished loading komponen jawaban for DLP: '+dlp+' | No.Foto: '+nofoto+' | ID Periksa: '+idne);
 	}
 	function openedpage( jQuery ){
 		var jenis	= document.getElementById('master_set01').value;
@@ -3553,19 +4069,55 @@
 				{ name: 'dokter', type: 'text'},
 				{ name: 'ppds1', type: 'text'},
 				{ name: 'ppds2', type: 'text'},
-				{ name: 'updated_at', type: 'text'},
+				{ name: 'updated_at', type: 'date'},
 				{ name: 'daftar', type: 'text'},
 				{ name: 'verifikasi', type: 'text'},
-				{ name: 'ppdsas', type: 'text'},
 				{ name: 'otherppds', type: 'text'},
 				{ name: 'nmpendaftar', type: 'text'},
 				{ name: 'alamatpasien', type: 'text'},
 			],
 			type		: 'GET',
-			data		: {jenis:'verificationppds', mulai:mulai, akhir:akhir, valcari:valcari, poli:poli, master:'verificationppds', _token: '{{csrf_token()}}'},
+			data		: {jenis:jenis, mulai:mulai, akhir:akhir, valcari:valcari, poli:poli, master:master, _token: '{{csrf_token()}}'},
 			url			: '{{ route("getList") }}',
 		};
 		var dataAdapter = new $.jqx.dataAdapter(sourcepasiencari);
+		var tlsdurasi = function (row, column, value) {
+			var verifikasi 	= $('#gridpemeriksaan').jqxGrid('getrowdata', row).verifikasi;
+			var daftar 		= $('#gridpemeriksaan').jqxGrid('getrowdata', row).daftar;
+			var from 		= moment(daftar);
+			var to 			= moment(verifikasi);
+			if (to.isValid()) {
+				var duration 	= moment.duration(to.diff(from));
+				var years 		= duration.years();
+				var months 		= duration.months();
+				var days 		= duration.days();
+				var hours 		= duration.hours();
+				var minutes 	= duration.minutes();
+				var seconds 	= duration.seconds();
+				var result 		= '';
+				if (years > 0) {
+					result += years + ' tahun ';
+				}
+				if (months > 0) {
+					result += months + ' bulan ';
+				}
+				if (days > 0) {
+					result += days + ' hari ';
+				}
+				if (hours > 0) {
+					result += hours + ' jam ';
+				}
+				if (minutes > 0) {
+					result += minutes + ' menit ';
+				}
+				if (seconds > 0) {
+					result += seconds + ' detik';
+				}
+				return result;
+			} else {
+				return 'On Progress';
+			}
+		};
 		$("#gridpemeriksaan").jqxGrid({
 			width			: '100%',
 			filterable		: true,
@@ -3576,30 +4128,14 @@
 			autoheight		: true,
 			source			: dataAdapter,
 			theme			: "energyblue",
+			selectionmode	: 'checkbox',
 			altrows			: true,
 			columns: [
-				{ text: 'Report', filterable: false, columntype: 'button', align: 'center', width: 50, cellsrenderer: function () {
-					return "Print";
-					}, buttonclick: function (row) {
-						editrowjabatan 	= row;
-						var offset      = $("#gridpemeriksaan").offset();
-						var dataRecord  = $("#gridpemeriksaan").jqxGrid('getrowdata', editrowjabatan);
-						var goook       = dataRecord.id;
-						var status      = dataRecord.status;
-						var nofoto      = dataRecord.nofoto;
-						var asalpasien 	= dataRecord.asalpasien;
-						var token       = document.getElementById('token').value;
-						var masterk		= document.getElementById('master_kelompok').value;
-						var home 		= '{{URL::to("/")}}';
-						var alamat		= home+'/hasil/'+dataRecord.nofoto;
-						window.open(alamat,'_blank');
-					}
-				},
 				{ text: 'Expertise', filterable: false, columntype: 'button', align: 'center', width: 70, cellsrenderer: function () {
 					return "Expertise";
-					}, buttonclick: function (row) {        
-						editrow         	= row;   
-						var offset      	= $("#gridpemeriksaan").offset();       
+					}, buttonclick: function (row) {
+						editrow         	= row;
+						var offset      	= $("#gridpemeriksaan").offset();
 						var dataRecord  	= $("#gridpemeriksaan").jqxGrid('getrowdata', editrow);
 						$("#nofoto").val('');
 						$("#id_mikroorganismeoptional").val('').trigger('change');
@@ -3681,24 +4217,26 @@
 						var dataadendum 	= new $.jqx.dataAdapter(sourceadendum);
 						var datadetail 		= new $.jqx.dataAdapter(sourcedetail);
 						var jsonSirab 		= new $.jqx.dataAdapter(sourcesirab);
+						$('#btnsavedraft').show();
+						$('#divadendumketerangan').hide();
 						$('#divtemplate').hide();
 						$('#pilihancontohuji').show();
 						$('#tekscontohuji').hide();
 						$('#pilihanlokasianatomi').show();
 						$('#tekslokasianatomi').hide();
 						$('.setelahdipilihtemplate').hide();
-						$("#asalpasien").val(dataRecord.asalpasien);
+						$("#asalpasien").html(dataRecord.asalpasien);
 						$("#modaliti").val(dataRecord.modality);
 						$("#dlp").val(dataRecord.dlp);
 						$("#template_jenis").val(dataRecord.dlp);
 						$("#nofoto").val(dataRecord.nofoto);
 						$("#norm").val(dataRecord.noregister);
 						$("#nonama").val(dataRecord.nmpasien);
-						$("#nokel").val(dataRecord.jkpasien);
-						$("#nousia").val(dataRecord.usia);
+						$("#nokel").html(dataRecord.jkpasien);
+						$("#nousia").html(dataRecord.usia);
 						$("#noservis").html(dataRecord.tlsreques);
 						$("#nokamar").val(dataRecord.ruangan);
-						$("#nostatus").val(statuse);
+						$("#nostatus").html(statuse);
 						$("#alamat").html(dataRecord.alamatpasien);
 						$("#tlppasien").html(dataRecord.tlppasien);
 						$("#periksa_id").val(dataRecord.id);
@@ -3728,7 +4266,7 @@
 						$("#mas").val(dataRecord.nm_spesimen);
 						$("#berat").val(dataRecord.berat);
 						$("#klinis").val(dataRecord.klinis);
-						$("#klinisi").val(dataRecord.klinisi);
+						$("#klinisi").html(dataRecord.klinisi);
 						$('#sirabketerangan').hide();
 						CKEDITOR.instances['keterangan'].setData(dataRecord.keterangan)
 						CKEDITOR.instances['kesimpulan'].setData(dataRecord.kesimpulan)
@@ -3787,9 +4325,9 @@
 							altrows					: true,
 							selectionmode			: 'multiplecellsextended',
 							columns					: [
-								{ text: 'Date', datafield: 'tanggal', width: '25%', cellsalign: 'left', align: 'center' },
-								{ text: 'Excutor', datafield: 'inputor', width: '40%', cellsalign: 'left', align: 'center' },
-								{ text: 'Type', datafield: 'keterangan', width: '25%', cellsalign: 'left', align: 'center' },
+								{ text: 'Date', datafield: 'tanggal', width: '20%', cellsalign: 'left', align: 'center' },
+								{ text: 'Excutor', datafield: 'inputor', width: '20%', cellsalign: 'left', align: 'center' },
+								{ text: 'Type', datafield: 'keterangan', width: '50%', cellsalign: 'left', align: 'center' },
 								{ text: 'Report', filterable: false, columntype: 'button', align: 'center', width: '10%', cellsrenderer: function () {
 									return "View";
 									}, buttonclick: function (row) {        
@@ -3809,7 +4347,7 @@
 												'<body>' + goook + '</body>\n</html>';
 											document.write(pageContent);
 											document.close();
-											return false;                     
+											return false;
 									}
 								},
 							]
@@ -3931,6 +4469,11 @@
 						function(data){
 							
 						});
+						if (master == 'buku02'){
+							$("#template_jenis").val('CCI');
+							$("#dlp").val('CCI');
+						}
+						
 						if (statuse === null) {
 							$('#divperiksa').show();
 							$('#divawal').hide();
@@ -3956,10 +4499,21 @@
 								type	: 'warning',
 							})
 						} else if (statuse == 'Selesai' || statuse == 'Arsip') {
-							$('#divreadonly').hide();
-							$('#divperiksa').show();
-							$('#divawal').hide();
-							openlamanekpertise();
+							var hakakses = "{{Session('previlage')}}";
+							if (hakakses == 'supervisor'){
+								$('#divreadonly').hide();
+								$('#divperiksa').show();
+								$('#divawal').hide();
+								$('#btnsavedraft').hide();
+								$('#divadendumketerangan').show();
+								openlamanekpertise();
+							} else {
+								swal({
+									title	: 'Ekspertise Final',
+									text	: 'Hanya Akun SPV yang diperkenankan mengubah data Arsip',
+									type	: 'warning',
+								})
+							}
 						} else {
 							$('#divreadonly').hide();
 							$('#divperiksa').show();
@@ -3974,16 +4528,38 @@
 						}
 					}
 				},
-				{ text: 'Specimen', filtertype: 'checkedlist', datafield: 'nm_spesimen', width: 200, cellsalign: 'left', align: 'center'},
+				{ text: 'Report', filterable: false, columntype: 'button', align: 'center', width: 50, cellsrenderer: function () {
+					return "Print";
+					}, buttonclick: function (row) {
+						editrowjabatan 	= row;
+						var offset      = $("#gridpemeriksaan").offset();
+						var dataRecord  = $("#gridpemeriksaan").jqxGrid('getrowdata', editrowjabatan);
+						var goook       = dataRecord.id;
+						var status      = dataRecord.status;
+						var nofoto      = dataRecord.nofoto;
+						var asalpasien 	= dataRecord.asalpasien;
+						var token       = document.getElementById('token').value;
+						var masterk		= document.getElementById('master_kelompok').value;
+						var home 		= '{{URL::to("/")}}';
+						var alamat		= home+'/hasil/'+dataRecord.nofoto;
+						window.open(alamat,'_blank');
+					}
+				},
 				{ text: 'Acc.No', datafield: 'tlsnofoto', width: 100, align: 'center', cellsalign: 'center'},
+				{ text: 'Asal Sample', datafield: 'modality', width: 100, align: 'center', cellsalign: 'center'},
 				{ text: 'No.RM', datafield: 'tlsnoregister', width: 100, cellsalign: 'left', align: 'center'},
 				{ text: 'Name', datafield: 'tlsnama', width: 150, cellsalign: 'left', align: 'center'},
 				{ text: 'Date', datafield: 'daftartgl', width: 80, cellsalign: 'center', align: 'center'},
 				{ text: 'Time', datafield: 'daftarjam', width: 80, cellsalign: 'center', align: 'center'},
+				{ text: 'Inputor', filtertype: 'checkedlist', datafield: 'nmpendaftar', width: 110, cellsalign: 'left', align: 'center'},
 				{ text: 'Comming From', filtertype: 'checkedlist', datafield: 'asalpasien', width: 120, cellsalign: 'left', align: 'center'},
-				{ text: 'Service', datafield: 'tlsreques', width: 170, cellsalign: 'left', align: 'center'},
-				{ text: 'Pengirim', datafield: 'nmexcutor', width: 200, cellsalign: 'left', align: 'center'},
-				{ text: 'Themeplate', filtertype: 'checkedlist', datafield: 'dlp', width: 220, cellsalign: 'left', align: 'center'},
+				{ text: 'Service', datafield: 'tlsreques', width: 150, cellsalign: 'left', align: 'center'},
+				{ text: 'Status', filtertype: 'checkedlist', datafield: 'tlsstatus', width: 150, cellsalign: 'left', align: 'center'},
+				{ text: 'Themeplate', filtertype: 'checkedlist', datafield: 'dlp', width: 75, cellsalign: 'left', align: 'center'},
+				{ text: 'Jenis', filtertype: 'checkedlist', datafield: 'diagnosa2', width: 75, cellsalign: 'left', align: 'center'},
+				{ text: 'Specimen', filtertype: 'checkedlist', datafield: 'nm_spesimen', width: 230, cellsalign: 'left', align: 'center'},
+				{ text: 'Updated_at', datafield: 'updated_at', filtertype: 'date', width: 150, cellsalign: 'left', align: 'center'},
+				{ text: 'Duration',  cellsrenderer: tlsdurasi, width: 100, cellsalign: 'left', align: 'center'  },
 			]
 		});
 		$("html, body").animate({ scrollTop: 0 }, "slow");
@@ -4027,6 +4603,7 @@
 		CKEDITOR.replace( 'lsg_pewarnaanlain');
 		CKEDITOR.replace( 'viralload');
 		CKEDITOR.replace( 'iggigm_interpretasi');
+		CKEDITOR.replace( 'addendumketerangan');
 		$("#mulai").datepicker({format: 'yyyy-mm-dd', autoclose: true});
 		$("#akhir").datepicker({format: 'yyyy-mm-dd', autoclose: true});
 		$("#id_tanggalpengambilancontohuji").datepicker({format: 'yyyy-mm-dd', autoclose: true});
@@ -4071,17 +4648,16 @@
 			$('#modalgridmediatamlainnya').modal('show');
 			$('#idpertumbuhankoloni').val('new');
 		});
-		$("#btnsimpanpertumbuhankolonibap").click(function() {
-			$('#modalgridmediabap').modal('hide');
+		$("#btnbapkosong").click(function() {
 			var id 			= document.getElementById('periksa_id').value;
-			var idtabel 	= document.getElementById('idpertumbuhankoloni').value;
+			var idtabel 	= 'new';
 			var media 		= 'Media BAP';
-			var kuman 		= document.getElementById('id_mediabap').value;
-			var hemolisa 	= document.getElementById('id_pemeriksaanhemolisa').value;
-			var katalase 	= document.getElementById('id_pemeriksaankatalase').value;
-			var koagulase 	= document.getElementById('id_pemeriksaankabulase').value;
-			var ujilainnya 	= document.getElementById('id_ujialainnyabap').value;
-			var status 		= document.getElementById('id_statusmediabap').value;
+			var kuman 		= '';
+			var hemolisa 	= '';
+			var katalase 	= '';
+			var koagulase 	= '';
+			var ujilainnya 	= '';
+			var status 		= 'Tidak ada pertumbuhan';
 			$.post('{{ route("getResult") }}', { 
 				nofoto: id,
 				komponen: media,
@@ -4098,17 +4674,45 @@
 				$("#gridmediabap").jqxGrid('updatebounddata','filter');
 			});
 		});
-		$("#btnsimpanpertumbuhankolonicap").click(function() {
-			$('#modalgridmediacap').modal('hide');
+		$("#btnsimpanpertumbuhankolonibap").click(function() {
+			$('#modalgridmediabap').modal('hide');
 			var id 			= document.getElementById('periksa_id').value;
 			var idtabel 	= document.getElementById('idpertumbuhankoloni').value;
+			var media 		= 'Media BAP';
+			var kuman 		= document.getElementById('id_mediabap').value;
+			var hemolisa 	= document.getElementById('id_pemeriksaanhemolisa').value;
+			var katalase 	= document.getElementById('id_pemeriksaankatalase').value;
+			var koagulase 	= document.getElementById('id_pemeriksaankabulase').value;
+			var ujilainnya 	= document.getElementById('id_ujialainnyabap').value;
+			var status 		= document.getElementById('id_statusmediabap').value;
+			var tindaklanjut= document.getElementById('id_mediabapkuman').value;
+			$.post('{{ route("getResult") }}', { 
+				nofoto: id,
+				komponen: media,
+				isi: idtabel,
+				kuman: kuman,
+				hemolisa: hemolisa,
+				katalase: katalase,
+				koagulase: koagulase,
+				ujilainnya: ujilainnya,
+				status: status,
+				tindaklanjut: tindaklanjut,
+				keterangan: 'pertumbuhankoloni',
+				_token: '{{ csrf_token() }}' },
+			function(data){
+				$("#gridmediabap").jqxGrid('updatebounddata','filter');
+			});
+		});
+		$("#btncapkosong").click(function() {
+			var id 			= document.getElementById('periksa_id').value;
+			var idtabel 	= 'new';
 			var media 		= 'Media CAP';
-			var kuman 		= document.getElementById('id_mediacap').value;
+			var kuman 		= '';
 			var hemolisa 	= '';
-			var katalase 	= document.getElementById('cap_pemeriksaankatalase').value;
-			var koagulase 	= document.getElementById('cap_pemeriksaankabulase').value;
-			var ujilainnya 	= document.getElementById('id_ujialainnyacap').value;
-			var status 		= document.getElementById('id_statusmediacap').value;
+			var katalase 	= '';
+			var koagulase 	= '';
+			var ujilainnya 	= '';
+			var status 		= 'Tidak ada pertumbuhan';
 			$.post('{{ route("getResult") }}', { 
 				nofoto: id,
 				komponen: media,
@@ -4125,6 +4729,61 @@
 				$("#gridmediacap").jqxGrid('updatebounddata','filter');
 			});
 		});
+		$("#btnmckonkeykosong").click(function() {
+			var id 			= document.getElementById('periksa_id').value;
+			var idtabel 	= 'new';
+			var media 		= 'Media Mc Conkey';
+			var kuman 		= '';
+			var hemolisa 	= '';
+			var katalase 	= '';
+			var koagulase 	= '';
+			var ujilainnya 	= '';
+			var status 		= 'Tidak ada pertumbuhan';
+			$.post('{{ route("getResult") }}', { 
+				nofoto: id,
+				komponen: media,
+				isi: idtabel,
+				kuman: kuman,
+				hemolisa: hemolisa,
+				katalase: katalase,
+				koagulase: koagulase,
+				ujilainnya: ujilainnya,
+				status: status,
+				keterangan: 'pertumbuhankoloni',
+				_token: '{{ csrf_token() }}' },
+			function(data){
+				$("#gridmediamcconkey").jqxGrid('updatebounddata','filter');
+			});
+		});
+		$("#btnsimpanpertumbuhankolonicap").click(function() {
+			$('#modalgridmediacap').modal('hide');
+			var id 			= document.getElementById('periksa_id').value;
+			var idtabel 	= document.getElementById('idpertumbuhankoloni').value;
+			var media 		= 'Media CAP';
+			var kuman 		= document.getElementById('id_mediacap').value;
+			var hemolisa 	= '';
+			var katalase 	= document.getElementById('cap_pemeriksaankatalase').value;
+			var koagulase 	= document.getElementById('cap_pemeriksaankabulase').value;
+			var ujilainnya 	= document.getElementById('id_ujialainnyacap').value;
+			var status 		= document.getElementById('id_statusmediacap').value;
+			var tindaklanjut= document.getElementById('id_mediacapkuman').value;
+			$.post('{{ route("getResult") }}', { 
+				nofoto: id,
+				komponen: media,
+				isi: idtabel,
+				kuman: kuman,
+				hemolisa: hemolisa,
+				katalase: katalase,
+				koagulase: koagulase,
+				ujilainnya: ujilainnya,
+				status: status,
+				keterangan: 'pertumbuhankoloni',
+				tindaklanjut: tindaklanjut,
+				_token: '{{ csrf_token() }}' },
+			function(data){
+				$("#gridmediacap").jqxGrid('updatebounddata','filter');
+			});
+		});
 		$("#btnsimpanpertumbuhankolonimcconkey").click(function() {
 			$('#modalgridmediamcconkey').modal('hide');
 			var id 			= document.getElementById('periksa_id').value;
@@ -4137,6 +4796,7 @@
 			var ujilainnya 	= document.getElementById('id_ujialainnyamcconkey').value;
 			var oksidase 	= document.getElementById('id_ujioksidasemcconkey').value;
 			var status 		= document.getElementById('id_statusmediamcconkey').value;
+			var tindaklanjut= document.getElementById('id_mediamcconkeykuman').value;
 			$.post('{{ route("getResult") }}', { 
 				nofoto: id,
 				komponen: media,
@@ -4149,6 +4809,7 @@
 				oksidase: oksidase,
 				status: status,
 				keterangan: 'pertumbuhankoloni',
+				tindaklanjut: tindaklanjut,
 				_token: '{{ csrf_token() }}' },
 			function(data){
 				$("#gridmediamcconkey").jqxGrid('updatebounddata','filter');
@@ -4352,6 +5013,14 @@
 			$("#valjenis").val('searchbydate');
 			openedpage();
 		});
+		$("#btnpunyaku").click(function() {
+			$("#master_userid").val("{{ Session('id') }}");
+			openedpage();
+		});
+		$("#btnallspv").click(function() {
+			$("#master_userid").val('allspv');
+			openedpage();
+		});
 		$("#btnkembali").click(function() {
 			$('#divperiksa').hide();
 			$('#divreadonly').hide();
@@ -4395,6 +5064,101 @@
 			$('#divtemplate').show();
 		});
 		$("#btnsendexpertisetopacs").click(function(){
+			var keterangan      	=   CKEDITOR.instances['keterangan'].getData();
+			var lsg_pewarnaanlain	=   CKEDITOR.instances['lsg_pewarnaanlain'].getData();
+			var viralload			=   CKEDITOR.instances['viralload'].getData();
+			var periksa_id      	=   document.getElementById('periksa_id').value;
+			var template_jenis		= 	document.getElementById('template_jenis').value;
+			var id_dokter			= 	document.getElementById('dokter').value;
+			var acc_number			= 	document.getElementById('nofoto').value;
+			var nostatus			= 	document.getElementById('nostatus').value;
+			var addendumketerangan	=   CKEDITOR.instances['addendumketerangan'].getData();
+			if (id_dokter == 'Pilih' || id_dokter == '' || id_dokter == '0' || id_dokter == null){
+				swal({
+					title	: 'Stop',
+					text	: 'Please Select SPV',
+					type	: 'warning',
+				})
+				return false;
+			} else if (addendumketerangan == '' && nostatus == 'Selesai'){
+				swal({
+					title	: 'Stop',
+					text	: 'Addendum Keterangan Wajib Di Isi',
+					type	: 'warning',
+				})
+				return false;
+			} else if (addendumketerangan == '' && nostatus == 'Arsip'){
+				swal({
+					title	: 'Stop',
+					text	: 'Addendum Keterangan Wajib Di Isi',
+					type	: 'warning',
+				})
+				return false;
+			} else {
+				const checkboxMap 		= {
+					inlineCheckbox1: 'TBC SO',
+					inlineCheckbox2: 'TBC RO',
+					inlineCheckbox3: 'Anak',
+					inlineCheckbox4: 'HIV',
+					inlineCheckbox5: 'DM',
+					inlineCheckbox6: 'Nanah Lendir',
+					inlineCheckbox7: 'Bercak darah',
+					inlineCheckbox8: 'Air liur',
+					inlineCheckbox9: 'Nanah Lendir',
+					inlineCheckbox10: 'Bercak darah',
+					inlineCheckbox11: 'Air liur',
+				};
+				const checkboxValues = {};
+				$.each(checkboxMap, function (id, label) {
+					checkboxValues[id] = $(`#${id}`).is(':checked') ? label : '';
+				});
+				var formdata = new FormData($('#kt_form')[0]);
+					formdata.set('periksa_id', periksa_id);
+					formdata.set('acc_number', acc_number);
+					formdata.set('val01', 'verifikasi');
+					formdata.set('val10', template_jenis);
+					formdata.set('keterangan', keterangan);
+					formdata.set('addendumketerangan', addendumketerangan);
+					formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain);
+					formdata.set('viralload', viralload);
+					formdata.set('_token', '{{ csrf_token() }}');
+				$.each(checkboxValues, (key, val) => formdata.set(key, val));
+				$.ajax({
+					url         : '{{ route("exexpertisepacs") }}',
+					data        : formdata,
+					type        : 'POST',
+					contentType : false,
+					processData : false,
+					success: function (data) {
+						$("#gridpemeriksaan").jqxGrid('updatebounddata','filter');
+						$("#gridadendum").jqxGrid('updatebounddata','filter');
+						var status  = data.status;
+						var message = data.message;
+						var warna 	= data.warna;
+						var icon 	= data.icon;
+						$.toast({
+							heading		: status,
+							text		: message,
+							position	: 'top-right',
+							loaderBg	: warna,
+							icon		: icon,
+							hideAfter	: 5000,
+							stack		: 1
+						});
+						//window.location.href = "{{ url('/mikro') }}";
+						return false;
+					},
+					error: function (xhr, status, error) {
+						swal({
+							title	: 'Stop',
+							text	: xhr.responseText,
+							type	: 'warning',
+						})
+					}
+				});
+			}
+		});
+		$("#btnSavePeriksa").click(function(){
 			var keterangan      	=   CKEDITOR.instances['keterangan'].getData();
 			var lsg_pewarnaanlain	=   CKEDITOR.instances['lsg_pewarnaanlain'].getData();
 			var viralload			=   CKEDITOR.instances['viralload'].getData();
@@ -4430,7 +5194,7 @@
 				var formdata = new FormData($('#kt_form')[0]);
 					formdata.set('periksa_id', periksa_id);
 					formdata.set('acc_number', acc_number);
-					formdata.set('val01', 'verifikasi');
+					formdata.set('val01', 'Permohonan Verifikasi');
 					formdata.set('val10', template_jenis);
 					formdata.set('keterangan', keterangan);
 					formdata.set('lsg_pewarnaanlain', lsg_pewarnaanlain);
@@ -4444,8 +5208,6 @@
 					contentType : false,
 					processData : false,
 					success: function (data) {
-						$("#gridpemeriksaan").jqxGrid('updatebounddata','filter');
-						$("#gridadendum").jqxGrid('updatebounddata','filter');
 						var status  = data.status;
 						var message = data.message;
 						var warna 	= data.warna;
@@ -4459,7 +5221,6 @@
 							hideAfter	: 5000,
 							stack		: 1
 						});
-						//window.location.href = "{{ url('/mikro') }}";
 						return false;
 					},
 					error: function (xhr, status, error) {
@@ -4833,6 +5594,12 @@
 				$('#tekslokasianatomi').show();
 			}
 		});
+		$("#id_bakterihitungkolmediabap").on('change', function() {
+			if ($(this).val() == 'lainnya') {
+				$('#id_bakterimediabapselect').hide();
+				$('#id_bakterimediabapteks').show();
+			}
+		});
 		$("#id_contohuji").on('change', function() {
 			if ($(this).val() == 'Lainnya') {
 				$('#pilihancontohuji').hide();
diff --git a/htdocs/resources/views/dokter/ppds.blade.php b/htdocs/resources/views/dokter/ppds.blade.php
index ebd36c35..35a87cc7 100644
--- a/htdocs/resources/views/dokter/ppds.blade.php
+++ b/htdocs/resources/views/dokter/ppds.blade.php
@@ -2946,11 +2946,14 @@
 			}
 		});
 	}
-	function btncreateantibiotikkumanmanual1(jQuery){
+	function btncreateantibiotikkumanmanual1(){
+		console.log('--- START Manual 1 ---');
 		var idne	= $('#periksa_id').val();
 		var kuman01	= $('#id_bakteri01').val();
 		var antibio1= $('#id_antibiotikmanual1').val();
+		console.log('Manual 1 Values:', { idne: idne, kuman: kuman01, antibio: antibio1 });
 		if (kuman01 == '' || kuman01 == null) {
+			console.warn('Manual 1 BERHENTI: ID Bakteri 01 Kosong!');
 			return;
 		}
 		if ( $.fn.DataTable.isDataTable('#tblkumanmanual1') ) {
@@ -3055,11 +3058,12 @@
 			}
 		});
     }
-	function btncreateantibiotikkumanmanual2(jQuery){
+	function btncreateantibiotikkumanmanual2(){
+		console.log('--- START Manual 2 ---');
 		var idne	= $('#periksa_id').val();
 		var kuman02	= $('#id_bakteri02').val();
 		var antibio2= $('#id_antibiotikmanual2').val();
-		
+		console.log('Manual 2 Values:', { idne: idne, kuman: kuman02, antibio: antibio2 });
 		if (kuman02 == '' || kuman02 == null) {
 			return;
 		}
@@ -3165,9 +3169,14 @@
 			}
 		});
     }
-	function btncreateantibiotikvitek(jQuery){
+	function btncreateantibiotikvitek(){
 		var idne	= document.getElementById('periksa_id').value;
 		var kuman	= $('#bakteri').val();
+		console.log('Vitek Values:', { idne: idne, kuman: kuman });
+
+		if(!kuman) {
+			console.warn('Vitek mungkin kosong datanya karena Bakteri belum dipilih');
+		}
 		if ( $.fn.DataTable.isDataTable('#tblvitek') ) {
 			$('#tblvitek').DataTable().clear().destroy();
 		}
@@ -3911,6 +3920,12 @@
 					} else if (rows.komponen.includes("id_bakteri01") || rows.komponen.includes("id_bakteri02")) {
 						var isidataString 	= rows.isidata;
 						$("#"+rows.komponen).val(isidataString).select2().trigger('change');
+						if (rows.komponen === 'id_bakteri01') {
+							btncreateantibiotikkumanmanual1();
+						}
+						if (rows.komponen === 'id_bakteri02') {
+							btncreateantibiotikkumanmanual2();
+						}
 					} else if (rows.komponen.includes("inlineCheckbox")) {
 						if (rows.isidata === '' || rows.isidata === null) {
 							$("#" + rows.komponen).prop('checked', false);
@@ -3938,6 +3953,9 @@
 						}
 					} else {
 						$("#" + rows.komponen).val(rows.isidata);
+						if (rows.komponen === 'bakteri'){
+							btncreateantibiotikvitek();
+						}
 						if (rows.komponen === 'id_jenispemeriksaantb') {
 							if (rows.isidata === 'TCM MTB Rif (Xpert)' || rows.isidata === 'TCM MTB Rif (Truenat)' || rows.isidata === 'TCM MTB Rif INH (BDMAX)' || rows.isidata === 'LPA lini 2' || rows.isidata === 'LPA lini 1') {
 								$('#hasilpemeriksaanttcmmtbrifxpert').show();
@@ -4022,9 +4040,6 @@
 		} else if (dlp == 'IgM IgG Leptospira'){
 			$('#templateleptospira').show();
 		}
-		btncreateantibiotikvitek();
-		btncreateantibiotikkumanmanual1();
-		btncreateantibiotikkumanmanual2();
 		console.log('Finished loading komponen jawaban for DLP: '+dlp+' | No.Foto: '+nofoto+' | ID Periksa: '+idne);
 	}
 	function openedpage( jQuery ){
@@ -4526,6 +4541,7 @@
 							$("#template_jenis").val('CCI');
 							$("#dlp").val('CCI');
 						}
+						
 						if (statuse === null) {
 							$('#divperiksa').show();
 							$('#divawal').hide();
diff --git a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php
index e962a556..030f7051 100644
--- a/htdocs/resources/views/dokter/ppdsdeveloper.blade.php
+++ b/htdocs/resources/views/dokter/ppdsdeveloper.blade.php
@@ -2946,11 +2946,14 @@
 			}
 		});
 	}
-	function btncreateantibiotikkumanmanual1(jQuery){
+	function btncreateantibiotikkumanmanual1(){
+		console.log('--- START Manual 1 ---');
 		var idne	= $('#periksa_id').val();
 		var kuman01	= $('#id_bakteri01').val();
 		var antibio1= $('#id_antibiotikmanual1').val();
+		console.log('Manual 1 Values:', { idne: idne, kuman: kuman01, antibio: antibio1 });
 		if (kuman01 == '' || kuman01 == null) {
+			console.warn('Manual 1 BERHENTI: ID Bakteri 01 Kosong!');
 			return;
 		}
 		if ( $.fn.DataTable.isDataTable('#tblkumanmanual1') ) {
@@ -3055,11 +3058,12 @@
 			}
 		});
     }
-	function btncreateantibiotikkumanmanual2(jQuery){
+	function btncreateantibiotikkumanmanual2(){
+		console.log('--- START Manual 2 ---');
 		var idne	= $('#periksa_id').val();
 		var kuman02	= $('#id_bakteri02').val();
 		var antibio2= $('#id_antibiotikmanual2').val();
-		
+		console.log('Manual 2 Values:', { idne: idne, kuman: kuman02, antibio: antibio2 });
 		if (kuman02 == '' || kuman02 == null) {
 			return;
 		}
@@ -3165,9 +3169,14 @@
 			}
 		});
     }
-	function btncreateantibiotikvitek(jQuery){
+	function btncreateantibiotikvitek(){
 		var idne	= document.getElementById('periksa_id').value;
 		var kuman	= $('#bakteri').val();
+		console.log('Vitek Values:', { idne: idne, kuman: kuman });
+
+		if(!kuman) {
+			console.warn('Vitek mungkin kosong datanya karena Bakteri belum dipilih');
+		}
 		if ( $.fn.DataTable.isDataTable('#tblvitek') ) {
 			$('#tblvitek').DataTable().clear().destroy();
 		}
@@ -3911,6 +3920,12 @@
 					} else if (rows.komponen.includes("id_bakteri01") || rows.komponen.includes("id_bakteri02")) {
 						var isidataString 	= rows.isidata;
 						$("#"+rows.komponen).val(isidataString).select2().trigger('change');
+						if (rows.komponen === 'id_bakteri01') {
+							btncreateantibiotikkumanmanual1();
+						}
+						if (rows.komponen === 'id_bakteri02') {
+							btncreateantibiotikkumanmanual2();
+						}
 					} else if (rows.komponen.includes("inlineCheckbox")) {
 						if (rows.isidata === '' || rows.isidata === null) {
 							$("#" + rows.komponen).prop('checked', false);
@@ -3938,6 +3953,9 @@
 						}
 					} else {
 						$("#" + rows.komponen).val(rows.isidata);
+						if (rows.komponen === 'bakteri'){
+							btncreateantibiotikvitek();
+						}
 						if (rows.komponen === 'id_jenispemeriksaantb') {
 							if (rows.isidata === 'TCM MTB Rif (Xpert)' || rows.isidata === 'TCM MTB Rif (Truenat)' || rows.isidata === 'TCM MTB Rif INH (BDMAX)' || rows.isidata === 'LPA lini 2' || rows.isidata === 'LPA lini 1') {
 								$('#hasilpemeriksaanttcmmtbrifxpert').show();
@@ -4022,9 +4040,6 @@
 		} else if (dlp == 'IgM IgG Leptospira'){
 			$('#templateleptospira').show();
 		}
-		btncreateantibiotikvitek();
-		btncreateantibiotikkumanmanual1();
-		btncreateantibiotikkumanmanual2();
 		console.log('Finished loading komponen jawaban for DLP: '+dlp+' | No.Foto: '+nofoto+' | ID Periksa: '+idne);
 	}
 	function openedpage( jQuery ){