diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..16e7dd85
Binary files /dev/null and b/.DS_Store differ
diff --git a/htdocs/.DS_Store b/htdocs/.DS_Store
new file mode 100644
index 00000000..fb25bc81
Binary files /dev/null and b/htdocs/.DS_Store differ
diff --git a/htdocs/app/Http/Controllers/DokterController.php b/htdocs/app/Http/Controllers/DokterController.php
index 77800451..4953a15c 100644
--- a/htdocs/app/Http/Controllers/DokterController.php
+++ b/htdocs/app/Http/Controllers/DokterController.php
@@ -924,6 +924,31 @@ class DokterController extends Controller
 				Periksa::where('nofoto', $nofoto)->update([
 					'dlp'	=> $request->input('jenis')
 				]);
+				$cekdatanmaddendum = Periksa::where('nofoto', $nofoto)->first();
+				if (isset($cekdatanmaddendum->nmadendum) AND $cekdatanmaddendum->nmadendum != ''){
+					$getdatapasangannya = Periksa::where('nmadendum', $cekdatanmaddendum->nmadendum)->where('nofoto', '!=', $nofoto)->get();
+					foreach ($getdatapasangannya as $item){
+						KomponenJawaban::updateOrCreate(
+							[
+								'accnumber'		=> $item->nofoto,
+								'template'		=> $request->input('jenis'),
+								'komponen'		=> $request->input('komponen'),
+							],
+							[
+								'isidata'		=> $request->input('isi'),
+								'created_by'	=> Session('nama')
+							]
+						);
+						if ($request->input('komponen') == 'id_jenispemeriksaantb'){
+							Periksa::where('nofoto', $item->nofoto)->update([
+								'diagnosa2'	=> $request->input('isi')
+							]);
+						}
+						Periksa::where('nofoto', $item->nofoto)->update([
+							'dlp'	=> $request->input('jenis')
+						]);
+					}
+				}
 				$pesan = $nofoto.' Saved '.$request->input('jenis');
 			}catch (Exception $e) {
 				$pesan 	= $e->getMessage();
@@ -1047,6 +1072,129 @@ class DokterController extends Controller
 					]
 				);
 				$pesan = $nofoto.' Saved '.$request->input('jenis');
