diff --git a/app/Controllers/Ipd_discharge.php b/app/Controllers/Ipd_discharge.php index ab6714c..92eafce 100644 --- a/app/Controllers/Ipd_discharge.php +++ b/app/Controllers/Ipd_discharge.php @@ -578,7 +578,11 @@ class Ipd_discharge extends BaseController $surgery = $section(['Surgery :', '>Surgery :', 'Surgery :']); $procedure = $section(['Procedure :', '>Procedure :', 'Procedure :']); $personalHistory = $section(['Personal History']); - $presentingComplaints = $section(['Presenting Complaints and Reason for Admission']); + $presentingComplaints = $section([ + 'Presenting Complaints and Reason for Admission', + 'Presenting Complaints with Duration and Reason for Admission', + 'Complaints with Duration and Reason for Admission', + ]); $painMeasurement = $section(['Pain Measurement Scale']); $generalExam = $section(['General Examination on Admission']); $clinicalInvestigations = $section(['Clinical Investigation Reports']); @@ -662,6 +666,20 @@ class Ipd_discharge extends BaseController $procedure = $this->buildNamedDateSection('Procedure', $procedureRows, 'procedure_name', 'procedure_date', 'Date of Procedure'); } + $presentingComplaintsText = trim(strip_tags((string) $presentingComplaints)); + if ($presentingComplaintsText === '') { + $complaints = $this->byIpdRows('ipd_discharge_complaint', ['comp_report', 'comp_remark'], 'id ASC', $ipdId); + $complaintRemark = $this->firstRowByIpd('ipd_discharge_complaint_remark', $ipdId); + $complaintRemarkText = $this->sanitizeComplaintNarrativeRemark( + $this->normalizeRichText((string) ($complaintRemark['comp_remark'] ?? '')) + ); + $presentingComplaints = $this->buildNarrativeSection( + 'Presenting Complaints and Reason for Admission', + $complaints, + $complaintRemarkText + ); + } + $vars = [ 'DISCHARGE_STATUS' => $dischargeStatusHeading, // Main discharge summary from HTML editor (instruction_remark field)