diff --git a/application/controllers/tools/Inform_consent.php b/application/controllers/tools/Inform_consent.php index d1a29198..c28fcacb 100644 --- a/application/controllers/tools/Inform_consent.php +++ b/application/controllers/tools/Inform_consent.php @@ -112,7 +112,7 @@ class Inform_consent extends MY_Controller )->row_array(); $printName = trim($cacheRow['ppc_name'] ?? ''); $row['patient_name'] = trim( - ($title ? $title . '. ' : '') . + ($title ? $title . ' ' : '') . trim($row['M_PatientPrefix'] ?? '') . ' ' . trim($printName !== '' ? $printName : ($row['M_PatientName'] ?? '')) . ' ' . trim($row['M_PatientSuffix'] ?? '') diff --git a/application/controllers/tools/Inform_consent_cpmi.php b/application/controllers/tools/Inform_consent_cpmi.php index 7ac31571..6e23d2b1 100644 --- a/application/controllers/tools/Inform_consent_cpmi.php +++ b/application/controllers/tools/Inform_consent_cpmi.php @@ -67,6 +67,9 @@ class Inform_consent_cpmi extends MY_Controller IFNULL(h.T_OrderHeaderM_PatientAge, '') as age, p.M_PatientID, CONCAT(TRIM(IFNULL(t.M_TitleName,'')), ' ', TRIM(IFNULL(p.M_PatientPrefix,'')), ' ', TRIM(IFNULL(p.M_PatientName,'')), ' ', TRIM(IFNULL(p.M_PatientSuffix,''))) AS patient_name, + IFNULL(t.M_TitleName, '') as M_TitleName, + IFNULL(p.M_PatientPrefix, '') as M_PatientPrefix, + IFNULL(p.M_PatientSuffix, '') as M_PatientSuffix, IFNULL(s.M_SexCode, '') as sex_code, DATE_FORMAT(p.M_PatientDOB, '%d-%m-%Y') as dob, IFNULL(pa.M_PatientAddressDescription,'') as alamat,