+				$cekdatanmaddendum = Periksa::where('nofoto', $nofoto)->first();
+				if (isset($cekdatanmaddendum->nmadendum) AND $cekdatanmaddendum->nmadendum != ''){
+					$getdatapasangannya = Periksa::where('nmadendum', $cekdatanmaddendum->nmadendum)->where('nofoto', '!=', $nofoto)->get();
+					foreach ($getdatapasangannya as $item){
+						$nofoto 		= $item->nofoto;
+						$dokter_id 		= 0;
+						$analis			= 0;
+						$ppds3			= 0;
+						$nmanalis		= '';
+						$nmdokter 		= '';
+						$nmppdssenior 	= '';
+						if ($request->input('komponen') == 'analis' OR $request->input('komponen') == 'ppds3' OR $request->input('komponen') == 'dokter'){
+							if ($request->input('isi') != 0){
+								if ($request->input('komponen') == 'analis'){
+									$analis		= $request->input('isi');
+									$getnama 	= User::where('id', $analis)->first();
+									Periksa::where('nofoto', $nofoto)->update([
+										'analis'	=> $analis,
+										'nmanalis'	=> $getnama->nama
+									]);
+								} else if ($request->input('komponen') == 'ppds3'){
+									$ppds3		= $request->input('isi');
+									$getnama 	= User::where('id', $ppds3)->first();
+									Periksa::where('nofoto', $nofoto)->update([
+										'ppds3'			=> $ppds3,
+										'nmppdssenior'	=> $getnama->nama
+									]);
+								} else {
+									$dokter_id 	= $request->input('isi');
+									$getnama 	= User::where('id', $dokter_id)->first();
+									Periksa::where('nofoto', $nofoto)->update([
+										'dokter_id'	=> $dokter_id,
+										'nmdokter'	=> $getnama->nama
+									]);
+								}
+							} else {
+								if ($request->input('komponen') == 'analis'){
+									Periksa::where('nofoto', $nofoto)->update([
+										'analis'		=> 0,
+										'nmanalis'		=> '',
+										'nmdrafter'		=> Session('nama'),
+									]);
+								} else if ($request->input('komponen') == 'ppds3'){
+									Periksa::where('nofoto', $nofoto)->update([
+										'ppds3'			=> 0,
+										'nmppdssenior'	=> '',
+										'nmdrafter'		=> Session('nama'),
+									]);
+								} else {
+									Periksa::where('nofoto', $nofoto)->update([
+										'dokter_id'		=> 0,
+										'nmdokter'		=> '',
+										'nmdrafter'		=> Session('nama'),
+									]);
+								}
+							}
+						} else if ($request->input('komponen') == 'klinis'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'klinis'			=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'bhp_media'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'bhp_media'			=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'bhp_potsputum'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'bhp_potsputum'		=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'bhp_poturine'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'bhp_poturine'		=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'bhp_oshe'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'bhp_oshe'			=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'bhp_obyekglass'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'bhp_obyekglass'	=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'bhp_botolbd'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'bhp_botolbd'		=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'bhp_parafilm'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'bhp_parafilm'		=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'bhp_tips'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'bhp_tips'			=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'bhp_cottonswab'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'bhp_cottonswab'	=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'id_esbl'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'id_esbl'	=> $request->input('isi'),
+							]);
+						} else if ($request->input('komponen') == 'id_mrsa'){
+							Periksa::where('nofoto', $nofoto)->update([
+								'id_mrsa'	=> $request->input('isi'),
+							]);
+						} else {
+							Periksa::where('nofoto', $nofoto)->update([
+								'bhp_antibiotiktambahan'	=> $request->input('isi'),
+							]);
+						}
+						KomponenJawaban::updateOrCreate(
+							[
+								'accnumber'		=> $nofoto,
+								'template'		=> $request->input('jenis'),
+								'komponen'		=> $request->input('komponen'),
+							],
+							[
+								'isidata'		=> $request->input('isi'),
+								'created_by'	=> Session('nama')
+							]
+						);
+					}
+
+				}
 			} catch (Exception $e) {
 				$pesan 	= $e->getMessage();
 			}
@@ -1164,6 +1312,23 @@ class DokterController extends Controller
 							'created_by'	=> Session('nama')
 						]
 					);
+					$cekdatanmaddendum = Periksa::where('nofoto', $nofoto)->first();
+					if (isset($cekdatanmaddendum->nmadendum) AND $cekdatanmaddendum->nmadendum != ''){
+						$getdatapasangannya = Periksa::where('nmadendum', $cekdatanmaddendum->nmadendum)->where('nofoto', '!=', $nofoto)->get();
+						foreach ($getdatapasangannya as $item){
+							KomponenJawaban::updateOrCreate(
+								[
+									'accnumber'		=> $item->nofoto,
+									'template'		=> $request->input('jenis'),
+									'komponen'		=> $request->input('komponen'),
+								],
+								[
+									'isidata'		=> $isidata,
+									'created_by'	=> Session('nama')
+								]
+							);
+						}
+					}
 				}
 				$pesan = $isidata;
 			}catch (Exception $e) {
@@ -1213,8 +1378,24 @@ class DokterController extends Controller
 							'created_by'	=> Session('nama')
 						]
 					);
+					$cekdatanmaddendum = Periksa::where('nofoto', $nofoto)->first();
+					if (isset($cekdatanmaddendum->nmadendum) AND $cekdatanmaddendum->nmadendum != ''){
+						$getdatapasangannya = Periksa::where('nmadendum', $cekdatanmaddendum->nmadendum)->where('nofoto', '!=', $nofoto)->get();
+						foreach ($getdatapasangannya as $item){
+							KomponenJawaban::updateOrCreate(
+								[
+									'accnumber'		=> $item->nofoto,
+									'template'		=> $request->input('jenis'),
+									'komponen'		=> $request->input('komponen'),
+								],
+								[
+									'isidata'		=> $isidata,
+									'created_by'	=> Session('nama')
+								]
+							);
+						}
+					}
 				}
