dwi_vendor/lis
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Dwi Swandhana
2026-01-31 15:51:45 +07:00
parent 11bc7e172f
commit 3af340d09d
3 changed files with 251 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

htdocs/app/Http/Controllers/FrontpageController.php
+37 -109
View File
@@ -24,7 +24,7 @@ use App\PeriksaSYNC;
use App\Logbook; use App\Logbook;
use App\Worklist; use App\Worklist;
use App\Jawaban; use App\Jawaban;
use App\PendaftaranOnListiner; use App\Paslab;
use App\Subjawaban; use App\Subjawaban;
use App\Organisms; use App\Organisms;
use App\Dokter; use App\Dokter;
@@ -1095,39 +1095,33 @@ class FrontpageController extends Controller
]); ]);
$pesan = $nofoto; $pesan = $nofoto;
if ($kd_spesimen != '' AND $nm_spesimen != ''){ if ($kd_spesimen != '' AND $nm_spesimen != ''){
PendaftaranOnListiner::updateOrCreate( Paslab::updateOrCreate(
[ [
'rnoreg' => $nofoto, 'rnoreg' => $nofoto,
], ],
[ [
'rtglast' => $tglsekarang,
'norm' => $noregister,
'nama' => $nama, 'nama' => $nama,
'norm' => $noregister,
'rtglast' => $mulai,
'alamat' => $alamat, 'alamat' => $alamat,
'telp' => $telpon,
'hp' => $telpon,
'tgllahir' => $tgllahir,
'umur' => $usia,
'rjenis' => $jk, 'rjenis' => $jk,
'kodedok' => $notransaksi, 'umur' => $usia,
'namadok' => $klinisi, 'namadok' => $dokter,
'ruangan' => $kamar, 'ruangan' => 'Mikrobiologi',
'tes' => $rekues, 'tes' => $rekues,
'alat' => 'All', 'alat' => 'ALL',
'kd_spesimen' => $kd_spesimen, 'kd_spesimen' => $kd_spesimen,
'nm_spesimen' => $nm_spesimen, 'nm_spesimen' => $nm_spesimen,
'tgllahir' => $tgllahir,
'flg_vitek1' => false,
'flg_vitek2' => false,
'flg_bd1' => false,
'flg_bd2' => false,
'flg_gxp1' => false,
'flg_gxp2' => false,
'flg_gxp3' => false,
] ]
); );
$dataForLis = [
'nama' => $nama,
'noregister' => $noregister,
'nofoto' => $nofoto,
'kd_spesimen' => $kd_spesimen,
'nm_spesimen' => $nm_spesimen,
'tgllahir' => $tgllahir,
'jk' => $jk,
];
//$this->sendRegistrationToLis($dataForLis);
} }
if ($pesan != ''){ if ($pesan != ''){
return response()->json(['status' => 'Sukses', 'message' => $pesan], 201); return response()->json(['status' => 'Sukses', 'message' => $pesan], 201);
@@ -1320,8 +1314,11 @@ class FrontpageController extends Controller
]); ]);
$pesan = $nofoto; $pesan = $nofoto;
try { try {
DB::table('paslab')->insert([ Paslab::updateOrCreate(
[
'rnoreg' => $nofoto, 'rnoreg' => $nofoto,
],
[
'nama' => $nama, 'nama' => $nama,
'norm' => $noregister, 'norm' => $noregister,
'rtglast' => $mulai, 'rtglast' => $mulai,
@@ -1341,44 +1338,9 @@ class FrontpageController extends Controller
'flg_bd2' => false, 'flg_bd2' => false,
'flg_gxp1' => false, 'flg_gxp1' => false,
'flg_gxp2' => false, 'flg_gxp2' => false,
]); 'flg_gxp3' => false,
if ($kd_spesimen != '' AND $nm_spesimen != ''){
PendaftaranOnListiner::updateOrCreate(
[
'rnoreg' => $nofoto,
],
[
'rtglast' => $tglsekarang,
'norm' => $noregister,
'nama' => $nama,
'alamat' => $alamat,
'telp' => $telpon,
'hp' => $telpon,
'tgllahir' => $tgllahir,
'umur' => $usia,
'rjenis' => $jk,
'kodedok' => Session('id'),
'namadok' => Session('nama'),
'ruangan' => $kamar,
'tes' => $rekues,
'alat' => 'All',
'kd_spesimen' => $kd_spesimen,
'nm_spesimen' => $nm_spesimen,
] ]
); );
/*
$dataForLis = [
'nama' => $nama,
'noregister' => $noregister,
'nofoto' => $nofoto,
'kd_spesimen' => $kd_spesimen,
'nm_spesimen' => $nm_spesimen,
'tgllahir' => $tgllahir,
'jk' => $jk,
];
$this->sendRegistrationToLis($dataForLis);
*/
}
return response()->json(['status' => 'Sukses', 'message' => $pesan], 201); return response()->json(['status' => 'Sukses', 'message' => $pesan], 201);
} catch (Exception $e) { } catch (Exception $e) {
return response()->json(['status' => 'Sukses', 'message' => $pesan], 201); return response()->json(['status' => 'Sukses', 'message' => $pesan], 201);
@@ -1624,44 +1586,9 @@ class FrontpageController extends Controller
'flg_bd2' => false, 'flg_bd2' => false,
'flg_gxp1' => false, 'flg_gxp1' => false,
'flg_gxp2' => false, 'flg_gxp2' => false,
'flg_gxp3' => false,
]); ]);
if ($kd_spesimen != '' AND $nm_spesimen != ''){
PendaftaranOnListiner::updateOrCreate(
[
'rnoreg' => $nofoto,
],
[
'rtglast' => $mulai,
'norm' => $noregister,
'nama' => $nama,
'alamat' => $alamat,
'telp' => $telpon,
'hp' => $telpon,
'tgllahir' => $tgllahir,
'umur' => $usia,
'rjenis' => $jk,
'kodedok' => Session('id'),
'namadok' => Session('nama'),
'ruangan' => $kamar,
'tes' => $rekues,
'alat' => 'All',
'kd_spesimen' => $kd_spesimen,
'nm_spesimen' => $nm_spesimen,
]
);
/*
$dataForLis = [
'nama' => $nama,
'noregister' => $noregister,
'nofoto' => $nofoto,
'kd_spesimen' => $kd_spesimen,
'nm_spesimen' => $nm_spesimen,
'tgllahir' => $tgllahir,
'jk' => $jk,
];
$this->sendRegistrationToLis($dataForLis);
*/
}
$pesan = $pesan.' Nomor Lokal '.$nofoto.' dengan No. Urut '.$noloket.' Berhasil di Simpan'; $pesan = $pesan.' Nomor Lokal '.$nofoto.' dengan No. Urut '.$noloket.' Berhasil di Simpan';
if ($pesan != ''){ if ($pesan != ''){
if ($file != '' AND $jenisgambar != ''){ if ($file != '' AND $jenisgambar != ''){
@@ -1758,32 +1685,33 @@ class FrontpageController extends Controller
'nm_spesimen' => $nm_spesimen, 'nm_spesimen' => $nm_spesimen,
]); ]);
$pesan = $pesan.' Data Berhasil di Update'; $pesan = $pesan.' Data Berhasil di Update';
if ($kd_spesimen != '' AND $nm_spesimen != ''){ Paslab::updateOrCreate(
PendaftaranOnListiner::updateOrCreate(
[ [
'rnoreg' => $nofoto, 'rnoreg' => $nofoto,
], ],
[ [
'rtglast' => $mulai,
'norm' => $noregister,
'nama' => $nama, 'nama' => $nama,
'norm' => $noregister,
'rtglast' => $mulai,
'alamat' => $alamat, 'alamat' => $alamat,
'telp' => $telpon,
'hp' => $telpon,
'tgllahir' => $tgllahir,
'umur' => $usia,
'rjenis' => $jk, 'rjenis' => $jk,
'kodedok' => Session('id'), 'umur' => $usia,
'namadok' => Session('nama'), 'namadok' => $dokter,
'ruangan' => 'Mikrobiologi', 'ruangan' => 'Mikrobiologi',
'tes' => $rekues, 'tes' => $rekues,
'alat' => 'All', 'alat' => 'ALL',
'kd_spesimen' => $kd_spesimen, 'kd_spesimen' => $kd_spesimen,
'nm_spesimen' => $nm_spesimen, 'nm_spesimen' => $nm_spesimen,
'tgllahir' => $tgllahir,
'flg_vitek1' => false,
'flg_vitek2' => false,
'flg_bd1' => false,
'flg_bd2' => false,
'flg_gxp1' => false,
'flg_gxp2' => false,
'flg_gxp3' => false,
] ]
); );
}
if ($pesan != ''){ if ($pesan != ''){
if ($file != '' AND $jenisgambar != ''){ if ($file != '' AND $jenisgambar != ''){
Xfiles::create([ Xfiles::create([
htdocs/app/Paslab.php
+11
View File
@@ -0,0 +1,11 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Paslab extends Model
{
protected $table = "paslab";
protected $guarded = [];
}
listener/app.py
+107 -115
View File
@@ -733,11 +733,10 @@ def manage_vitek_port(config):
port_name = config['port'] port_name = config['port']
flag_col = config.get('flag_column') flag_col = config.get('flag_column')
alat_name = config.get('alat_name', 'VITEK') alat_name = config.get('alat_name', 'VITEK')
logging.info(f"[{port_name}] Membuka port untuk alat {alat_name}...")
print(f"[{port_name}] Membuka port untuk alat {alat_name}...")
# Buffer untuk menampung pecahan data
rx_buffer = b""
logging.info(f"[{port_name}] START VITEK SERVICE (Relaxed Mode)...")
print(f"[{port_name}] START VITEK SERVICE (Relaxed Mode)...")
while True:
try: try:
with serial.Serial( with serial.Serial(
port=port_name, port=port_name,
@@ -747,83 +746,86 @@ def manage_vitek_port(config):
parity=serial.PARITY_NONE, parity=serial.PARITY_NONE,
stopbits=serial.STOPBITS_ONE, stopbits=serial.STOPBITS_ONE,
xonxoff=False, xonxoff=False,
rtscts=False, # Pastikan flow control mati agar tidak blocking hardware rtscts=False,
dsrdtr=False dsrdtr=False
) as ser: ) as ser:
ser.reset_input_buffer() ser.reset_input_buffer()
ser.reset_output_buffer() logging.info(f"[{port_name}] Ready & Listening.")
print(f"[{port_name}] Port Connected. Waiting activity...")
while True: while True:
has_activity = False # Penanda agar kita sleep kalau sepi
# ========================================== # ==========================================
# PHASE 1: LISTENING (PRIORITAS UTAMA) # PHASE 1: LISTENING
# ========================================== # ==========================================
try:
if ser.in_waiting > 0: if ser.in_waiting > 0:
has_activity = True header = ser.read(1)
char = ser.read(1)
#data_chunk = ser.read(ser.in_waiting or 1024)
# 1. HANDLE HANDSHAKE (ENQ -> ACK)
if char == b'\x05': # ENQ
logging.info(f"[{port_name}] Terima ENQ. Kirim ACK.")
print(f"[{port_name}] Terima ENQ. Kirim ACK.")
ser.write(b'\x06') # ACK
rx_buffer = b"" # Siap terima frame baru
continue
# 2. HANDLE END OF TRANSMISSION (EOT) # --- HANDSHAKE ---
elif char == b'\x04': # EOT if header == b'\x05':
logging.info(f"[{port_name}] Sesi Selesai (EOT).") logging.info(f"[{port_name}] Got ENQ -> Reply ACK")
print(f"[{port_name}] Sesi Selesai (EOT).") print(f"[{port_name}] Got ENQ -> Reply ACK")
# Jika masih ada sisa buffer yang belum diproses (jarang terjadi jika logic benar), proses disini
rx_buffer = b""
continue
# 3. HANDLE DATA FRAME
else:
rx_buffer += char
if ser.in_waiting:
rx_buffer += ser.read(ser.in_waiting)
if b'\x03' in rx_buffer:
# Cek apakah sudah ada CRLF (akhir mutlak)
if rx_buffer.endswith(b'\n'):
logging.info(f"[{port_name}] Frame Lengkap diterima. KIRIM ACK!")
print(f"[{port_name}] Frame Lengkap diterima. KIRIM ACK!")
# --- KRITIKAL: KIRIM ACK SEKARANG JUGA ---
# Jangan tunggu EOT. Kirim ACK per frame agar Vitek lanjut ke pesan berikutnya (antibiotik)
ser.write(b'\x06') ser.write(b'\x06')
# ----------------------------------------- ser.reset_input_buffer()
# Proses Data # --- DATA FRAME ---
elif header == b'\x02':
logging.info(f"[{port_name}] Frame Start. Reading...")
print(f"[{port_name}] Frame Start. Reading...")
original_timeout = ser.timeout
ser.timeout = 1.5
body = ser.read_until(b'\x03')
ser.timeout = original_timeout
full_frame = header + body
is_valid = False
if full_frame.endswith(b'\x03'):
is_valid = True
elif b'\x1d' in full_frame[-10:]:
# Cek 10 karakter terakhir, ada GS gak?
# Log Anda: ...|zz|\x1de7 (GS ada di posisi -3)
is_valid = True
logging.warning(f"[{port_name}] Frame tanpa ETX tapi ada Checksum. Menerima paksa...")
print(f"[{port_name}] Frame tanpa ETX tapi ada Checksum. Menerima paksa...")
if is_valid:
logging.info(f"[{port_name}] Frame Accepted. Sending ACK.")
print(f"[{port_name}] Frame OK -> ACK Sent.")
print(f"[{port_name}] FULL FRAME: {full_frame}")
# 1. KIRIM ACK (WAJIB)
ser.write(b'\x06')
# 2. Proses Data
try: try:
full_str = rx_buffer.decode('latin-1', errors='ignore') full_str = full_frame.decode('latin-1', errors='ignore')
logging.info(f"[{port_name}] Data: {full_str[:50]}...") # Debug
print(f"[{port_name}] Data: {full_str[:50]}...") # print(f"[{port_name}] CONTENT: {full_str}")
# Panggil parser Vitek
if len(full_str) > 5:
parse_and_save_vitek_result(full_str, alat_name) parse_and_save_vitek_result(full_str, alat_name)
except Exception as e: except Exception as e:
logging.error(f"Error Parse: {e}") logging.error(f"[{port_name}] Parse Err: {e}")
print(f"Error Parse: {e}") print(f"[{port_name}] Parse Err: {e}")
# Kosongkan buffer untuk frame berikutnya else:
rx_buffer = b"" logging.warning(f"[{port_name}] Frame Corrupt/Timeout: {full_frame}")
print(f"[{port_name}] Frame Corrupt/Timeout: {full_frame}")
ser.write(b'\x15') # NAK
# Safety: Jika buffer kepenuhan sampah (lebih dari 4KB) tanpa framing, buang. # --- EOT ---
if len(rx_buffer) > 5000: elif header == b'\x04':
logging.warning(f"[{port_name}] Buffer overflow/Garbage. Reset.") logging.info(f"[{port_name}] Session End (EOT).")
print(f"[{port_name}] Buffer overflow/Garbage. Reset.") print(f"[{port_name}] Session End (EOT).")
rx_buffer = b"" ser.reset_input_buffer()
except Exception as e:
logging.error(f"[{port_name}] Error Reading: {e}") else:
print(f"[{port_name}] Error Reading: {e}") pass
rx_buffer = b"" # Reset jika error parah
# ========================================== # ==========================================
# PHASE 2: SENDING ORDER (JIKA BUFFER KOSONG) # PHASE 2: SENDING ORDER (JIKA IDLE)
# ========================================== # ==========================================
# Kita hanya kirim order jika sedang tidak menerima data (buffer kosong) else:
if not rx_buffer and flag_col: # Kita masuk sini jika ser.in_waiting == 0 (Sepi)
# Pastikan kolom flag diset di config
if flag_col:
try: try:
session = SessionLocal() session = SessionLocal()
# Cari order yang belum dikirim # Cari order yang belum dikirim
@@ -832,93 +834,83 @@ def manage_vitek_port(config):
).first() ).first()
if pending_order: if pending_order:
has_activity = True # Jangan sleep lama-lama logging.info(f"[{port_name}] Ada Order: {pending_order.rnoreg}. Coba Handshake...")
logging.info(f"[{port_name}] Menemukan Order: {pending_order.rnoreg}. Memulai Handshake...") print(f"[{port_name}] Ada Order: {pending_order.rnoreg}...")
print(f"[{port_name}] Menemukan Order: {pending_order.rnoreg}. Memulai Handshake...")
handshake_success = False
handshake_attempts = 0
while handshake_attempts < 3:
# --- STEP 1: HANDSHAKE (ENQ) ---
ser.reset_input_buffer()
ser.write(b'\x05')
time.sleep(0.5)
response = ser.read(1)
if response == b'\x06': # ACK received # --- LOGIC HANDSHAKE DENGAN RETRY ---
handshake_success = False
# Coba kirim ENQ max 3 kali
for attempt in range(3):
ser.reset_input_buffer()
ser.write(b'\x05') # Kirim ENQ
time.sleep(0.5) # Tunggu balasan
if ser.in_waiting:
resp = ser.read(1)
if resp == b'\x06': # Dapat ACK
handshake_success = True handshake_success = True
break break
elif response == b'\x15': # NAK (Alat nolak) elif resp == b'\x15': # Dapat NAK
logging.warning(f"[{port_name}] Dibalas NAK. Tunggu 2 detik...") time.sleep(1)
time.sleep(2)
else: else:
# Timeout atau respon aneh # Timeout, alat diam saja
# logging.debug(f"[{port_name}] No ACK (Got: {response}). Retry {handshake_attempts+1}...")
pass pass
handshake_attempts += 1
time.sleep(1) # Jeda antar percobaan
if handshake_success: if handshake_success:
# === SUKSES HANDSHAKE, KIRIM DATA === # === KIRIM DATA ORDER ===
logging.info(f"[{port_name}] Handshake OK. Sending Frames...") logging.info(f"[{port_name}] Handshake OK. Kirim Frames...")
frames = create_vitek_order_message(pending_order) frames = create_vitek_order_message(pending_order)
all_frames_sent = True all_sent = True
for frame in frames: for frame in frames:
ser.write(frame) ser.write(frame)
# Tunggu ACK Frame # Tunggu ACK per frame
t_wait = time.time()
got_ack = False got_ack = False
while time.time() - t_wait < 3: # 3 detik timeout per frame wait_start = time.time()
while time.time() - wait_start < 3:
if ser.in_waiting: if ser.in_waiting:
if ser.read(1) == b'\x06': if ser.read(1) == b'\x06':
got_ack = True got_ack = True
break break
if not got_ack: if not got_ack:
logging.error(f"[{port_name}] Frame Timeout/NoACK. Abort.") all_sent = False
all_frames_sent = False
break break
# Tutup Sesi # Tutup Sesi
ser.write(b'\x04') # EOT ser.write(b'\x04') # EOT
if all_frames_sent: if all_sent:
logging.info(f"[{port_name}] Order Sukses Terkirim.") logging.info(f"[{port_name}] Order SELESAI Terkirim.")
print(f"[{port_name}] Order SELESAI Terkirim.")
setattr(pending_order, flag_col, True) setattr(pending_order, flag_col, True)
session.commit() session.commit()
else: else:
logging.warning(f"[{port_name}] Order Gagal Tengah Jalan.") logging.error(f"[{port_name}] Order Gagal (No ACK).")
else: else:
# === GAGAL HANDSHAKE 3x -> FORCE RESET ALAT === # === FORCE RESET (ANTI-STUCK) ===
# Inilah solusi masalah "Stuck" Anda # Jika sudah 3x ENQ tidak dibalas, anggap alat 'bengong'
logging.warning(f"[{port_name}] ALAT STUCK/SIBUK. Mengirim FORCE EOT (Reset State)...") # Kirim EOT untuk mereset status alat
print(f"[{port_name}] ALAT STUCK -> FORCE RESET.") logging.warning(f"[{port_name}] Alat Sibuk/Stuck. Kirim Force EOT.")
print(f"[{port_name}] Alat Sibuk/Stuck. Kirim Force EOT.")
ser.write(b'\x04')
time.sleep(1)
ser.write(b'\x04') # Kirim EOT paksa
time.sleep(2) # Beri waktu alat bernafas
ser.reset_input_buffer() # Buang sampah sisa
# Kita tidak update DB, biar loop berikutnya coba lagi
session.close() session.close()
except Exception as e: except Exception as e:
logging.error(f"[{port_name}] Error Sending Logic: {e}") logging.error(f"[{port_name}] Sending Error: {e}")
print(f"[{port_name}] Error Sending Logic: {e}") print(f"[{port_name}] Sending Error: {e}")
if 'session' in locals(): session.close() if 'session' in locals(): session.close()
# ========================================== # Sleep penting agar CPU tidak 100% saat idle
# PHASE 3: IDLE MANAGEMENT time.sleep(0.1)
# ==========================================
# Jika tidak ada data masuk dan tidak ada order keluar, tidur sebentar
# Ini penting agar CPU tidak 100% dan DB tidak jebol
if not has_activity:
time.sleep(0.5)
except Exception as e: except Exception as e:
logging.critical(f"[{port_name}] Gagal connect Serial: {e}") logging.critical(f"[{port_name}] Serial Crash: {e}")
print(f"[{port_name}] Gagal connect Serial: {e}")
time.sleep(5) time.sleep(5)
# ========================================== # ==========================================