fix report non gyn

master
Star Indy 2025-04-11 13:54:07 +07:00
parent ed08434ea8
commit f7e3561597
2 changed files with 3 additions and 4 deletions

View File

@ -90,7 +90,6 @@ $this->params['breadcrumbs'][] = $this->title;
</div>
</div>
<div class="card">
<div class="card-header">
<h5 class="card-title"><i class="ri-file-text-line"></i> <?= $this->title ?></h5>
@ -238,7 +237,7 @@ $this->params['breadcrumbs'][] = $this->title;
'headerOptions' => ['style' => 'text-align:center; width: 200;'],
'format' => 'raw',
'value' => function ($model) {
return isset($model->cytotech) ? $model->cytotech->realname : '';
return isset($model->cytotech1) ? $model->cytotech1->realname : '';
}
],
[

View File

@ -51,10 +51,10 @@ $final_report = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'rep
<?php } ?>
<?php if (!empty($diagnosis->sourceSpecimen) || isset($diagnosis->specimen) && $diagnosis->report_type != 'addendum') { ?>
<?php if ((!empty($model->non_gyn_specimen_other) || !empty($model->specimen)) && $diagnosis->report_type != 'addendum') { ?>
<span style="color: #2d6bb6; font-size: 14pt; font-weight: bold;">Site:</span>
<span style="font-size: 12pt;">
<?= isset($diagnosis->non_gyn_specimen_other) && !empty($diagnosis->non_gyn_specimen_other) ? $diagnosis->non_gyn_specimen_other : (isset($diagnosis->specimen) ? $diagnosis->specimen->name : '') ?>
<?= isset($model->non_gyn_specimen_other) && !empty($model->non_gyn_specimen_other) ? $model->non_gyn_specimen_other : (isset($model->specimen) ? $model->specimen->name : '') ?>
</span>
&nbsp;&nbsp;