-				
 				$pesan = $isidata;
 			}catch (Exception $e) {
 				$pesan 	= $isidata.'<br />'.$e->getMessage();
@@ -1269,10 +1450,25 @@ class DokterController extends Controller
 							'created_by'    => Session('nama')
 						]
 					);
+					$cekdatanmaddendum = Periksa::where('nofoto', $nofoto)->first();
+					if (isset($cekdatanmaddendum->nmadendum) AND $cekdatanmaddendum->nmadendum != ''){
+						$getdatapasangannya = Periksa::where('nmadendum', $cekdatanmaddendum->nmadendum)->where('nofoto', '!=', $nofoto)->get();
+						foreach ($getdatapasangannya as $item){
+							KomponenJawaban::updateOrCreate(
+								[
+									'accnumber'		=> $item->nofoto,
+									'template'		=> $request->input('jenis'),
+									'komponen'		=> $request->input('komponen'),
+								],
+								[
+									'isidata'		=> $isidata,
+									'created_by'	=> Session('nama')
+								]
+							);
+						}
+					}
 				}
-				
 				$pesan = $isidata;
-
 			} catch (Exception $e) {
 				$pesan  = (is_null($isidata) ? '' : $isidata . '<br />') . 'Error: ' . $e->getMessage();
 				Log::error('Exception dalam fungsi requestResult.', [
@@ -1348,6 +1544,23 @@ class DokterController extends Controller
 					'created_by'	=> Session('nama')
 				]
 			);
+			$cekdatanmaddendum = Periksa::where('nofoto', $nofoto)->first();
+			if (isset($cekdatanmaddendum->nmadendum) AND $cekdatanmaddendum->nmadendum != ''){
+				$getdatapasangannya = Periksa::where('nmadendum', $cekdatanmaddendum->nmadendum)->where('nofoto', '!=', $nofoto)->get();
+				foreach ($getdatapasangannya as $item){
+					KomponenJawaban::updateOrCreate(
+						[
+							'accnumber'		=> $item->nofoto,
+							'template'		=> $request->input('jenis'),
+							'komponen'		=> $request->input('komponen'),
+						],
+						[
+							'isidata'		=> $isidata,
+							'created_by'	=> Session('nama')
+						]
+					);
+				}
+			}
 			return $tabel;
 		} else if ($worklist == 'addsirabketerangan'){
 			$tabelawal 		= $request->input('tabelawal');
@@ -1539,7 +1752,6 @@ class DokterController extends Controller
 				'nmexcutor'		=> Session('nama'),
 				'excutor'		=> Session('id'),
 				'tgladendum' 	=> date('Y-m-d H:i:s'),
-				'nmadendum'		=> Session('nama'),
 			]);
 			if ($getdataawal->dokter_id != 0){
 				$tuliskirim = Session('nama').' Mengisi Adendum Untuk Pasien an. '.$getdataawal->nmpasien.' Dengan Order Awal '.$getdataawal->reques;
@@ -1746,7 +1958,7 @@ class DokterController extends Controller
 			$surat 		= self::genSurat($periksa->id, 'dengan kop');
 			$dataraw	= KomponenJawaban::where('accnumber', $periksa->nofoto)->get();
 			return response()->json(['htmlink' => url('/').'/hasil/'.$periksa->nofoto, 'html' => $surat, 'rawdata' => json_encode($dataraw)], 201);
-			return $surat;
+			//return $surat;
 		} else {
 			return response()->json(['status' => 'Failed', 'message' => 'Nomor Lab : '.$nolab.' Tidak di Temukan Cek Kembali Variable Yang di Kirim Haruslah Variable nolab'], 500);
 		}
diff --git a/htdocs/app/Http/Controllers/FrontpageController.php b/htdocs/app/Http/Controllers/FrontpageController.php
index bd7ad82e..a79c9e0d 100644
--- a/htdocs/app/Http/Controllers/FrontpageController.php
+++ b/htdocs/app/Http/Controllers/FrontpageController.php
@@ -1607,7 +1607,10 @@ class FrontpageController extends Controller
 			$nama 			= '';
 			$tgllahir 		= '';
 			$asalpasien 	= '';
