diff --git a/htdocs/app/Http/Controllers/ListController.php b/htdocs/app/Http/Controllers/ListController.php
index a5e85b05..c4472216 100644
--- a/htdocs/app/Http/Controllers/ListController.php
+++ b/htdocs/app/Http/Controllers/ListController.php
@@ -224,41 +224,118 @@ class ListController extends Controller
     	$id 		=	$request->input('val01');
     	$alasan 	= 	$request->input('val02');
 		$tabel 		= 	$request->input('val03');
-		if ($alasan == ''){
-			return response()->json(['icon' => 'error', 'warna' => '#bf441d', 'status' => 'Gagal', 'message' => 'Mohon isi semua form']);
-			return back();
-		} else {
-			if ($tabel == 'aktif'){
-				$alasan		= 'Dibatalkan dengan alasan '.$alasan;
-				$input 		= Periksa::where('id', $id)->update([
-					'noloket'	=> null,
-					'status'	=> 	$alasan
+		if ($id == 'buatulang'){
+			$getdata= 	Periksa::where('id', $request->input('val02'))->first();
+			if (isset($getdata->nofoto)){
+				$ceksudah 	= Periksa::where('nofoto', 'LIKE', $getdata->nofoto.'_%')->count();
+				$nomorbaru 	= $ceksudah++;
+				$periksaid 			= Periksa::insertGetId([
+					'mulai'        	=>  $getdata->mulai,
+					'akhir'        	=>  $getdata->akhir,
+					'noloket'       =>  $getdata->noloket,
+					'nofoto'        =>  $getdata->nofoto.'_'.$nomorbaru,
+					'noregister'    =>  $getdata->noregister,
+					'asalpasien'    =>  $getdata->asalpasien,
+					'nmrs'    		=>  $getdata->nmrs,
+					'pasien_id'     =>  $getdata->pasien_id,
+					'nmpasien'		=> 	$getdata->nmpasien,
+					'jkpasien'		=> 	$getdata->jkpasien,
+					'ktp'			=> 	$getdata->ktp,
+					'bpjs'			=> 	$getdata->bpjs,
+					'tgllahirpasien'=> 	$getdata->tgllahirpasien,
+					'tlppasien'		=> 	$getdata->tlppasien,
+					'alamatpasien'	=> 	$getdata->alamatpasien,
+					'reques'     	=>  $getdata->reques,
+					'usia'          =>  $getdata->usia,
+					'berat'         =>  $getdata->berat,
+					'ruangan_id'    =>  $getdata->ruangan_id,
+					'ruangan'    	=>  $getdata->ruangan,
+					'klinisi'       =>  $getdata->klinisi,
+					'klinis'		=>  $getdata->klinis,
+					'poli_id'       =>  $getdata->poli_id,
+					'kd_spesimen'	=>  $getdata->kd_spesimen,
+					'nm_spesimen'	=>  $getdata->nm_spesimen,
+					'keterangan'    =>  '',
+					'kesimpulan'    =>  '',
+					'asuransi'      =>  $getdata->asuransi,
+					'urgensi'       =>  $getdata->urgensi,
+					'daftar'        =>  $getdata->daftar,
+					'pendaftar'   	=>  Session('id'),
+					'nmpendaftar'	=>  Session('nama'),
+					'orderid'		=> 	$getdata->orderid,
 				]);
-				$pesan 		= 'Order Expertise Canceled';
-			} else if ($tabel == 'arsip'){
-				$total = 0;
-				$input = Periksa::whereIn('id', $id)->update([
-					'status'=> 	'Arsip'
-				]);
-				if ($input){
-					$total++;
-				} 
-				$pesan 		= 'Expertise Archieved '.$total;
+				try {
+					if ($getdata->kd_spesimen != '' AND $getdata->nm_spesimen != ''){
+						PendaftaranOnListiner::updateOrCreate(
+							[
+								'rnoreg'	=> $getdata->nofoto,
+							],
+							[
+								'rtglast'		=> date('Y-m-d'),
+								'norm'			=> $getdata->noregister,
+								'nama'			=> $getdata->nmpasien,
+								'alamat'		=> $getdata->alamatpasien,
+								'telp'			=> $getdata->tlppasien,
+								'hp'			=> $getdata->tlppasien,
+								'tgllahir'		=> $getdata->tgllahirpasien,
+								'umur'			=> $getdata->usia,
+								'rjenis'		=> $getdata->jkpasien,
+								'kodedok'		=> Session('id'),
+								'namadok'		=> Session('nama'),
+								'ruangan'		=> $getdata->ruangan,
+								'tes'			=> '',
+								'alat'			=> 'All',
+								'kd_spesimen'	=> $getdata->kd_spesimen,
+								'nm_spesimen'	=> $getdata->nm_spesimen,
+							]
+						);
+					}
+					return response()->json(['status' => 'Sukses', 'message' => 'Data Order Berhasil di Gandakan'], 201);
+				} catch (Exception $e) {
+					return response()->json(['status' => 'Sukses', 'message' => 'Data Order Berhasil di Gandakan'], 201);
+				}
 			} else {
-				$alasan		= 'Dibatalkan dengan alasan '.$alasan;
-				$input 		= Jadwalperiksa::where('id', $id)->update([
-					'noloket'	=> null,
-					'status'	=> 	$alasan
-				]);
-				$pesan 		= 'Schedulling Canceled';
+				return response()->json(['icon' => 'error', 'warna' => '#bf441d', 'status' => 'Gagal', 'message' => 'Data Tidak Valid']);
+				return back();
 			}
-			if ($input){
-				return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Sukses', 'message' => $pesan]);
-				return back();
-			}else {
-				return response()->json(['icon' => 'error', 'warna' => '#bf441d', 'status' => 'Gagal', 'message' => 'System Down, please try again in a few years...']);
+		} else {
+			if ($alasan == ''){
+				return response()->json(['icon' => 'error', 'warna' => '#bf441d', 'status' => 'Gagal', 'message' => 'Mohon isi semua form']);
 				return back();
+			} else {
+				if ($tabel == 'aktif'){
+					$alasan		= 'Dibatalkan dengan alasan '.$alasan;
+					$input 		= Periksa::where('id', $id)->update([
+						'noloket'	=> null,
+						'status'	=> 	$alasan
+					]);
+					$pesan 		= 'Order Expertise Canceled';
+				} else if ($tabel == 'arsip'){
+					$total = 0;
+					$input = Periksa::whereIn('id', $id)->update([
+						'status'=> 	'Arsip'
+					]);
+					if ($input){
+						$total++;
+					} 
+					$pesan 		= 'Expertise Archieved '.$total;
+				} else {
+					$alasan		= 'Dibatalkan dengan alasan '.$alasan;
+					$input 		= Jadwalperiksa::where('id', $id)->update([
+						'noloket'	=> null,
+						'status'	=> 	$alasan
+					]);
+					$pesan 		= 'Schedulling Canceled';
+				}
+				if ($input){
+					return response()->json(['icon' => 'success', 'warna' => '#5ba035', 'status' => 'Sukses', 'message' => $pesan]);
+					return back();
+				}else {
+					return response()->json(['icon' => 'error', 'warna' => '#bf441d', 'status' => 'Gagal', 'message' => 'System Down, please try again in a few years...']);
+					return back();
+				}
 			}
 		}
+		
     }
 }
diff --git a/htdocs/resources/views/pendaftaran.blade.php b/htdocs/resources/views/pendaftaran.blade.php
index b3cf9c5a..4d40570d 100644
--- a/htdocs/resources/views/pendaftaran.blade.php
+++ b/htdocs/resources/views/pendaftaran.blade.php
@@ -283,14 +283,12 @@
 							<button type="button" class="btn btn-success waves-effect waves-light pull-right" id="btnsimpan">Daftar</button>
 						</div>
 					</div>
-					<!--
-						<div class="form-group account-btn text-center m-t-10" id="divpembatalan">
-							<div class="col-12">
-								<input type="text" id="alasan" name="alasan" placeholder="Tulis Alasan Pembatalannya di Sini" class="form-control">
-								<button type="button" class="btn btn-success waves-effect waves-light pull-right" id="btnbatalkan">Batalkan</button>
-							</div>
+					<div class="form-group account-btn text-center m-t-10" id="divpembatalan">
+						<div class="col-12">
+							<input type="text" id="alasan" name="alasan" placeholder="Tulis Alasan Pembatalannya di Sini" class="form-control">
+							<button type="button" class="btn btn-success waves-effect waves-light pull-right" id="btnbatalkan">Batalkan</button>
 						</div>
-					-->
+					</div>
 				</div>
             </div>
             <div class="col-lg-12" id="modalawal">
@@ -590,68 +588,6 @@
 				// called when the Grid is loaded. Call methods or set properties here.         
 			},
 			columns: [
-				/*
-				{ text: 'Barcode', filterable: false, columntype: 'button', align: 'center', width: 80, cellsrenderer: function () {
-					return "View";
-					}, buttonclick: function (row) {
-						editrow         = row;
-						var offset      = $("#gridpemeriksaan").offset();
-						var dataRecord  = $("#gridpemeriksaan").jqxGrid('getrowdata', editrow);
-						$("#view_nama").val(dataRecord.nama);
-						$("#nofoto").val(dataRecord.nofoto);
-						$("#view_noregister").val(dataRecord.noregister);
-						$("#view_noloket").val(dataRecord.noloket);
-						$("#view_klinisi").val(dataRecord.klinisi);
-						$("#view_klinis").val(dataRecord.klinis);
-						$("#view_kd_spesimen").val(dataRecord.kd_spesimen);
-						$("#view_nm_spesimen").val(dataRecord.nm_spesimen);
-						var isidataString 	= dataRecord.modality;
-						var noloket 		= dataRecord.noloket;
-						var nofoto 			= dataRecord.nofoto;
-						var noregister 		= dataRecord.noregister;
-						var kd_spesimen 	= dataRecord.kd_spesimen;
-						var nama 			= dataRecord.nama;
-						var itemParts 		= nofoto.split('-');
-						var tahunpendek 	= itemParts[0].trim();
-						var daftar 			= dataRecord.daftar;
-						var arrmulai 		= daftar.split(' ');
-						var tangggal 		= arrmulai[0].trim();
-						var itemPartsThn 	= tangggal.split('-');
-						var tahun 			= itemPartsThn[0].trim();
-						var bulan 			= itemPartsThn.length > 1 ? itemPartsThn[1].trim() : "00";
-						var tanggal 		= itemPartsThn.length > 2 ? itemPartsThn[2].trim() : "00";
-						$("#view_tanggal").val(tangggal);
-						$("#view_tahun").val(tahunpendek);
-						var tableBody 		= $("#tableModality tbody");
-							tableBody.empty();
-						var isidataArray 	= JSON.parse(isidataString);
-						if (isidataArray && Array.isArray(isidataArray)) {
-							$("#view_modality").val(isidataArray).select2().trigger('change');
-							isidataArray.forEach(function (item, index) {
-								if (item == 'Vitek 1' || item == 'Vitek 2'){
-									var barcodeunik = tanggal+bulan+tahun+'-'+noloket;
-								} else if (item == 'BD Bachtect' || item == 'BD MGIT'){
-									var barcodeunik = tahunpendek+'-'+noloket;
-								} else if (item == 'abbotm2000' || item == 'abbotm2000rt'){
-									var barcodeunik = tahun+bulan+tanggal+'-'+noloket;
-								} else {
-									var barcodeunik = nofoto;
-								}
-								var row = `<tr>
-										<td>${index + 1}</td>
-										<td>${item}</td>
-										<td>${barcodeunik}</td>
-										<td><button class="btn btn-primary btn-sm" onClick="jQueryOpenBarCode('${item}<>${tahunpendek}<>${noloket}<>${tangggal}<>${nofoto}<>${noregister}<>${kd_spesimen}<>${nama}')">Print Barcode</button></td></tr>`;
-								tableBody.append(row);
-							});
-						} else {
-							$("#view_modality").val([]).select2().trigger('change');
-						}
-						$('#modalawal').removeClass('col-lg-12').addClass('col-lg-8');
-						$('#modalkirimkealat').show();
-					}
-				},
-				*/
 				{ text: 'Form', filterable: false, columntype: 'button', align: 'center', width: 50, cellsrenderer: function () {
 					return "Print";
 					}, buttonclick: function (row) {        
@@ -680,17 +616,6 @@
 						});
 					}
 				},
-				{ text: 'Result', 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 home 		= '{{URL::to("/")}}';
-						var alamat		= home+'/hasil/'+dataRecord.nofoto;
-						window.open(alamat,'_blank');
-					}
-				},
 				{ text: 'Edit', filterable: false, columntype: 'button', align: 'center', width: 50, cellsrenderer: function () {
 					return "Edit";
 					}, buttonclick: function (row) {        
@@ -765,6 +690,41 @@
 						$('#modalawal').removeClass('col-lg-12').addClass('col-lg-8');
 					}
 				},
