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

Refine IPD discharge summary layout

Browse Source
This commit is contained in:
DevSoftTech Server 2026-06-11 11:53:39 +05:30
parent 191c25de68
commit 0c2e1385cb
2 changed files with 3470 additions and 3475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/Controllers/Ipd_discharge.php
View File

@ -1977,6 +1977,30 @@ class Ipd_discharge extends BaseController
return '<p><b>' . esc($title) . '</b> :<br /> ' . implode('<br /> ', $lines) . '</p>'; return '<p><b>' . esc($title) . '</b> :<br /> ' . implode('<br /> ', $lines) . '</p>';
} }
private function sanitizeComplaintNarrativeRemark(string $remark): string
{
$remark = trim($remark);
if ($remark === '') {
return '';
}
$patterns = [
'/^\s*Drug\s*Allergy\s*Status\s*:\s*.+$/im',
'/^\s*Drug\s*Allergy\s*Details\s*:\s*.+$/im',
'/^\s*ADR\s*History\s*:\s*.+$/im',
'/^\s*Current\s*Medications\s*:\s*.+$/im',
'/^\s*Co-Morbidities\s*:\s*.+$/im',
];
foreach ($patterns as $pattern) {
$remark = (string) preg_replace($pattern, '', $remark);
}
$remark = (string) preg_replace('/(?:\r\n?|\n){3,}/', "\n\n", $remark);
return trim($remark);
}
private function buildInlineExamSummary(array $rows): string private function buildInlineExamSummary(array $rows): string
{ {
$parts = []; $parts = [];
@ -2077,7 +2101,9 @@ class Ipd_discharge extends BaseController
$complaints = $this->byIpdRows('ipd_discharge_complaint', ['comp_report', 'comp_remark'], 'id ASC', $ipdId); $complaints = $this->byIpdRows('ipd_discharge_complaint', ['comp_report', 'comp_remark'], 'id ASC', $ipdId);
$complaintRemark = $this->firstRowByIpd('ipd_discharge_complaint_remark', $ipdId); $complaintRemark = $this->firstRowByIpd('ipd_discharge_complaint_remark', $ipdId);
$complaintRemarkText = $this->normalizeRichText((string) ($complaintRemark['comp_remark'] ?? '')); $complaintRemarkText = $this->sanitizeComplaintNarrativeRemark(
$this->normalizeRichText((string) ($complaintRemark['comp_remark'] ?? ''))
);
$complaintBlock = $this->buildNarrativeSection('Presenting Complaints and Reason for Admission', $complaints, $complaintRemarkText); $complaintBlock = $this->buildNarrativeSection('Presenting Complaints and Reason for Admission', $complaints, $complaintRemarkText);
if ($complaintBlock !== '') { if ($complaintBlock !== '') {
$sections[] = $complaintBlock; $sections[] = $complaintBlock;
@ -2176,6 +2202,11 @@ class Ipd_discharge extends BaseController
} }
$coMorbText = trim((string) ($opdHistory['co_morbidities'] ?? '')); $coMorbText = trim((string) ($opdHistory['co_morbidities'] ?? ''));
if ($allergySection !== '') {
$sections[] = $allergySection;
}
if ($coMorbText !== '') { if ($coMorbText !== '') {
$sections[] = '<h4 class="discharge-section-heading">Co-Morbidities</h4><div>' . esc($coMorbText) . '</div>'; $sections[] = '<h4 class="discharge-section-heading">Co-Morbidities</h4><div>' . esc($coMorbText) . '</div>';
} }
@ -2319,10 +2350,6 @@ class Ipd_discharge extends BaseController
$sections[] = $painSection; $sections[] = $painSection;
} }
if ($allergySection !== '') {
$sections[] = $allergySection;
}
$nursingTrendSection = $this->buildNursingTrendSection($ipdId); $nursingTrendSection = $this->buildNursingTrendSection($ipdId);
if ($nursingTrendSection !== '') { if ($nursingTrendSection !== '') {
$sections[] = $nursingTrendSection; $sections[] = $nursingTrendSection;

6908
app/Views/billing/ipd/discharge_create.php
View File

File diff suppressed because it is too large Load Diff