mahdahar/pbmc_cmod-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

202502070537 state

Browse Source
This commit is contained in:
mikael-zakaria 2025-02-07 06:37:40 +08:00
parent 839e31af63
commit 999529a15f
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/API_Requests.php
View File

@ -159,7 +159,8 @@ class API_Requests extends ResourceController {
}
$orm = "MSH|^~\&|PBMC|TM|TDNL||||ORM^O01^|||2.3||||\r";
$orm .= "PID|1||$patnumber^^^^PATNUMBER||$firstname^$lastname^^^^^L||$dob|$sex||^|^^||$phone^^TELEPHON||||^||||||||||||||||\r";
$orm .= "PID|1||$patnumber^^^^PATNUMBER||$lastname^$firstname^^^^^L||$dob|$sex||^|^^||$phone^^TELEPHON||||^||||||||||||||||\r";
//$orm .= "PV1|||$loc^^^||||$doc|$doc|||||||||||$hosp|||||||||||||||||||||||||$reqdate||||||||||\r";
$orm .= "PV1|||$loc^^^||||$doc|$doc||||||||||||||||||||||||||||||||||||$reqdate||||||||||\r";
$sql = "select t.TESTSTATUS, m.LISCODE from cmod.dbo.CM_TM_TESTS t
@ -172,9 +173,10 @@ class API_Requests extends ResourceController {
$liscode = $qdata['LISCODE'];
$status = $qdata['TESTSTATUS'];
if($liscode != '') {
if($status!=1 || $status !=2) {$status="NW";} else {$status="CA";}
//if($status!=1 || $status !=2) {$status="NW";} else {$status="CA";}
if($status!='CANCEL') {$status="NW";} else {$status="CA";}
$orm .= "ORC|$status|$reffid||$reffid|||^^^$reqdate|||||$doc|$loc||$reqdate|||||||||\r";
if($i==1) { $orm .= "NTE|0||$hosp|\r"; }
if($i==1) { $orm .= "NTE|1||$hosp|\r"; }
$orm .= "OBR|$i|||$liscode|||||||R|||||$doc|||||||||||||||||||||||||\r";
$i++;
if($liscode=="EGFR") {

29
app/Controllers/API_Results.php
View File

@ -24,8 +24,8 @@ where r.SP_ACCESSNUMBER='$accessnumber'";
$company = $results[0]['COMPANY'];
$createdt = gmdate('Y-m-d\TH:i:s.v\Z');
$patnumber = substr($results[0]['PATNUMBER'],-9);
$firstname = $results[0]['FIRSTNAME'];
$lastname = $results[0]['NAME'];
$firstname = $results[0]['NAME'];
$lastname = $results[0]['FIRSTNAME'];
$dob = $results[0]['BIRTHDATE'];
$sex = $results[0]['SEX'];
$phone = $results[0]['TELEPHON'];
@ -65,7 +65,9 @@ where r.SP_ACCESSNUMBER='$accessnumber'";
"height" => $bh,
],
],
"test_results" => []
"test_results" => [],
"collects" => [],
"receives" => []
];
$sql = "select dc.CHAPID, t.DEPTH as depth_test, dc.FULLTEXT as chap_eng, dc.FULLTEXT as chap_ind, st.FULLTEXT as serum_type,
@ -144,6 +146,27 @@ where r.ACCESSNUMBER='$accessnumber' ORDER BY t.TESTORDER";
$json['test_results'][$d0]['subtest_results'][$d1]['subtest_results'][] = $data;
}
}
$sql = "SELECT ds.SHORTTEXT,
FORMAT(tu.COLLECTIONDATE, 'dd-MM-yyyy') AS RECVDATE,
FORMAT(tu.COLLECTIONDATE, 'HH:mm') AS RECVTIME,
FORMAT(ct.COLLECTIONDATE, 'dd-MM-yyyy') AS COLLDATE,
FORMAT(ct.COLLECTIONDATE, 'HH:mm') AS COLLTIME
FROM SP_TUBES tu
LEFT JOIN DICT_SAMPLES_TYPES ds ON ds.SAMPCODE = tu.SAMPLETYPE
LEFT JOIN cmod.dbo.CM_TUBES ct ON ct.SAMPLETYPE = tu.SAMPLETYPE AND ct.ACCESSNUMBER = tu.SP_ACCESSNUMBER
WHERE tu.SP_ACCESSNUMBER = '$accessnumber';";
$query = $db->query($sql);
$samples = $query->getResultArray();
foreach ($samples as $data) {
$sample = $data['SHORTTEXT'];
$recvdate = $data['RECVDATE'];
$recvtime = $data['RECVTIME'];
$colldate = $data['COLLDATE'];
$colltime = $data['COLLTIME'];
$json['collects'][] = [ "sample" => "$sample", "colldate" => "$colldate", "colltime" => "$colltime" ];
$json['receives'][] = [ "sample" => "$sample", "recvdate" => "$recvdate", "recvtime" => "$recvtime" ];
}
return $json;
}