+
+				{ text: 'Ulang', filterable: false, columntype: 'button', align: 'center', width: 50, cellsrenderer: function () {
+					return "Ulang";
+					}, buttonclick: function (row) {        
+						editrowjabatan 	= row;   
+						var offset      = $("#gridpemeriksaan").offset();       
+						var dataRecord  = $("#gridpemeriksaan").jqxGrid('getrowdata', editrowjabatan);
+						swal({
+							title: 'Apakah anda yakin ?',
+							text: 'Data Pemeriksaan '+dataRecord.tlsreques+' an '+dataRecord.tlsnama+' akan kami buatkan order baru di LIS.?',
+							type: 'warning',
+							showCancelButton: true,
+							confirmButtonClass: 'btn btn-confirm mt-2',
+							cancelButtonClass: 'btn btn-cancel ml-2 mt-2',
+							confirmButtonText: 'Yes, Buatkan Ulang'
+						}).then(function () {
+							$.post('{{ route("deleteList") }}', { val01: 'buatulang', val02: dataRecord.id, val03: '', _token: '{{csrf_token()}}' },
+							function(data){
+								var status  = data.status;
+								var message = data.message;
+								$.toast({
+									heading: status,
+									text: message,
+									position: 'top-right',
+									loaderBg: '#bf441d',
+									icon: 'info',
+									hideAfter: 5000,
+									stack: 1
+								});
+								openedpage();
+								return false;
+							});
+						});
+					}
+				},
 				{ text: 'No', filterable: false, datafield: 'noloket', width: 70, cellsalign: 'center', align: 'center' },
 				{ text: 'Status', filtertype: 'checkedlist', datafield: 'tlsstatus', width: 75, cellsalign: 'left', align: 'center' },
 				{ text: 'AccNumber', datafield: 'nofoto', width: 100, cellsalign: 'left', align: 'center' },