-			$nofoto 		= '';	
+			$nofoto 		= '';
+			$kelamin 		= '';
+			$marking 		= $noregister.'-'.$daftartgl.'-'.$header;
+			$marking 		= md5($marking);
 			$sql = Periksa::where('noregister', $request->input('noregister'))->whereDate('daftar', $request->input('daftartgl'))->where('nm_spesimen', $request->input('nm_spesimen'))->get();
 			foreach($sql as $row){
 				$nama 			= $row->nmpasien;
@@ -1615,6 +1618,7 @@ class FrontpageController extends Controller
 				$asalpasien 	= $row->asalpasien;
 				$nofoto 		= $row->nofoto;
 				$kd_spesimen 	= $row->kd_spesimen;
+				$kelamin 		= $row->jkpasien;
 				if ($footer == ''){
 					$footer 	= $kd_spesimen;
 				} else {
@@ -1625,7 +1629,11 @@ class FrontpageController extends Controller
 					}
 				}
 			}
-			$item 		= $asalpasien.'<>'.$header.'<>'.$noregister.'<>'.$nama.'<>'.$tgllahir.'<>'.$footer.'<>'.$daftartgl;
+			Periksa::where('noregister', $request->input('noregister'))->whereDate('daftar', $request->input('daftartgl'))->where('nm_spesimen', $request->input('nm_spesimen'))->update([
+				'nmadendum'	=> $marking
+			]);
+			
+			$item 		= $asalpasien.'<>'.$header.'<>'.$noregister.'<>'.$nama.'<>'.$tgllahir.'<>'.$footer.'<>'.$daftartgl.'<>'.$kelamin;
 			return response()->json(['item' => $item, 'nofoto' => $nofoto]);
 			return back();
 			
diff --git a/htdocs/app/Services/AstmMessageService.php b/htdocs/app/Services/AstmMessageService.php
index 3a531089..244a0644 100644
--- a/htdocs/app/Services/AstmMessageService.php
+++ b/htdocs/app/Services/AstmMessageService.php
@@ -11,6 +11,8 @@ use Exception;
 use App\DataListiner;
 use App\Periksa; 
 use App\RekapAntibiotik;
+use App\PendaftaranOnListiner;
+
 // Proses untuk Growth and Detection Result
 function processGrowthDetectionResult($rawData){
     // Format: R|1| ^ ^ ^GND_MGIT^430100001234|INST_POSITIVE ^87| ...
@@ -636,7 +638,11 @@ class AstmMessageService
                             'status' => 'Data BD di Terima',
                         ]);
                         Log::info("Data ASTM BD ", $resultSample->toArray());
