d_s_bisht/devsofttech_hms_ci4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: respect configured discharge template content

Browse Source
This commit is contained in:
DevSoftTech Server 2026-08-10 14:58:50 +05:30
parent 4ca463cc1e
commit 670f6d3f1f
1 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/Controllers/Ipd_discharge.php
View File

@ -1104,9 +1104,6 @@ class Ipd_discharge extends BaseController
$tokenVars['INSTRUCTION_REMARK'] = ''; $tokenVars['INSTRUCTION_REMARK'] = '';
} }
if (! $this->templateHasKnownDischargeTokens($templateHtml, $tokenVars)) {
$templateHtml .= "\n{{CONTENT}}";
}
$patientName = html_entity_decode((string) ($tokenVars['PATIENT_NAME'] ?? ''), ENT_QUOTES, 'UTF-8'); $patientName = html_entity_decode((string) ($tokenVars['PATIENT_NAME'] ?? ''), ENT_QUOTES, 'UTF-8');
$patientCode = html_entity_decode((string) ($tokenVars['UHID'] ?? ''), ENT_QUOTES, 'UTF-8'); $patientCode = html_entity_decode((string) ($tokenVars['UHID'] ?? ''), ENT_QUOTES, 'UTF-8');
$ipdCode = html_entity_decode((string) ($tokenVars['IPD_CODE'] ?? ''), ENT_QUOTES, 'UTF-8'); $ipdCode = html_entity_decode((string) ($tokenVars['IPD_CODE'] ?? ''), ENT_QUOTES, 'UTF-8');
@ -1181,42 +1178,6 @@ class Ipd_discharge extends BaseController
return $renderedHtml; return $renderedHtml;
} }
private function templateHasKnownDischargeTokens(string $templateHtml, array $tokenVars): bool
{
if (trim($templateHtml) === '') {
return false;
}
$matches = [];
$matchCount = preg_match_all('/\{\{\s*([A-Za-z0-9_]+)\s*\}\}|\{\s*([A-Za-z0-9_]+)\s*\}/', $templateHtml, $matches, PREG_SET_ORDER);
if ($matchCount === false || $matchCount === 0) {
return false;
}
foreach ($matches as $match) {
$tokenName = (string) (($match[1] ?? '') !== '' ? $match[1] : ($match[2] ?? ''));
if ($tokenName === '') {
continue;
}
$lower = strtolower($tokenName);
$candidates = [
$tokenName,
strtoupper($tokenName),
$lower,
ucfirst($lower),
];
foreach ($candidates as $candidate) {
if (array_key_exists($candidate, $tokenVars)) {
return true;
}
}
}
return false;
}
private function shouldUseContentOnlyTemplate(string $content, string $templateHtml): bool private function shouldUseContentOnlyTemplate(string $content, string $templateHtml): bool
{ {
$content = trim($content); $content = trim($content);