diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php
index e2970ea6..33036b3c 100644
--- a/htdocs/app/Http/Controllers/DokterController.php
+++ b/htdocs/app/Http/Controllers/DokterController.php
@@ -470,24 +470,15 @@ class DokterController extends Controller
 		$nmadendum		= $periksa->nmadendum ?? '';
 		$tglverifikasi	= $periksa->verifikasi ?? $today;
 		
-		$cekganda 		= Periksa::where('noregister', $noregister)->where('nmadendum', $nmadendum)->where('nm_spesimen', 'SPUTUM')->where('id', '!=', $idperiksa)->get();
+		$cekganda 		= Periksa::where('noregister', $noregister)->where('nmadendum', $nmadendum)->where('id', '!=', $idperiksa)->get();
 		$statusdraft 	= 'Pemeriksaan awal';
 		KomponenJawaban::where('accnumber', $nofoto)->where('template', $dlp)->delete();
 		$data = $request->except(['_token', 'periksa_id', 'val01', 'val10', 'acc_number']);
 		foreach ($data as $key => $value) {
 			if ($value === "" || is_null($value) || $value === "Pilih Salah Satu") continue;
+			$isidataawal = null;
 			if (is_array($value)) {
-				KomponenJawaban::updateOrCreate(
-					[
-						'accnumber' => $nofoto,
-						'komponen'  => $key,
-					],
-					[
-						'isidata'    => json_encode($value),
-						'template'   => $dlp,
-						'created_by' => session('nama'),
-					]
-				);
+				$isidataawal = json_encode($value);
 			} else {
 				if ($key == 'id_statusmediatamlainnya' AND $value != ''){
 					$statusdraft = $value;
@@ -503,48 +494,47 @@ class DokterController extends Controller
 					$statusdraft = $value;
 				} else {
 				}
-				KomponenJawaban::updateOrCreate(
-					[
-						'accnumber' => $nofoto,
-						'komponen'  => $key,
-					],
-					[
-						'isidata'    => $value,
-						'template'   => $dlp,
-						'created_by' => session('nama'),
-					]
-				);
+				$isidataawal = $value;
 			}
+			KomponenJawaban::updateOrCreate(
+				[
+					'accnumber' => $nofoto,
+					'komponen'  => $key,
+				],
+				[
+					'isidata'    => $isidataawal,
+					'template'   => $dlp,
+					'created_by' => session('nama'),
+				]
+			);
 			$yangperludicloning = '';
-			if ($dlp == 'Kultur'){
-				if ($key == 'id_selepitel'){ $yangperludicloning = 'lsg_selepitel'; }
-				if ($key == 'id_selradang'){ $yangperludicloning = 'lsg_selradang'; }
-				if ($key == 'id_mikroorganisme'){ $yangperludicloning = 'lsg_mikroorganisme'; }
-				if ($key == 'id_mikroorganismeoptional'){ $yangperludicloning = 'lsg_mikroorganismeoptional'; }
-				if ($key == 'id_pewarnaanziehlnielsen'){ $yangperludicloning = 'lsg_pewarnaanziehlnielsen'; }
-				if ($key == 'id_pewarnaanziehlnielsensewaktu'){ $yangperludicloning = 'lsg_pewarnaanziehlnielsensewaktu'; }
-				if ($key == 'id_pewarnaankoh'){ $yangperludicloning = 'lsg_pewarnaankoh'; }
-				if ($key == 'id_pewarnaankohoptional'){ $yangperludicloning = 'lsg_pewarnaankohoptional'; }
-				if ($key == 'id_pewarnaanneisser'){ $yangperludicloning = 'lsg_pewarnaanneisser'; }
-				if ($key == 'id_pewarnaannegatif'){ $yangperludicloning = 'lsg_pewarnaannegatif'; }
-				if ($key == 'id_pewarnaanspora'){ $yangperludicloning = 'lsg_pewarnaanspora'; }
-				if ($key == 'id_pewarnaangiesma'){ $yangperludicloning = 'lsg_pewarnaangiesma'; }
-				if ($key == 'id_pewarnaangiesmaoptional'){ $yangperludicloning = 'lsg_pewarnaangiesmaoptional'; }
-			} else {
-				if ($key == 'lsg_selepitel'){ $yangperludicloning = 'id_selepitel'; }
-				if ($key == 'lsg_selradang'){ $yangperludicloning = 'id_selradang'; }
-				if ($key == 'lsg_mikroorganisme'){ $yangperludicloning = 'id_mikroorganisme'; }
-				if ($key == 'lsg_mikroorganismeoptional'){ $yangperludicloning = 'id_mikroorganismeoptional'; }
-				if ($key == 'lsg_pewarnaanziehlnielsen'){ $yangperludicloning = 'id_pewarnaanziehlnielsen'; }
-				if ($key == 'lsg_pewarnaanziehlnielsensewaktu'){ $yangperludicloning = 'id_pewarnaanziehlnielsensewaktu'; }
-				if ($key == 'lsg_pewarnaankoh'){ $yangperludicloning = 'id_pewarnaankoh'; }
-				if ($key == 'lsg_pewarnaankohoptional'){ $yangperludicloning = 'id_pewarnaankohoptional'; }
-				if ($key == 'lsg_pewarnaanneisser'){ $yangperludicloning = 'id_pewarnaanneisser'; }
-				if ($key == 'lsg_pewarnaannegatif'){ $yangperludicloning = 'id_pewarnaannegatif'; }
-				if ($key == 'lsg_pewarnaanspora'){ $yangperludicloning = 'id_pewarnaanspora'; }
-				if ($key == 'lsg_pewarnaangiesma'){ $yangperludicloning = 'id_pewarnaangiesma'; }
-				if ($key == 'lsg_pewarnaangiesmaoptional'){ $yangperludicloning = 'id_pewarnaangiesmaoptional'; }
-			}
+			if ($key == 'id_selepitel'){ $yangperludicloning = 'lsg_selepitel'; }
+			if ($key == 'id_selradang'){ $yangperludicloning = 'lsg_selradang'; }
+			if ($key == 'id_mikroorganisme'){ $yangperludicloning = 'lsg_mikroorganisme'; }
+			if ($key == 'id_mikroorganismeoptional'){ $yangperludicloning = 'lsg_mikroorganismeoptional'; }
+			if ($key == 'id_pewarnaanziehlnielsen'){ $yangperludicloning = 'lsg_pewarnaanziehlnielsen'; }
+			if ($key == 'id_pewarnaanziehlnielsensewaktu'){ $yangperludicloning = 'lsg_pewarnaanziehlnielsensewaktu'; }
+			if ($key == 'id_pewarnaankoh'){ $yangperludicloning = 'lsg_pewarnaankoh'; }
+			if ($key == 'id_pewarnaankohoptional'){ $yangperludicloning = 'lsg_pewarnaankohoptional'; }
+			if ($key == 'id_pewarnaanneisser'){ $yangperludicloning = 'lsg_pewarnaanneisser'; }
+			if ($key == 'id_pewarnaannegatif'){ $yangperludicloning = 'lsg_pewarnaannegatif'; }
+			if ($key == 'id_pewarnaanspora'){ $yangperludicloning = 'lsg_pewarnaanspora'; }
+			if ($key == 'id_pewarnaangiesma'){ $yangperludicloning = 'lsg_pewarnaangiesma'; }
+			if ($key == 'id_pewarnaangiesmaoptional'){ $yangperludicloning = 'lsg_pewarnaangiesmaoptional'; }
+			if ($key == 'lsg_selepitel'){ $yangperludicloning = 'id_selepitel'; }
+			if ($key == 'lsg_selradang'){ $yangperludicloning = 'id_selradang'; }
+			if ($key == 'lsg_mikroorganisme'){ $yangperludicloning = 'id_mikroorganisme'; }
+			if ($key == 'lsg_mikroorganismeoptional'){ $yangperludicloning = 'id_mikroorganismeoptional'; }
+			if ($key == 'lsg_pewarnaanziehlnielsen'){ $yangperludicloning = 'id_pewarnaanziehlnielsen'; }
+			if ($key == 'lsg_pewarnaanziehlnielsensewaktu'){ $yangperludicloning = 'id_pewarnaanziehlnielsensewaktu'; }
+			if ($key == 'lsg_pewarnaankoh'){ $yangperludicloning = 'id_pewarnaankoh'; }
+			if ($key == 'lsg_pewarnaankohoptional'){ $yangperludicloning = 'id_pewarnaankohoptional'; }
+			if ($key == 'lsg_pewarnaanneisser'){ $yangperludicloning = 'id_pewarnaanneisser'; }
+			if ($key == 'lsg_pewarnaannegatif'){ $yangperludicloning = 'id_pewarnaannegatif'; }
+			if ($key == 'lsg_pewarnaanspora'){ $yangperludicloning = 'id_pewarnaanspora'; }
+			if ($key == 'lsg_pewarnaangiesma'){ $yangperludicloning = 'id_pewarnaangiesma'; }
+			if ($key == 'lsg_pewarnaangiesmaoptional'){ $yangperludicloning = 'id_pewarnaangiesmaoptional'; }
+			
 			if (!empty($cekganda) AND $yangperludicloning != ''){
 				foreach($cekganda as $rcloning){
 					$nofotocloning 	= $rcloning->nofoto;
@@ -553,46 +543,24 @@ class DokterController extends Controller
 					if ($cekada){
 						
 					} else {
-						if (is_array($value)) {
-							KomponenJawaban::updateOrCreate(
-								[
-									'accnumber' => $nofotocloning,
-									'komponen'  => $yangperludicloning,
-								],
-								[
-									'isidata'    => json_encode($value),
-									'template'   => $dlpcloning,
-									'created_by' => session('nama'),
-								]
-							);
-							Riwayat::create([
-								'nofoto'		=> $nofotocloning,
-								'jawaban'		=> json_encode($value),
-								'inputor'		=> Session('nama'),
-								'keterangan'	=> 'Clone Data '.$yangperludicloning.' Dari ('.$nofoto.')',
-								'verifikasi'	=> '',
-							]);
-						} else {
-							KomponenJawaban::updateOrCreate(
-								[
-									'accnumber' => $nofotocloning,
-									'komponen'  => $yangperludicloning,
-								],
-								[
-									'isidata'    => $value,
-									'template'   => $dlpcloning,
-									'created_by' => session('nama'),
-								]
-							);
-							Riwayat::create([
-								'nofoto'		=> $nofotocloning,
-								'jawaban'		=> $value,
-								'inputor'		=> Session('nama'),
-								'keterangan'	=> 'Clone Data '.$yangperludicloning.' Dari ('.$nofoto.')',
-								'verifikasi'	=> '',
-							]);
-						}
-						
+						KomponenJawaban::updateOrCreate(
+							[
+								'accnumber' => $nofotocloning,
+								'komponen'  => $yangperludicloning,
+							],
+							[
+								'isidata'    => $isidataawal,
+								'template'   => $dlpcloning,
+								'created_by' => session('nama'),
+							]
+						);
+						Riwayat::create([
+							'nofoto'		=> $nofotocloning,
+							'jawaban'		=> $isidataawal,
+							'inputor'		=> Session('nama'),
+							'keterangan'	=> 'Clone Data '.$yangperludicloning.' Dari ('.$nofoto.')',
+							'verifikasi'	=> '',
+						]);
 					}
 				}
 			}
@@ -1368,62 +1336,6 @@ class DokterController extends Controller
 					);
 				}
 			}
