From d2dd84b27fccd71deb12476f6809b4746e6e25fb Mon Sep 17 00:00:00 2001 From: DevSoftTech Server Date: Thu, 8 Oct 2026 14:31:33 +0530 Subject: [PATCH] fix(ipd): define dischargeRaw and match care context reference on discharge health_records save --- app/Controllers/Ipd_discharge.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Controllers/Ipd_discharge.php b/app/Controllers/Ipd_discharge.php index f983f49..1881e08 100644 --- a/app/Controllers/Ipd_discharge.php +++ b/app/Controllers/Ipd_discharge.php @@ -9394,8 +9394,9 @@ class Ipd_discharge extends BaseController $dischargeCombined .= ' ' . $dischargeTimeRaw; } + $dischargeRaw = $dischargeCombined !== '' ? $dischargeCombined : $dischargeDateRaw; $admissionIso = $this->toIsoDateTimeOrNow($admissionCombined !== '' ? $admissionCombined : $admissionDateRaw); - $dischargeIso = $this->toIsoDateTimeOrNow($dischargeCombined !== '' ? $dischargeCombined : $dischargeDateRaw); + $dischargeIso = $this->toIsoDateTimeOrNow($dischargeRaw); $visitDate = $dischargeDateRaw !== '' ? date('Y-m-d', strtotime($dischargeDateRaw)) : ($admissionDateRaw !== '' ? date('Y-m-d', strtotime($admissionDateRaw)) : date('Y-m-d')); @@ -9816,8 +9817,13 @@ class Ipd_discharge extends BaseController if ($this->db && $this->db->tableExists('health_records')) { $existingHr = $this->db->table('health_records') - ->where('entity_type', 'ipd') - ->where('entity_id', (string) $ipdId) + ->groupStart() + ->groupStart() + ->where('entity_type', 'ipd') + ->where('entity_id', (string) $ipdId) + ->groupEnd() + ->orWhere('care_context_reference LIKE', 'DISCHARGE-' . $ipdId . '%') + ->groupEnd() ->whereIn('hi_type', ['DischargeSummaryRecord', 'DischargeSummary']) ->orderBy('id', 'DESC') ->get(1)