update NOTE pada Hasil Test -zaka edisi salah commit
This commit is contained in:
parent
d8cc5730b4
commit
ae44159ccd
@ -442,13 +442,18 @@ P1
|
|||||||
}
|
}
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
|
if ($item['RESTYPE'] == "CE"){
|
||||||
|
$resvalue = $item['RESULT'];
|
||||||
|
} else {
|
||||||
|
$resvalue = $item['RESVALUE'];
|
||||||
|
}
|
||||||
$resultTest .= "
|
$resultTest .= "
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan='1' class=''>
|
<td colspan='1' class=''>
|
||||||
<pre> ".$item["test_eng"]."</pre>
|
<pre> ".$item["test_eng"]."</pre>
|
||||||
<pre> <small>".$item["test_ind"]."</small></pre>
|
<pre> <small>".$item["test_ind"]."</small></pre>
|
||||||
</td>
|
</td>
|
||||||
<td class=''>" . $item["RESVALUE"] . "</td>
|
<td class=''>" . $resvalue . "</td>
|
||||||
<td class=''>" . $item["UNIT"] . "</td>
|
<td class=''>" . $item["UNIT"] . "</td>
|
||||||
<td class=''>" . $item["REFRANGE"] . "</td>
|
<td class=''>" . $item["REFRANGE"] . "</td>
|
||||||
<td class=''>" . " " . "</td>
|
<td class=''>" . " " . "</td>
|
||||||
@ -478,15 +483,36 @@ P1
|
|||||||
|
|
||||||
public function printResultTest($access) {
|
public function printResultTest($access) {
|
||||||
$db = \Config\Database::connect();
|
$db = \Config\Database::connect();
|
||||||
$sql = "select dc.CHAPID, dc.FULLTEXT as chap_eng,dc.FULLTEXT as chap_ind, cr.*, cdt.TEXT1 as test_eng, cdt.TEXT2 as test_ind
|
$sql = "SELECT
|
||||||
from cmod.dbo.CM_RESULTS cr
|
dc.CHAPID,
|
||||||
left join REQUESTS r on r.ACCESSNUMBER=cr.ACCESSNUMBER
|
dc.FULLTEXT AS chap_eng,
|
||||||
left join cmod.dbo.CM_DICT_TESTS cdt on cr.TESTCODE=cdt.TESTCODE
|
dc.FULLTEXT AS chap_ind,
|
||||||
left join DICT_TESTS dt on dt.TESTCODE=cr.TESTCODE and dt.ENDVALIDDATE is null
|
cr.*,
|
||||||
left join TESTS t on t.REQUESTID = r.REQUESTID and t.TESTID=dt.TESTID
|
cdt.TEXT1 AS test_eng,
|
||||||
left join DICT_CHAPTERS dc on dc.CHAPID=dt.CHAPID and dc.ENDVALIDDATE is null
|
cdt.TEXT2 AS test_ind
|
||||||
left join cmod.dbo.CM_DICT_CHAPTERS cdc on cdc.CHAPCODE=dc.CHAPCODE
|
FROM
|
||||||
where cr.ACCESSNUMBER='$access' order by t.TESTORDER";
|
cmod.dbo.CM_RESULTS cr
|
||||||
|
LEFT JOIN REQUESTS r
|
||||||
|
ON r.ACCESSNUMBER = cr.ACCESSNUMBER
|
||||||
|
LEFT JOIN cmod.dbo.CM_DICT_TESTS cdt
|
||||||
|
ON cr.TESTCODE = cdt.TESTCODE
|
||||||
|
LEFT JOIN DICT_TESTS dt
|
||||||
|
ON dt.TESTCODE = cr.TESTCODE AND dt.ENDVALIDDATE IS NULL
|
||||||
|
LEFT JOIN TESTS t
|
||||||
|
ON t.REQUESTID = r.REQUESTID AND t.TESTID = dt.TESTID
|
||||||
|
LEFT JOIN DICT_CHAPTERS dc
|
||||||
|
ON dc.CHAPID = dt.CHAPID AND dc.ENDVALIDDATE IS NULL
|
||||||
|
LEFT JOIN cmod.dbo.CM_DICT_CHAPTERS cdc
|
||||||
|
ON cdc.CHAPCODE = dc.CHAPCODE
|
||||||
|
WHERE
|
||||||
|
cr.ACCESSNUMBER = '$access'
|
||||||
|
ORDER BY
|
||||||
|
CASE
|
||||||
|
WHEN cr.TESTCODE = 'NOTE' THEN 1
|
||||||
|
ELSE 0
|
||||||
|
END,
|
||||||
|
t.TESTORDER;
|
||||||
|
";
|
||||||
|
|
||||||
$query = $db->query($sql);
|
$query = $db->query($sql);
|
||||||
$results = $query->getResultArray();
|
$results = $query->getResultArray();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user