diff --git a/frontend/modules/register/views/center/pap.php b/frontend/modules/register/views/center/pap.php index eafa0c38..3634a101 100755 --- a/frontend/modules/register/views/center/pap.php +++ b/frontend/modules/register/views/center/pap.php @@ -90,7 +90,6 @@ $this->params['breadcrumbs'][] = $this->title; -
title ?>
@@ -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 : ''; } ], [ diff --git a/frontend/modules/report/views/case/_preview_non_gyn.php b/frontend/modules/report/views/case/_preview_non_gyn.php index 3abdcc80..2951ecf0 100755 --- a/frontend/modules/report/views/case/_preview_non_gyn.php +++ b/frontend/modules/report/views/case/_preview_non_gyn.php @@ -51,10 +51,10 @@ $final_report = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'rep - sourceSpecimen) || isset($diagnosis->specimen) && $diagnosis->report_type != 'addendum') { ?> + non_gyn_specimen_other) || !empty($model->specimen)) && $diagnosis->report_type != 'addendum') { ?> Site: - non_gyn_specimen_other) && !empty($diagnosis->non_gyn_specimen_other) ? $diagnosis->non_gyn_specimen_other : (isset($diagnosis->specimen) ? $diagnosis->specimen->name : '') ?> + non_gyn_specimen_other) && !empty($model->non_gyn_specimen_other) ? $model->non_gyn_specimen_other : (isset($model->specimen) ? $model->specimen->name : '') ?>