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)
131 lines
4.5 KiB
PHP
131 lines
4.5 KiB
PHP
<?php
|
|
|
|
namespace App\Models\Test;
|
|
|
|
use App\Models\BaseModel;
|
|
use App\Libraries\ValueSet;
|
|
|
|
class TestDefSiteModel extends BaseModel {
|
|
protected $table = 'testdefsite';
|
|
protected $primaryKey = 'TestSiteID';
|
|
protected $allowedFields = [
|
|
'SiteID',
|
|
'TestSiteCode',
|
|
'TestSiteName',
|
|
'TestType',
|
|
'Description',
|
|
'SeqScr',
|
|
'SeqRpt',
|
|
'IndentLeft',
|
|
'FontStyle',
|
|
'VisibleScr',
|
|
'VisibleRpt',
|
|
'CountStat',
|
|
'CreateDate',
|
|
'StartDate',
|
|
'EndDate'
|
|
];
|
|
|
|
protected $useTimestamps = true;
|
|
protected $createdField = 'CreateDate';
|
|
protected $updatedField = 'StartDate';
|
|
protected $useSoftDeletes = true;
|
|
protected $deletedField = "EndDate";
|
|
|
|
public function getTests($siteId = null, $testType = null, $visibleScr = null, $visibleRpt = null, $keyword = null) {
|
|
$builder = $this->select("testdefsite.TestSiteID, testdefsite.TestSiteCode, testdefsite.TestSiteName, testdefsite.TestType,
|
|
testdefsite.SeqScr, testdefsite.SeqRpt, testdefsite.VisibleScr, testdefsite.VisibleRpt,
|
|
testdefsite.CountStat, testdefsite.StartDate, testdefsite.EndDate")
|
|
->where('testdefsite.EndDate IS NULL');
|
|
|
|
if ($siteId) {
|
|
$builder->where('testdefsite.SiteID', $siteId);
|
|
}
|
|
|
|
if ($testType) {
|
|
$builder->where('testdefsite.TestType', $testType);
|
|
}
|
|
|
|
if ($visibleScr !== null) {
|
|
$builder->where('testdefsite.VisibleScr', $visibleScr);
|
|
}
|
|
|
|
if ($visibleRpt !== null) {
|
|
$builder->where('testdefsite.VisibleRpt', $visibleRpt);
|
|
}
|
|
|
|
if ($keyword) {
|
|
$builder->like('testdefsite.TestSiteName', $keyword);
|
|
}
|
|
|
|
$rows = $builder->orderBy('testdefsite.SeqScr', 'ASC')->findAll();
|
|
$rows = ValueSet::transformLabels($rows, [
|
|
'TestType' => 'test_type',
|
|
]);
|
|
return $rows;
|
|
}
|
|
|
|
public function getTest($TestSiteID) {
|
|
$db = \Config\Database::connect();
|
|
|
|
$row = $this->select("testdefsite.*")
|
|
->where("testdefsite.TestSiteID", $TestSiteID)
|
|
->find($TestSiteID);
|
|
|
|
if (!$row) return null;
|
|
|
|
$row = ValueSet::transformLabels([$row], [
|
|
'TestType' => 'test_type',
|
|
])[0];
|
|
|
|
$typeCode = $row['TestType'] ?? '';
|
|
|
|
if ($typeCode === 'CALC') {
|
|
$row['testdefcal'] = $db->table('testdefcal')
|
|
->select('testdefcal.*, d.DisciplineName, dept.DepartmentName')
|
|
->join('discipline d', 'd.DisciplineID=testdefcal.DisciplineID', 'left')
|
|
->join('department dept', 'dept.DepartmentID=testdefcal.DepartmentID', 'left')
|
|
->where('testdefcal.TestSiteID', $TestSiteID)
|
|
->where('testdefcal.EndDate IS NULL')
|
|
->get()->getResultArray();
|
|
|
|
$testMapModel = new \App\Models\Test\TestMapModel();
|
|
$row['testmap'] = $testMapModel->where('TestSiteID', $TestSiteID)->where('EndDate IS NULL')->findAll();
|
|
|
|
} elseif ($typeCode === 'GROUP') {
|
|
$row['testdefgrp'] = $db->table('testdefgrp')
|
|
->select('testdefgrp.*, t.TestSiteCode, t.TestSiteName, t.TestType')
|
|
->join('testdefsite t', 't.TestSiteID=testdefgrp.Member', 'left')
|
|
->where('testdefgrp.TestSiteID', $TestSiteID)
|
|
->where('testdefgrp.EndDate IS NULL')
|
|
->orderBy('testdefgrp.TestGrpID', 'ASC')
|
|
->get()->getResultArray();
|
|
|
|
$row['testdefgrp'] = ValueSet::transformLabels($row['testdefgrp'], [
|
|
'TestType' => 'test_type',
|
|
]);
|
|
|
|
$testMapModel = new \App\Models\Test\TestMapModel();
|
|
$row['testmap'] = $testMapModel->where('TestSiteID', $TestSiteID)->where('EndDate IS NULL')->findAll();
|
|
|
|
} elseif ($typeCode === 'TITLE') {
|
|
$testMapModel = new \App\Models\Test\TestMapModel();
|
|
$row['testmap'] = $testMapModel->where('TestSiteID', $TestSiteID)->where('EndDate IS NULL')->findAll();
|
|
|
|
} elseif (in_array($typeCode, ['TEST', 'PARAM'])) {
|
|
$row['testdeftech'] = $db->table('testdeftech')
|
|
->select('testdeftech.*, d.DisciplineName, dept.DepartmentName')
|
|
->join('discipline d', 'd.DisciplineID=testdeftech.DisciplineID', 'left')
|
|
->join('department dept', 'dept.DepartmentID=testdeftech.DepartmentID', 'left')
|
|
->where('testdeftech.TestSiteID', $TestSiteID)
|
|
->where('testdeftech.EndDate IS NULL')
|
|
->get()->getResultArray();
|
|
|
|
$testMapModel = new \App\Models\Test\TestMapModel();
|
|
$row['testmap'] = $testMapModel->where('TestSiteID', $TestSiteID)->where('EndDate IS NULL')->findAll();
|
|
}
|
|
|
|
return $row;
|
|
}
|
|
}
|