mahdahar
bb7df6b70c
Complete overhaul of the valueset system to use human-readable names
instead of numeric IDs for improved maintainability and API consistency.
- PatientController: Renamed 'Gender' field to 'Sex' in validation rules
- ValuesetController: Changed API endpoints from ID-based (/:num) to name-based (/:any)
- TestsController: Refactored to use ValueSet library instead of direct valueset queries
- Added ValueSet library (app/Libraries/ValueSet.php) with static lookup methods:
- getOptions() - returns dropdown format [{value, label}]
- getLabel(, ) - returns label for a value
- transformLabels(, ) - batch transform records
- get() and getRaw() for Lookups compatibility
- Added ValueSetApiController for public valueset API endpoints
- Added ValueSet refresh endpoint (POST /api/valueset/refresh)
- Added DemoOrderController for testing order creation without auth
- 2026-01-12-000001: Convert valueset references from VID to VValue
- 2026-01-12-000002: Rename patient.Gender column to Sex
- OrderTestController: Now uses OrderTestModel with proper model pattern
- TestsController: Uses ValueSet library for all lookup operations
- ValueSetController: Simplified to use name-based lookups
- Updated all organization (account/site/workstation) dialogs and index views
- Updated specimen container dialogs and index views
- Updated tests_index.php with ValueSet integration
- Updated patient dialog form and index views
- Removed .factory/config.json and CLAUDE.md (replaced by AGENTS.md)
- Consolidated lookups in Lookups.php (removed inline valueset constants)
- Updated all test files to match new field names
- 32 modified files, 17 new files, 2 deleted files
- Net: +661 insertions, -1443 deletions (significant cleanup)
79 lines
2.5 KiB
PHP
79 lines
2.5 KiB
PHP
<?php
|
|
namespace App\Controllers\Test;
|
|
|
|
use CodeIgniter\API\ResponseTrait;
|
|
use CodeIgniter\Controller;
|
|
use App\Models\Patient\PatientModel;
|
|
use App\Models\OrderTest\OrderTestModel;
|
|
|
|
class DemoOrderController extends Controller {
|
|
use ResponseTrait;
|
|
|
|
protected $db;
|
|
protected $patientModel;
|
|
protected $orderModel;
|
|
|
|
public function __construct() {
|
|
$this->db = \Config\Database::connect();
|
|
$this->patientModel = new PatientModel();
|
|
$this->orderModel = new OrderTestModel();
|
|
}
|
|
|
|
public function createDemoOrder() {
|
|
$input = $this->request->getJSON(true);
|
|
|
|
$patientData = [
|
|
'PatientID' => $input['PatientID'] ?? 'DEMO' . time(),
|
|
'Gender' => $input['Gender'] ?? '1',
|
|
'NameFirst' => $input['NameFirst'] ?? 'Demo',
|
|
'NameLast' => $input['NameLast'] ?? 'Patient',
|
|
'Birthdate' => $input['Birthdate'] ?? '1990-01-01'
|
|
];
|
|
|
|
$patient = $this->patientModel->where('PatientID', $patientData['PatientID'])->findAll();
|
|
if (empty($patient)) {
|
|
$internalPID = $this->patientModel->createPatient($patientData);
|
|
} else {
|
|
$internalPID = $patient[0]['InternalPID'];
|
|
}
|
|
|
|
$orderData = [
|
|
'InternalPID' => $internalPID,
|
|
'PatVisitID' => $input['PatVisitID'] ?? null,
|
|
'Priority' => $input['Priority'] ?? 'R',
|
|
'OrderingProvider' => $input['OrderingProvider'] ?? 'Dr. Demo',
|
|
'DepartmentID' => $input['DepartmentID'] ?? 1,
|
|
];
|
|
|
|
$orderID = $this->orderModel->createOrder($orderData);
|
|
|
|
return $this->respond([
|
|
'status' => 'success',
|
|
'message' => 'Demo order created successfully',
|
|
'data' => [
|
|
'PatientID' => $patientData['PatientID'],
|
|
'InternalPID' => $internalPID,
|
|
'OrderID' => $orderID,
|
|
'OrderStatus' => 'ORD'
|
|
]
|
|
], 201);
|
|
}
|
|
|
|
public function listDemoOrders() {
|
|
$orders = $this->db->table('ordertest ot')
|
|
->select('ot.OrderID, ot.InternalPID, p.PatientID, ot.OrderDateTime, ot.Priority, ot.OrderStatus')
|
|
->join('patient p', 'p.InternalPID = ot.InternalPID')
|
|
->where('ot.DelDate', null)
|
|
->orderBy('ot.OrderDateTime', 'DESC')
|
|
->limit(50)
|
|
->get()
|
|
->getResultArray();
|
|
|
|
return $this->respond([
|
|
'status' => 'success',
|
|
'message' => 'Data fetched successfully',
|
|
'data' => $orders
|
|
], 200);
|
|
}
|
|
}
|