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

Fix discharge time placeholders and department/doctor field mappings

Browse Source 
CRITICAL FIXES based on actual database schema analysis:

Problem 1: {{ADMISSION_TIME}} showing 12:00 AM
- Code was looking for: register_time, admission_time (don't exist)
- Actual field: reg_time (stores '14:44' format)
- Fix: Changed to use ipd->reg_time field

Problem 2: {{DISCHARGE_TIME}} showing 12:00 AM
- Code was looking for: discharge_date datetime field
- Actual field: discharge_time (stores '05:30' format)
- Fix: Changed to use ipd->discharge_time field directly

Problem 3: {{DEPARTMENT}} showing blank
- Code was using: hc_department.id field for lookup
- Actual field: hc_department.iId (primary key is iId, not id)
- Fix: Changed WHERE clause from 'id' to 'iId'

Problem 4: {{DOCTOR_NAMES}} showing blank
- Code was looking for: doc_list, doctor_id, doc_id (don't exist)
- Actual field: r_doc_id (referring doctor ID = 12)
- Fix: Changed primary lookup to r_doc_id field

Technical Improvements:

1. Enhanced safeTime() function:
   - Added regex parsing for 'HH:MM' time format
   - Validates hour (0-23) and minute (0-59) ranges
   - Converts 24-hour to 12-hour format with AM/PM
   - Example: '14:44' -> '02:44 PM', '05:30' -> '05:30 AM'
   - Falls back to strtotime() for datetime formats
   - Returns empty string for invalid times

2. Updated getDischargeDoctorNames():
   - Primary: ipd->r_doc_id (referring doctor)
   - Fallback: ipd->doc_list (comma-separated IDs)
   - Fallback: ipd->doctor_id, doc_id, consultant_id
   - Queries doctor_master table
   - Gets specializations from doc_spec + med_spec
   - Format: 'Dr. Name [Specialization]' or 'Title Name [Spec]'

3. Updated getDischargeDepartmentName():
   - Changed: WHERE id = dept_id
   - To: WHERE iId = dept_id
   - Keeps fallback to ipd_department table
   - Returns department vName field

4. Updated debug endpoint:
   - Now checks: reg_time, reg_time_bak, discharge_time, discharge_time_bak
   - Shows: dept_id, r_doc_id, r_doc_name
   - Removed non-existent fields from output

Database Schema (from live data):
- ipd_master.reg_time: '14:44' (admission time)
- ipd_master.discharge_time: '05:30' (discharge time)
- ipd_master.dept_id: 2 -> hc_department.iId (vName field)
- ipd_master.r_doc_id: 12 -> doctor_master.id (p_fname field)

Testing:
- Admission Time should show: 02:44 PM (from reg_time '14:44')
- Discharge Time should show: 05:30 AM (from discharge_time '05:30')
- Department should show department name from hc_department
- Doctor Names should show doctor name with specialization
This commit is contained in:
DevSoftTech Server 2026-06-07 07:07:35 +05:30
parent 87789cff7a
commit e152fab496
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/Controllers/Ipd_discharge.php
View File

@ -474,9 +474,9 @@ class Ipd_discharge extends BaseController
'DEPARTMENT' => esc($this->getDischargeDepartmentName($ipd)),
'ADMIT_DATE_ONLY' => esc($this->safeDate((string) ($ipd->str_register_date ?? $ipd->register_date ?? ''))),
'DISCHARGE_DATE_ONLY' => esc($this->safeDate((string) ($ipd->str_discharge_date ?? $ipd->discharge_date ?? ''))),
'ADMISSION_TIME' => esc($this->safeTime((string) ($ipd->register_date ?? $ipd->register_time ?? $ipd->admission_time ?? $ipd->str_register_date ?? ''))),
'DISCHARGE_TIME' => esc($this->safeTime((string) ($ipd->discharge_date ?? $ipd->discharge_time ?? $ipd->str_discharge_date ?? ''))),
'ADMIT_TIME' => esc($this->safeTime((string) ($ipd->register_date ?? $ipd->register_time ?? $ipd->admission_time ?? $ipd->str_register_date ?? ''))),
'ADMISSION_TIME' => esc($this->safeTime((string) ($ipd->reg_time ?? $ipd->register_time ?? ''))),
'DISCHARGE_TIME' => esc($this->safeTime((string) ($ipd->discharge_time ?? ''))),
'ADMIT_TIME' => esc($this->safeTime((string) ($ipd->reg_time ?? $ipd->register_time ?? ''))),
'INSURANCE_COMPANY' => esc($insuranceCompany),
'DOCTOR_NAMES' => esc($doctorNames),
'DOCTOR_NAME' => esc($doctorNames),
@ -943,10 +943,13 @@ class Ipd_discharge extends BaseController
return '';
}
// Try doc_list field (comma-separated IDs)
$docList = trim((string) ($ipd->doc_list ?? ''));
if ($docList === '' || $docList === '0') {
// Fallback: try single doctor_id or doc_id field
// Try r_doc_id field first (referring doctor)
$docList = '';
$singleDocId = (int) ($ipd->r_doc_id ?? $ipd->doc_list ?? 0);
if ($singleDocId > 0) {
$docList = (string) $singleDocId;
} else {
// Fallback: try other doctor fields
$singleDocId = (int) ($ipd->doctor_id ?? $ipd->doc_id ?? $ipd->consultant_id ?? 0);
if ($singleDocId > 0) {
$docList = (string) $singleDocId;
@ -1331,6 +1334,24 @@ class Ipd_discharge extends BaseController
return '';
}
// Try to parse as time (HH:MM or HH:MM:SS format)
if (preg_match('/^(\d{1,2}):(\d{2})(?::(\d{2}))?$/', $value, $matches)) {
$hour = (int)$matches[1];
$minute = (int)$matches[2];
// Validate hour and minute
if ($hour >= 0 && $hour <= 23 && $minute >= 0 && $minute <= 59) {
// Convert to 12-hour format with AM/PM
$ampm = $hour >= 12 ? 'PM' : 'AM';
$hour12 = $hour % 12;
if ($hour12 === 0) {
$hour12 = 12;
}
return sprintf('%02d:%02d %s', $hour12, $minute, $ampm);
}
}
// Fallback: try strtotime for datetime formats
$ts = strtotime($value);
if ($ts === false) {
return '';
@ -1391,11 +1412,11 @@ class Ipd_discharge extends BaseController
// Try dept_id first (common field name)
$deptId = (int) ($ipd->dept_id ?? $ipd->department_id ?? 0);
// Try hc_department table first
if ($deptId > 0 && $this->tableHasColumns('hc_department', ['id', 'vName'])) {
// Try hc_department table first (field is iId, not id)
if ($deptId > 0 && $this->db->tableExists('hc_department')) {
$row = $this->db->table('hc_department')
->select('vName')
->where('id', $deptId)
->where('iId', $deptId)
->get(1)
->getRowArray();
$name = trim((string) ($row['vName'] ?? ''));
@ -4523,16 +4544,13 @@ class Ipd_discharge extends BaseController
'Available Fields in ipd_master' => array_keys((array)$ipdMaster),
'register_date' => $ipdMaster->register_date ?? 'NOT FOUND',
'discharge_date' => $ipdMaster->discharge_date ?? 'NOT FOUND',
'register_time' => $ipdMaster->register_time ?? 'NOT FOUND',
'reg_time' => $ipdMaster->reg_time ?? 'NOT FOUND',
'reg_time_bak' => $ipdMaster->reg_time_bak ?? 'NOT FOUND',
'discharge_time' => $ipdMaster->discharge_time ?? 'NOT FOUND',
'admission_time' => $ipdMaster->admission_time ?? 'NOT FOUND',
'discharge_time_bak' => $ipdMaster->discharge_time_bak ?? 'NOT FOUND',
'dept_id' => $ipdMaster->dept_id ?? 'NOT FOUND',
'department_id' => $ipdMaster->department_id ?? 'NOT FOUND',
'department' => $ipdMaster->department ?? 'NOT FOUND',
'doc_list' => $ipdMaster->doc_list ?? 'NOT FOUND',
'doctor_id' => $ipdMaster->doctor_id ?? 'NOT FOUND',
'doc_id' => $ipdMaster->doc_id ?? 'NOT FOUND',
'consultant_id' => $ipdMaster->consultant_id ?? 'NOT FOUND',
'r_doc_id' => $ipdMaster->r_doc_id ?? 'NOT FOUND',
'r_doc_name' => $ipdMaster->r_doc_name ?? 'NOT FOUND',
];
// Check what getDischargeDepartmentName returns
@ -4542,8 +4560,8 @@ class Ipd_discharge extends BaseController
$fields['getDischargeDoctorNames()'] = $this->getDischargeDoctorNames($ipd);
// Check safeTime results
$fields['safeTime(register_date)'] = $this->safeTime((string)($ipdMaster->register_date ?? ''));
$fields['safeTime(discharge_date)'] = $this->safeTime((string)($ipdMaster->discharge_date ?? ''));
$fields['safeTime(reg_time)'] = $this->safeTime((string)($ipdMaster->reg_time ?? ''));
$fields['safeTime(discharge_time)'] = $this->safeTime((string)($ipdMaster->discharge_time ?? ''));
return $this->response->setJSON($fields, JSON_PRETTY_PRINT);
}