@@ -1194,25 +1154,43 @@
 			var periksa_id  =   document.getElementById('jeniskerja').value;
 			var alasan      =   document.getElementById('alasan').value;       
 			var tabel       =   'aktif';
-			$("html, body").animate({ scrollTop: 0 }, "slow");
-			$('#modalbaru').hide();
-			$('#modalawal').removeClass('col-lg-8').addClass('col-lg-12');
-			$.post('{{ route("deleteList") }}', { val01: periksa_id, val02: alasan, val03: tabel, _token: '{{csrf_token()}}' },
-			function(data){
-				var status  = data.status;
-				var message = data.message;
-				$.toast({
-					heading: status,
-					text: message,
-					position: 'top-right',
-					loaderBg: '#bf441d',
-					icon: 'info',
-					hideAfter: 5000,
-					stack: 1
+			if (periksa_id == '' || alasan == ''){
+				swal({
+					title	: 'Info',
+					text	: 'Alasan tidak boleh dikosongi',
+					type	: 'warning',
+				})
+			} else {
+				swal({
+					title: 'Apakah anda yakin ?',
+					text: 'Data Yang sudah dibatalkan tidak bisa dikembalikan lagi, apakah anda yakin.!',
+					type: 'warning',
+					showCancelButton: true,
+					confirmButtonClass: 'btn btn-confirm mt-2',
+					cancelButtonClass: 'btn btn-cancel ml-2 mt-2',
+					confirmButtonText: 'Yes'
+				}).then(function () {
+					$("html, body").animate({ scrollTop: 0 }, "slow");
+					$('#modalbaru').hide();
+					$('#modalawal').removeClass('col-lg-8').addClass('col-lg-12');
+					$.post('{{ route("deleteList") }}', { val01: periksa_id, val02: alasan, val03: tabel, _token: '{{csrf_token()}}' },
+					function(data){
+						var status  = data.status;
+						var message = data.message;
+						$.toast({
+							heading: status,
+							text: message,
+							position: 'top-right',
+							loaderBg: '#bf441d',
+							icon: 'info',
+							hideAfter: 5000,
+							stack: 1
+						});
+						openedpage();
+						return false;
+					});
 				});
-				openedpage();
-				return false;
-			});
+			}
 		});
 		$("#btnkirimkealat").click(function(){
 			$('#modalawal').removeClass('col-lg-8').addClass('col-lg-12');