Fix qr_printout test id matching
This commit is contained in:
@@ -4941,7 +4941,7 @@ class Resultentry extends MY_Controller
|
||||
}
|
||||
}
|
||||
|
||||
if ($prm['action'] === 'val1') {
|
||||
if ((isset($prm['action']) && $prm['action'] === 'val1') || (isset($prm['act']) && $prm['act'] === 'val1')) {
|
||||
$sql = "UPDATE so_resultentry SET
|
||||
So_ResultEntryValidation1 = 'Y',
|
||||
So_ResultEntryStatus = 'VAL1',
|
||||
@@ -5325,10 +5325,10 @@ class Resultentry extends MY_Controller
|
||||
T_OrderHeaderGroupResultGroup_ResultName,
|
||||
T_TestName
|
||||
FROM t_orderheader_group_result
|
||||
JOIN t_test
|
||||
LEFT JOIN t_test
|
||||
ON T_OrderHeaderGroupResultT_TestID = T_TestID
|
||||
AND T_TestIsActive = 'Y'
|
||||
WHERE T_OrderHeaderGroupResultT_TestID = ?
|
||||
WHERE (T_OrderHeaderGroupResultT_TestID = ? OR T_OrderHeaderGroupResultT_TestID = 0)
|
||||
AND T_OrderHeaderGroupResultT_OrderHeaderID = ?
|
||||
AND T_OrderHeaderGroupResultIsActive = 'Y'";
|
||||
$qry_get = $this->db_onedev->query($sql_get, array($trx['test_id'], $trx['orderid']));
|
||||
@@ -5394,6 +5394,8 @@ class Resultentry extends MY_Controller
|
||||
$printCode = $map[$report_key];
|
||||
|
||||
foreach ($data as $value) {
|
||||
$target_test_id = intval($trx['test_id']) > 0 ? intval($trx['test_id']) : intval($value['T_OrderHeaderGroupResultT_TestID']);
|
||||
|
||||
$sql_pt = "SELECT Print_TransactionUrlWatermark
|
||||
FROM print_transaction
|
||||
WHERE Print_TransactionCode = ?
|
||||
@@ -5432,7 +5434,7 @@ class Resultentry extends MY_Controller
|
||||
$qry_check = $this->db_onedev->query($sql_check, array(
|
||||
$trx['orderid'],
|
||||
$value['T_OrderHeaderGroupResultGroup_ResultID'],
|
||||
$value['T_OrderHeaderGroupResultT_TestID']
|
||||
$target_test_id
|
||||
));
|
||||
if (!$qry_check) {
|
||||
$this->sys_error_db("error qr_printout", $this->db_onedev);
|
||||
@@ -5444,7 +5446,7 @@ class Resultentry extends MY_Controller
|
||||
$params = array(
|
||||
'orderHeaderID' => $trx['orderid'],
|
||||
'groupResultID' => $value['T_OrderHeaderGroupResultGroup_ResultID'],
|
||||
'testID' => $value['T_OrderHeaderGroupResultT_TestID'],
|
||||
'testID' => $target_test_id,
|
||||
'groupResultName' => $value['T_OrderHeaderGroupResultGroup_ResultName'],
|
||||
'verifyBaseURL' => $verify_url,
|
||||
'QR_PrintOutReportURL' => $full_url,
|
||||
|
||||
Reference in New Issue
Block a user