diff --git a/frontend/modules/report/views/case/_preview_non_gyn.php b/frontend/modules/report/views/case/_preview_non_gyn.php
index 520f5b84..f7d3932c 100755
--- a/frontend/modules/report/views/case/_preview_non_gyn.php
+++ b/frontend/modules/report/views/case/_preview_non_gyn.php
@@ -41,6 +41,7 @@ $final_report = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'rep
 <?php } */ ?>
 
 <div class="d-flex align-items-center">
+    <?php if (!empty($model->sourceSpecimen) && $diagnosis->report_type != 'addendum') { ?>
     <span style="color: #2d6bb6; font-size: 12pt; font-weight: bold;">Source of specimen:</span>
     <span style="font-size: 10pt; margin-right: 20px;">
         <?= isset($model->sourceSpecimen) ? $model->sourceSpecimen->name : '' ?>
@@ -48,27 +49,38 @@ $final_report = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'rep
 
     &nbsp;&nbsp;
 
+    <?php } ?>
+
+    <?php if (!empty($model->sourceSpecimen) && isset($model->specimen) && $diagnosis->report_type != 'addendum') { ?>
     <span style="color: #2d6bb6; font-size: 12pt; font-weight: bold;">Site:</span>
     <span style="font-size: 10pt;">
         <?= 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;
+    <?php } ?>
 
+    <?php if (!empty($model->volume) || !empty($model->color) && $diagnosis->report_type != 'addendum') { ?>
     <span style="color: #2d6bb6; font-size: 12pt; font-weight: bold;">Appearance:</span>
     <span style="font-size: 10pt;">
-        <?= 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) ? $model->volume . ' ml, ' . $model->color : $model->color ?>
     </span>
+    <?php } ?>
 </div>
 
 <div class="d-flex align-items-center">
+
+    <?php if (!empty($model->typeSpecimen) && $diagnosis->report_type != 'addendum') { ?>
     <span style="color: #2d6bb6; font-size: 12pt; font-weight: bold;">Type of specimen received:</span>
     <span style="font-size: 10pt; margin-right: 20px;">
         <?= isset($model->typeSpecimen) ? $model->typeSpecimen->name : '' ?>
     </span>
 
     &nbsp;&nbsp;&nbsp;&nbsp;
+    <?php } ?>
 
+    <?php if ((!empty($model->spin) || !empty($model->smear) || !empty($model->cell_block)) && $diagnosis->report_type != 'addendum') { ?>
     <span style="color: #2d6bb6; font-size: 12pt; font-weight: bold;">Number of slides:</span>
     <?php
     $slideParts = [];
@@ -92,17 +104,22 @@ $final_report = CytoNonGynDiagnosis::findOne(['id_case' => $model->id_case, 'rep
     </span>
 
     &nbsp;&nbsp;
+    <?php } ?>
 
+    <?php if (!empty($model->fixation) && $diagnosis->report_type != 'addendum') { ?>
     <span style="color: #2d6bb6; font-size: 12pt; font-weight: bold;">Fixation:</span>
     <span style="font-size: 10pt; margin-right: 20px;">
         <?= isset($model->fixation) ? $model->fixation->name : '' ?>
     </span>
+    <?php } ?>
 </div>
 
+<?php if (!empty($diagnosis->specimen_adequacy1_other) || !empty($diagnosis->specimenAdequacy1) && $diagnosis->report_type != 'addendum') { ?>
 <span style="color: #2d6bb6; font-size: 12pt; font-weight: bold;">Adequacy of specimen: </span>
 <span style="font-size: 10pt;">
     <?= isset($diagnosis->specimen_adequacy1_other) && !empty($diagnosis->specimen_adequacy1_other) ? $diagnosis->specimen_adequacy1_other : (isset($diagnosis->specimenAdequacy1) ? $diagnosis->specimenAdequacy1->name : '') ?>
 </span><br /><br />
+<?php } ?>
 
 <?php if (isset($diagnosis->diagnosis) ? $diagnosis->diagnosis : '') { ?>
 <h3 style="margin-left: 0px; font-size: 16pt;">