-
+                        PendaftaranOnListiner::where('rnoreg', $data->no_id)->update([
+                            'rtglast'		=> date('Y-m-d'),
+                            'flg_vitek1'	=> 0,
+						    'flg_vitek2'	=> 0
+                        ]);
                     } else {
                         DataListiner::where('urut', $data->urut)->update([
                             'processed' => 9
@@ -684,7 +690,11 @@ class AstmMessageService
                             'status' => 'Data BD di Terima',
                         ]);
                         Log::info("Data ASTM BD ", $resultSample->toArray());
-
+                        PendaftaranOnListiner::where('rnoreg', $data->no_id)->update([
+                            'rtglast'		=> date('Y-m-d'),
+                            'flg_vitek1'	=> 0,
+						    'flg_vitek2'	=> 0
+                        ]);
                     } else {
                         DB::table('lis_phoenix')->where('id', $data->id)->update([
                             'processed' => 9
diff --git a/htdocs/config/global.php b/htdocs/config/global.php
index 1182059c..1192f101 100644
--- a/htdocs/config/global.php
+++ b/htdocs/config/global.php
@@ -1,14 +1,14 @@
 <?php
 return [
-	'Title' 			    => 'LIS',
-	'namaapps' 				=> 'Laboratory Information System',
+	'Title' 			    => 'MIS',
+	'namaapps' 				=> 'Mikrobiologi Information System',
 	'domainapps' 			=> 'RSUD Dr. Saiful Anwar',
 	'subdomainapps' 		=> 'Kota Malang',
 	'subsubdomainapps' 		=> 'Jawa Timur',
 	'addressapps' 			=> 'Jl. Lamandau 18A Bunulrejo Blimbing Malang',
-    'kota' 		        	=> 'Lumajang',
+    'kota' 		        	=> 'Malang',
 	'emailapps' 			=> 'swandhana17@gmail.com',
-	'lamanapps' 			=> 'https://lis.swandhana.test',
+	'lamanapps' 			=> 'https://mis.rssa.id',
 	'logofrontapps' 		=> 'header.png',
 ];
 ?>
\ No newline at end of file
diff --git a/htdocs/resources/views/dokter/pemeriksaan.blade.php b/htdocs/resources/views/dokter/pemeriksaan.blade.php
index 8fe32a9b..662a6813 100644
--- a/htdocs/resources/views/dokter/pemeriksaan.blade.php
+++ b/htdocs/resources/views/dokter/pemeriksaan.blade.php
@@ -2726,7 +2726,7 @@
     var start = new Date();
 	CountDownTimer(start, 'timeremaining');
 	function CountDownTimer(dt, id) {
-		var end 	= new Date(dt.getTime() + 60000);
+		var end 	= new Date(dt.getTime() + 6000000);
 		var _second = 1000;
 		var _minute = _second * 60;
 		var _hour 	= _minute * 60;
diff --git a/htdocs/resources/views/dokter/ppds.blade.php b/htdocs/resources/views/dokter/ppds.blade.php
index 15f2178b..a5f8d750 100644
--- a/htdocs/resources/views/dokter/ppds.blade.php
+++ b/htdocs/resources/views/dokter/ppds.blade.php
@@ -2826,7 +2826,7 @@
     var start = new Date();
 	CountDownTimer(start, 'timeremaining');
 	function CountDownTimer(dt, id) {
-		var end 	= new Date(dt.getTime() + 60000);
+		var end 	= new Date(dt.getTime() + 6000000);
 		var _second = 1000;
 		var _minute = _second * 60;
 		var _hour 	= _minute * 60;
diff --git a/htdocs/resources/views/pendaftaran.blade.php b/htdocs/resources/views/pendaftaran.blade.php
index e9b92b8a..6f7c3ae7 100644
--- a/htdocs/resources/views/pendaftaran.blade.php
+++ b/htdocs/resources/views/pendaftaran.blade.php
@@ -900,6 +900,7 @@
 		const tgllahir = itemParts[4]?.trim() || "0000-00-00";
 		const reques = itemParts[5]?.trim() || "xx";
 		const daftartgl = itemParts[6]?.trim() || "xx";
+		const kelamin = itemParts[7]?.trim() || "x";
 		if (nama.length > 12) {
 			nama = nama.substring(0, 12) + ".";
 		}
@@ -933,7 +934,7 @@
 			doc.addImage(barcodeDataUrl, 'PNG', leftMargin, yPosition, contentWidth, barcodeHeight);
 			yPosition += barcodeHeight + 3; 
 			doc.setFont('helvetica', 'bold');
-			doc.setFontSize(8);
+			doc.setFontSize(9);
 			const centerX = 50 / 2;
 			doc.text(nofoto, centerX, yPosition, { align: 'center' });
 			yPosition += 4;
@@ -945,7 +946,7 @@
 		}
 		doc.setFont('helvetica', 'bold');
 		doc.setFontSize(6.5);
-		doc.text(`${noregister} / ${nama} / ${tgllahir}`, leftMargin, yPosition, {
+		doc.text(`${noregister} / ${nama} / ${tgllahir} / ${kelamin}`, leftMargin, yPosition, {
 			maxWidth: contentWidth,
 		});
 		yPosition += 4;
diff --git a/htdocs/storage/.DS_Store b/htdocs/storage/.DS_Store
new file mode 100644
index 00000000..77af5e7a
Binary files /dev/null and b/htdocs/storage/.DS_Store differ