diff --git a/app/Controllers/API_Requests.php b/app/Controllers/API_Requests.php index e71bc1c..15c43d1 100644 --- a/app/Controllers/API_Requests.php +++ b/app/Controllers/API_Requests.php @@ -102,7 +102,7 @@ class API_Requests extends ResourceController { $db->query($sql); //sendORM - //$this->orm($reqid); + $this->orm($reqid); return $this->respond(201); /* @@ -119,7 +119,7 @@ class API_Requests extends ResourceController { public function orm($reqid) { $db = \Config\Database::connect(); - $sql = "select r.REFFID, r.LOC, p.PATNUMBER, p.FIRSTNAME, p.LASTNAME, p.BIRTHDATE, p.SEX, r.REQNUMBER, r.REQDATE, r.AGENT, r.DOC + $sql = "select r.REFFID, r.LOC, p.PATNUMBER, p.FIRSTNAME, p.LASTNAME, p.BIRTHDATE, p.SEX, r.REQNUMBER, r.REQDATE, r.AGENT, r.DOC, r.BW, r.BH from cmod.dbo.CM_TM_REQUESTS r left join cmod.dbo.CM_TM_PATIENTS p on p.PATID=r.PATID where r.REQID='$reqid'"; @@ -139,6 +139,8 @@ class API_Requests extends ResourceController { $reqdate = $res['REQDATE']; $time = Time::createFromFormat('Y-m-d\TH:i:s.u\Z', $reqdate, 'UTC'); //2024-10-19T00:47:06.424654Z $agent = $res['AGENT']; + $bw = $res['BW']; + $bh = $res['BH']; // LOC if($loc == "PBMC Bali") { @@ -169,6 +171,9 @@ class API_Requests extends ResourceController { $orm .= "ORC|$status|$reffid||$reffid|||^^^$reqdate|||||$doc|$loc||$reqdate|||||||||\r"; $orm .= "OBR|$i|||$liscode|||||||R|||||$doc|||||||||||||||||||||||||\r"; $i++; + if($liscode=="EGFR") { + $orm .= "OBX||NM|BW||$bw\r"; + } } } diff --git a/cretab.sql b/cretab.sql index 90f2e01..425e33b 100644 --- a/cretab.sql +++ b/cretab.sql @@ -1,27 +1,9 @@ USE [cmod] GO -DROP TABLE CM_TM_LOGS; DROP TABLE CM_TM_REQUESTS; DROP TABLE CM_TM_PATIENTS; DROP TABLE CM_TM_TESTS; -/****** Object: Table [dbo].[CM_TM_LOGS] Script Date: 13/01/2025 16:49:08 ******/ -SET ANSI_NULLS ON -GO -SET QUOTED_IDENTIFIER ON -GO -CREATE TABLE [dbo].[CM_TM_LOGS]( - [LOGID] [int] IDENTITY(1,1) NOT NULL, - [URL] [varchar](150) NULL, - [METHOD] [varchar](10) NULL, - [BODY] [text] NULL, - [LOGDATE] [datetime] NULL, - CONSTRAINT [PK_CM_TM_LOGS] PRIMARY KEY CLUSTERED -( - [LOGID] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON, OPTIMIZE_FOR_SEQUENTIAL_KEY = OFF) ON [PRIMARY] -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] -GO -/****** Object: Table [dbo].[CM_TM_PATIENTS] Script Date: 13/01/2025 16:49:08 ******/ +/****** Object: Table [dbo].[CM_TM_PATIENTS] Script Date: 1/21/2025 1:36:13 PM ******/ SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON @@ -31,42 +13,45 @@ CREATE TABLE [dbo].[CM_TM_PATIENTS]( [PATNUMBER] [varchar](50) NULL, [FIRSTNAME] [varchar](100) NULL, [LASTNAME] [varchar](100) NULL, - [BIRTHDATE] [date] NULL, + [BIRTHDATE] [varchar](20) NULL, [SEX] [varchar](10) NULL, [PHONE] [varchar](50) NULL, [TAKEN] [varchar](1) NULL ) ON [PRIMARY] GO -/****** Object: Table [dbo].[CM_TM_REQUESTS] Script Date: 13/01/2025 16:49:08 ******/ +/****** Object: Table [dbo].[CM_TM_REQUESTS] Script Date: 1/21/2025 1:36:13 PM ******/ SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON GO CREATE TABLE [dbo].[CM_TM_REQUESTS]( [REQID] [int] IDENTITY(1,1) NOT NULL, - [REFFID] [text] NULL, + [REFFID] [varchar](11) NULL, [REQNUMBER] [varchar](10) NULL, [REQTYPE] [varchar](10) NULL, - [REQDATE] [datetime] NULL, + [REQDATE] [varchar](30) NULL, [AGENT] [varchar](100) NULL, [DOC] [varchar](100) NULL, [LOC] [varchar](10) NULL, [PATID] [int] NULL, [COMPANY] [varchar](50) NULL, [REQDESC] [varchar](50) NULL, - [TAKEN] [varchar](1) NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] + [LOGDATE] [varchar](30) NULL, + [ISTAKEN] [varchar](1) NULL, + [BW] [char](10) NULL, + [BH] [char](10) NULL +) ON [PRIMARY] GO -/****** Object: Table [dbo].[CM_TM_TESTS] Script Date: 13/01/2025 16:49:08 ******/ +/****** Object: Table [dbo].[CM_TM_TESTS] Script Date: 1/21/2025 1:36:13 PM ******/ SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON GO CREATE TABLE [dbo].[CM_TM_TESTS]( [REQTESTID] [int] IDENTITY(1,1) NOT NULL, - [REFFID] [text] NULL, + [REFFTESTID] [char](50) NULL, [REQID] [int] NOT NULL, [HISCODE] [varchar](10) NOT NULL, [TESTSTATUS] [char](1) NULL -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +) ON [PRIMARY] GO