diff --git a/htdocs/app/Http/Controllers/ListController.php b/htdocs/app/Http/Controllers/ListController.php index 673d0511..8146474c 100644 --- a/htdocs/app/Http/Controllers/ListController.php +++ b/htdocs/app/Http/Controllers/ListController.php @@ -238,10 +238,10 @@ class ListController extends Controller $urine ); $batasWaktu = Carbon::now()->subHours(36); - Periksa::whereNull('status')->where('mulai', '<', $batasWaktu)->update([ - 'status' => 'Dibatalkan (Arsip)', - 'updated_at' => now() - ]); + //Periksa::whereNull('status')->where('created_at', '<', $batasWaktu)->update([ + // 'status' => 'Dibatalkan (Arsip)', + // 'updated_at' => now() + //]); $arraylist = Periksa::select( 'id', 'mulai', 'akhir', 'orderid', 'noloket', 'nofoto', 'noregister', 'asalpasien', 'nmrs', 'pasien_id', 'nmpasien', 'jkpasien', 'tgllahirpasien', 'tlppasien', 'alamatpasien', 'reques', 'usia', 'berat', 'ktp', 'bpjs', 'ruangan_id', diff --git a/listener/app.py b/listener/app.py index ff3f8cff..80b1575a 100644 --- a/listener/app.py +++ b/listener/app.py @@ -145,10 +145,10 @@ class LisPhoenix(Base): class LisPhoenixDtl(Base): __tablename__ = 'lis_phoenix_dtl' id = Column(Integer, primary_key=True) - seq_no = Column(String(50)) # Isolate ID / Sample ID + seq_no = Column(String(50)) kd_antibiotik = Column(String(50)) nm_antibiotik = Column(String(100)) - keterangan = Column(String(50)) # MIC Value (e.g., <=0.5) + keterangan = Column(String(50)) interpretasi = Column(String(10)) # S, I, R no = Column(Integer) @@ -176,6 +176,8 @@ class PaslabOrder(Base): flg_gxp1 = Column(Boolean, default=False) flg_gxp2 = Column(Boolean, default=False) flg_gxp3 = Column(Boolean, default=False) + created_at = Column(SqDateTime, default=datetime.datetime.now) + updated_at = Column(SqDateTime, default=datetime.datetime.now, onupdate=datetime.datetime.now) Base.metadata.create_all(bind=engine) @@ -647,11 +649,16 @@ def parse_and_save_vitek_result(raw_data, port_name="VITEK"): # === SKENARIO PESAN KEDUA (UPDATE) === logging.info(f"[{port_name}] UPDATE Data (Tahap 2) -> ID: {sample_id}, Pasien: {patient_name}") print(f"[{port_name}] UPDATE Data -> ID: {sample_id} (Hasil Lengkap)") - existing_data.rnmpas = patient_name - existing_data.organisme = final_res_string - existing_data.rawdt = raw_data - existing_data.tgl_data = result_date - existing_data.processed = None + new_entry = LisPhoenix( + no_id=sample_id, + seq_no=final_seq_no, + rnmpas=patient_name, + tgl_data=result_date, + rawdt=raw_data, + organisme=final_res_string, + alat=port_name + ) + session.add(new_entry) else: # === SKENARIO PESAN PERTAMA (INSERT) === diff --git a/uploadkegit.sh b/uploadkegit.sh new file mode 100755 index 00000000..aa09effe --- /dev/null +++ b/uploadkegit.sh @@ -0,0 +1,5 @@ +git pull origin main +git add . +git commit -m "update" +git push +