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

fix(opd): fix undefined patLastName and make FHIR and audit logging fail-safe in opd_prescription_save

Browse Source
This commit is contained in:
DevSoftTech Server 2026-09-22 23:40:05 +05:30
parent 659106c66a
commit 126a62b8d0
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Controllers/Opd_prescription.php
View File

@ -693,10 +693,19 @@ class Opd_prescription extends BaseController
$afterRow = $this->db->table('opd_prescription')->where('id', $recordId)->where('opd_id', $opdId)->get(1)->getRowArray() ?? [];
if (!empty($afterRow)) {
$this->clinicalAuditTrail->logChangedFields('opd_prescription', $recordId, $beforeRow, $afterRow, $this->getCurrentUserId());
try {
$this->clinicalAuditTrail->logChangedFields('opd_prescription', $recordId, $beforeRow, $afterRow, $this->getCurrentUserId());
} catch (\Throwable $auditEx) {
log_message('error', 'Audit trail logging failed on opd_prescription: ' . $auditEx->getMessage());
}
}
$fhirStored = $this->storePrescriptionFhirBundle((int) $opdId, (int) $recordId, $patientRow, (array) $opdRow);
$fhirStored = false;
try {
$fhirStored = $this->storePrescriptionFhirBundle((int) $opdId, (int) $recordId, $patientRow, (array) $opdRow);
} catch (\Throwable $fhirEx) {
log_message('error', 'FHIR bundle store failed during opd save: ' . $fhirEx->getMessage() . ' in ' . $fhirEx->getFile() . ':' . $fhirEx->getLine());
}
$this->syncPatientAddictionFlags((int) ($opdRow->p_id ?? 0), [
'is_smoking' => (int) $this->request->getPost('is_smoking'),
@ -746,11 +755,11 @@ class Opd_prescription extends BaseController
'csrfHash' => csrf_hash(),
]);
} catch (\Throwable $e) {
log_message('error', 'opd_prescription_save failed: {message}', ['message' => $e->getMessage()]);
log_message('error', 'opd_prescription_save failed: ' . $e->getMessage() . ' in ' . $e->getFile() . ':' . $e->getLine());
return $this->response->setJSON([
'update' => 0,
'error_text' => 'Unable to save prescription right now. Please retry.',
'error_text' => 'Unable to save prescription right now. ' . $e->getMessage(),
'csrfName' => csrf_token(),
'csrfHash' => csrf_hash(),
]);
@ -4879,7 +4888,8 @@ class Opd_prescription extends BaseController
$abhaAddress = $abhaField !== null ? trim((string) ($patientRow[$abhaField] ?? '')) : '';
$patFirstName = $this->sanitizePersonNamePart((string) ($patientRow['p_fname'] ?? ''));
$patFullName = $patFirstName;
$patLastName = $this->sanitizePersonNamePart((string) ($patientRow['p_lname'] ?? ''));
$patFullName = trim($patFirstName . ($patLastName !== '' ? ' ' . $patLastName : ''));
if ($patFullName === '') {
$patFullName = trim((string) ($opdRow['P_name'] ?? ''));
}
@ -11694,7 +11704,8 @@ class Opd_prescription extends BaseController
$abhaAddress = $abhaField !== null ? trim((string) ($patientRow[$abhaField] ?? '')) : '';
$patFirstName = $this->sanitizePersonNamePart((string) ($patientRow['p_fname'] ?? ''));
$patFullName = $patFirstName;
$patLastName = $this->sanitizePersonNamePart((string) ($patientRow['p_lname'] ?? ''));
$patFullName = trim($patFirstName . ($patLastName !== '' ? ' ' . $patLastName : ''));
if ($patFullName === '') {
$patFullName = trim((string) ($opdRow['P_name'] ?? ''));
}

25
app/Libraries/ClinicalAuditTrail.php
View File

@ -40,16 +40,21 @@ class ClinicalAuditTrail
$module . '|' . $recordIdText . '|' . $fieldName . '|' . $oldValueJson . '|' . $newValueJson . '|' . $userIdText . '|' . $actionAt
);
return (bool) $this->auditModel->insert([
'module' => $module,
'record_id' => $recordIdText,
'field_name' => $fieldName,
'old_value' => $oldValueJson,
'new_value' => $newValueJson,
'user_id' => $userIdText,
'action_at' => $actionAt,
'hash' => $hash,
]);
try {
return (bool) $this->auditModel->insert([
'module' => $module,
'record_id' => $recordIdText,
'field_name' => $fieldName,
'old_value' => $oldValueJson,
'new_value' => $newValueJson,
'user_id' => $userIdText,
'action_at' => $actionAt,
'hash' => $hash,
]);
} catch (\Throwable $e) {
log_message('error', 'Clinical audit insert failed: ' . $e->getMessage());
return false;
}
}
/**