HANUMANIT
/
surat
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

master
mrkcp 2025-04-23 11:35:05 +07:00
parent 0e648c4f9b
commit ccb79aa807
3 changed files with 201 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
frontend/modules/report/views/case/_preview_frozen.php
View File

@ -43,7 +43,7 @@ die();*/
</table>
<!-- DIAGNOSIS -->
<?php if (!empty($diagnosis->diagnosis)) { ?>
<?php /* if (!empty($diagnosis->diagnosis)) { ?>
<h3 style="margin-left: 0px; font-size: 16pt;">
<strong style="color: #2d6bb6">
<?php
@ -58,10 +58,50 @@ die();*/
</strong>
</h3>
<div style="font-size: 14pt !important;"><?= $diagnosis->diagnosis ?></div><br />
<?php } */ ?>
<!-- DIAGNOSIS -->
<?php if (!empty($diagnosis->diagnosis) && ($diagnosis->report_type != 'addendum')) { ?>
<h3 style="margin-left: 0px; font-size: 16pt;">
<strong style="color: #2d6bb6">
<?php
if ($diagnosis->report_type === 'corrected') {
echo 'REPORT';
} else {
echo 'DIAGNOSIS:';
}
?>
</strong>
</h3>
<div style="font-size: 14pt !important;"><?= $diagnosis->diagnosis ?></div><br />
<?php } else { ?>
<h3 style="margin-left: 0px; font-size: 16pt;">
<strong>
<?php
if ($diagnosis->report_type === 'addendum') {
$final = FrozenDiagnosis::findOne(['id_case' => $model->id_case, 'report_type' => 'final']);
$addendum = FrozenDiagnosis::findOne(['id_case' => $model->id_case, 'report_type' => 'addendum']);
if ($final) {
echo '<div style="color: #2d6bb6";>FINAL DIAGNOSIS</div>';
echo '<div style="font-size: 14pt !important;">' . $final->diagnosis . '</div><br>';
}
if ($addendum) {
echo '<div style="color: #2d6bb6";>ADDENDUM DIAGNOSIS</div>';
echo '<div style="font-size: 14pt !important;">' . $addendum->diagnosis . '</div><br>';
}
}
?>
</strong>
</h3>
<?php } ?>
<!-- DIAGNOSIS -->
<!-- DIAGNOSIS -->
<?php // ($model->is_critical_diagnosis ? '<div style="color: red; font-size: 14pt; text-align: right;">(แจ้งแพทย์ด่วน)</div>' : '')
?>

63
frontend/modules/report/views/case/_preview_non_gyn.php
View File

@ -63,7 +63,8 @@ $final_report = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'rep
<?php if ((!empty($model->volume) || !empty($model->color) || $model->is_out_of_specimen == 1) && $diagnosis->report_type != 'addendum') { ?>
<span style="color: #2d6bb6; font-size: 14pt; font-weight: bold;">Appearance:</span>
<span style="font-size: 12pt; margin-right: 20px;">
<?php // isset($model->volume) && isset($model->color) ? $model->volume . ' ml, ' . $model->color : '' ?>
<?php // isset($model->volume) && isset($model->color) ? $model->volume . ' ml, ' . $model->color : ''
?>
<?= isset($model->volume) && !empty($model->volume) ? $model->volume . ' ml' : '' ?><?= !empty($model->color) ? ', ' . $model->color : '' ?><?= $model->is_out_of_specimen == 1 ? ', Out of NS' : '' ?>
</span>
<?php } ?>
@ -115,13 +116,53 @@ $final_report = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'rep
</div>
<?php if (!empty($diagnosis->specimen_adequacy1_other) || !empty($diagnosis->specimenAdequacy1) && $diagnosis->report_type != 'addendum') { ?>
<span style="color: #2d6bb6; font-size: 14pt; font-weight: bold;">Adequacy of specimen: </span>
<span style="font-size: 12pt; margin-right: 20px;">
<span style="color: #2d6bb6; font-size: 14pt; font-weight: bold;">Adequacy of specimen: </span>
<span style="font-size: 12pt; margin-right: 20px;">
<?= isset($diagnosis->specimen_adequacy1_other) && !empty($diagnosis->specimen_adequacy1_other) ? $diagnosis->specimen_adequacy1_other : (isset($diagnosis->specimenAdequacy1) ? $diagnosis->specimenAdequacy1->name : '') ?>
</span><br /><br />
</span><br /><br />
<?php } ?>
<?php if (isset($diagnosis->diagnosis) ? $diagnosis->diagnosis : '') { ?>
<!-- DIAGNOSIS -->
<?php if (!empty($diagnosis->diagnosis) && ($diagnosis->report_type != 'addendum')) { ?>
<h3 style="margin-left: 0px; font-size: 16pt;">
<strong style="color: #2d6bb6">
<?php
if ($diagnosis->report_type === 'corrected') {
echo 'REPORT';
} else {
echo 'DIAGNOSIS:';
}
?>
</strong>
</h3>
<div style="font-size: 14pt !important;"><?= $diagnosis->diagnosis ?></div><br />
<?php } else { ?>
<h3 style="margin-left: 0px; font-size: 16pt;">
<strong>
<?php
if ($diagnosis->report_type === 'addendum') {
$final = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'report_type' => 'final']);
$addendum = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'report_type' => 'addendum']);
if ($final) {
echo '<div style="color: #2d6bb6";>FINAL DIAGNOSIS</div>';
echo '<div style="font-size: 14pt !important;">' . $final->diagnosis . '</div><br>';
}
if ($addendum) {
echo '<div style="color: #2d6bb6";>ADDENDUM DIAGNOSIS</div>';
echo '<div style="font-size: 14pt !important;">' . $addendum->diagnosis . '</div><br>';
}
}
?>
</strong>
</h3>
<?php } ?>
<!-- DIAGNOSIS -->
<?php /* if (isset($diagnosis->diagnosis) ? $diagnosis->diagnosis : '') { ?>
<h3 style="margin-left: 0px; font-size: 16pt;">
<strong style="color: #2d6bb6"><?php // strtoupper($diagnosis->report_type)
?>
@ -132,12 +173,12 @@ $final_report = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'rep
</h3>
<div style="font-size: 14pt !important;"><?= $diagnosis->diagnosis ?></div><br />
<?php } ?>
<?php } */ ?>
<?php if (!empty($diagnosis->gross_description) /*&& $diagnosis->report_type != 'addendum'*/) { ?>
<h3 style="margin-left: 0px; font-size: 16pt;"><strong style="color: #2d6bb6">Cytologic findings:</strong></h3>
<div style="font-size: 14pt !important;"><?= $diagnosis->gross_description ?></div><br />
<h3 style="margin-left: 0px; font-size: 16pt;"><strong style="color: #2d6bb6">Cytologic findings:</strong></h3>
<div style="font-size: 14pt !important;"><?= $diagnosis->gross_description ?></div><br />
<?php } ?>
<div>
@ -191,12 +232,12 @@ $final_report = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'rep
<?php if ($diagnosis->diagnosis_type == 1) {
$approve = CenterApprove::find()->where(['id_case' => $diagnosis->id_case, 'report_type' => $diagnosis->report_type, 'ref_id' => $diagnosis->id])->one();
?>
<strong><i>This case was passed QC
<strong><i>This case was passed QC
on
<?= isset($approve) && !empty($approve->approve_at) && $approve->approve_status == 4 ? $approve->approve_at : '' ?></i></strong>
<br />
<br />
<?php } else { ?>
<br />
<br />
<?php } ?>
<div style="text-align: center; font-size: 14pt">End of report <?= $model->id_case ?></div>

