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

Fix OPD advice label and Hindi rendering in template output

Browse Source
This commit is contained in:
DevSoftTech Server 2026-07-04 14:53:13 +05:30
parent fb460e02e8
commit 43f465e261
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/Controllers/Opd.php
View File

@ -2931,7 +2931,7 @@ class Opd extends BaseController
$rxAdvice = $rxRead($rx, ['advice', 'Advice', 'prescription_advice', 'advice_notes', 'advice_note']); $rxAdvice = $rxRead($rx, ['advice', 'Advice', 'prescription_advice', 'advice_notes', 'advice_note']);
$rxAdviceLocal = ''; $rxAdviceLocal = '';
if ($rxAdvice === '' && !empty($data['rx_advices']) && is_array($data['rx_advices'])) { if (!empty($data['rx_advices']) && is_array($data['rx_advices'])) {
$parts = []; $parts = [];
$partsLocal = []; $partsLocal = [];
foreach ($data['rx_advices'] as $adv) { foreach ($data['rx_advices'] as $adv) {
@ -2940,14 +2940,19 @@ class Opd extends BaseController
$parts[] = $txt; $parts[] = $txt;
} }
$localTxt = trim((string) ($adv['advice_hindi'] ?? ($adv['advice_txt_hindi'] ?? ''))); $localRaw = (string) ($adv['advice_hindi'] ?? ($adv['advice_txt_hindi'] ?? ''));
$localTxt = trim((string) preg_replace('/\r\n|\r|\n/', "\n", str_replace(['<br/>', '<br />', '<br>'], "\n", strip_tags($localRaw))));
if ($localTxt !== '') { if ($localTxt !== '') {
$partsLocal[] = $localTxt; $partsLocal[] = $localTxt;
} }
} }
$rxAdvice = implode(', ', $parts);
if ($rxAdvice === '' && !empty($parts)) {
$rxAdvice = implode(', ', array_values(array_unique($parts)));
}
if (!empty($partsLocal)) { if (!empty($partsLocal)) {
$rxAdviceLocal = implode(' | ', $partsLocal); $rxAdviceLocal = implode(' | ', array_values(array_unique($partsLocal)));
} }
} }
@ -4177,9 +4182,19 @@ class Opd extends BaseController
$tokens['InvestigationBlock'] = (string) ($tokens['investigation'] ?? ''); $tokens['InvestigationBlock'] = (string) ($tokens['investigation'] ?? '');
$tokens['RemarksBlock'] = (string) ($tokens['Prescriber_Remarks'] ?? ''); $tokens['RemarksBlock'] = (string) ($tokens['Prescriber_Remarks'] ?? '');
$adviceBlockBody = trim((string) ($tokens['advice'] ?? '')); $adviceBlockBody = trim((string) ($tokens['advice'] ?? ''));
$tokens['AdviceBlock'] = $adviceBlockBody !== '' $adviceBlockLocal = trim((string) ($tokens['advice_local'] ?? ''));
? '<strong>Advice</strong> : ' . $adviceBlockBody if ($adviceBlockBody !== '' || $adviceBlockLocal !== '') {
: ''; $adviceBlockLines = [];
if ($adviceBlockBody !== '') {
$adviceBlockLines[] = '<strong>Advice</strong> : ' . $adviceBlockBody;
}
if ($adviceBlockLocal !== '') {
$adviceBlockLines[] = '<strong>सलाह</strong> : ' . $adviceBlockLocal;
}
$tokens['AdviceBlock'] = implode('<br>', $adviceBlockLines);
} else {
$tokens['AdviceBlock'] = '';
}
$tokens['NextVisitBlock'] = (string) ($tokens['next_visit'] ?? ''); $tokens['NextVisitBlock'] = (string) ($tokens['next_visit'] ?? '');
$tokens['RxTable'] = $medicalHtml; $tokens['RxTable'] = $medicalHtml;
@ -4393,6 +4408,12 @@ class Opd extends BaseController
// Convert generic echo statements that match a known scalar token key. // Convert generic echo statements that match a known scalar token key.
$out = (string) preg_replace('/<\?php\s+echo\s+\$content\s*;?\s*\?>/i', '{{content}}', $out); $out = (string) preg_replace('/<\?php\s+echo\s+\$content\s*;?\s*\?>/i', '{{content}}', $out);
// Legacy templates often place {{advice}} on its own line (without label).
// Upgrade only standalone advice placeholders to {{AdviceBlock}} so
// existing templates that already print "Advice: {{advice}}" remain unchanged.
$out = (string) preg_replace('/(^|\n)\s*\{\{\s*advice\s*\}\}\s*(?=\n|$)/i', '$1{{AdviceBlock}}', $out);
$out = (string) preg_replace('/(^|\n)\s*\{\s*advice\s*\}\s*(?=\n|$)/i', '$1{{AdviceBlock}}', $out);
// Remove remaining PHP blocks that cannot be interpreted safely. // Remove remaining PHP blocks that cannot be interpreted safely.
$out = (string) preg_replace('/<\?(?:php|=)[\s\S]*?\?>/i', '', $out); $out = (string) preg_replace('/<\?(?:php|=)[\s\S]*?\?>/i', '', $out);