diff --git a/app/Controllers/API_TM.php b/app/Controllers/API_TM.php
index 36f1e54..e241a91 100644
--- a/app/Controllers/API_TM.php
+++ b/app/Controllers/API_TM.php
@@ -76,8 +76,8 @@ class API_TM extends ResourceController {
 		
 		// log to cm_tm_logs
 		$data = str_replace("'","''",json_encode($raw));
-		//$sql = "INSERT INTO cmod.dbo.CM_TM_LOGS (URL, METHOD, BODY, LOGDATE) VALUES ('API/REQUESTS', 'POST', '$data', GETDATE())";
-		//$db->query($sql);
+		$sql = "INSERT INTO cmod.dbo.CM_TM_LOGS (URL, METHOD, BODY, LOGDATE) VALUES ('API/REQUESTS', 'POST', '$data', GETDATE())";
+		$db->query($sql);
 		
 		$data = array();
 		$qdata = (array)$raw;
@@ -127,19 +127,21 @@ class API_TM extends ResourceController {
 		else { $reqid = ''; $rpatid = ''; }
 
 		//echo "$patid<br/>$reqid - $rpatid";
-
+		
 		//check receive
-		$sql = "select recv=case when exists (select * from PADMA.dbo.SP_TUBES where SP_ACCESSNUMBER='5061004820' and TUBESTATUS=4) then 1 else 0 end;";
+		$sql = "select recv=case when exists (select * from PADMA.dbo.SP_TUBES t 
+			left join PADMA.dbo.SP_REQUESTS r on r.SP_ACCESSNUMBER=t.SP_ACCESSNUMBER
+			where r.HOSTORDERNUMBER='$reffid' and TUBESTATUS=4) then 1 else 0 end";
 		$query = $db->query($sql);
 		$result = $query->getResultArray();
 		$recv = $result[0]['recv'];
-
+		
 		// check data patient
 		if($patid == '') { // new patient
 			$sql = "INSERT INTO cmod.dbo.CM_TM_PATIENTS (PATNUMBER, FIRSTNAME, LASTNAME, BIRTHDATE, SEX, PHONE ) VALUES ('$rm', '$firstname', '$lastname', '$dob', '$sex', '$phone' )"; 
 			$db->query($sql); $patid = $db->insertID();
 		} else { // existing patient
-			if($rpatid == $patid && $rfirstname==$firstname && $rlastname == $lastname ) { // if patient is the same
+			if( $rfirstname==$firstname && $rlastname == $lastname ) { // if patient is the same
 				if($recv == 0) {
 					$sql = "UPDATE cmod.dbo.CM_TM_PATIENTS SET FIRSTNAME='$firstname', LASTNAME='$lastname', BIRTHDATE='$dob', SEX='$sex', PHONE='$phone' where PATID='$patid'"; 
 					$db->query($sql);
@@ -156,8 +158,8 @@ class API_TM extends ResourceController {
 				$sql = "INSERT INTO cmod.dbo.CM_TM_REQUESTS (REFFID, REQNUMBER, REQDATE, AGENT, DOC, LOC, PATID, COMPANY, LOGDATE, BW, BH, VISITDESC, VISITTYPE, REQSTATUS) 
 					VALUES ('$reffid', '$visitnum', '$visitdt', '$agentname', '$doc', '$loc', '$patid', '$company', '$createdt', '$bw', '$bh', '$visitdesc', '$visittype', '$reqstatus' )"; 
 				$db->query($sql);
+				$reqid = $db->insertID();
 			} else { // existing request
-				
 				if($recv == 0) {
 					$sql = "UPDATE cmod.dbo.CM_TM_REQUESTS SET REQNUMBER='$visitnum', REQDATE='$visitdt', AGENT='$agentname', DOC='$doc', LOC='$loc', PATID='$patid', 
 						COMPANY='$company',LOGDATE='$createdt', BW='$bw', BH='$bh', VISITDESC='$visitdesc', VISITTYPE='$visittype', REQSTATUS='$reqstatus'
@@ -169,6 +171,30 @@ class API_TM extends ResourceController {
 			}
 		} 
 		
+		/*
+		if($patid == '') { // new patient
+			$sql = "INSERT INTO cmod.dbo.CM_TM_PATIENTS (PATNUMBER, FIRSTNAME, LASTNAME, BIRTHDATE, SEX, PHONE ) VALUES ('$rm', '$firstname', '$lastname', '$dob', '$sex', '$phone' )"; 
+			$db->query($sql); $patid = $db->insertID();
+		} else { // existing patient
+			$sql = "UPDATE cmod.dbo.CM_TM_PATIENTS SET FIRSTNAME='$firstname', LASTNAME='$lastname', BIRTHDATE='$dob', SEX='$sex', PHONE='$phone' where PATID='$patid'"; 
+			$db->query($sql);
+		}
+		
+		if($reqstatus != 1) { // reqstatus = order
+			if( $reqid == '' ) { // new request
+				$sql = "INSERT INTO cmod.dbo.CM_TM_REQUESTS (REFFID, REQNUMBER, REQDATE, AGENT, DOC, LOC, PATID, COMPANY, LOGDATE, BW, BH, VISITDESC, VISITTYPE, REQSTATUS) 
+					VALUES ('$reffid', '$visitnum', '$visitdt', '$agentname', '$doc', '$loc', '$patid', '$company', '$createdt', '$bw', '$bh', '$visitdesc', '$visittype', '$reqstatus' )"; 
+				$db->query($sql); 
+				$reqid = $db->insertID();
+			} else { // existing request
+				$sql = "UPDATE cmod.dbo.CM_TM_REQUESTS SET REQNUMBER='$visitnum', REQDATE='$visitdt', AGENT='$agentname', DOC='$doc', LOC='$loc', PATID='$patid', 
+					COMPANY='$company',LOGDATE='$createdt', BW='$bw', BH='$bh', VISITDESC='$visitdesc', VISITTYPE='$visittype', REQSTATUS='$reqstatus'
+					where REQID='$reqid'"; 
+				$db->query($sql);
+			}
+		} 
+		*/
+		
 		// tests
 		$tests = json_decode(json_encode($qpat['tests']), true);;
 		$string = '';
@@ -185,7 +211,7 @@ class API_TM extends ResourceController {
 			SELECT S.REFFTESTID, S.REQID, S.HISCODE, S.TESTSTATUS FROM ( VALUES $string ) AS S (REFFTESTID, REQID, HISCODE, TESTSTATUS)
 			WHERE NOT EXISTS ( SELECT 1 FROM cmod.dbo.CM_TM_TESTS T WHERE T.REQID = S.REQID AND T.HISCODE = S.HISCODE );";
 		$db->query($sql);
-
+		
 		$sql = "UPDATE cmod.dbo.CM_TM_TESTS SET TESTSTATUS = S.TESTSTATUS
 			FROM cmod.dbo.CM_TM_TESTS T
 			INNER JOIN ( VALUES $string ) AS S (REFFTESTID, REQID, HISCODE, TESTSTATUS)