31
frontend/modules/report/views/case/_preview_surgical.php
View File

@ -43,14 +43,13 @@ die();*/
</table>
<!-- DIAGNOSIS -->
<?php if (!empty($surgical_diagnosis->diagnosis)) { ?>
<!-- DIAGNOSIS -->
<?php if (!empty($surgical_diagnosis->diagnosis) && ($surgical_diagnosis->report_type != 'addendum')) { ?>
<h3 style="margin-left: 0px; font-size: 16pt;">
<strong style="color: #2d6bb6">
<?php
if ($surgical_diagnosis->report_type === 'corrected') {
echo 'REPORT';
} elseif ($surgical_diagnosis->report_type === 'addendum') {
echo 'DIAGNOSIS:';
} else {
echo 'DIAGNOSIS:';
}
@ -58,10 +57,34 @@ die();*/
</strong>
</h3>
<div style="font-size: 14pt !important;"><?= $surgical_diagnosis->diagnosis ?></div><br />
<?php } else { ?>
<h3 style="margin-left: 0px; font-size: 16pt;">
<strong>
<?php
if ($surgical_diagnosis->report_type === 'addendum') {
$final = SurgicalDiagnosis::findOne(['id_case' => $model->id_case, 'report_type' => 'final']);
$addendum = SurgicalDiagnosis::findOne(['id_case' => $model->id_case, 'report_type' => 'addendum']);
if ($final) {
echo '<div style="color: #2d6bb6";>FINAL DIAGNOSIS</div>';
echo '<div style="font-size: 14pt !important;">' . $final->diagnosis . '</div><br>';
}
if ($addendum) {
echo '<div style="color: #2d6bb6";>ADDENDUM DIAGNOSIS</div>';
echo '<div style="font-size: 14pt !important;">' . $addendum->diagnosis . '</div><br>';
}
}
?>
</strong>
</h3>
<?php } ?>
<!-- DIAGNOSIS -->
<!-- DIAGNOSIS -->
<?php // ($model->is_critical_diagnosis ? '<div style="color: red; font-size: 14pt; text-align: right;">(แจ้งแพทย์ด่วน)</div>' : '')
?>
@ -112,7 +135,7 @@ die();*/
<br />
<?php } */ ?>
<?php if (!empty($surgical_diagnosis->gross_description) /* && $surgical_diagnosis->report_type != 'addendum') */){ ?>
<?php if (!empty($surgical_diagnosis->gross_description) /* && $surgical_diagnosis->report_type != 'addendum') */) { ?>
<h3 style="margin-left: 0px; font-size: 16pt;"><strong style="color: #2d6bb6">GROSS DESCRIPTION:</strong>
</h3>