diff --git a/app/Controllers/Ipd_discharge.php b/app/Controllers/Ipd_discharge.php index 1bded86..8b3ea23 100644 --- a/app/Controllers/Ipd_discharge.php +++ b/app/Controllers/Ipd_discharge.php @@ -1176,11 +1176,6 @@ class Ipd_discharge extends BaseController 'template_css' => (string) ($selectedTemplate['template_css'] ?? ''), ]); - $templateCss = trim((string) $templateSettings['template_css']); - if ($templateCss !== '') { - $templateHtml = '' . $templateHtml; - } - $rendered = $this->applyDischargeTemplateTokens($templateHtml, $tokenVars); $rendered = $this->dedupeRepeatedClinicalSummary($rendered, (string) ($tokenVars['DISCHARGE_SUMMARY'] ?? '')); @@ -7384,9 +7379,12 @@ class Ipd_discharge extends BaseController $prefixHtml = $namedBlocks; + $templateCss = trim((string) ($templateSettings['template_css'] ?? '')); + $cssBlock = $templateCss !== '' ? '' : ''; + $pdfHtml = $this->buildDischargePdfHtml($panelData, $renderedHtml, $withHeader, $templateName); - // Prepend @page CSS to body so mPDF applies named header/footer on every page. - $pdfHtml = str_replace('', $pageBlock . '', $pdfHtml); + // Inject @page and template CSS into so they apply globally. + $pdfHtml = str_replace('', $pageBlock . $cssBlock . '', $pdfHtml); $pdfHtml = mpdf_normalize_font_weight_css($pdfHtml); $pdfBinary = $this->runMpdfWithTolerantWarnings(static function () use ($mpdf, $prefixHtml, $pdfHtml, $fileName): string { if ($prefixHtml !== '') {