-			$cekdatanmaddendum 	= Periksa::where('nofoto', $nofoto)->first();
-			$tgldaftarpasangan  = $cekdatanmaddendum->daftar ?? '';
-			$nmadendum  		= $cekdatanmaddendum->nmadendum ?? '';
-			$getdatapasangannya = Periksa::where('nmadendum', $nmadendum)->where('nofoto', '!=', $nofoto)->get();
-			if (!empty($getdatapasangannya)){
-				foreach ($getdatapasangannya as $item){
-					$datayangperludicloning = KomponenJawaban::where('accnumber', $item->nofoto)->get();
-					foreach ($datayangperludicloning as $rclone){
-						$komponenterclone = '';
-						if ($rclone->komponen == 'lsg_selepitel'){
-							$komponenterclone = 'id_selepitel';
-						}
-						if ($rclone->komponen == 'id_selepitel'){
-							$komponenterclone = 'lsg_selepitel';
-						}
-						if ($rclone->komponen == 'lsg_selradang'){
-							$komponenterclone = 'id_selradang';
-						}
-						if ($rclone->komponen == 'id_selradang'){
-							$komponenterclone = 'lsg_selradang';
-						}
-						if ($rclone->komponen == 'lsg_mikroorganisme'){
-							$komponenterclone = 'id_mikroorganisme';
-						}
-						if ($rclone->komponen == 'id_mikroorganisme'){
-							$komponenterclone = 'lsg_mikroorganisme';
-						}
-						if ($rclone->komponen == 'lsg_mikroorganismeoptional'){
-							$komponenterclone = 'id_mikroorganismeoptional';
-						}
-						if ($rclone->komponen == 'id_mikroorganismeoptional'){
-							$komponenterclone = 'lsg_mikroorganismeoptional';
-						}
-						if ($rclone->komponen == 'lsg_mikroorganismeoptional'){
-							$komponenterclone = 'id_mikroorganismeoptional';
-						}
-						$ceksudahcloning = KomponenJawaban::where('accnumber', $rclone->accnumber)->where('komponen', $komponenterclone)->count();
-						if ($ceksudahcloning == 0 AND $komponenterclone != ''){
-							KomponenJawaban::create([
-								'accnumber'		=> $rclone->accnumber,
-								'template'		=> $ruangan,
-								'komponen'		=> $komponenterclone,
-								'isidata'		=> $rclone->isidata,
-								'created_by'	=> Session('nama')
-							]);
-							Riwayat::create([
-								'nofoto'		=> $rclone->accnumber,
-								'jawaban'		=> $rclone->isidata,
-								'inputor'		=> Session('nama'),
-								'keterangan'	=> 'Clone Data '.$komponenterclone.' Dari ('.$nofoto.')',
-								'verifikasi'	=> '',
-							]);
-						}
-					}
-				}
-			}
 			KomponenJawaban::where('accnumber', $nofoto)->where('template', 'all')->update([
 				'template'		=> $ruangan,
 			]);