diff --git a/.serena/.gitignore b/.serena/.gitignore
new file mode 100644
index 0000000..14d86ad
--- /dev/null
+++ b/.serena/.gitignore
@@ -0,0 +1 @@
+/cache
diff --git a/.serena/project.yml b/.serena/project.yml
new file mode 100644
index 0000000..024bb1a
--- /dev/null
+++ b/.serena/project.yml
@@ -0,0 +1,89 @@
+# list of languages for which language servers are started; choose from:
+#   al                  bash                clojure             cpp                 csharp
+#   csharp_omnisharp    dart                elixir              elm                 erlang
+#   fortran             fsharp              go                  groovy              haskell
+#   java                julia               kotlin              lua                 markdown
+#   matlab              nix                 pascal              perl                php
+#   powershell          python              python_jedi         r                   rego
+#   ruby                ruby_solargraph     rust                scala               swift
+#   terraform           toml                typescript          typescript_vts      vue
+#   yaml                zig
+#   (This list may be outdated. For the current list, see values of Language enum here:
+#   https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py
+#   For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
+# Note:
+#   - For C, use cpp
+#   - For JavaScript, use typescript
+#   - For Free Pascal/Lazarus, use pascal
+# Special requirements:
+#   - csharp: Requires the presence of a .sln file in the project folder.
+#   - pascal: Requires Free Pascal Compiler (fpc) and optionally Lazarus.
+# When using multiple languages, the first language server that supports a given file will be used for that file.
+# The first language is the default language and the respective language server will be used as a fallback.
+# Note that when using the JetBrains backend, language servers are not used and this list is correspondingly ignored.
+languages:
+- php
+
+# the encoding used by text files in the project
+# For a list of possible encodings, see https://docs.python.org/3.11/library/codecs.html#standard-encodings
+encoding: "utf-8"
+
+# whether to use project's .gitignore files to ignore files
+ignore_all_files_in_gitignore: true
+
+# list of additional paths to ignore in all projects
+# same syntax as gitignore, so you can use * and **
+ignored_paths: []
+
+# whether the project is in read-only mode
+# If set to true, all editing tools will be disabled and attempts to use them will result in an error
+# Added on 2025-04-18
+read_only: false
+
+# list of tool names to exclude. We recommend not excluding any tools, see the readme for more details.
+# Below is the complete list of tools for convenience.
+# To make sure you have the latest list of tools, and to view their descriptions, 
+# execute `uv run scripts/print_tool_overview.py`.
+#
+#  * `activate_project`: Activates a project by name.
+#  * `check_onboarding_performed`: Checks whether project onboarding was already performed.
+#  * `create_text_file`: Creates/overwrites a file in the project directory.
+#  * `delete_lines`: Deletes a range of lines within a file.
+#  * `delete_memory`: Deletes a memory from Serena's project-specific memory store.
+#  * `execute_shell_command`: Executes a shell command.
+#  * `find_referencing_code_snippets`: Finds code snippets in which the symbol at the given location is referenced.
+#  * `find_referencing_symbols`: Finds symbols that reference the symbol at the given location (optionally filtered by type).
+#  * `find_symbol`: Performs a global (or local) search for symbols with/containing a given name/substring (optionally filtered by type).
+#  * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
+#  * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
+#  * `initial_instructions`: Gets the initial instructions for the current project.
+#     Should only be used in settings where the system prompt cannot be set,
+#     e.g. in clients you have no control over, like Claude Desktop.
+#  * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
+#  * `insert_at_line`: Inserts content at a given line in a file.
+#  * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
+#  * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
+#  * `list_memories`: Lists memories in Serena's project-specific memory store.
+#  * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
+#  * `prepare_for_new_conversation`: Provides instructions for preparing for a new conversation (in order to continue with the necessary context).
+#  * `read_file`: Reads a file within the project directory.
+#  * `read_memory`: Reads the memory with the given name from Serena's project-specific memory store.
+#  * `remove_project`: Removes a project from the Serena configuration.
+#  * `replace_lines`: Replaces a range of lines within a file with new content.
+#  * `replace_symbol_body`: Replaces the full definition of a symbol.
+#  * `restart_language_server`: Restarts the language server, may be necessary when edits not through Serena happen.
+#  * `search_for_pattern`: Performs a search for a pattern in the project.
+#  * `summarize_changes`: Provides instructions for summarizing the changes made to the codebase.
+#  * `switch_modes`: Activates modes by providing a list of their names
+#  * `think_about_collected_information`: Thinking tool for pondering the completeness of collected information.
+#  * `think_about_task_adherence`: Thinking tool for determining whether the agent is still on track with the current task.
+#  * `think_about_whether_you_are_done`: Thinking tool for determining whether the task is truly completed.
+#  * `write_memory`: Writes a named memory (for future reference) to Serena's project-specific memory store.
+excluded_tools: []
+
+# initial prompt for the project. It will always be given to the LLM upon activating the project
+# (contrary to the memories, which are loaded on demand).
+initial_prompt: ""
+
+project_name: "clqms01"
+included_optional_tools: []
diff --git a/AGENTS.md b/AGENTS.md
deleted file mode 100644
index fe4396c..0000000
--- a/AGENTS.md
+++ /dev/null
@@ -1,235 +0,0 @@
-# CLQMS Backend - Agent Instructions
-
-**Project:** Clinical Laboratory Quality Management System (CLQMS) Backend
-**Framework:** CodeIgniter 4 (PHP 8.1+)
-**Platform:** Windows - Use PowerShell or CMD for terminal commands
-**Frontend:** Alpine.js (views/v2 directory)
-
-## Build / Test Commands
-
-```bash
-# Install dependencies
-composer install
-
-# Run all tests
-composer test
-php vendor/bin/phpunit
-
-# Run single test file
-php vendor/bin/phpunit tests/feature/Patients/PatientIndexTest.php
-
-# Run single test method
-php vendor/bin/phpunit tests/feature/Patients/PatientIndexTest.php --filter=testIndexWithoutParams
-
-# Run tests with coverage
-php vendor/bin/phpunit --coverage-html build/logs/html
-
-# Run tests in verbose mode
-php vendor/bin/phpunit --verbose
-```
-
-**Test Structure:**
-- Feature tests: `tests/feature/` - API endpoint testing with `FeatureTestTrait`
-- Unit tests: `tests/unit/` - Model/Logic testing
-- Base test case: `Tests\Support\v2\MasterTestCase.php` - Provides JWT auth and helper methods
-
-## Code Style Guidelines
-
-### PHP Standards
-- **PHP Version:** 8.1 minimum
-- **PSR-4 Autoloading:** Follow namespace-to-path conventions (`App\Controllers\*`, `App\Models\*`)
-- **Line endings:** Unix-style (LF) - configure editor accordingly
-
-### Naming Conventions
-| Element | Convention | Examples |
-|---------|------------|----------|
-| Classes | PascalCase | `PatientController`, `BaseModel` |
-| Methods | camelCase | `getPatient()`, `createPatient()` |
-| Variables | camelCase | `$internalPID`, `$patientData` |
-| Constants | UPPER_SNAKE_CASE | `ORDER_PRIORITY`, `TEST_TYPE` |
-| Table names | snake_case | `patient`, `pat_idt`, `valueset` |
-| Column names | PascalCase (original DB) | `InternalPID`, `PatientID` |
-
-### File Organization
-```
-app/
-├── Controllers/{Domain}/
-│   └── DomainController.php
-├── Models/{Domain}/
-│   └── DomainModel.php
-├── Libraries/
-│   └── ValueSet.php          # Base lookup class (loads from JSON)
-│   └── Lookups.php           # Extends ValueSet - use this for lookups
-└── Views/v2/
-```
-
-### Imports and Namespaces
-```php
-<?php
-namespace App\Controllers\Patient;
-
-use CodeIgniter\Controller;
-use CodeIgniter\API\ResponseTrait;
-use App\Models\Patient\PatientModel;
-```
-
-- Use fully qualified class names or `use` statements
-- Group imports logically
-- Avoid unnecessary aliases
-
-### Code Formatting
-- **Indentation:** 4 spaces (not tabs)
-- **Braces:** Allman style for classes/functions, K&R for control structures
-- **Line length:** Soft limit 120 characters
-- **Empty lines:** Single blank line between method definitions and logical groups
-
-### Type Hints and Return Types
-```php
-// Required for new code
-public function getPatient(int $internalPID): ?array
-protected function createPatient(array $input): int
-private function checkDbError(object $db, string $context): void
-
-// Use nullable types for optional returns
-public function findById(?int $id): ?array
-```
-
-### Controller Patterns
-```php
-class PatientController extends Controller {
-    use ResponseTrait;
-
-    protected $db;
-    protected $model;
-    protected $rules;
-
-    public function __construct() {
-        $this->db = \Config\Database::connect();
-        $this->model = new PatientModel();
-        $this->rules = [...]; // Validation rules
-    }
-
-    public function index() {
-        try {
-            $data = $this->model->findAll();
-            return $this->respond([...], 200);
-        } catch (\Exception $e) {
-            return $this->failServerError($e->getMessage());
-        }
-    }
-}
-```
-
-### Model Patterns
-```php
-class PatientModel extends BaseModel {
-    protected $table = 'patient';
-    protected $primaryKey = 'InternalPID';
-    protected $allowedFields = [...];
-    protected $useSoftDeletes = true;
-    protected $deletedField = 'DelDate';
-
-    public function getPatients(array $filters = []): array {
-        // Query builder chain
-        $this->select('...');
-        $this->join(...);
-        if (!empty($filters['key'])) {
-            $this->where('key', $filters['key']);
-        }
-        return $this->findAll();
-    }
-}
-```
-
-### Error Handling
-- Controllers: Use try-catch with `failServerError()`, `failValidationErrors()`, `failNotFound()`
-- Models: Throw `\Exception` with descriptive messages
-- Database errors: Check `$db->error()` after operations
-- Always validate input before DB operations
-
-### Validation Rules
-```php
-protected $rules = [
-    'PatientID' => 'required|regex_match[/^[A-Za-z0-9]+$/]|max_length[30]',
-    'EmailAddress' => 'permit_empty|valid_email|max_length[100]',
-    'Phone' => 'permit_empty|regex_match[/^\+?[0-9]{8,15}$/]',
-];
-```
-
-### Date Handling
-- All dates stored/retrieved in UTC via `BaseModel` callbacks
-- Use `utc` helper functions: `convert_array_to_utc()`, `convert_array_to_utc_iso()`
-- Format: ISO 8601 (`Y-m-d\TH:i:s\Z`) for API responses
-
-### API Response Format
-```php
-// Success
-return $this->respond([
-    'status' => 'success',
-    'message' => 'Data fetched successfully',
-    'data' => $rows
-], 200);
-
-// Created
-return $this->respondCreated([
-    'status' => 'success',
-    'message' => 'Record created'
-]);
-
-// Error
-return $this->failServerError('Something went wrong: ' . $e->getMessage());
-```
-
-### Database Transactions
-```php
-$db->transBegin();
-try {
-    $this->insert($data);
-    $this->checkDbError($db, 'Insert operation');
-    $db->transCommit();
-    return $insertId;
-} catch (\Exception $e) {
-    $db->transRollback();
-    throw $e;
-}
-```
-
-### Frontend Integration (Alpine.js)
-- API calls use `BASEURL` global variable
-- Include `credentials: 'include'` for authenticated requests
-- Modals use `x-show` with `@click.self` backdrop close
-
-### Lookups Library
-Use `App\Libraries\Lookups` (extends `ValueSet`) for all static lookup values. Data is loaded from JSON files in `app/Libraries/Data/valuesets/`:
-```php
-use App\Libraries\Lookups;
-
-// Get formatted for frontend dropdowns [{value: 'X', label: 'Y'}, ...]
-$gender = Lookups::get('gender');
-$priorities = Lookups::get('order_priority');
-
-// Get raw data [{key: 'X', value: 'Y'}, ...]
-$raw = Lookups::getRaw('gender');
-
-// Get single label by key
-$label = Lookups::getLabel('gender', '1'); // Returns 'Female'
-
-// Get options with key/value pairs
-$options = Lookups::getOptions('gender');
-// Returns: [['key' => '1', 'value' => 'Female'], ...]
-
-// Transform data with lookup labels
-$patients = Lookups::transformLabels($patients, [
-    'Sex' => 'gender',
-    'Priority' => 'order_priority'
-]);
-
-// Clear cache after data changes
-Lookups::clearCache();
-```
-
-### Important Notes
-- **Soft deletes:** Use `DelDate` field instead of hard delete
-- **UTC timezone:** All dates normalized to UTC automatically
-- **JWT auth:** API endpoints require Bearer token in `Authorization` header
-- **No comments:** Do not add comments unless explicitly requested
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..1c0eade
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,200 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+---
+
+## Tool Preference: Use Serena MCP
+
+**Always prioritize Serena MCP tools for code operations to minimize tool calls:**
+
+- **Use `find_symbol` / `get_symbols_overview`** instead of `Read` for exploring code structure
+- **Use `replace_symbol_body`** instead of `Edit` for modifying functions, methods, classes
+- **Use `insert_before_symbol` / `insert_after_symbol`** for adding new code symbols
+- **Use `search_for_pattern`** instead of `Grep` for searching code patterns
+- **Use `list_dir` / `find_file`** instead of `Glob` for file discovery
+
+This leverages semantic code understanding for this PHP codebase.
+
+---
+
+## Common Commands
+
+### Testing
+```bash
+# Run all tests
+vendor/bin/phpunit
+
+# Run specific test file
+vendor/bin/phpunit tests/feature/UniformShowTest.php
+
+# Run tests in a directory
+vendor/bin/phpunit app/Models
+
+# Generate code coverage report
+vendor/bin/phpunit --colors --coverage-text=tests/coverage.txt --coverage-html=tests/coverage/ -d memory_limit=1024m
+```
+
+### Database
+```bash
+# Run migrations
+spark migrate
+
+# Rollback migrations
+spark migrate:rollback
+
+# Seed database
+spark db:seed DBSeeder
+
+# Refresh all migrations and seed
+spark migrate:refresh --seed
+```
+
+### CodeIgniter CLI
+```bash
+# General help
+spark help
+
+# Generate code (scaffolding)
+spark make:model ModelName
+spark make:controller ControllerName
+spark make:migration MigrationName
+```
+
+### API Documentation
+```bash
+# Keep api-docs.yaml updated whenever controllers change
+# File: public/api-docs.yaml
+# After modifying controllers, update the OpenAPI schema definitions
+# to reflect new field names, types, and response formats
+```
+
+---
+
+## Architecture Overview
+
+### Core Pattern: MVC + Libraries
+
+CLQMS follows CodeIgniter 4 conventions with these key architectural patterns:
+
+**Controllers** (`app/Controllers/`)
+- Organized by domain: `Patient/`, `Organization/`, `Specimen/`, `Test/`, `Contact/`
+- Root-level controllers for cross-domain concerns: `AuthController`, `EdgeController`, `ValueSetController`
+- All controllers extend `BaseController` which provides request/response helpers
+
+**Models** (`app/Models/`)
+- Organized by domain matching controllers: `Patient/`, `Organization/`, `Specimen/`, `Test/`, etc.
+- All models extend `BaseModel` which provides automatic UTC date normalization
+- Model callbacks: `beforeInsert/Update` normalize dates to UTC, `afterFind/Insert/Update` convert to UTC ISO format
+
+**Libraries** (`app/Libraries/`)
+- `ValueSet` - Static lookup system using JSON files (see "Lookup System" below)
+
+### Lookup System: ValueSet Library
+
+The system uses a **JSON file-based lookup system** instead of database queries for static values.
+
+**Location:** `app/Libraries/Data/*.json` (44+ JSON files)
+
+**Key Files:**
+- `_meta.json` - Metadata about lookup definitions
+- `sex.json`, `order_status.json`, `specimen_type.json`, `test_type.json`, etc.
+
+**Usage:**
+```php
+use App\Libraries\ValueSet;
+
+// Get dropdown-formatted options
+$options = ValueSet::get('sex'); // [["value"=>"1","label"=>"Female"],...]
+
+// Get raw data
+$raw = ValueSet::getRaw('sex'); // [["key"=>"1","value"=>"Female"],...]
+
+// Get label for a specific key
+$label = ValueSet::getLabel('sex', '1'); // "Female"
+
+// Transform database records with lookup text labels
+$data = ValueSet::transformLabels($patients, ['Sex' => 'sex']);
+
+// Clear cache after modifying JSON files
+ValueSet::clearCache();
+```
+
+**When to use ValueSet vs API:**
+- **ValueSet library** - Static values that rarely change (fast, cached)
+- **API `/api/valueset*`** - Dynamic values managed by admins at runtime
+
+### Database Migrations Structure
+
+Migrations are numbered sequentially starting with `2026-01-01-`:
+
+| Migration | Tables Created |
+|-----------|----------------|
+| 000001 | valueset, counter, containerdef, occupation, specialty |
+| 000002 | account, site, location, discipline, department |
+| 000003 | patient, patidentifier, pataddress, patcontact |
+| 000004 | contact, contactdetail, userdevices, loginattempts |
+| 000005 | patvisit, patinsurance |
+| 000006 | porder, orderitem |
+| 000007 | specimen, specmenactivity, containerdef |
+| 000008 | testdefinition, testactivity, refnum, reftxt |
+| 000009 | patresult, patresultdetail, patresultcomment |
+| 000010 | edgeres, edgestatus, edgeack, workstation |
+
+### Authentication & Authorization
+
+- **JWT-based authentication** using `firebase/php-jwt`
+- **AuthFilter** - Route filter protecting API endpoints
+- **AuthController** - Login/logout endpoints (`POST /api/login`, `POST /api/logout`)
+- **AuthV2Controller** - V2 authentication endpoints
+
+### Edge API (Instrument Integration)
+
+The `EdgeController` provides endpoints for laboratory instrument integration via `tiny-edge` middleware:
+
+- `POST /api/edge/results` - Receive instrument results (stored in `edgeres` table)
+- `GET /api/edge/orders` - Fetch pending orders for instruments
+- `POST /api/edge/orders/:id/ack` - Acknowledge order delivery
+- `POST /api/edge/status` - Log instrument status updates
+
+**Workflow:** `Instrument → tiny-edge → edgeres table → [Processing] → patresult table`
+
+### Test Types System
+
+Tests in `testdefinition` table support multiple types via `TestType` field:
+
+| Code | Type | Description |
+|------|------|-------------|
+| TEST | Technical | Individual lab test with specs |
+| PARAM | Parameter | Non-lab measurement |
+| CALC | Calculated | Test with formula |
+| GROUP | Panel/Profile | Contains multiple tests |
+| TITLE | Section | Report organization header |
+
+### Reference Range Architecture
+
+Reference ranges support multiple types for result validation:
+
+| Type | Table | Purpose |
+|------|-------|---------|
+| Numeric | `refnum` | Ranges with age/sex criteria |
+| Threshold | `refthold` | Critical values |
+| Text | `reftxt` | Text-based references |
+| Value Set | `refvset` | Coded references |
+
+### Routes Organization
+
+Routes are defined in `app/Config/Routes.php`:
+- API routes: `/api/{resource}`
+- Auth-protected routes use `AuthFilter`
+
+---
+
+## Project Structure Notes
+
+- **Language:** PHP 8.1+ (PSR-compliant)
+- **Framework:** CodeIgniter 4
+- **Database:** MySQL with migration-based schema management
+- **Testing:** PHPUnit 10.5+ (tests in `tests/` directory)
+- **Entry point:** `public/index.php` (web), `spark` (CLI)
+- **Environment config:** `.env` file (copy from `env` template)
diff --git a/PRD.md b/PRD.md
new file mode 100644
index 0000000..8e06b6a
--- /dev/null
+++ b/PRD.md
@@ -0,0 +1,747 @@
+# CLQMS Product Requirements Document
+
+> Clinical Laboratory Quality Management System - Minimum Viable Product
+>
+> Version: 1.0
+> Last Updated: 2026-01-28
+
+---
+
+## 1. Executive Summary
+
+CLQMS is a **REST API backend** for a Clinical Laboratory Quality Management System designed to manage the complete laboratory workflow from order creation to result reporting. The system integrates with laboratory instruments via the Edge API and provides comprehensive specimen tracking, result management, and quality control capabilities.
+
+### Product Vision
+To provide a **headless, API-first** laboratory information system that serves as the backend for any frontend client (web, mobile, desktop) while streamlining laboratory operations, ensuring regulatory compliance, and integrating seamlessly with laboratory instruments.
+
+### Core Value Propositions
+- **API-First Design**: Pure REST API with comprehensive endpoints for all laboratory operations
+- **Complete Workflow Coverage**: Order → Collection → Reception → Preparation → Analysis → Verification → Review → Reporting
+- **Instrument Integration**: Standard Edge API for bidirectional communication with laboratory analyzers
+- **Quality Management**: Built-in QC, calibration tracking, and audit trails
+- **Modern Architecture**: RESTful API, JWT authentication, UTC timestamp normalization
+- **Frontend Agnostic**: No view layer - clients consume JSON API responses
+
+---
+
+## 2. Product Goals
+
+### MVP Success Criteria
+| Goal | Description | Success Metric |
+|------|-------------|----------------|
+| Patient Registration | Register patients with demographics | Patient can be created and retrieved |
+| Test Ordering | Generate valid order IDs and test mappings | Order ID format: LLYYMMDDXXXXX |
+| Specimen Tracking | Track specimens through entire lifecycle | Status updates: Collection→Transport→Reception→Prep→Analysis |
+| Result Entry | Enter results with reference range validation | Numeric, text, valueset, and range results supported |
+| Result Verification | Multi-level verification workflow | VER → REV → REP status tracking |
+| Instrument Integration | Receive results via Edge API | Results stored and processed to patient results |
+| Master Data Management | Complete lookup and reference data | All value sets and test definitions manageable |
+
+---
+
+## 3. Target Users
+
+### API Consumers
+
+| Consumer Type | Description | Key API Needs |
+|---------------|-------------|---------------|
+| Frontend Applications | Web apps, mobile apps, desktop clients consuming the API | Full CRUD operations, authentication, real-time updates |
+| Laboratory Instruments | Analyzers and middleware systems | Edge API for orders/results, status monitoring |
+| Third-Party Systems | HIS, EMR, billing systems | Patient data sync, order/results integration |
+| Integration Partners | External lab networks, reference labs | Order referral, result reporting APIs |
+
+### API Client Types
+- **Web Clients**: Single-page applications (React, Vue, Angular) consuming REST endpoints
+- **Mobile Clients**: iOS/Android apps for mobile laboratory workflows
+- **Desktop Clients**: Native applications for result entry and verification
+- **Middleware Systems**: Instrument integration layer (tiny-edge)
+- **Batch Processors**: Scheduled jobs, data import/export utilities
+
+---
+
+## 4. Functional Requirements
+
+### 4.1 Priority Framework
+
+| Priority | Definition | Timeline |
+|----------|------------|----------|
+| **P0** | Must-have for MVP | Phase 1 |
+| **P1** | Should-have for MVP | Phase 2 |
+| **P2** | Nice-to-have for production | Phase 3 |
+| **P3** | Future enhancement | Phase 4+ |
+
+### 4.2 Master Data Requirements (P0 - Foundation)
+
+> **Rationale:** All transactional API workflows depend on complete master data. Master data must be completed before order/test/result API operations can function properly.
+
+#### 4.2.1 Value Sets & Lookups ✅
+| Requirement | Description | Status |
+|-------------|-------------|--------|
+| VS-001 | Value set definitions management | Complete |
+| VS-002 | Value set values management | Complete |
+| VS-003 | JSON-based static lookup system | Complete |
+| VS-004 | Lookup caching for performance | Complete |
+
+**Key Value Sets:**
+- Demographics: sex, marital_status, race, ethnic
+- Orders: order_status, order_priority, priority
+- Specimens: specimen_type, specimen_status, specimen_condition
+- Results: result_type, result_status, result_unit
+- Organizations: site_type, location_type
+- Technical: test_type, unit, formula_language
+
+#### 4.2.2 Test Definitions ✅
+| Requirement | Description | Status |
+|-------------|-------------|--------|
+| TD-001 | Test site definitions (testdefsite) | Complete |
+| TD-002 | Technical specifications (testdeftech) | Complete |
+| TD-003 | Calculated test formulas (testdefcal) | Complete |
+| TD-004 | Test groups/panels (testdefgrp) | Complete |
+| TD-005 | Test parameters | Complete |
+| TD-006 | Instrument test mapping (testmap) | Complete |
+
+**Test Types Supported:**
+| Code | Type | Description |
+|------|------|-------------|
+| TEST | Technical | Individual lab test with specs |
+| PARAM | Parameter | Non-lab measurement |
+| CALC | Calculated | Test with formula |
+| GROUP | Panel/Profile | Contains multiple tests |
+| TITLE | Section | Report organization header |
+
+#### 4.2.3 Reference Ranges ⚠️
+| Requirement | Description | Status |
+|-------------|-------------|--------|
+| RR-001 | Numeric reference ranges (refnum) | Complete |
+| RR-002 | Threshold ranges (refthold) | Missing migration |
+| RR-003 | Text reference ranges (reftxt) | Complete |
+| RR-004 | Value set reference ranges (refvset) | Missing migration |
+| RR-005 | Age/sex-based criteria | Complete (refnum) |
+| RR-006 | Critical value flagging | Needs implementation |
+
+**Gap Analysis:** Missing database migrations for `refthold` and `refvset` tables.
+
+#### 4.2.4 Organization Structure ✅
+| Requirement | Description | Status |
+|-------------|-------------|--------|
+| ORG-001 | Account management | Complete |
+| ORG-002 | Site management | Complete |
+| ORG-003 | Location management | Complete |
+| ORG-004 | Discipline management | Complete |
+| ORG-005 | Department management | Complete |
+| ORG-006 | Workstation management | Complete |
+
+#### 4.2.5 Specimen Types ✅
+| Requirement | Description | Status |
+|-------------|-------------|--------|
+| SPEC-001 | Container definitions (containerdef) | Complete |
+| SPEC-002 | Specimen type catalog | Complete |
+| SPEC-003 | Collection methods | Complete |
+| SPEC-004 | Container classes and sizes | Complete |
+
+### 4.3 Order Management (P0)
+
+| Requirement | Description | Acceptance Criteria |
+|-------------|-------------|---------------------|
+| ORD-001 | Create order with patient linkage | OrderID generated in LLYYMMDDXXXXX format |
+| ORD-002 | Update order details | All fields editable before verification |
+| ORD-003 | Delete order (soft delete) | DelDate set, order not displayed |
+| ORD-004 | Order status tracking | ORD → SCH → ANA → VER → REV → REP |
+| ORD-005 | Priority assignment | Stat/Routine/ASAP |
+| ORD-006 | Order attachment handling | Support for ordercom, orderatt tables |
+| ORD-007 | Test-to-order mapping | Multiple tests per order |
+| ORD-008 | Calculated test auto-selection | Parameters auto-added based on formulas |
+| ORD-009 | Provider identification | Ordering provider captured |
+| ORD-010 | Order date/time tracking | UTC timestamps normalized |
+
+**Minimum Data Required for Order Creation:**
+```sql
+-- Patient (at least 1 required)
+-- Order Status values (VSetID=11): ORD, SCH, ANA, VER, REV, REP
+-- Priority values (VSetID=10): S, R, A
+-- Counter for Order ID generation
+```
+
+### 4.4 Specimen Management (P0)
+
+| Requirement | Description | Acceptance Criteria |
+|-------------|-------------|---------------------|
+| SPM-001 | Create specimen from order | SpecimenID = OrderID + SSS + C |
+| SPM-002 | Collection status | Specimen marked as collected |
+| SPM-003 | In-transit status | Track specimen transport |
+| SPM-004 | Reception | Received or Rejected status |
+| SPM-005 | Preparation | Centrifuge, Aliquot, Pre-treatment |
+| SPM-006 | Storage | Stored status with location |
+| SPM-007 | Dispatch | Dispatch status for referral |
+| SPM-008 | Condition tracking | HEM, ITC, LIP flag support |
+| SPM-009 | Activity logging | Full audit trail via specmenactivity |
+| SPM-010 | Specimen-test linking | Tests mapped to specimens |
+
+**Specimen ID Format:** `OrderID + SpecimenTypeCode(3) + ContainerCode(1)`
+
+**Specimen Conditions:**
+| Code | Description |
+|------|-------------|
+| HEM | Hemolysis |
+| ITC | Insufficient |
+| LIP | Lipemic |
+
+### 4.5 Result Management (P0)
+
+| Requirement | Description | Acceptance Criteria |
+|-------------|-------------|---------------------|
+| RES-001 | Numeric result entry | Value with unit, range validation |
+| RES-002 | Text result entry | Free text or coded values |
+| RES-003 | Value set result entry | Dropdown selection from valueset |
+| RES-004 | Range result entry | Min/max with reference |
+| RES-005 | Reference range validation | Auto-flag abnormal results |
+| RES-006 | Critical value flagging | Threshold-based alerts |
+| RES-007 | Result verification (Technical) | First-level verification (VER status) |
+| RES-008 | Result verification (Clinical) | Pathologist review (REV status) |
+| RES-009 | Result reporting | Final report status (REP) |
+| RES-010 | Result rerun | AspCnt tracking for reruns |
+| RES-011 | Result comments | Support for patresultcomment |
+| RES-012 | Result details | Multiple details per result (patresultdetail) |
+
+**Result Verification Workflow:**
+```
+Entry → VER (Technical) → REV (Clinical) → REP (Reported)
+```
+
+### 4.6 Patient Visit (P1)
+
+| Requirement | Description | Acceptance Criteria |
+|-------------|-------------|---------------------|
+| VIS-001 | Create patient visit | Visit linked to patient |
+| VIS-002 | Visit-to-order linkage | Orders associated with visits |
+| VIS-003 | ADT tracking | Admission, Discharge, Transfer |
+| VIS-004 | Diagnosis linking | patdiag table support |
+| VIS-005 | Insurance tracking | patinsurance table support |
+
+### 4.7 Instrument Integration (P1)
+
+| Requirement | Description | Acceptance Criteria |
+|-------------|-------------|---------------------|
+| EDGE-001 | Receive instrument results | POST /api/edge/results |
+| EDGE-002 | Store raw results | edgeres table |
+| EDGE-003 | Status logging | edgestatus tracking |
+| EDGE-004 | Order acknowledgment | edgeack confirmation |
+| EDGE-005 | Fetch pending orders | GET /api/edge/orders |
+| EDGE-006 | Acknowledge order delivery | POST /api/edge/orders/:id/ack |
+| EDGE-007 | Instrument status updates | POST /api/edge/status |
+
+**Edge API Flow:**
+```
+Instrument → tiny-edge → /api/edge/results → edgeres table → Processing → patresult table
+```
+
+### 4.8 Quality Control (P2)
+
+| Requirement | Description | Acceptance Criteria |
+|-------------|-------------|---------------------|
+| QC-001 | QC result entry | calres table storage |
+| QC-002 | Levey-Jennings data | Data preparation endpoints |
+| QC-003 | QC validation | 2SD auto-validation rules |
+| QC-004 | Sigma metrics | Calculation endpoint |
+| QC-005 | QC history | Trend analysis support |
+
+### 4.9 Calibration (P2)
+
+| Requirement | Description | Acceptance Criteria |
+|-------------|-------------|---------------------|
+| CAL-001 | Calibration result entry | Factor tracking |
+| CAL-002 | Calibration history | Historical query endpoint |
+| CAL-003 | Calibration validation | Rule-based validation |
+
+### 4.10 Audit Trail (P2)
+
+| Requirement | Description | Acceptance Criteria |
+|-------------|-------------|---------------------|
+| AUD-001 | Audit logging middleware | Automatic change capture |
+| AUD-002 | What/who/when tracking | Complete change record |
+| AUD-003 | Security logging | Authentication attempts |
+| AUD-004 | Audit query endpoint | Searchable audit logs |
+
+### 4.11 Inventory & Billing (P3)
+
+| Requirement | Description | Acceptance Criteria |
+|-------------|-------------|---------------------|
+| INV-001 | Counter management | ORDER, SID, etc. |
+| INV-002 | Product catalog | Reagents, consumables |
+| INV-003 | Reagent tracking | Lot numbers, expiration |
+| INV-004 | Consumables usage | Usage logging |
+| INV-005 | Billing export | Tariff-based billing |
+| INV-006 | Service class selection | Billing tiers |
+
+---
+
+## 5. Non-Functional Requirements
+
+### 5.1 Security
+| Requirement | Description |
+|-------------|-------------|
+| AUTH-001 | JWT-based authentication for all API endpoints |
+| AUTH-002 | Role-based access control (RBAC) |
+| AUTH-003 | Password hashing with bcrypt |
+| AUTH-004 | Login attempt tracking |
+| AUTH-005 | Device registration (userdevices) |
+
+### 5.2 Data Integrity
+| Requirement | Description |
+|-------------|-------------|
+| DATA-001 | Soft delete (DelDate) on all transactional tables |
+| DATA-002 | UTC timezone normalization for all datetime fields |
+| DATA-003 | Automatic date conversion (UTC ↔ ISO 8601) |
+| DATA-004 | Referential integrity via foreign keys |
+| DATA-005 | Transactional data consistency |
+
+### 5.3 Performance
+| Requirement | Description | Target |
+|-------------|-------------|--------|
+| PERF-001 | Standard query response time | < 2 seconds |
+| PERF-002 | API endpoint latency | < 500ms (p95) |
+| PERF-003 | Lookup cache hit rate | > 95% |
+| PERF-004 | Database indexing | All foreign keys indexed |
+
+### 5.4 Reliability
+| Requirement | Description |
+|-------------|-------------|
+| REL-001 | Graceful error handling |
+| REL-002 | Database transaction support |
+| REL-003 | API rate limiting |
+| REL-004 | Request validation |
+
+### 5.5 Maintainability
+| Requirement | Description |
+|-------------|-------------|
+| MAIN-001 | PSR-12 coding standards |
+| MAIN-002 | RESTful API design |
+| MAIN-003 | Comprehensive documentation |
+| MAIN-004 | Unit test coverage > 80% |
+| MAIN-005 | Migration-based schema management |
+
+---
+
+## 6. API Workflow Examples
+
+### 6.1 Core Laboratory API Workflow
+
+```
+POST /api/patient           → Create patient
+POST /api/ordertest         → Create order with tests
+POST /api/specimen          → Create specimen from order
+PATCH /api/specimen/status  → Update specimen status
+POST /api/patresult         → Enter results
+PATCH /api/patresult/status → Verify results (VER → REV → REP)
+GET  /api/patresult/:id     → Retrieve final report
+```
+
+### 6.2 Order Creation API Sequence
+
+```bash
+# 1. Create/Register Patient
+POST /api/patient
+{
+  "NameFirst": "John",
+  "NameLast": "Doe",
+  "Sex": "1",
+  "Birthdate": "1990-05-15"
+}
+# Response: { "InternalPID": 123, "PatientID": "PT001" }
+
+# 2. Create Order with Tests
+POST /api/ordertest
+{
+  "InternalPID": 123,
+  "Priority": "R",
+  "OrderingProvider": "Dr. Smith",
+  "Tests": [{ "TestID": 10 }, { "TestID": 15 }]
+}
+# Response: { "OrderID": "00250112000001", "OrderStatus": "ORD" }
+
+# 3. Create Specimens (if applicable)
+POST /api/specimen
+{
+  "OrderID": "00250112000001",
+  "SpecimenType": "BLD",
+  "SpecimenStatus": "COLLECTED"
+}
+# Response: { "SID": "00250112000001BLDA" }
+```
+
+### 6.3 Result Entry & Verification API Sequence
+
+```bash
+# 1. Enter Results
+POST /api/patresult
+{
+  "OrderID": "00250112000001",
+  "TestID": 10,
+  "ResultValue": "5.2",
+  "ResultUnit": "g/dL",
+  "ResultStatus": "ENTRY"
+}
+
+# 2. Technical Verification
+PATCH /api/patresult/status
+{
+  "ResultID": 456,
+  "ResultStatus": "VER",
+  "VerifierID": 7
+}
+
+# 3. Clinical Review
+PATCH /api/patresult/status
+{
+  "ResultID": 456,
+  "ResultStatus": "REV",
+  "VerifierID": 8
+}
+
+# 4. Report Finalization
+PATCH /api/patresult/status
+{
+  "ResultID": 456,
+  "ResultStatus": "REP"
+}
+```
+
+### 6.4 Instrument Integration API Workflow
+
+```bash
+# 1. Fetch Pending Orders for Instrument
+GET /api/edge/orders?instrument=coulter_counter
+
+# 2. Instrument Acknowledges Order
+POST /api/edge/orders/123/ack
+
+# 3. Instrument Sends Results
+POST /api/edge/results
+{
+  "SampleID": "00250112000001",
+  "Results": [
+    { "TestCode": "HGB", "Value": "14.5", "Unit": "g/dL" },
+    { "TestCode": "WBC", "Value": "7.2", "Unit": "x10^9/L" }
+  ]
+}
+
+# 4. System Processes Results (automatic or manual)
+# Results stored in edgeres → processed to patresult
+```
+
+---
+
+## 7. Technical Architecture
+
+### 7.1 Technology Stack
+
+| Layer | Technology | Version |
+|-------|-----------|---------|
+| Backend | PHP | 8.1+ |
+| Framework | CodeIgniter | 4.x |
+| Database | MySQL | 8.0+ |
+| Authentication | JWT (firebase/php-jwt) | Latest |
+| Testing | PHPUnit | 10.5+ |
+| API Format | JSON | RESTful |
+
+### 7.2 Architecture Pattern
+
+```
+┌─────────────────────────────────────────────────────────┐
+│                   API Consumers                         │
+│  (Web Apps, Mobile Apps, Desktop Clients, Instruments)  │
+└────────────────────┬────────────────────────────────────┘
+                     │ HTTP/HTTPS (JSON)
+┌────────────────────┴────────────────────────────────────┐
+│                   REST API Layer                         │
+│  (Controllers: Patient, Order, Specimen, Result, etc.)  │
+│  - JWT Authentication Filter                            │
+│  - Request Validation                                   │
+│  - Response Formatting                                  │
+└────────────────────┬────────────────────────────────────┘
+                     │
+┌────────────────────┴────────────────────────────────────┐
+│                   Business Logic Layer                   │
+│              (Models + Libraries + Services)            │
+│  - ValueSet Library (JSON-based lookups)                │
+│  - Base Model (UTC normalization)                       │
+│  - Edge Processing Service                              │
+└────────────────────┬────────────────────────────────────┘
+                     │
+┌────────────────────┴────────────────────────────────────┐
+│                   Data Access Layer                      │
+│              (CodeIgniter Query Builder)                 │
+└────────────────────┬────────────────────────────────────┘
+                     │
+┌────────────────────┴────────────────────────────────────┐
+│                   MySQL Database                         │
+│           (Migration-managed schema)                     │
+└─────────────────────────────────────────────────────────┘
+```
+
+### 7.3 API Design Principles
+
+| Principle | Implementation |
+|-----------|----------------|
+| **Resource-Based** | URLs represent resources (patients, orders, specimens) |
+| **HTTP Methods** | GET (read), POST (create), PATCH (update), DELETE (soft delete) |
+| **Stateless** | Each request contains all necessary context (JWT token) |
+| **JSON Responses** | All API responses use consistent JSON format |
+| **Versioning** | API versioning via URL prefix (/api/v1/, /api/v2/) |
+| **Error Handling** | Standardized error responses with status codes |
+| **Pagination** | List endpoints support pagination parameters |
+
+### 7.3 Database Schema
+
+**Core Transaction Tables:**
+| Table | Purpose | Key Fields |
+|-------|---------|------------|
+| patient | Patient registry | InternalPID, PatientID, NameFirst, NameLast, Sex, Birthdate |
+| porder | Laboratory orders | OrderID, InternalPID, OrderStatus, Priority |
+| orderitem | Order tests | OrderID, TestID |
+| specimen | Specimens | SID, SpecimenID, SpecimenStatus |
+| patresult | Patient results | ResultID, OrderID, TestID, ResultValue |
+| patresultdetail | Result details | ResultID, ParameterID, Value |
+
+**Master Data Tables:**
+| Table | Purpose |
+|-------|---------|
+| valueset | Static lookup values |
+| valuesetdef | Value set definitions |
+| testdefsite | Test definitions by site |
+| testdeftech | Technical test specifications |
+| testdefcal | Calculated test formulas |
+| testdefgrp | Test groups/panels |
+| refnum | Numeric reference ranges |
+| reftxt | Text reference ranges |
+
+**Integration Tables:**
+| Table | Purpose |
+|-------|---------|
+| edgeres | Raw instrument results |
+| edgestatus | Instrument status |
+| edgeack | Order acknowledgment |
+
+### 7.4 API Specifications
+
+**Authentication Endpoint:**
+```
+POST /api/login
+Request: { "username": "...", "password": "..." }
+Response: { "token": "jwt-token", "expires": 3600 }
+```
+
+**Demo Order Endpoint (No Auth):**
+```
+POST /api/demo/order
+Request: {
+  "PatientID": "PT001",
+  "NameFirst": "John",
+  "NameLast": "Doe",
+  "Sex": "1",
+  "Birthdate": "1990-05-15",
+  "Priority": "R",
+  "OrderingProvider": "Dr. Smith"
+}
+Response: {
+  "status": "success",
+  "data": {
+    "PatientID": "DEMO1736689600",
+    "InternalPID": 1,
+    "OrderID": "00250112000001",
+    "OrderStatus": "ORD"
+  }
+}
+```
+
+**Order Endpoints:**
+```
+GET    /api/ordertest        - List orders
+POST   /api/ordertest        - Create order
+GET    /api/ordertest/:id    - Get order
+PUT    /api/ordertest/:id    - Update order
+DELETE /api/ordertest/:id    - Delete order
+POST   /api/ordertest/status - Update status
+```
+
+**Edge API Endpoints:**
+```
+POST /api/edge/results         - Receive results
+GET  /api/edge/orders          - Fetch pending orders
+POST /api/edge/orders/:id/ack  - Acknowledge order
+POST /api/edge/status          - Log status
+```
+
+---
+
+## 8. Implementation Roadmap
+
+### Phase 0: Master Data Completion (P0)
+> **Prerequisite:** All master data must be complete before transactional workflows
+
+| Task | Effort | Dependencies |
+|------|--------|--------------|
+| Complete reference range migrations | 2 days | None |
+| Create reference range CRUD controllers | 3 days | Migrations |
+| Verify all value sets populated | 1 day | None |
+| Complete test definitions data entry | 2 days | None |
+| **Total** | **8 days** | - |
+
+### Phase 1: Core Lab Workflow (P0)
+| Task | Effort | Dependencies |
+|------|--------|--------------|
+| Order CRUD complete | 5 days | Phase 0 |
+| Order ID generation | 2 days | Order CRUD |
+| Order status tracking | 2 days | Order CRUD |
+| Specimen API complete | 5 days | Phase 0 |
+| Specimen status workflow | 3 days | Specimen API |
+| Result CRUD | 5 days | Phase 0 |
+| Result entry with validation | 4 days | Result CRUD |
+| Result verification workflow | 4 days | Result CRUD |
+| Result report generation | 3 days | Result verification |
+| **Total** | **33 days** | Phase 0 |
+
+### Phase 2: Instrument Integration (P1)
+| Task | Effort | Dependencies |
+|------|--------|--------------|
+| Edge API results endpoint | 4 days | Phase 1 |
+| Edge API orders endpoint | 3 days | Phase 1 |
+| Test mapping management | 3 days | Phase 0 |
+| Order acknowledgment | 2 days | Edge orders |
+| Status logging | 2 days | Edge results |
+| **Total** | **14 days** | Phase 1 |
+
+### Phase 3: Quality Management (P2)
+| Task | Effort | Dependencies |
+|------|--------|--------------|
+| QC result entry | 4 days | Phase 2 |
+| QC validation rules | 3 days | QC entry |
+| Calibration tracking | 3 days | None |
+| Audit trail implementation | 5 days | Phase 1 |
+| **Total** | **15 days** | Phase 2 |
+
+### Phase 4: Additional Features (P3)
+| Task | Effort | Dependencies |
+|------|--------|--------------|
+| Inventory management | 8 days | None |
+| Billing integration | 6 days | Phase 1 |
+| Advanced reporting | 5 days | Phase 1 |
+| **Total** | **19 days** | Phase 1 |
+
+**Total MVP Timeline:** ~89 days (~4 months)
+- Phase 0: 2 weeks
+- Phase 1: 7 weeks
+- Phase 2: 3 weeks
+- Phase 3: 3 weeks
+- Phase 4: 4 weeks
+
+---
+
+## 9. Success Criteria
+
+### 9.1 API Endpoint Acceptance
+
+A REST API endpoint is considered complete when:
+- [ ] HTTP methods implemented (GET, POST, PATCH, DELETE)
+- [ ] Request validation implemented (input sanitization, type checking)
+- [ ] JSON response format consistent with API standards
+- [ ] Error responses include status code and error message
+- [ ] JWT authentication/authorization configured
+- [ ] Soft delete implemented (where applicable)
+- [ ] UTC date normalization working
+- [ ] Unit tests written (PHPUnit)
+- [ ] API documented (request/response examples)
+- [ ] Pagination support (list endpoints)
+- [ ] Filtering/sorting support (where applicable)
+
+### 9.2 MVP Definition of Done
+
+The MVP is considered complete when:
+1. ✅ Patient can be registered and retrieved
+2. ✅ Order can be created with valid OrderID
+3. ✅ Specimen can be tracked through all statuses
+4. ✅ Results can be entered with range validation
+5. ✅ Results can be verified (VER → REV → REP)
+6. ✅ Instruments can send results via Edge API
+7. ✅ All master data is manageable
+8. ✅ JWT authentication protects all endpoints
+9. ✅ Soft delete works on all transactions
+10. ✅ UTC timestamps are normalized
+
+### 9.3 Performance Benchmarks
+
+| Metric | Target | Measurement |
+|--------|--------|-------------|
+| API response time (p95) | < 500ms | Apache Bench |
+| Database query time | < 200ms | EXPLAIN analysis |
+| Lookup cache hit rate | > 95% | Application metrics |
+| Test coverage | > 80% | PHPUnit --coverage |
+
+---
+
+## 10. Open Questions & Risks
+
+### 10.1 Open Questions
+| Question | Impact | Target Date |
+|----------|--------|-------------|
+| Reference range types (refthold, refvset) - are they needed for MVP? | Medium | Phase 0 |
+| Multi-site deployment requirements? | High | Phase 0 |
+| Specific instrument integrations needed? | High | Phase 2 |
+| Report format requirements (PDF/HTML)? | Medium | Phase 1 |
+| HL7/FHIR integration requirements? | Low | Phase 4 |
+
+### 10.2 Technical Risks
+
+| Risk | Probability | Impact | Mitigation |
+|------|-------------|--------|------------|
+| Edge API protocol mismatches | Medium | High | Early instrument testing |
+| Reference range complexity | Low | Medium | Start with refnum only |
+| Performance at scale | Low | Medium | Database indexing, caching |
+| Test definition data entry | High | Medium | Provide templates/bulk import |
+
+### 10.3 Business Risks
+
+| Risk | Probability | Impact | Mitigation |
+|------|-------------|--------|------------|
+| Scope creep | High | High | Strict MVP definition |
+| Resource constraints | Medium | High | Phased delivery |
+| Instrument compatibility | Medium | High | Edge API abstraction layer |
+
+---
+
+## 11. Appendix
+
+### 11.1 Glossary
+
+| Term | Definition |
+|------|------------|
+| **OrderID** | Laboratory order identifier: LLYYMMDDXXXXX (Lab+Date+Sequence) |
+| **SID** | Specimen identifier: OrderID + SpecimenType + Container |
+| **VSetID** | Value set definition ID |
+| **VID** | Value set value ID |
+| **Edge API** | Standardized interface for laboratory instrument integration |
+| **ADT** | Admission, Discharge, Transfer |
+| **QC** | Quality Control |
+| **LLYYMMDD** | Lab location (LL) + Year (YY) + Month (MM) + Day (DD) |
+| **UTC** | Coordinated Universal Time |
+
+### 11.2 Reference Documents
+
+| Document | Location |
+|----------|----------|
+| Technical Architecture | `CLAUDE.md` |
+| Implementation Tasks | `TODO.md` |
+| API Documentation | `README.md` |
+| Database Migrations | `app/Database/Migrations/` |
+
+### 11.3 Revision History
+
+| Version | Date | Author | Changes |
+|---------|------|--------|---------|
+| 1.0 | 2026-01-28 | Claude | Initial PRD from TODO.md |
+
+---
+
+**Document Status:** Draft for Review
+**Next Review:** Upon Phase 0 completion
+**Approvals:** Pending
diff --git a/README.md b/README.md
index 6fb829e..4016225 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,40 @@
 # CLQMS (Clinical Laboratory Quality Management System)
 
-> **The core backend engine for modern clinical laboratory workflows.**
+> **A REST API backend for modern clinical laboratory workflows.**
 
-CLQMS is a robust, mission-critical API suite designed to streamline laboratory operations, ensure data integrity, and manage complex diagnostic workflows. Built on a foundation of precision and regulatory compliance, this system handles everything from patient registration to high-throughput test resulting.
+---
+
+## 🤖 For Claude Code
+
+**When working in this repository, prioritize Serena MCP tools for code operations:**
+
+- **Use `find_symbol` / `get_symbols_overview`** instead of `Read` for exploring code structure
+- **Use `replace_symbol_body`** instead of `Edit` for modifying functions, methods, classes
+- **Use `insert_before_symbol` / `insert_after_symbol`** for adding new code symbols
+- **Use `search_for_pattern`** instead of `Grep` for searching code patterns
+- **Use `list_dir` / `find_file`** instead of `Glob` for file discovery
+
+This minimizes tool calls and leverages semantic code understanding for this PHP codebase.
+
+---
+
+CLQMS is a **headless REST API backend** designed to streamline laboratory operations, ensure data integrity, and manage complex diagnostic workflows. Built on a foundation of precision and regulatory compliance, this system provides comprehensive JSON endpoints for laboratory operations.
+
+**Key Characteristic:** This is an **API-only system** with no view layer. Frontend applications (web, mobile, desktop) consume these REST endpoints to build laboratory information systems.
 
 ---
 
 ## 🏛️ Core Architecture & Design
 
-The system is currently undergoing a strategic **Architectural Redesign** to consolidate legacy structures into a high-performance, maintainable schema. This design, spearheaded by leadership, focuses on reducing technical debt and improving data consistency across:
+CLQMS is a **headless REST API system** following a clean architecture pattern. The system is designed to be consumed by any frontend client (web, mobile, desktop) through comprehensive JSON endpoints.
+
+**API-First Architecture:**
+- **No View Layer:** This system provides REST APIs only - no HTML views, no server-side rendering
+- **Frontend Agnostic:** Any client can consume these APIs (React, Vue, Angular, mobile apps, desktop apps)
+- **JSON-First:** All requests/responses use JSON format
+- **Stateless:** Each API request is independent with JWT authentication
+
+The system is currently undergoing a strategic **Architectural Redesign** to consolidate legacy structures into a high-performance, maintainable schema. This design focuses on reducing technical debt and improving data consistency across:
 
 - **Unified Test Definitions:** Consolidating technical, calculated, and site-specific test data.
 - **Reference Range Centralization:** A unified engine for numeric, threshold, text, and coded results.
@@ -30,23 +56,177 @@ The system is currently undergoing a strategic **Architectural Redesign** to con
 | Component      | Specification |
 | :------------- | :------------ |
 | **Language**   | PHP 8.1+ (PSR-compliant) |
-| **Framework**  | CodeIgniter 4 |
+| **Framework**  | CodeIgniter 4 (API-only mode) |
 | **Security**   | JWT (JSON Web Tokens) Authorization |
 | **Database**   | MySQL (Optimized Schema Migration in progress) |
+| **API Format** | RESTful JSON |
+| **Testing**    | PHPUnit 10.5+ |
 
 
 ---
 
 ## 📂 Documentation & Specifications
 
-For detailed architectural blueprints and API specifications, please refer to the internal documentation:
+### Key Documents
 
-👉 **[Internal Documentation Index](./docs/README.md)**
+| Document | Location | Description |
+|----------|----------|-------------|
+| **PRD** | `PRD.md` | Complete Product Requirements Document (API-focused) |
+| **Technical Guide** | `CLAUDE.md` | Architecture, coding standards, common commands |
+| **API Overview** | This file | REST API documentation and endpoints |
+| **Database Migrations** | `app/Database/Migrations/` | Database schema history |
 
-Key documents:
-- [Database Schema Redesign Proposal](./docs/20251216002-Test_OrderTest_RefRange_schema_redesign_proposal.md)
-- [API Contract: Patient Registration](./docs/api_contract_patient_registration.md)
-- [Database Design Review (Reference)](./docs/20251212001-database_design_review_sonnet.md)
+### API Documentation
+
+All API endpoints follow REST conventions:
+
+**Base URL:** `/api`
+
+**Authentication:** JWT token required for most endpoints (except `/api/login`, `/api/demo/*`)
+
+**Response Format:**
+```json
+{
+  "status": "success|error",
+  "message": "Human-readable message",
+  "data": { ... }
+}
+```
+
+---
+
+## 🔌 REST API Overview
+
+### API Endpoint Categories
+
+#### Authentication & Authorization
+
+| Method | Endpoint | Description | Auth Required |
+|--------|----------|-------------|---------------|
+| `POST` | `/api/login` | User login, returns JWT token | No |
+| `POST` | `/api/logout` | Invalidate JWT token | Yes |
+| `POST` | `/api/refresh` | Refresh JWT token | Yes |
+
+#### Patient Management
+
+| Method | Endpoint | Description | Auth Required |
+|--------|----------|-------------|---------------|
+| `GET` | `/api/patient` | List patients with pagination | Yes |
+| `GET` | `/api/patient/{id}` | Get patient details | Yes |
+| `POST` | `/api/patient` | Create new patient | Yes |
+| `PATCH` | `/api/patient/{id}` | Update patient | Yes |
+| `DELETE` | `/api/patient/{id}` | Soft delete patient | Yes |
+
+#### Order Management
+
+| Method | Endpoint | Description | Auth Required |
+|--------|----------|-------------|---------------|
+| `GET` | `/api/ordertest` | List orders | Yes |
+| `GET` | `/api/ordertest/{id}` | Get order details | Yes |
+| `POST` | `/api/ordertest` | Create order | Yes |
+| `PATCH` | `/api/ordertest/{id}` | Update order | Yes |
+| `DELETE` | `/api/ordertest/{id}` | Delete order | Yes |
+| `POST` | `/api/ordertest/status` | Update order status | Yes |
+
+#### Demo/Test Endpoints (No Auth)
+
+| Method | Endpoint | Description | Auth Required |
+|--------|----------|-------------|---------------|
+| `POST` | `/api/demo/order` | Create demo order with patient | No |
+
+#### Specimen Management
+
+| Method | Endpoint | Description | Auth Required |
+|--------|----------|-------------|---------------|
+| `GET` | `/api/specimen` | List specimens | Yes |
+| `GET` | `/api/specimen/{id}` | Get specimen details | Yes |
+| `POST` | `/api/specimen` | Create specimen | Yes |
+| `PATCH` | `/api/specimen/{id}` | Update specimen | Yes |
+| `POST` | `/api/specimen/status` | Update specimen status | Yes |
+
+#### Result Management
+
+| Method | Endpoint | Description | Auth Required |
+|--------|----------|-------------|---------------|
+| `GET` | `/api/patresult` | List patient results | Yes |
+| `GET` | `/api/patresult/{id}` | Get result details | Yes |
+| `POST` | `/api/patresult` | Enter new result | Yes |
+| `PATCH` | `/api/patresult/{id}` | Update result | Yes |
+| `POST` | `/api/patresult/status` | Verify result (VER/REV/REP) | Yes |
+
+#### Edge API (Instrument Integration)
+
+| Method | Endpoint | Description | Auth Required |
+|--------|----------|-------------|---------------|
+| `POST` | `/api/edge/results` | Receive instrument results | API Key |
+| `GET` | `/api/edge/orders` | Fetch pending orders | API Key |
+| `POST` | `/api/edge/orders/{id}/ack` | Acknowledge order | API Key |
+| `POST` | `/api/edge/status` | Log instrument status | API Key |
+
+### API Response Format
+
+All API endpoints return JSON in this format:
+
+**Success Response:**
+```json
+{
+  "status": "success",
+  "message": "Operation completed successfully",
+  "data": {
+    // Response data here
+  }
+}
+```
+
+**Error Response:**
+```json
+{
+  "status": "error",
+  "message": "Error description",
+  "errors": [
+    {
+      "field": "field_name",
+      "message": "Validation error message"
+    }
+  ]
+}
+```
+
+### Authentication
+
+Most endpoints require JWT authentication:
+
+**Request Headers:**
+```
+Authorization: Bearer {jwt_token}
+Content-Type: application/json
+```
+
+**Login Request Example:**
+```bash
+POST /api/login
+{
+  "username": "labuser",
+  "password": "password123"
+}
+```
+
+**Login Response:**
+```json
+{
+  "status": "success",
+  "message": "Login successful",
+  "data": {
+    "token": "eyJ0eXAiOiJKV1QiLCJhbGc...",
+    "expires_in": 3600,
+    "user": {
+      "id": 1,
+      "username": "labuser",
+      "name": "Lab User"
+    }
+  }
+}
+```
 
 ---
 
@@ -151,32 +331,12 @@ $labeled = Lookups::transformLabels($patients, [
 Lookups::clearCache();
 ```
 
-### Frontend Usage (Alpine.js)
-
-```php
-<?php
-// In your PHP view file
-use App\Libraries\Lookups;
-
-$allLookups = Lookups::getAll();
-?>
-<script>
-const LOOKUPS = <?= json_encode($allLookups) ?>;
-console.log(LOOKUPS.gender);
-// Output: {"values":[{"key":"1","value":"Female"},{"key":"2","value":"Male"},...]}
-
-// Convenience accessors
-const genderValues = LOOKUPS.gender.values;
-const genderDropdown = LOOKUPS.gender.values.map(v => ({value: v.key, label: v.value}));
-</script>
-```
-
 ### When to Use
 
 | Approach | Use Case |
 |----------|----------|
-| **Lookups Library** | Static values that rarely change (gender, status, types) - fast, cached |
-| **API `/api/valueset*`** | Dynamic values managed by admins at runtime |
+| **Lookups Library** | Server-side static values that rarely change (gender, status, types) - fast, cached |
+| **API `/api/valueset*`** | Dynamic values managed by admins at runtime, or for frontend clients needing lookup data |
 
 ### Adding New Lookups
 
@@ -199,9 +359,9 @@ const genderDropdown = LOOKUPS.gender.values.map(v => ({value: v.key, label: v.v
 
 ## 📋 Master Data Management
 
-CLQMS provides comprehensive master data management for laboratory operations. All master data is accessible via the V2 UI at `/v2/master/*` endpoints.
+CLQMS provides comprehensive master data management for laboratory operations. All master data is accessible via REST API endpoints.
 
-### 🧪 Laboratory Tests (`/v2/master/tests`)
+### 🧪 Laboratory Tests
 
 The Test Definitions module manages all laboratory test configurations including parameters, calculated tests, and test panels.
 
@@ -254,7 +414,7 @@ The Test Definitions module manages all laboratory test configurations including
 }
 ```
 
-### 📏 Reference Ranges (`/v2/master/refrange`)
+### 📏 Reference Ranges
 
 Reference Ranges define normal and critical values for test results. The system supports multiple reference range types based on patient demographics.
 
@@ -292,7 +452,7 @@ Reference Ranges define normal and critical values for test results. The system
 | `PATCH` | `/api/refnum` | Update reference range |
 | `DELETE` | `/api/refnum` | Soft delete reference range |
 
-### 📑 Value Sets (`/v2/master/valuesets`)
+### 📑 Value Sets
 
 Value Sets are configurable dropdown options used throughout the system. Each Value Set Definition (VSetDef) contains multiple Value Set Values (ValueSet).
 
@@ -386,6 +546,9 @@ Instrument → tiny-edge → POST /api/edge/results → edgeres table → [Manua
 ---
 
 ### 📜 Usage Notice
+
+**This is an API-only backend system.** There are no views, HTML templates, or server-side rendering components. Frontend applications should consume these REST endpoints to build user interfaces for laboratory operations.
+
 This repository contains proprietary information intended for the 5Panda Team and authorized collaborators.
 
 ---
diff --git a/USER_STORIES.md b/USER_STORIES.md
new file mode 100644
index 0000000..4a4d91a
--- /dev/null
+++ b/USER_STORIES.md
@@ -0,0 +1,1607 @@
+# CLQMS User Stories
+
+> Clinical Laboratory Quality Management System - User Stories
+>
+> Version: 1.0
+> Last Updated: 2026-01-28
+
+---
+
+## How to Read These Stories
+
+Each user story follows this format:
+
+**Story ID**: [Module]-[Number]
+**Priority**: P0 (Must-have) | P1 (Should-have) | P2 (Nice-to-have) | P3 (Future)
+
+```
+As a [actor/role],
+I want [feature/action],
+So that [benefit/value].
+```
+
+**Acceptance Criteria:**
+- [ ] Criteria 1
+- [ ] Criteria 2
+
+---
+
+## Table of Contents
+
+1. [Master Data Management (P0)](#1-master-data-management-p0)
+2. [Order Management (P0)](#2-order-management-p0)
+3. [Specimen Management (P0)](#3-specimen-management-p0)
+4. [Result Management (P0)](#4-result-management-p0)
+5. [Patient Visit (P1)](#5-patient-visit-p1)
+6. [Instrument Integration (P1)](#6-instrument-integration-p1)
+7. [Quality Control (P2)](#7-quality-control-p2)
+8. [Calibration (P2)](#8-calibration-p2)
+9. [Audit Trail (P2)](#9-audit-trail-p2)
+10. [Inventory & Billing (P3)](#10--inventory--billing-p3)
+
+---
+
+## 1. Master Data Management (P0)
+
+> **Note**: All master data stories are P0 because they are foundational prerequisites for all transactional workflows.
+
+### VS-001: Manage Value Set Definitions
+**Priority**: P0
+
+As a **system administrator**,
+I want **to manage value set definitions**,
+So that **I can define and maintain lookup value categories used throughout the system**.
+
+**Acceptance Criteria:**
+- [ ] Create new value set definition with name, description, and metadata
+- [ ] Update existing value set definition
+- [ ] Delete value set definition (soft delete)
+- [ ] List all value set definitions with pagination
+- [ ] Retrieve single value set definition by ID
+- [ ] Value set definitions include: name, description, category, active status
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/valuesetdef`
+
+---
+
+### VS-002: Manage Value Set Values
+**Priority**: P0
+
+As a **system administrator**,
+I want **to manage individual values within value sets**,
+So that **I can maintain the lookup options available for dropdown selections**.
+
+**Acceptance Criteria:**
+- [ ] Create new value set value with key, label, and sort order
+- [ ] Update existing value set value
+- [ ] Delete value set value (soft delete)
+- [ ] List all values for a specific value set definition
+- [ ] Filter values by active/inactive status
+- [ ] Values can be marked as default
+- [ ] Sort order controls display sequence in dropdowns
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/valueset`
+
+---
+
+### VS-003: Use JSON-Based Static Lookups
+**Priority**: P0
+
+As a **developer**,
+I want **to access static lookup values from JSON files**,
+So that **I can quickly load commonly-used reference data without database queries**.
+
+**Acceptance Criteria:**
+- [ ] ValueSet library provides `get($key)` method returning dropdown options
+- [ ] ValueSet library provides `getRaw($key)` method returning raw JSON data
+- [ ] ValueSet library provides `getLabel($key, $value)` to get text label
+- [ ] ValueSet library provides `transformLabels($records, $mappings)` for batch label conversion
+- [ ] JSON files stored in `app/Libraries/Data/*.json`
+- [ ] Lookup results cached for performance (>95% cache hit rate)
+- [ ] Cache can be cleared via `ValueSet::clearCache()`
+- [ ] Common lookups include: sex, marital_status, race, ethnic, order_status, specimen_type, result_type
+
+---
+
+### VS-004: Refresh Value Set Cache
+**Priority**: P0
+
+As a **system administrator**,
+I want **to refresh the value set cache after making changes**,
+So that **the system immediately reflects updated lookup values**.
+
+**Acceptance Criteria:**
+- [ ] API endpoint: POST `/api/valueset/refresh`
+- [ ] Cache refresh requires authentication
+- [ ] Cache refresh returns success status
+- [ ] All ValueSet library calls return fresh data after refresh
+
+---
+
+### TD-001: Manage Test Site Definitions
+**Priority**: P0
+
+As a **lab manager**,
+I want **to define which tests are available at each laboratory site**,
+So that **orders can only include tests appropriate for the testing location**.
+
+**Acceptance Criteria:**
+- [ ] Create test definition for a site
+- [ ] Update test site definition
+- [ ] Delete test site definition
+- [ ] List all tests available at a specific site
+- [ ] Filter tests by discipline, department, or specimen type
+- [ ] Mark tests as active/inactive per site
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/testdefsite`
+
+---
+
+### TD-002: Manage Technical Test Specifications
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to define technical specifications for each test**,
+So that **the system knows how to process, validate, and report test results**.
+
+**Acceptance Criteria:**
+- [ ] Define specimen type requirements
+- [ ] Define container requirements
+- [ ] Define result type (numeric, text, valueset, range)
+- [ ] Define expected units of measure
+- [ ] Define decimal precision
+- [ ] Define result format options
+- [ ] Link to reference range definitions
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/testdeftech`
+
+---
+
+### TD-003: Define Calculated Test Formulas
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to create formulas for calculated tests**,
+So that **the system can automatically compute derived values from other test results**.
+
+**Acceptance Criteria:**
+- [ ] Create formula for calculated test
+- [ ] Formula language supports basic arithmetic (+, -, *, /)
+- [ ] Formula can reference other test results by TestID
+- [ ] Formula can include constants and parentheses
+- [ ] Formula validation catches circular references
+- [ ] Formula calculation triggered when all dependencies are available
+- [ ] Calculated results flagged as "CALC" type
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/testdefcal`
+
+---
+
+### TD-004: Manage Test Groups and Panels
+**Priority**: P0
+
+As a **lab manager**,
+I want **to group individual tests into panels and profiles**,
+So that **clinicians can order commonly-related tests as a single group**.
+
+**Acceptance Criteria:**
+- [ ] Create test group with name and description
+- [ ] Add multiple tests to a group
+- [ ] Remove tests from a group
+- [ ] Mark group as type "GROUP" (panel) or "TITLE" (section header)
+- [ ] Groups can include other groups (nested panels)
+- [ ] Ordering a group automatically orders all component tests
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/testdefgrp`
+
+---
+
+### TD-005: Map Instruments to Tests
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to map laboratory instruments to specific tests**,
+So that **instrument results can be correctly matched to patient tests**.
+
+**Acceptance Criteria:**
+- [ ] Create instrument-to-test mapping
+- [ ] Define instrument test code (from analyzer)
+- [ ] Define corresponding CLQMS TestID
+- [ ] Define result transformation rules (if needed)
+- [ ] Specify unit conversions (if needed)
+- [ ] One instrument test can map to multiple CLQMS tests
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/testmap`
+
+---
+
+### TD-006: Auto-Select Calculated Test Parameters
+**Priority**: P0
+
+As a **laboratory information system**,
+I want **to automatically add parameters required for calculated tests**,
+So that **all necessary data is collected when calculated tests are ordered**.
+
+**Acceptance Criteria:**
+- [ ] System analyzes formulas for all calculated tests in order
+- [ ] System identifies parameter dependencies
+- [ ] System automatically adds missing parameters to order
+- [ ] User notified of auto-added parameters
+- [ ] Parameters cannot be removed if required by calculated test
+- [ ] Dependency chain is recursive (parameters may have their own dependencies)
+
+---
+
+### RR-001: Manage Numeric Reference Ranges
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to define numeric reference ranges with age and sex criteria**,
+So that **the system can automatically flag abnormal test results**.
+
+**Acceptance Criteria:**
+- [ ] Create reference range for a test
+- [ ] Define minimum and maximum normal values
+- [ ] Define age range (birth to death)
+- [ ] Define sex criteria (male, female, both)
+- [ ] Define race/ethnicity criteria (optional)
+- [ ] System auto-flags results outside range as "abnormal"
+- [ ] System finds matching range based on patient demographics
+- [ ] Supports critical value thresholds
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/refnum`
+
+---
+
+### RR-002: Manage Threshold Reference Ranges
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to define critical value thresholds**,
+So that **the system can generate urgent alerts for dangerous results**.
+
+**Acceptance Criteria:**
+- [ ] Create threshold range for a test
+- [ ] Define critical low and critical high values
+- [ ] Define panic values requiring immediate notification
+- [ ] Threshold overrides standard reference range
+- [ ] System flags threshold results as "critical"
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/refthold`
+
+---
+
+### RR-003: Manage Text Reference Ranges
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to define acceptable text values for qualitative tests**,
+So that **the system can validate text-based results**.
+
+**Acceptance Criteria:**
+- [ ] Create text reference range for a test
+- [ ] Define list of acceptable text values
+- [ ] Define default/normal value
+- [ ] Define abnormal values
+- [ ] System validates entered text against acceptable values
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/reftxt`
+
+---
+
+### RR-004: Manage Value Set Reference Ranges
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to define reference ranges based on value set codes**,
+So that **dropdown-based results can be validated**.
+
+**Acceptance Criteria:**
+- [ ] Create value set reference range
+- [ ] Link to specific value set definition
+- [ ] Mark which values are normal vs abnormal
+- [ ] Define default normal value
+- [ ] System flags non-default values as abnormal (optional)
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/refvset`
+
+---
+
+### ORG-001: Manage Accounts
+**Priority**: P0
+
+As a **system administrator**,
+I want **to manage laboratory accounts**,
+So that **the system can track orders and results by customer organization**.
+
+**Acceptance Criteria:**
+- [ ] Create account with name, code, and contact information
+- [ ] Update account details
+- [ ] Soft delete account
+- [ ] List all accounts with pagination
+- [ ] Assign sites to accounts
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/account`
+
+---
+
+### ORG-002: Manage Sites
+**Priority**: P0
+
+As a **system administrator**,
+I want **to manage laboratory sites**,
+So that **multi-location laboratories can track data by physical location**.
+
+**Acceptance Criteria:**
+- [ ] Create site with name, type, and location
+- [ ] Define site type (hospital, clinic, reference lab, etc.)
+- [ ] Link site to parent account
+- [ ] Define site address and contact
+- [ ] Update and soft delete sites
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/site`
+
+---
+
+### ORG-003: Manage Locations
+**Priority**: P0
+
+As a **system administrator**,
+I want **to manage physical locations within sites**,
+So that **specimens and orders can be tracked to specific areas**.
+
+**Acceptance Criteria:**
+- [ ] Create location within a site
+- [ ] Define location type (phlebotomy, reception, lab, storage, etc.)
+- [ ] Define location hierarchy (building, floor, room)
+- [ ] Update and soft delete locations
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/location`
+
+---
+
+### ORG-004: Manage Disciplines
+**Priority**: P0
+
+As a **lab manager**,
+I want **to manage laboratory disciplines**,
+So that **tests can be organized by clinical discipline**.
+
+**Acceptance Criteria:**
+- [ ] Create discipline (e.g., Chemistry, Hematology, Microbiology)
+- [ ] Define discipline code and description
+- [ ] Link departments to disciplines
+- [ ] Update and soft delete disciplines
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/discipline`
+
+---
+
+### ORG-005: Manage Departments
+**Priority**: P0
+
+As a **lab manager**,
+I want **to manage laboratory departments**,
+So that **tests and staff can be organized by sub-discipline**.
+
+**Acceptance Criteria:**
+- [ ] Create department within a discipline
+- [ ] Define department code and description
+- [ ] Link department to parent discipline
+- [ ] Update and soft delete departments
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/department`
+
+---
+
+### ORG-006: Manage Workstations
+**Priority**: P0
+
+As a **lab manager**,
+I want **to manage laboratory workstations**,
+So that **orders and results can be tracked to specific instruments or work areas**.
+
+**Acceptance Criteria:**
+- [ ] Create workstation with name and type
+- [ ] Link workstation to department
+- [ ] Define workstation as manual or automated
+- [ ] Link automated workstations to instruments
+- [ ] Update and soft delete workstations
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/workstation`
+
+---
+
+### SPEC-001: Manage Container Definitions
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to define specimen container types**,
+So that **the system can track appropriate containers for each specimen type**.
+
+**Acceptance Criteria:**
+- [ ] Create container definition
+- [ ] Define container class (tube, cup, slide, etc.)
+- [ ] Define container size
+- [ ] Define cap color
+- [ ] Define additive requirements
+- [ ] Define minimum and maximum volumes
+- [ ] Update and soft delete containers
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/containerdef`
+
+---
+
+### SPEC-002: Manage Specimen Types
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to define specimen types**,
+So that **orders can specify the required biological material**.
+
+**Acceptance Criteria:**
+- [ ] Create specimen type (Blood, Urine, Tissue, etc.)
+- [ ] Define specimen type code
+- [ ] Link to appropriate container types
+- [ ] Define collection methods
+- [ ] Define storage requirements
+- [ ] Update and soft delete specimen types
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/specimentype`
+
+---
+
+### SPEC-003: Manage Collection Methods
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to define specimen collection methods**,
+So that **phlebotomy procedures can be standardized**.
+
+**Acceptance Criteria:**
+- [ ] Create collection method (Venipuncture, Catheter, etc.)
+- [ ] Define method code and description
+- [ ] Link to appropriate specimen types
+- [ ] Update and soft delete collection methods
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/collectionmethod`
+
+---
+
+### SPEC-004: Manage Container Classes and Sizes
+**Priority**: P0
+
+As a **lab technical specialist**,
+I want **to define container classes and sizes**,
+So that **specimen containers can be consistently categorized**.
+
+**Acceptance Criteria:**
+- [ ] Container classes: tube, cup, vial, slide, bag, etc.
+- [ ] Container sizes with volume capacity
+- [ ] Size units (mL, L, etc.)
+- [ ] Link sizes to container classes
+- [ ] Manage cap color options
+- [ ] API endpoints: GET/POST/PATCH/DELETE for container class and size lookup tables
+
+---
+
+## 2. Order Management (P0)
+
+### ORD-001: Create Laboratory Order
+**Priority**: P0
+
+As a **ordering provider or clinical staff**,
+I want **to create a laboratory order for a patient**,
+So that **the laboratory can perform requested tests**.
+
+**Acceptance Criteria:**
+- [ ] Create order via POST `/api/ordertest`
+- [ ] Order requires patient identification (InternalPID)
+- [ ] Order requires priority (Stat/Routine/ASAP)
+- [ ] Order requires ordering provider identification
+- [ ] System generates unique OrderID in format: LLYYMMDDXXXXX
+  - LL: Lab location code
+  - YYMMDD: Date
+  - XXXXX: Sequential number
+- [ ] Order includes one or more tests
+- [ ] Initial order status is "ORD" (ordered)
+- [ ] Order date/time recorded in UTC
+- [ ] Response includes: OrderID, InternalPID, OrderStatus, list of tests
+
+---
+
+### ORD-002: Update Order Details
+**Priority**: P0
+
+As a **laboratory staff**,
+I want **to modify order details before verification**,
+So that **the order can be corrected if information was entered incorrectly**.
+
+**Acceptance Criteria:**
+- [ ] Update order via PATCH `/api/ordertest/:id`
+- [ ] Can update priority
+- [ ] Can update ordering provider
+- [ ] Can add tests to order
+- [ ] Can remove tests from order (before specimen collection)
+- [ ] Updates prevented if order is verified
+- [ ] Update timestamp recorded in UTC
+
+---
+
+### ORD-003: Delete Order
+**Priority**: P0
+
+As a **laboratory staff**,
+I want **to cancel an order**,
+So that **tests are not performed on cancelled orders**.
+
+**Acceptance Criteria:**
+- [ ] Delete order via DELETE `/api/ordertest/:id`
+- [ ] Delete is soft delete (DelDate set, not actual deletion)
+- [ ] Deleted orders not displayed in standard queries
+- [ ] Delete prevented if specimens have been collected
+- [ ] Delete reason must be recorded
+- [ ] Deleted orders can be retrieved with include_deleted flag
+
+---
+
+### ORD-004: Track Order Status
+**Priority**: P0
+
+As a **laboratory staff and clinician**,
+I want **to track order status through the testing workflow**,
+So that **I know the current state of the order**.
+
+**Acceptance Criteria:**
+- [ ] Order status workflow: ORD → SCH → ANA → VER → REV → REP
+  - ORD: Ordered
+  - SCH: Scheduled
+  - ANA: Analyzing
+  - VER: Technical verification complete
+  - REV: Clinical review complete
+  - REP: Reported (final)
+- [ ] Status can be updated via PATCH `/api/ordertest/:id/status`
+- [ ] Status update requires authentication
+- [ ] Status change recorded with user ID and timestamp
+- [ ] Status history tracked via audit trail
+- [ ] Current status included in all order responses
+
+---
+
+### ORD-005: Assign Order Priority
+**Priority**: P0
+
+As a **ordering provider or lab staff**,
+I want **to mark orders as urgent**,
+So that **critical tests are performed first**.
+
+**Acceptance Criteria:**
+- [ ] Priority options: Stat (S), Routine (R), ASAP (A)
+- [ ] Stat orders appear at top of worklists
+- [ ] Priority can be updated before specimen collection
+- [ ] Priority displayed on all order views
+- [ ] Default priority is Routine
+
+---
+
+### ORD-006: Attach Documents to Order
+**Priority**: P0
+
+As a **clinical staff**,
+I want **to attach documents or images to an order**,
+So that **relevant clinical information is available to laboratory staff**.
+
+**Acceptance Criteria:**
+- [ ] Upload attachments via POST `/api/ordertest/:id/attachments`
+- [ ] Supported file types: PDF, images (PNG, JPG), documents
+- [ ] File size limits enforced
+- [ ] Attachments linked to ordercom/orderatt tables
+- [ ] Attachment metadata includes: filename, type, size, uploader, timestamp
+- [ ] Attachments can be retrieved via GET `/api/ordertest/:id/attachments`
+
+---
+
+### ORD-007: Map Multiple Tests to Order
+**Priority**: P0
+
+As a **ordering provider**,
+I want **to include multiple tests in a single order**,
+So that **related tests are performed on the same specimen**.
+
+**Acceptance Criteria:**
+- [ ] Order can include multiple tests
+- [ ] Tests can be individual tests or panels
+- [ ] Panels expand to component tests
+- [ ] Orderitem table links OrderID to TestID
+- [ ] All tests in order initially have same status
+- [ ] Individual test status can be tracked independently
+
+---
+
+### ORD-008: Auto-Select Calculated Test Parameters
+**Priority**: P0
+
+As a **laboratory information system**,
+I want **to automatically add required parameters for calculated tests**,
+So that **all necessary data is collected**.
+
+**Acceptance Criteria:**
+- [ ] System detects calculated tests in order
+- [ ] System analyzes formulas for calculated tests
+- [ ] System adds missing parameters to order
+- [ ] User notified of auto-added parameters
+- [ ] Parameters cannot be removed if required
+- [ ] Dependency tracking is recursive
+
+---
+
+### ORD-009: Identify Ordering Provider
+**Priority**: P0
+
+As a **laboratory system**,
+I want **to track which provider ordered each test**,
+So that **results can be sent back and questions can be directed appropriately**.
+
+**Acceptance Criteria:**
+- [ ] Order requires ordering provider identification
+- [ ] Provider can be identified by ID or name
+- [ ] Provider contact information stored
+- [ ] Provider included in result reports
+- [ ] Results can be filtered by ordering provider
+
+---
+
+### ORD-010: Track Order Date/Time in UTC
+**Priority**: P0
+
+As a **laboratory system**,
+I want **to normalize all timestamps to UTC**,
+So that **times are consistent across multiple time zones**.
+
+**Acceptance Criteria:**
+- [ ] Order date stored in UTC in database
+- [ ] Order dates returned as UTC ISO 8601 format in API
+- [ ] Input dates automatically converted to UTC
+- [ ] Timezone information preserved in metadata
+- [ ] Display can show local time based on user preference
+
+---
+
+## 3. Specimen Management (P0)
+
+### SPM-001: Create Specimen from Order
+**Priority**: P0
+
+As a **phlebotomist or lab staff**,
+I want **to create a specimen record for an order**,
+So that **the specimen can be tracked through the laboratory workflow**.
+
+**Acceptance Criteria:**
+- [ ] Create specimen via POST `/api/specimen`
+- [ ] Specimen requires OrderID
+- [ ] Specimen requires SpecimenType
+- [ ] System generates unique SpecimenID = OrderID + SpecimenTypeCode(3) + ContainerCode(1)
+- [ ] Specimen linked to order
+- [ ] Initial specimen status is "COLLECTED"
+- [ ] Collection date/time recorded in UTC
+
+---
+
+### SPM-002: Mark Specimen as Collected
+**Priority**: P0
+
+As a **phlebotomist**,
+I want **to record specimen collection**,
+So that **the laboratory knows the specimen is ready for processing**.
+
+**Acceptance Criteria:**
+- [ ] Update specimen status to "COLLECTED"
+- [ ] Record collection date/time
+- [ ] Record collector ID
+- [ ] Record collection location
+- [ ] Record collection method (venipuncture, catheter, etc.)
+- [ ] Collection activity logged to specmenactivity table
+
+---
+
+### SPM-003: Track Specimen In-Transit
+**Priority**: P0
+
+As a **courier or lab staff**,
+I want **to mark specimen as in-transit**,
+So that **the specimen location is known during transport**.
+
+**Acceptance Criteria:**
+- [ ] Update specimen status to "IN_TRANSIT"
+- [ ] Record dispatch date/time
+- [ ] Record courier/staff ID
+- [ ] Record destination location
+- [ ] Expected arrival time can be recorded
+- [ ] Transit activity logged to specmenactivity table
+
+---
+
+### SPM-004: Receive or Reject Specimen
+**Priority**: P0
+
+As a **laboratory reception staff**,
+I want **to receive specimens and verify acceptability**,
+So that **unacceptable specimens are not processed**.
+
+**Acceptance Criteria:**
+- [ ] Update specimen status to "RECEIVED" or "REJECTED"
+- [ ] Record reception date/time
+- [ ] Record receiver ID
+- [ ] If rejected, record rejection reason
+- [ ] Rejection reasons: insufficient quantity, hemolysis, clotting, wrong container, etc.
+- [ ] Rejected specimens cannot proceed to analysis
+- [ ] Reception activity logged to specmenactivity table
+
+---
+
+### SPM-005: Prepare Specimen for Analysis
+**Priority**: P0
+
+As a **lab technician**,
+I want **to record specimen preparation steps**,
+So that **the specimen processing history is documented**.
+
+**Acceptance Criteria:**
+- [ ] Update specimen status to "PREPARATION"
+- [ ] Preparation types: centrifuge, aliquot, pretreatment, stain, etc.
+- [ ] Record preparation date/time
+- [ ] Record technician ID
+- [ ] Preparation activity logged to specmenactivity table
+- [ ] Multiple preparation steps can be recorded
+
+---
+
+### SPM-006: Store Specimen
+**Priority**: P0
+
+As a **lab technician**,
+I want **to record specimen storage location**,
+So that **the specimen can be retrieved if needed**.
+
+**Acceptance Criteria:**
+- [ ] Update specimen status to "STORED"
+- [ ] Record storage date/time
+- [ ] Record storage location (freezer, refrigerator, room)
+- [ ] Record technician ID
+- [ ] Storage activity logged to specmenactivity table
+- [ ] Storage conditions (temperature) can be recorded
+
+---
+
+### SPM-007: Dispatch Specimen for Referral
+**Priority**: P0
+
+As a **lab staff**,
+I want **to dispatch specimen to reference laboratory**,
+So that **tests not performed in-house can be completed**.
+
+**Acceptance Criteria:**
+- [ ] Update specimen status to "DISPATCHED"
+- [ ] Record dispatch date/time
+- [ ] Record destination (reference lab)
+- [ ] Record courier/tracking information
+- [ ] Dispatch activity logged to specmenactivity table
+- [ ] Dispatched specimens can be tracked
+
+---
+
+### SPM-008: Track Specimen Condition
+**Priority**: P0
+
+As a **lab staff**,
+I want **to flag specimen condition issues**,
+So that **result quality issues can be identified**.
+
+**Acceptance Criteria:**
+- [ ] Condition flags can be recorded: HEM (hemolysis), ITC (insufficient), LIP (lipemic)
+- [ ] Multiple conditions can be flagged
+- [ ] Conditions can be recorded at any stage
+- [ ] Conditions displayed on specimen and result views
+- [ ] Conditions included in result reports
+- [ ] Critical conditions prevent analysis
+
+---
+
+### SPM-009: Log Specimen Activity
+**Priority**: P0
+
+As a **laboratory system**,
+I want **to maintain complete audit trail for specimen**,
+So that **all specimen handling is documented**.
+
+**Acceptance Criteria:**
+- [ ] All status changes logged to specmenactivity table
+- [ ] Activity record includes: SID, activity type, timestamp, user ID
+- [ ] Activity history can be retrieved via GET `/api/specimen/:id/activity`
+- [ ] Activity history displayed chronologically
+- [ ] Activity cannot be deleted or modified
+
+---
+
+### SPM-010: Link Tests to Specimens
+**Priority**: P0
+
+As a **laboratory system**,
+I want **to map tests to specific specimens**,
+So that **results can be linked to the correct biological material**.
+
+**Acceptance Criteria:**
+- [ ] Tests from order can be assigned to specimen(s)
+- [ ] One order can have multiple specimens
+- [ ] Tests can be split across multiple specimens
+- [ ] Test-to-specimen mapping stored in specimen table
+- [ ] Results reference the specimen ID
+- [ ] Result reports show specimen information for each test
+
+---
+
+## 4. Result Management (P0)
+
+### RES-001: Enter Numeric Results
+**Priority**: P0
+
+As a **lab technician or instrument**,
+I want **to enter numeric test results**,
+So that **quantitative measurements are recorded**.
+
+**Acceptance Criteria:**
+- [ ] Create result via POST `/api/patresult`
+- [ ] Result type: numeric
+- [ ] Requires OrderID, TestID, ResultValue, ResultUnit
+- [ ] ResultValue must be valid number
+- [ ] ResultUnit must match test definition
+- [ ] Decimal precision enforced
+- [ ] Initial status is "ENTRY"
+- [ ] UTC timestamp recorded
+
+---
+
+### RES-002: Enter Text Results
+**Priority**: P0
+
+As a **lab technician or pathologist**,
+I want **to enter text-based results**,
+So that **qualitative or descriptive findings can be recorded**.
+
+**Acceptance Criteria:**
+- [ ] Create result via POST `/api/patresult`
+- [ ] Result type: text
+- [ ] Requires OrderID, TestID, ResultValue (text)
+- [ ] Text can be free-form or coded
+- [ ] Text length limits enforced
+- [ ] Initial status is "ENTRY"
+- [ ] UTC timestamp recorded
+
+---
+
+### RES-003: Enter Value Set Results
+**Priority**: P0
+
+As a **lab technician**,
+I want **to select results from dropdown options**,
+So that **coded results ensure consistency**.
+
+**Acceptance Criteria:**
+- [ ] Create result via POST `/api/patresult`
+- [ ] Result type: valueset
+- [ ] Dropdown populated from linked value set
+- [ ] Requires OrderID, TestID, ResultValue (code)
+- [ ] Code must be valid value from value set
+- [ ] Initial status is "ENTRY"
+- [ ] UTC timestamp recorded
+
+---
+
+### RES-004: Enter Range Results
+**Priority**: P0
+
+As a **lab technician**,
+I want **to enter range-based results**,
+So that **measurements with min/max can be recorded**.
+
+**Acceptance Criteria:**
+- [ ] Create result via POST `/api/patresult`
+- [ ] Result type: range
+- [ ] Requires OrderID, TestID, ResultMin, ResultMax, ResultUnit
+- [ ] Both min and max must be valid numbers
+- [ ] ResultUnit must match test definition
+- [ ] Initial status is "ENTRY"
+- [ ] UTC timestamp recorded
+
+---
+
+### RES-005: Validate Against Reference Ranges
+**Priority**: P0
+
+As a **laboratory system**,
+I want **to automatically flag results outside reference ranges**,
+So that **abnormal results are highlighted for review**.
+
+**Acceptance Criteria:**
+- [ ] System retrieves reference range for test based on patient age/sex
+- [ ] Numeric results compared to min/max
+- [ ] Text results compared to acceptable values
+- [ ] Value set results compared to normal/abnormal flags
+- [ ] Results outside range flagged as "abnormal"
+- [ ] Flag displayed on result entry and review screens
+- [ ] Flag included in result reports
+
+---
+
+### RES-006: Flag Critical Values
+**Priority**: P0
+
+As a **laboratory system**,
+I want **to identify critical values**,
+So that **urgent results are immediately brought to attention**.
+
+**Acceptance Criteria:**
+- [ ] Critical values defined in threshold reference ranges
+- [ ] Results exceeding critical thresholds flagged as "critical"
+- [ ] Critical flag visually prominent in UI
+- [ ] Critical results require acknowledgment
+- [ ] Critical results require notification to ordering provider
+- [ ] Critical notification logged
+
+---
+
+### RES-007: Technical Verification
+**Priority**: P0
+
+As a **lab technician or technologist**,
+I want **to verify results for technical accuracy**,
+So that **results are validated before clinical review**.
+
+**Acceptance Criteria:**
+- [ ] Update result status to "VER" via PATCH `/api/patresult/:id/status`
+- [ ] Verification requires authenticated user
+- [ ] Verifier ID recorded
+- [ ] Verification timestamp recorded in UTC
+- [ ] Verification requires review of reference range flags
+- [ ] Verification requires review of critical values
+- [ ] Bulk verification allowed for multiple results
+- [ ] Verification can be reversed before clinical review
+
+---
+
+### RES-008: Clinical Review
+**Priority**: P0
+
+As a **pathologist or clinical reviewer**,
+I want **to review results for clinical interpretation**,
+So that **results are validated before reporting**.
+
+**Acceptance Criteria:**
+- [ ] Update result status to "REV" via PATCH `/api/patresult/:id/status`
+- [ ] Review requires authenticated user with clinical role
+- [ ] Reviewer ID recorded
+- [ ] Review timestamp recorded in UTC
+- [ ] Review can add clinical comments
+- [ ] Review can override reference range flags with justification
+- [ ] Bulk review allowed for multiple results
+- [ ] Review can be reversed before reporting
+
+---
+
+### RES-009: Report Final Results
+**Priority**: P0
+
+As a **laboratory staff**,
+I want **to finalize results for reporting**,
+So that **results can be sent to clinicians**.
+
+**Acceptance Criteria:**
+- [ ] Update result status to "REP" via PATCH `/api/patresult/:id/status`
+- [ ] Finalization requires clinical review complete
+- [ ] Finalization timestamp recorded in UTC
+- [ ] Finalizer ID recorded
+- [ ] Finalized results cannot be modified (only addendum)
+- [ ] Finalized results trigger report generation
+- [ ] Finalized results sent to ordering provider
+- [ ] Bulk finalization allowed for multiple results
+
+---
+
+### RES-010: Track Result Reruns
+**Priority**: P0
+
+As a **lab technician**,
+I want **to record result reruns**,
+So that **quality issues and repeated measurements are documented**.
+
+**Acceptance Criteria:**
+- [ ] Rerun count tracked via AspCnt field
+- [ ] Rerun reason can be recorded
+- [ ] Rerun timestamp recorded
+- [ ] All reruns preserved (no overwriting)
+- [ ] Final result selected from reruns
+- [ ] Rerun history displayed with result
+- [ ] Rerun cannot occur after result verification
+
+---
+
+### RES-011: Add Result Comments
+**Priority**: P0
+
+As a **lab technician or pathologist**,
+I want **to add comments to results**,
+So that **additional context and notes are preserved**.
+
+**Acceptance Criteria:**
+- [ ] Add comment via POST `/api/patresult/:id/comments`
+- [ ] Comment requires text and user ID
+- [ ] Comment timestamp recorded in UTC
+- [ ] Comment type flag: technical, clinical, administrative
+- [ ] Comments displayed with result
+- [ ] Comments included in result reports
+- [ ] Comments cannot be deleted (only appended)
+
+---
+
+### RES-012: Manage Result Details
+**Priority**: P0
+
+As a **lab technician**,
+I want **to add multiple detail parameters to a result**,
+So that **complex multi-part results can be recorded**.
+
+**Acceptance Criteria:**
+- [ ] Add detail via POST `/api/patresult/:id/details`
+- [ ] Detail requires ParameterID and Value
+- [ ] Multiple details can be added to one result
+- [ ] Details can be numeric, text, or coded
+- [ ] Details linked to patresultdetail table
+- [ ] Details displayed with main result
+- [ ] Details included in result reports
+
+---
+
+## 5. Patient Visit (P1)
+
+### VIS-001: Create Patient Visit
+**Priority**: P1
+
+As a **admission or registration staff**,
+I want **to create a patient visit record**,
+So that **orders and results can be linked to an encounter**.
+
+**Acceptance Criteria:**
+- [ ] Create visit via POST `/api/patvisit`
+- [ ] Visit requires patient identification (InternalPID)
+- [ ] Visit type: inpatient, outpatient, emergency
+- [ ] Visit number generated
+- [ ] Admission date/time recorded in UTC
+- [ ] Discharge date/time nullable (open until discharged)
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/patvisit`
+
+---
+
+### VIS-002: Link Orders to Visit
+**Priority**: P1
+
+As a **laboratory or clinical staff**,
+I want **to associate orders with a patient visit**,
+So that **laboratory work is organized by encounter**.
+
+**Acceptance Criteria:**
+- [ ] Orders can be linked to visit during creation
+- [ ] Orders can be updated to link to visit
+- [ ] Visit ID included in order record
+- [ ] Orders can be queried by visit
+- [ ] Visit details displayed with orders
+
+---
+
+### VIS-003: Track ADT Events
+**Priority**: P1
+
+As a **hospital staff**,
+I want **to record patient admission, discharge, and transfer**,
+So that **patient location is known throughout the stay**.
+
+**Acceptance Criteria:**
+- [ ] Record admission event
+- [ ] Record discharge event
+- [ ] Record transfer event
+- [ ] Each event requires timestamp (UTC) and location
+- [ ] ADT events logged to patvisit table
+- [ ] Current location always available
+- [ ] ADT history queryable
+
+---
+
+### VIS-004: Link Diagnosis to Visit
+**Priority**: P1
+
+As a **clinical staff**,
+I want **to record patient diagnoses**,
+So that **laboratory results can be correlated with clinical conditions**.
+
+**Acceptance Criteria:**
+- [ ] Add diagnosis via POST `/api/patvisit/:id/diagnosis`
+- [ ] Diagnosis requires ICD code or text
+- [ ] Diagnosis type: admission, principal, secondary
+- [ ] Multiple diagnoses can be added
+- [ ] Diagnoses stored in patdiag table
+- [ ] Diagnoses displayed with visit
+
+---
+
+### VIS-005: Track Insurance Information
+**Priority**: P1
+
+As a **registration or billing staff**,
+I want **to record patient insurance**,
+So that **billing information is available**.
+
+**Acceptance Criteria:**
+- [ ] Add insurance via POST `/api/patvisit/:id/insurance`
+- [ ] Insurance requires: company, policy number, group number
+- [ ] Insurance type: primary, secondary, tertiary
+- [ ] Multiple insurance policies can be added
+- [ ] Insurance stored in patinsurance table
+- [ ] Insurance displayed with visit
+
+---
+
+## 6. Instrument Integration (P1)
+
+### EDGE-001: Receive Instrument Results
+**Priority**: P1
+
+As a **laboratory instrument via tiny-edge**,
+I want **to send results to CLQMS**,
+So that **results are automatically recorded in the system**.
+
+**Acceptance Criteria:**
+- [ ] Receive results via POST `/api/edge/results`
+- [ ] Request includes: instrument ID, sample ID, results array
+- [ ] Each result includes: test code, value, unit, timestamp
+- [ ] Raw results stored in edgeres table
+- [ ] Results queued for processing
+- [ ] Acknowledgment returned to instrument
+- [ ] Authentication required (API key or JWT)
+
+---
+
+### EDGE-002: Store Raw Edge Results
+**Priority**: P1
+
+As a **laboratory system**,
+I want **to preserve raw instrument results**,
+So that **original data is available for troubleshooting and audit**.
+
+**Acceptance Criteria:**
+- [ ] Raw results stored in edgeres table
+- [ ] Raw data includes: instrument, sample, test code, value, unit, flags
+- [ ] Raw data is immutable (no updates or deletes)
+- [ ] Raw data linked to processed result
+- [ ] Raw data queryable for troubleshooting
+
+---
+
+### EDGE-003: Log Instrument Status
+**Priority**: P1
+
+As a **laboratory instrument**,
+I want **to send status updates**,
+So that **instrument health is monitored**.
+
+**Acceptance Criteria:**
+- [ ] Send status via POST `/api/edge/status`
+- [ ] Status includes: instrument ID, status code, message, timestamp
+- [ ] Status stored in edgestatus table
+- [ ] Status types: ready, busy, error, maintenance, offline
+- [ ] Status history queryable
+- [ ] Alerts triggered for error status
+
+---
+
+### EDGE-004: Acknowledge Order Delivery
+**Priority**: P1
+
+As a **laboratory instrument**,
+I want **to acknowledge order receipt**,
+So that **the system knows the order was received**.
+
+**Acceptance Criteria:**
+- [ ] Acknowledge via POST `/api/edge/orders/:id/ack`
+- [ ] Acknowledgment includes: order ID, instrument ID, timestamp
+- [ ] Acknowledgment stored in edgeack table
+- [ ] Order marked as "acknowledged" in system
+- [ ] Missing acknowledgments flagged
+
+---
+
+### EDGE-005: Fetch Pending Orders
+**Priority**: P1
+
+As a **laboratory instrument via tiny-edge**,
+I want **to retrieve pending orders**,
+So that **the instrument knows which samples to process**.
+
+**Acceptance Criteria:**
+- [ ] Fetch orders via GET `/api/edge/orders`
+- [ ] Can filter by instrument ID
+- [ ] Can filter by specimen status
+- [ ] Response includes: OrderID, SampleID, tests, priority
+- [ ] Only orders not yet acknowledged returned
+- [ ] Orders marked as "sent" after retrieval
+
+---
+
+### EDGE-006: Acknowledge Order Delivery
+**Priority**: P1
+
+As a **laboratory instrument**,
+I want **to confirm order receipt**,
+So that **the system can track order delivery**.
+
+**Acceptance Criteria:**
+- [ ] Acknowledge via POST `/api/edge/orders/:id/ack`
+- [ ] Acknowledgment requires instrument ID
+- [ ] Acknowledgment timestamp recorded
+- [ ] Acknowledgment stored in edgeack table
+- [ ] Failed acknowledgments retried
+
+---
+
+### EDGE-007: Process Edge Results to Patient Results
+**Priority**: P1
+
+As a **laboratory system**,
+I want **to automatically process raw edge results into patient results**,
+So that **instrument results become part of the patient record**.
+
+**Acceptance Criteria:**
+- [ ] System polls edgeres table for unprocessed results
+- [ ] Test code mapped to TestID via testmap
+- [ ] Sample ID mapped to OrderID/SpecimenID
+- [ ] Result value and unit converted if needed
+- [ ] Reference range validation performed
+- [ ] Result created in patresult table with status "ENTRY"
+- [ ] Raw result marked as processed
+- [ ] Processing errors logged
+
+---
+
+## 7. Quality Control (P2)
+
+### QC-001: Enter QC Results
+**Priority**: P2
+
+As a **lab technician**,
+I want **to enter quality control results**,
+So that **instrument performance is monitored**.
+
+**Acceptance Criteria:**
+- [ ] Create QC result via POST `/api/qcresult`
+- [ ] QC result requires: instrument, lot number, level, test, value
+- [ ] QC results stored in calres table
+- [ ] QC result timestamp recorded in UTC
+- [ ] QC result linked to QC material lot
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/qcresult`
+
+---
+
+### QC-002: Prepare Levey-Jennings Data
+**Priority**: P2
+
+As a **lab manager or quality officer**,
+I want **to retrieve Levey-Jennings chart data**,
+So that **QC trends can be visualized**.
+
+**Acceptance Criteria:**
+- [ ] Get QC data via GET `/api/qcresult/levey-jennings`
+- [ ] Requires instrument, test, lot, level, date range
+- [ ] Returns: mean, SD, values, timestamps
+- [ ] Data formatted for charting libraries
+- [ ] Includes control limits (±2SD, ±3SD)
+
+---
+
+### QC-003: Validate QC Results
+**Priority**: P2
+
+As a **laboratory system**,
+I want **to automatically validate QC results**,
+So that **out-of-control QC is flagged**.
+
+**Acceptance Criteria:**
+- [ ] System applies Westgard rules (or 2SD rule)
+- [ ] Rules: 1:2s warning, 1:3s rejection, 2:2s rejection, etc.
+- [ ] Out-of-control QC flagged
+- [ ] Flagged QC prevents patient result release
+- [ ] QC override requires justification
+
+---
+
+### QC-004: Calculate Sigma Metrics
+**Priority**: P2
+
+As a **lab manager or quality officer**,
+I want **to calculate sigma metrics**,
+So that **method performance can be evaluated**.
+
+**Acceptance Criteria:**
+- [ ] Calculate via GET `/api/qcresult/sigma`
+- [ ] Requires: test, total allowable error (TEa), CV, bias
+- [ ] Formula: Sigma = (TEa - bias) / CV
+- [ ] Returns sigma value and quality ranking
+- [ ] Rankings: world class (>6), excellent (5), good (4), marginal (3), poor (<3)
+
+---
+
+### QC-005: Query QC History
+**Priority**: P2
+
+As a **lab manager or quality officer**,
+I want **to review QC history**,
+So that **long-term trends can be analyzed**.
+
+**Acceptance Criteria:**
+- [ ] Query via GET `/api/qcresult/history`
+- [ ] Can filter by instrument, test, lot, date range
+- [ ] Returns all QC results with timestamps
+- [ ] Includes calculated statistics (mean, SD, CV)
+- [ ] Results downloadable as CSV
+
+---
+
+## 8. Calibration (P2)
+
+### CAL-001: Enter Calibration Results
+**Priority**: P2
+
+As a **lab technician**,
+I want **to record calibration results**,
+So that **instrument calibration is documented**.
+
+**Acceptance Criteria:**
+- [ ] Create calibration via POST `/api/calibration`
+- [ ] Calibration requires: instrument, test, calibrator, factor, result
+- [ ] Calibration stored in calres table
+- [ ] Calibration timestamp recorded in UTC
+- [ ] Calibration type: initial, periodic, after maintenance
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/calibration`
+
+---
+
+### CAL-002: Query Calibration History
+**Priority**: P2
+
+As a **lab manager or quality officer**,
+I want **to review calibration history**,
+So that **instrument performance over time is documented**.
+
+**Acceptance Criteria:**
+- [ ] Query via GET `/api/calibration/history`
+- [ ] Can filter by instrument, test, date range
+- [ ] Returns all calibrations with factors and results
+- [ ] Includes calibration type and technician
+- [ ] Results downloadable as CSV
+
+---
+
+### CAL-003: Validate Calibration
+**Priority**: P2
+
+As a **laboratory system**,
+I want **to validate calibration results**,
+So that **out-of-spec calibration is flagged**.
+
+**Acceptance Criteria:**
+- [ ] Calibration result compared to acceptable range
+- [ ] Out-of-spec calibration flagged
+- [ ] Flagged calibration prevents patient testing
+- [ ] Calibration override requires justification
+- [ ] Calibration failure triggers maintenance request
+
+---
+
+## 9. Audit Trail (P2)
+
+### AUD-001: Automatic Audit Logging
+**Priority**: P2
+
+As a **laboratory system**,
+I want **to automatically log all data changes**,
+So that **complete audit trail is maintained**.
+
+**Acceptance Criteria:**
+- [ ] Middleware intercepts all create/update/delete operations
+- [ ] Audit record includes: table, record ID, action, user, timestamp
+- [ ] Before and after values captured
+- [ ] IP address and user agent logged
+- [ ] Audit records stored in audit table
+- [ ] Audit records are immutable
+
+---
+
+### AUD-002: Track What/Who/When
+**Priority**: P2
+
+As a **compliance officer or auditor**,
+I want **to see complete change history**,
+So that **data provenance is documented**.
+
+**Acceptance Criteria:**
+- [ ] Query via GET `/api/audit`
+- [ ] Can filter by table, record, user, date range, action
+- [ ] Returns: action, table, record, user, timestamp, before, after
+- [ ] Results sorted chronologically
+- [ ] Supports pagination
+
+---
+
+### AUD-003: Log Security Events
+**Priority**: P2
+
+As a **laboratory system**,
+I want **to log authentication and authorization events**,
+So that **security incidents can be investigated**.
+
+**Acceptance Criteria:**
+- [ ] Login attempts logged (success and failure)
+- [ ] Logout events logged
+- [ ] Failed authorization attempts logged
+- [ ] Password changes logged
+- [ ] Permission changes logged
+- [ ] Events include: user, IP, timestamp, result
+
+---
+
+### AUD-004: Query Audit Logs
+**Priority**: P2
+
+As a **compliance officer or auditor**,
+I want **to search audit logs**,
+So that **specific events can be investigated**.
+
+**Acceptance Criteria:**
+- [ ] Query via GET `/api/audit/search`
+- [ ] Search parameters: table, record, user, action, date range, keyword
+- [ ] Returns matching audit records
+- [ ] Results sorted by relevance or chronology
+- [ ] Supports export to CSV/JSON
+
+---
+
+## 10. Inventory & Billing (P3)
+
+### INV-001: Manage Counters
+**Priority**: P3
+
+As a **system administrator**,
+I want **to manage system counters**,
+So that **sequential IDs can be generated**.
+
+**Acceptance Criteria:**
+- [ ] Create counter via POST `/api/counter`
+- [ ] Counter requires: name, prefix, current value
+- [ ] Counter can be incremented
+- [ ] Counter can be reset
+- [ ] Counters used for OrderID, SpecimenID, ResultID generation
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/counter`
+
+---
+
+### INV-002: Manage Product Catalog
+**Priority**: P3
+
+As a **inventory manager**,
+I want **to maintain product catalog**,
+So that **reagents and consumables are tracked**.
+
+**Acceptance Criteria:**
+- [ ] Create product via POST `/api/product`
+- [ ] Product requires: name, code, category, unit
+- [ ] Product includes: manufacturer, catalog number
+- [ ] Products can be marked as active/inactive
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/product`
+
+---
+
+### INV-003: Track Reagent Lots
+**Priority**: P3
+
+As a **inventory manager**,
+I want **to track reagent lot numbers and expiration**,
+So that **QC can be linked to specific lots**.
+
+**Acceptance Criteria:**
+- [ ] Create lot via POST `/api/reagentlot`
+- [ ] Lot requires: product, lot number, expiration date
+- [ ] Lot includes: received date, quantity, location
+- [ ] Lots can be marked as open/closed
+- [ ] Expired lots flagged
+- [ ] API endpoints: GET/POST/PATCH/DELETE `/api/reagentlot`
+
+---
+
+### INV-004: Track Consumable Usage
+**Priority**: P3
+
+As a **lab technician**,
+I want **to record consumable usage**,
+So that **inventory is accurate**.
+
+**Acceptance Criteria:**
+- [ ] Create usage record via POST `/api/consumableusage`
+- [ ] Usage requires: product, quantity, test or order
+- [ ] Usage timestamp recorded
+- [ ] Usage linked to user ID
+- [ ] Usage updates inventory quantity
+- [ ] Low inventory alerts triggered
+
+---
+
+### INV-005: Export Billing Data
+**Priority**: P3
+
+As a **billing staff**,
+I want **to export completed orders for billing**,
+So that **charges can be generated**.
+
+**Acceptance Criteria:**
+- [ ] Export via GET `/api/billing/export`
+- [ ] Can filter by date range, account, order status
+- [ ] Export includes: OrderID, PatientID, tests, dates
+- [ ] Export format: CSV, JSON, or HL7
+- [ ] Billing codes included (CPT, LOINC)
+- [ ] Export marks orders as "billed"
+
+---
+
+### INV-006: Select Service Class
+**Priority**: P3
+
+As a **ordering provider**,
+I want **to select service class for billing**,
+So that **appropriate pricing is applied**.
+
+**Acceptance Criteria:**
+- [ ] Service class options: routine, urgent, stat, research, etc.
+- [ ] Service class selected during order creation
+- [ ] Service class affects billing tier
+- [ ] Service class included in billing export
+- [ ] Service class can be updated before billing
+
+---
+
+## Summary Statistics
+
+**Total User Stories**: 103
+
+**By Priority:**
+- P0 (Must-have): 75
+- P1 (Should-have): 10
+- P2 (Nice-to-have): 13
+- P3 (Future): 5
+
+**By Module:**
+- Master Data: 28 stories
+- Order Management: 10 stories
+- Specimen Management: 10 stories
+- Result Management: 12 stories
+- Patient Visit: 5 stories
+- Instrument Integration: 7 stories
+- Quality Control: 5 stories
+- Calibration: 3 stories
+- Audit Trail: 4 stories
+- Inventory & Billing: 6 stories
+
+---
+
+## User Story Mapping
+
+### MVP Sprint 1: Foundation (Weeks 1-4)
+- All Master Data stories (28 stories)
+
+### MVP Sprint 2: Orders & Specimens (Weeks 5-8)
+- Order Management stories (10 stories)
+- Specimen Management stories (10 stories)
+
+### MVP Sprint 3: Results (Weeks 9-12)
+- Result Management stories (12 stories)
+
+### MVP Sprint 4: Integration (Weeks 13-16)
+- Patient Visit stories (5 stories)
+- Instrument Integration stories (7 stories)
+
+### Post-MVP: Enhancement (Weeks 17+)
+- Quality Control stories (5 stories)
+- Calibration stories (3 stories)
+- Audit Trail stories (4 stories)
+- Inventory & Billing stories (6 stories)
+
+---
+
+**Document Status**: Draft for Review
+**Last Updated**: 2026-01-28
+**Next Review**: Prior to Sprint 1 kickoff
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 2a83766..c95b6b5 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -22,6 +22,9 @@ $routes->group('api', ['filter' => 'auth'], function ($routes) {
 // Public Routes (no auth required)
 $routes->get('/v2/login', 'PagesController::login');
 
+// Swagger API Documentation (public - no filters)
+$routes->add('swagger', 'PagesController::swagger');
+
 // V2 Auth API Routes (public - no auth required)
 $routes->group('v2/auth', function ($routes) {
     $routes->post('login', 'AuthV2Controller::login');
diff --git a/app/Controllers/AuthController.php b/app/Controllers/AuthController.php
index 25e0dba..389881f 100644
--- a/app/Controllers/AuthController.php
+++ b/app/Controllers/AuthController.php
@@ -16,6 +16,8 @@ class AuthController extends Controller
 {
     use ResponseTrait;
 
+    protected $db;
+
     // ok
     public function __construct()
     {
@@ -170,19 +172,22 @@ class AuthController extends Controller
         try {
             // Melakukan Hash terhadap Payload dengan Kunci .env menggunakan Algortima HMAC + SHA-256
             $jwt = JWT::encode($payload, $key, 'HS256');
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             return $this->fail('Error generating JWT: ' . $e->getMessage(), 500);
         }
 
+        // Detect if HTTPS is being used
+        $isSecure = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
+
         // Kirim Respon ke HttpOnly yg akan disimpan di browser dan tidak akan dapat diakses oleh siapapun
         $this->response->setCookie([
             'name' => 'token',              // nama token
             'value' => $jwt,                 // value dari jwt yg sudah di hash
             'expire' => 864000,               // 10 hari
             'path' => '/',                  // valid untuk semua path
-            'secure' => true,                 // set true kalau sudah HTTPS
+            'secure' => $isSecure,
             'httponly' => true,                 // dipakai agar cookie berikut tidak dapat diakses oleh javascript
-            'samesite' => Cookie::SAMESITE_NONE
+            'samesite' => $isSecure ? Cookie::SAMESITE_NONE : Cookie::SAMESITE_LAX
         ]);
 
         // Response tanpa token di body
@@ -214,15 +219,18 @@ class AuthController extends Controller
     // }
     public function logout()
     {
+        // Detect if HTTPS is being used
+        $isSecure = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on';
+        
         // Definisikan ini pada cookies browser, harus sama dengan cookies login
         return $this->response->setCookie([
             'name' => 'token',
             'value' => '',
             'expire' => time() - 3600,
             'path' => '/',
-            'secure' => true,
+            'secure' => $isSecure,
             'httponly' => true,
-            'samesite' => Cookie::SAMESITE_NONE
+            'samesite' => $isSecure ? Cookie::SAMESITE_NONE : Cookie::SAMESITE_LAX
 
         ])->setJSON([
                     'status' => 'success',
diff --git a/app/Controllers/Contact/ContactController.php b/app/Controllers/Contact/ContactController.php
index 6fb0706..945f430 100644
--- a/app/Controllers/Contact/ContactController.php
+++ b/app/Controllers/Contact/ContactController.php
@@ -3,7 +3,7 @@ namespace App\Controllers\Contact;
 
 use CodeIgniter\API\ResponseTrait;
 use App\Controllers\BaseController;
-
+use App\Libraries\ValueSet;
 use App\Models\Contact\ContactModel;
 
 class ContactController extends BaseController {
@@ -23,11 +23,25 @@ class ContactController extends BaseController {
         $ContactName = $this->request->getVar('ContactName');
         $Specialty = $this->request->getVar('Specialty');
         $rows = $this->model->getContacts($ContactName, $Specialty);
-        
+
         if (empty($rows)) {
             return $this->respond([ 'status'  => 'success', 'message' => "no Data.", 'data' => [] ], 200);
         }
 
+        // Transform Specialty and Occupation
+        foreach ($rows as &$row) {
+            if (isset($row['Specialty'])) {
+                $row['specialty'] = $row['Specialty'];
+                $row['specialtyLabel'] = ValueSet::getLabel('specialty', $row['Specialty']) ?? '';
+                unset($row['Specialty']);
+            }
+            if (isset($row['Occupation'])) {
+                $row['occupation'] = $row['Occupation'];
+                $row['occupationLabel'] = ValueSet::getLabel('occupation', $row['Occupation']) ?? '';
+                unset($row['Occupation']);
+            }
+        }
+
         return $this->respond([ 'status' => 'success', 'message'=> "fetch success", 'data' => $rows ], 200);
     }
 
@@ -39,6 +53,18 @@ class ContactController extends BaseController {
             return $this->respond([ 'status'  => 'success', 'message' => "no Data.", 'data' => null ], 200);
         }
 
+        // Transform Specialty and Occupation
+        if (isset($row['Specialty'])) {
+            $row['specialty'] = $row['Specialty'];
+            $row['specialtyLabel'] = ValueSet::getLabel('specialty', $row['Specialty']) ?? '';
+            unset($row['Specialty']);
+        }
+        if (isset($row['Occupation'])) {
+            $row['occupation'] = $row['Occupation'];
+            $row['occupationLabel'] = ValueSet::getLabel('occupation', $row['Occupation']) ?? '';
+            unset($row['Occupation']);
+        }
+
         return $this->respond([ 'status' => 'success', 'message'=> "fetch success", 'data' => $row ], 200);
     }
 
diff --git a/app/Controllers/OrderTestController.php b/app/Controllers/OrderTestController.php
index 2565720..fb2f87f 100644
--- a/app/Controllers/OrderTestController.php
+++ b/app/Controllers/OrderTestController.php
@@ -3,9 +3,10 @@ namespace App\Controllers;
 
 use CodeIgniter\API\ResponseTrait;
 use CodeIgniter\Controller;
-use App\Models\OrderTest\OrderTestModel;
+use App\Libraries\ValueSet;
+use App\Models\OrderTestModel;
 use App\Models\Patient\PatientModel;
-use App\Models\PatVisit\PatVisitModel;
+use App\Models\Patient\PatVisitModel;
 
 class OrderTestController extends Controller {
     use ResponseTrait;
@@ -40,6 +41,20 @@ class OrderTestController extends Controller {
                     ->getResultArray();
             }
 
+            // Transform Priority and OrderStatus
+            foreach ($rows as &$row) {
+                if (isset($row['Priority'])) {
+                    $row['priority'] = $row['Priority'];
+                    $row['priorityLabel'] = ValueSet::getLabel('priority', $row['Priority']) ?? '';
+                    unset($row['Priority']);
+                }
+                if (isset($row['OrderStatus'])) {
+                    $row['orderStatus'] = $row['OrderStatus'];
+                    $row['orderStatusLabel'] = ValueSet::getLabel('order_status', $row['OrderStatus']) ?? '';
+                    unset($row['OrderStatus']);
+                }
+            }
+
             return $this->respond([
                 'status' => 'success',
                 'message' => 'Data fetched successfully',
@@ -60,6 +75,19 @@ class OrderTestController extends Controller {
                     'data' => null
                 ], 200);
             }
+
+            // Transform Priority and OrderStatus
+            if (isset($row['Priority'])) {
+                $row['priority'] = $row['Priority'];
+                $row['priorityLabel'] = ValueSet::getLabel('priority', $row['Priority']) ?? '';
+                unset($row['Priority']);
+            }
+            if (isset($row['OrderStatus'])) {
+                $row['orderStatus'] = $row['OrderStatus'];
+                $row['orderStatusLabel'] = ValueSet::getLabel('order_status', $row['OrderStatus']) ?? '';
+                unset($row['OrderStatus']);
+            }
+
             return $this->respond([
                 'status' => 'success',
                 'message' => 'Data fetched successfully',
diff --git a/app/Controllers/PagesController.php b/app/Controllers/PagesController.php
index e930108..9330317 100644
--- a/app/Controllers/PagesController.php
+++ b/app/Controllers/PagesController.php
@@ -175,4 +175,12 @@ class PagesController extends BaseController
             'activePage' => ''
         ]);
     }
+
+    /**
+     * API Documentation / Swagger UI page
+     */
+    public function swagger()
+    {
+        return view('swagger');
+    }
 }
diff --git a/app/Controllers/Patient/PatientController.php b/app/Controllers/Patient/PatientController.php
index 666775d..f66f9c0 100644
--- a/app/Controllers/Patient/PatientController.php
+++ b/app/Controllers/Patient/PatientController.php
@@ -13,6 +13,7 @@ class PatientController extends Controller {
     protected $model;
     protected $rules;
 
+use App\Libraries\ValueSet;
     public function __construct() {
         $this->db = \Config\Database::connect();
         $this->model = new PatientModel();
@@ -58,6 +59,16 @@ class PatientController extends Controller {
 
         try {
             $rows = $this->model->getPatients($filters);
+            
+            // Transform Sex to sex and sexLabel
+            foreach ($rows as &$row) {
+                if (isset($row['Sex'])) {
+                    $row['sex'] = $row['Sex'];
+                    $row['sexLabel'] = ValueSet::getLabel('sex', $row['Sex']) ?? '';
+                    unset($row['Sex']);
+                }
+            }
+            
             return $this->respond([ 'status' => 'success', 'message'=> "data fetched successfully", 'data'   => $rows ], 200);
         } catch (\Exception $e) {
             return $this->failServerError('Exception : '.$e->getMessage());
@@ -68,6 +79,14 @@ class PatientController extends Controller {
         try {
             $row = $this->model->getPatient($InternalPID);
             if (empty($row)) { return $this->respond([ 'status'  => 'success', 'message' => "data not found.", 'data' => null ], 200); }
+            
+            // Transform Sex to sex and sexLabel
+            if (isset($row['Sex'])) {
+                $row['sex'] = $row['Sex'];
+                $row['sexLabel'] = ValueSet::getLabel('sex', $row['Sex']) ?? '';
+                unset($row['Sex']);
+            }
+            
             return $this->respond([ 'status'  => 'success', 'message' => "data fetched successfully", 'data' => $row ], 200);
         } catch (\Exception $e) {
             return $this->failServerError('Something went wrong: ' . $e->getMessage());
diff --git a/app/Controllers/Specimen/ContainerDefController.php b/app/Controllers/Specimen/ContainerDefController.php
index 4f1cb48..1d7a448 100644
--- a/app/Controllers/Specimen/ContainerDefController.php
+++ b/app/Controllers/Specimen/ContainerDefController.php
@@ -4,6 +4,7 @@ namespace App\Controllers\Specimen;
 
 use CodeIgniter\API\ResponseTrait;
 use App\Controllers\BaseController;
+use App\Libraries\ValueSet;
 use App\Models\Specimen\ContainerDefModel;
 
 class ContainerDefController extends BaseController {
@@ -29,6 +30,26 @@ class ContainerDefController extends BaseController {
 				'ConName' => $this->request->getVar('ConName')
 			];
       $rows = $this->model->getContainers($filter);
+
+      // Transform ConCategory, CapColor, ConSize
+      foreach ($rows as &$row) {
+        if (isset($row['ConCategory'])) {
+          $row['conCategory'] = $row['ConCategory'];
+          $row['conCategoryLabel'] = ValueSet::getLabel('container_class', $row['ConCategory']) ?? '';
+          unset($row['ConCategory']);
+        }
+        if (isset($row['CapColor'])) {
+          $row['capColor'] = $row['CapColor'];
+          $row['capColorLabel'] = ValueSet::getLabel('container_cap_color', $row['CapColor']) ?? '';
+          unset($row['CapColor']);
+        }
+        if (isset($row['ConSize'])) {
+          $row['conSize'] = $row['ConSize'];
+          $row['conSizeLabel'] = ValueSet::getLabel('container_size', $row['ConSize']) ?? '';
+          unset($row['ConSize']);
+        }
+      }
+
       return $this->respond([ 'status' => 'success', 'message'=> "data fetched successfully", 'data'   => $rows ], 200);
     } catch (\Exception $e) {
       return $this->failServerError('Exception : '.$e->getMessage());
@@ -41,6 +62,24 @@ class ContainerDefController extends BaseController {
       if (empty($row)) {
         return $this->respond([ 'status' => 'success', 'message'=> "data not found", 'data' => null ], 200);
       }
+
+      // Transform ConCategory, CapColor, ConSize
+      if (isset($row['ConCategory'])) {
+        $row['conCategory'] = $row['ConCategory'];
+        $row['conCategoryLabel'] = ValueSet::getLabel('container_class', $row['ConCategory']) ?? '';
+        unset($row['ConCategory']);
+      }
+      if (isset($row['CapColor'])) {
+        $row['capColor'] = $row['CapColor'];
+        $row['capColorLabel'] = ValueSet::getLabel('container_cap_color', $row['CapColor']) ?? '';
+        unset($row['CapColor']);
+      }
+      if (isset($row['ConSize'])) {
+        $row['conSize'] = $row['ConSize'];
+        $row['conSizeLabel'] = ValueSet::getLabel('container_size', $row['ConSize']) ?? '';
+        unset($row['ConSize']);
+      }
+
       return $this->respond([ 'status' => 'success', 'message'=> "data fetched successfully", 'data'   => $row ], 200);
     } catch (\Exception $e) {
       return $this->failServerError('Exception : '.$e->getMessage());
diff --git a/app/Controllers/Specimen/SpecimenCollectionController.php b/app/Controllers/Specimen/SpecimenCollectionController.php
index 69d38ac..1c5a1f1 100644
--- a/app/Controllers/Specimen/SpecimenCollectionController.php
+++ b/app/Controllers/Specimen/SpecimenCollectionController.php
@@ -4,6 +4,7 @@ namespace App\Controllers\Specimen;
 
 use CodeIgniter\API\ResponseTrait;
 use App\Controllers\BaseController;
+use App\Libraries\ValueSet;
 use App\Models\Specimen\SpecimenCollectionModel;
 
 class SpecimenCollectionController extends BaseController {
@@ -22,6 +23,26 @@ class SpecimenCollectionController extends BaseController {
     public function index() {
         try {
             $rows = $this->model->findAll();
+
+            // Transform CollectionMethod, Additive, SpecimenRole
+            foreach ($rows as &$row) {
+                if (isset($row['CollectionMethod'])) {
+                    $row['collectionMethod'] = $row['CollectionMethod'];
+                    $row['collectionMethodLabel'] = ValueSet::getLabel('collection_method', $row['CollectionMethod']) ?? '';
+                    unset($row['CollectionMethod']);
+                }
+                if (isset($row['Additive'])) {
+                    $row['additive'] = $row['Additive'];
+                    $row['additiveLabel'] = ValueSet::getLabel('additive', $row['Additive']) ?? '';
+                    unset($row['Additive']);
+                }
+                if (isset($row['SpecimenRole'])) {
+                    $row['specimenRole'] = $row['SpecimenRole'];
+                    $row['specimenRoleLabel'] = ValueSet::getLabel('specimen_role', $row['SpecimenRole']) ?? '';
+                    unset($row['SpecimenRole']);
+                }
+            }
+
             return $this->respond([ 'status' => 'success', 'message'=> "data fetched successfully", 'data'   => $rows ], 200);
         } catch (\Exception $e) {
             return $this->failServerError('Exception : '.$e->getMessage());
@@ -34,6 +55,24 @@ class SpecimenCollectionController extends BaseController {
             if (empty($row)) {
                 return $this->respond([ 'status' => 'success', 'message'=> "data not found", 'data' => null ], 200);
             }
+
+            // Transform CollectionMethod, Additive, SpecimenRole
+            if (isset($row['CollectionMethod'])) {
+                $row['collectionMethod'] = $row['CollectionMethod'];
+                $row['collectionMethodLabel'] = ValueSet::getLabel('collection_method', $row['CollectionMethod']) ?? '';
+                unset($row['CollectionMethod']);
+            }
+            if (isset($row['Additive'])) {
+                $row['additive'] = $row['Additive'];
+                $row['additiveLabel'] = ValueSet::getLabel('additive', $row['Additive']) ?? '';
+                unset($row['Additive']);
+            }
+            if (isset($row['SpecimenRole'])) {
+                $row['specimenRole'] = $row['SpecimenRole'];
+                $row['specimenRoleLabel'] = ValueSet::getLabel('specimen_role', $row['SpecimenRole']) ?? '';
+                unset($row['SpecimenRole']);
+            }
+
             return $this->respond([ 'status' => 'success', 'message'=> "data fetched successfully", 'data'   => $row ], 200);
         } catch (\Exception $e) {
             return $this->failServerError('Exception : '.$e->getMessage());
diff --git a/app/Controllers/Specimen/SpecimenController.php b/app/Controllers/Specimen/SpecimenController.php
index 6eba3d0..76322c0 100644
--- a/app/Controllers/Specimen/SpecimenController.php
+++ b/app/Controllers/Specimen/SpecimenController.php
@@ -4,6 +4,7 @@ namespace App\Controllers\Specimen;
 
 use CodeIgniter\API\ResponseTrait;
 use App\Controllers\BaseController;
+use App\Libraries\ValueSet;
 use App\Models\Specimen\SpecimenModel;
 
 class SpecimenController extends BaseController {
@@ -22,6 +23,26 @@ class SpecimenController extends BaseController {
     public function index() {
         try {
             $rows = $this->model->findAll();
+
+            // Transform SpecimenType, SpecimenStatus, BodySite
+            foreach ($rows as &$row) {
+                if (isset($row['SpecimenType'])) {
+                    $row['specimenType'] = $row['SpecimenType'];
+                    $row['specimenTypeLabel'] = ValueSet::getLabel('specimen_type', $row['SpecimenType']) ?? '';
+                    unset($row['SpecimenType']);
+                }
+                if (isset($row['SpecimenStatus'])) {
+                    $row['specimenStatus'] = $row['SpecimenStatus'];
+                    $row['specimenStatusLabel'] = ValueSet::getLabel('specimen_status', $row['SpecimenStatus']) ?? '';
+                    unset($row['SpecimenStatus']);
+                }
+                if (isset($row['BodySite'])) {
+                    $row['bodySite'] = $row['BodySite'];
+                    $row['bodySiteLabel'] = ValueSet::getLabel('body_site', $row['BodySite']) ?? '';
+                    unset($row['BodySite']);
+                }
+            }
+
             return $this->respond([ 'status' => 'success', 'message'=> "data fetched successfully", 'data'   => $rows ], 200);
         } catch (\Exception $e) {
             return $this->failServerError('Exception : '.$e->getMessage());
@@ -34,6 +55,24 @@ class SpecimenController extends BaseController {
             if (empty($row)) {
                 return $this->respond([ 'status' => 'success', 'message'=> "data not found", 'data' => null ], 200);
             }
+
+            // Transform SpecimenType, SpecimenStatus, BodySite
+            if (isset($row['SpecimenType'])) {
+                $row['specimenType'] = $row['SpecimenType'];
+                $row['specimenTypeLabel'] = ValueSet::getLabel('specimen_type', $row['SpecimenType']) ?? '';
+                unset($row['SpecimenType']);
+            }
+            if (isset($row['SpecimenStatus'])) {
+                $row['specimenStatus'] = $row['SpecimenStatus'];
+                $row['specimenStatusLabel'] = ValueSet::getLabel('specimen_status', $row['SpecimenStatus']) ?? '';
+                unset($row['SpecimenStatus']);
+            }
+            if (isset($row['BodySite'])) {
+                $row['bodySite'] = $row['BodySite'];
+                $row['bodySiteLabel'] = ValueSet::getLabel('body_site', $row['BodySite']) ?? '';
+                unset($row['BodySite']);
+            }
+
             return $this->respond([ 'status' => 'success', 'message'=> "data fetched successfully", 'data'   => $row ], 200);
         } catch (\Exception $e) {
             return $this->failServerError('Exception : '.$e->getMessage());
diff --git a/app/Controllers/Specimen/SpecimenStatusController.php b/app/Controllers/Specimen/SpecimenStatusController.php
index 2444135..d9cb606 100644
--- a/app/Controllers/Specimen/SpecimenStatusController.php
+++ b/app/Controllers/Specimen/SpecimenStatusController.php
@@ -4,6 +4,7 @@ namespace App\Controllers\Specimen;
 
 use CodeIgniter\API\ResponseTrait;
 use App\Controllers\BaseController;
+use App\Libraries\ValueSet;
 use App\Models\Specimen\SpecimenStatusModel;
 
 class ContainerDef extends BaseController {
@@ -22,6 +23,21 @@ class ContainerDef extends BaseController {
     public function index() {
         try {
             $rows = $this->model->findAll();
+
+            // Transform Status and Activity
+            foreach ($rows as &$row) {
+                if (isset($row['Status'])) {
+                    $row['status'] = $row['Status'];
+                    $row['statusLabel'] = ValueSet::getLabel('specimen_status', $row['Status']) ?? '';
+                    unset($row['Status']);
+                }
+                if (isset($row['Activity'])) {
+                    $row['activity'] = $row['Activity'];
+                    $row['activityLabel'] = ValueSet::getLabel('specimen_activity', $row['Activity']) ?? '';
+                    unset($row['Activity']);
+                }
+            }
+
             return $this->respond([ 'status' => 'success', 'message'=> "data fetched successfully", 'data'   => $rows ], 200);
         } catch (\Exception $e) {
             return $this->failServerError('Exception : '.$e->getMessage());
@@ -34,6 +50,19 @@ class ContainerDef extends BaseController {
             if (empty($row)) {
                 return $this->respond([ 'status' => 'success', 'message'=> "data not found", 'data' => null ], 200);
             }
+
+            // Transform Status and Activity
+            if (isset($row['Status'])) {
+                $row['status'] = $row['Status'];
+                $row['statusLabel'] = ValueSet::getLabel('specimen_status', $row['Status']) ?? '';
+                unset($row['Status']);
+            }
+            if (isset($row['Activity'])) {
+                $row['activity'] = $row['Activity'];
+                $row['activityLabel'] = ValueSet::getLabel('specimen_activity', $row['Activity']) ?? '';
+                unset($row['Activity']);
+            }
+
             return $this->respond([ 'status' => 'success', 'message'=> "data fetched successfully", 'data'   => $row ], 200);
         } catch (\Exception $e) {
             return $this->failServerError('Exception : '.$e->getMessage());
diff --git a/app/Controllers/Test/DemoOrderController.php b/app/Controllers/Test/DemoOrderController.php
index 5d2cb6f..eeabf40 100644
--- a/app/Controllers/Test/DemoOrderController.php
+++ b/app/Controllers/Test/DemoOrderController.php
@@ -3,8 +3,9 @@ namespace App\Controllers\Test;
 
 use CodeIgniter\API\ResponseTrait;
 use CodeIgniter\Controller;
+use App\Libraries\ValueSet;
 use App\Models\Patient\PatientModel;
-use App\Models\OrderTest\OrderTestModel;
+use App\Models\OrderTestModel;
 
 class DemoOrderController extends Controller {
     use ResponseTrait;
@@ -69,6 +70,20 @@ class DemoOrderController extends Controller {
             ->get()
             ->getResultArray();
 
+        // Transform Priority and OrderStatus
+        foreach ($orders as &$order) {
+            if (isset($order['Priority'])) {
+                $order['priority'] = $order['Priority'];
+                $order['priorityLabel'] = ValueSet::getLabel('priority', $order['Priority']) ?? '';
+                unset($order['Priority']);
+            }
+            if (isset($order['OrderStatus'])) {
+                $order['orderStatus'] = $order['OrderStatus'];
+                $order['orderStatusLabel'] = ValueSet::getLabel('order_status', $order['OrderStatus']) ?? '';
+                unset($order['OrderStatus']);
+            }
+        }
+
         return $this->respond([
             'status' => 'success',
             'message' => 'Data fetched successfully',
diff --git a/app/Controllers/Test/TestMapController.php b/app/Controllers/Test/TestMapController.php
index 8d9677c..fc77d19 100644
--- a/app/Controllers/Test/TestMapController.php
+++ b/app/Controllers/Test/TestMapController.php
@@ -3,6 +3,7 @@ namespace App\Controllers\Test;
 
 use CodeIgniter\API\ResponseTrait;
 use App\Controllers\BaseController;
+use App\Libraries\ValueSet;
 use App\Models\Test\TestMapModel;
 
 class TestMapController extends BaseController {
@@ -20,13 +21,41 @@ class TestMapController extends BaseController {
     public function index() {
         $rows = $this->model->findAll();
         if (empty($rows)) { return $this->respond([ 'status'  => 'success', 'message' => "no Data.", 'data' => [] ], 200); }
-        return $this->respond([ 'status' => 'success', 'message'=> "Data fetched successfully", 'data' => $rows ], 200); 
+
+        // Transform HostType and ClientType
+        foreach ($rows as &$row) {
+            if (isset($row['HostType'])) {
+                $row['hostType'] = $row['HostType'];
+                $row['hostTypeLabel'] = ValueSet::getLabel('entity_type', $row['HostType']) ?? '';
+                unset($row['HostType']);
+            }
+            if (isset($row['ClientType'])) {
+                $row['clientType'] = $row['ClientType'];
+                $row['clientTypeLabel'] = ValueSet::getLabel('entity_type', $row['ClientType']) ?? '';
+                unset($row['ClientType']);
+            }
+        }
+
+        return $this->respond([ 'status' => 'success', 'message'=> "Data fetched successfully", 'data' => $rows ], 200);
     }
 
     public function show($id = null) {
         $row = $this->model->where('TestMapID',$id)->first();
         if (empty($row)) { return $this->respond([ 'status'  => 'success', 'message' => "no Data.", 'data' => null ], 200); }
-        return $this->respond([ 'status' => 'success', 'message'=> "Data fetched successfully", 'data' => $row ], 200); 
+
+        // Transform HostType and ClientType
+        if (isset($row['HostType'])) {
+            $row['hostType'] = $row['HostType'];
+            $row['hostTypeLabel'] = ValueSet::getLabel('entity_type', $row['HostType']) ?? '';
+            unset($row['HostType']);
+        }
+        if (isset($row['ClientType'])) {
+            $row['clientType'] = $row['ClientType'];
+            $row['clientTypeLabel'] = ValueSet::getLabel('entity_type', $row['ClientType']) ?? '';
+            unset($row['ClientType']);
+        }
+
+        return $this->respond([ 'status' => 'success', 'message'=> "Data fetched successfully", 'data' => $row ], 200);
     }
 
     public function create() {
diff --git a/app/Libraries/Data/activity_result.json b/app/Libraries/Data/activity_result.json
index 238647a..22c3c08 100644
--- a/app/Libraries/Data/activity_result.json
+++ b/app/Libraries/Data/activity_result.json
@@ -1,6 +1,6 @@
 {"name": "activity_result",
   "VSName": "Activity Result",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "0", "value": "Failed"},
     {"key": "1", "value": "Success with note"},
diff --git a/app/Libraries/Data/additive.json b/app/Libraries/Data/additive.json
index adfe244..b4a04f4 100644
--- a/app/Libraries/Data/additive.json
+++ b/app/Libraries/Data/additive.json
@@ -1,6 +1,6 @@
 {"name": "additive",
   "VSName": "Additive",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "Hep", "value": "Heparin ammonium"},
     {"key": "Apro", "value": "Aprotinin"},
diff --git a/app/Libraries/Data/adt_event.json b/app/Libraries/Data/adt_event.json
index a0938ff..939edc8 100644
--- a/app/Libraries/Data/adt_event.json
+++ b/app/Libraries/Data/adt_event.json
@@ -1,6 +1,6 @@
 {"name": "adt_event",
   "VSName": "ADT Event",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "A01", "value": "Admit"},
     {"key": "A02", "value": "Transfer"},
diff --git a/app/Libraries/Data/area_class.json b/app/Libraries/Data/area_class.json
index 30d7415..dd6c9bb 100644
--- a/app/Libraries/Data/area_class.json
+++ b/app/Libraries/Data/area_class.json
@@ -1,6 +1,6 @@
 {"name": "area_class",
   "VSName": "Area Class",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "PROP", "value": "Propinsi"},
     {"key": "KAB", "value": "Kabupaten"},
diff --git a/app/Libraries/Data/body_site.json b/app/Libraries/Data/body_site.json
index 1812af4..abb4b69 100644
--- a/app/Libraries/Data/body_site.json
+++ b/app/Libraries/Data/body_site.json
@@ -1,6 +1,6 @@
 {"name": "body_site",
   "VSName": "Body Site",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "LA", "value": "Left Arm"},
     {"key": "RA", "value": "Right Arm"},
diff --git a/app/Libraries/Data/collection_method.json b/app/Libraries/Data/collection_method.json
index aeb5181..3bed5eb 100644
--- a/app/Libraries/Data/collection_method.json
+++ b/app/Libraries/Data/collection_method.json
@@ -1,6 +1,6 @@
 {"name": "collection_method",
   "VSName": "Collection Method",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "pcntr", "value": "Puncture"},
     {"key": "fprk", "value": "Finger-prick sampling"},
diff --git a/app/Libraries/Data/container_cap_color.json b/app/Libraries/Data/container_cap_color.json
index 2963b3a..2d60188 100644
--- a/app/Libraries/Data/container_cap_color.json
+++ b/app/Libraries/Data/container_cap_color.json
@@ -1,6 +1,6 @@
 {"name": "container_cap_color",
   "VSName": "Container Cap Color",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "PRPL", "value": "Purple"},
     {"key": "RED", "value": "Red"},
diff --git a/app/Libraries/Data/container_class.json b/app/Libraries/Data/container_class.json
index 14f7e24..d6627a4 100644
--- a/app/Libraries/Data/container_class.json
+++ b/app/Libraries/Data/container_class.json
@@ -1,6 +1,6 @@
 {"name": "container_class",
   "VSName": "Container Class",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "Pri", "value": "Primary"},
     {"key": "Sec", "value": "Secondary"},
diff --git a/app/Libraries/Data/container_size.json b/app/Libraries/Data/container_size.json
index dbc4d4c..b45ffed 100644
--- a/app/Libraries/Data/container_size.json
+++ b/app/Libraries/Data/container_size.json
@@ -1,6 +1,6 @@
 {"name": "container_size",
   "VSName": "Container Size",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "5ml", "value": "5 mL"},
     {"key": "7ml", "value": "7 mL"},
diff --git a/app/Libraries/Data/country.json b/app/Libraries/Data/country.json
index 632aac9..015e850 100644
--- a/app/Libraries/Data/country.json
+++ b/app/Libraries/Data/country.json
@@ -1,6 +1,6 @@
 {"name": "country",
   "VSName": "Country",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "AFG", "value": "Afghanistan"},
     {"key": "ALA", "value": "Åland Islands"},
diff --git a/app/Libraries/Data/ethnic.json b/app/Libraries/Data/ethnic.json
index 966eaea..c417cb6 100644
--- a/app/Libraries/Data/ethnic.json
+++ b/app/Libraries/Data/ethnic.json
@@ -1,6 +1,6 @@
 {"name": "ethnic",
   "VSName": "Ethnic",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "PPMLN", "value": "Papua Melanezoid"},
     {"key": "NGRID", "value": "Negroid"},
diff --git a/app/Libraries/Data/fasting_status.json b/app/Libraries/Data/fasting_status.json
index f7b3414..03e6314 100644
--- a/app/Libraries/Data/fasting_status.json
+++ b/app/Libraries/Data/fasting_status.json
@@ -1,6 +1,6 @@
 {"name": "fasting_status",
   "VSName": "Fasting Status",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "F", "value": "Fasting"},
     {"key": "NF", "value": "Not Fasting"},
diff --git a/app/Libraries/Data/formula_language.json b/app/Libraries/Data/formula_language.json
index b7bce89..9bc3513 100644
--- a/app/Libraries/Data/formula_language.json
+++ b/app/Libraries/Data/formula_language.json
@@ -1,6 +1,6 @@
 {"name": "formula_language",
   "VSName": "Formula Language",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "Phyton", "value": "Phyton"},
     {"key": "CQL", "value": "Clinical Quality Language"},
diff --git a/app/Libraries/Data/identifier_type.json b/app/Libraries/Data/identifier_type.json
index 4d38c15..a4cd258 100644
--- a/app/Libraries/Data/identifier_type.json
+++ b/app/Libraries/Data/identifier_type.json
@@ -1,6 +1,6 @@
 {"name": "identifier_type",
   "VSName": "Identifier Type",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "KTP", "value": "Kartu Tanda Penduduk"},
     {"key": "PASS", "value": "Passport"},
diff --git a/app/Libraries/Data/location_type.json b/app/Libraries/Data/location_type.json
index 3374b9e..7c38fe4 100644
--- a/app/Libraries/Data/location_type.json
+++ b/app/Libraries/Data/location_type.json
@@ -1,6 +1,6 @@
 {"name": "location_type",
   "VSName": "Location Type",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "FCLT", "value": "Facility"},
     {"key": "BLDG", "value": "Building"},
diff --git a/app/Libraries/Data/marital_status.json b/app/Libraries/Data/marital_status.json
index 582ecc3..ff6f2cc 100644
--- a/app/Libraries/Data/marital_status.json
+++ b/app/Libraries/Data/marital_status.json
@@ -1,6 +1,6 @@
 {"name": "marital_status",
   "VSName": "Marital Status",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "A", "value": "Separated"},
     {"key": "D", "value": "Divorced"},
diff --git a/app/Libraries/Data/math_sign.json b/app/Libraries/Data/math_sign.json
index 9197639..9e5f1c1 100644
--- a/app/Libraries/Data/math_sign.json
+++ b/app/Libraries/Data/math_sign.json
@@ -1,6 +1,6 @@
 {"name": "math_sign",
   "VSName": "Math Sign",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "=", "value": "Equal"},
     {"key": "<", "value": "Less than"},
diff --git a/app/Libraries/Data/numeric_ref_type.json b/app/Libraries/Data/numeric_ref_type.json
index 4533bc4..fb5afd3 100644
--- a/app/Libraries/Data/numeric_ref_type.json
+++ b/app/Libraries/Data/numeric_ref_type.json
@@ -1,6 +1,6 @@
 {"name": "numeric_ref_type",
   "VSName": "Numeric Reference Type",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "RANGE", "value": "Range"},
     {"key": "THOLD", "value": "Threshold"}
diff --git a/app/Libraries/Data/order_priority.json b/app/Libraries/Data/order_priority.json
index 0864f8f..ed23871 100644
--- a/app/Libraries/Data/order_priority.json
+++ b/app/Libraries/Data/order_priority.json
@@ -1,6 +1,6 @@
 {"name": "order_priority",
   "VSName": "Order Priority",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "S", "value": "Stat"},
     {"key": "A", "value": "ASAP"},
diff --git a/app/Libraries/Data/order_status.json b/app/Libraries/Data/order_status.json
index 9fb4ce2..49b7395 100644
--- a/app/Libraries/Data/order_status.json
+++ b/app/Libraries/Data/order_status.json
@@ -1,6 +1,6 @@
 {"name": "order_status",
   "VSName": "Order Status",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "A", "value": "Some, not all results available"},
     {"key": "CA", "value": "Order is cancelled"},
diff --git a/app/Libraries/Data/priority.json b/app/Libraries/Data/priority.json
index 4ed812f..60fcac6 100644
--- a/app/Libraries/Data/priority.json
+++ b/app/Libraries/Data/priority.json
@@ -1,6 +1,6 @@
 {"name": "priority",
   "VSName": "Priority",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "S", "value": "Stat"},
     {"key": "A", "value": "ASAP"},
diff --git a/app/Libraries/Data/race.json b/app/Libraries/Data/race.json
index 7dee89a..5f29061 100644
--- a/app/Libraries/Data/race.json
+++ b/app/Libraries/Data/race.json
@@ -1,6 +1,6 @@
 {"name": "race",
   "VSName": "Race (Ethnicity)",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "JAWA", "value": "Jawa"},
     {"key": "SUNDA", "value": "Sunda"},
diff --git a/app/Libraries/Data/range_type.json b/app/Libraries/Data/range_type.json
index 8e187d7..31a7d76 100644
--- a/app/Libraries/Data/range_type.json
+++ b/app/Libraries/Data/range_type.json
@@ -1,6 +1,6 @@
 {"name": "range_type",
   "VSName": "Range Type",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "REF", "value": "Reference Range"},
     {"key": "CRTC", "value": "Critical Range"},
diff --git a/app/Libraries/Data/reference_type.json b/app/Libraries/Data/reference_type.json
index 639a3ee..f6fe909 100644
--- a/app/Libraries/Data/reference_type.json
+++ b/app/Libraries/Data/reference_type.json
@@ -1,6 +1,6 @@
 {"name": "reference_type",
   "VSName": "Reference Type",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "NMRC", "value": "Numeric"},
     {"key": "TEXT", "value": "Text"}
diff --git a/app/Libraries/Data/religion.json b/app/Libraries/Data/religion.json
index 7cf774d..a16915a 100644
--- a/app/Libraries/Data/religion.json
+++ b/app/Libraries/Data/religion.json
@@ -1,6 +1,6 @@
 {"name": "religion",
   "VSName": "Religion",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "ISLAM", "value": "Islam"},
     {"key": "KRSTN", "value": "Kristen"},
diff --git a/app/Libraries/Data/request_status.json b/app/Libraries/Data/request_status.json
index 53cdd52..44646df 100644
--- a/app/Libraries/Data/request_status.json
+++ b/app/Libraries/Data/request_status.json
@@ -1,6 +1,6 @@
 {"name": "request_status",
   "VSName": "Request Status",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "STC", "value": "To be collected"},
     {"key": "SCFld", "value": "Collection failed"},
diff --git a/app/Libraries/Data/result_status.json b/app/Libraries/Data/result_status.json
index d1e7895..299da23 100644
--- a/app/Libraries/Data/result_status.json
+++ b/app/Libraries/Data/result_status.json
@@ -1,6 +1,6 @@
 {"name": "result_status",
   "VSName": "Result Status",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "PRELIMINARY", "value": "Preliminary"},
     {"key": "FINAL", "value": "Final"},
diff --git a/app/Libraries/Data/result_type.json b/app/Libraries/Data/result_type.json
index d090590..09081da 100644
--- a/app/Libraries/Data/result_type.json
+++ b/app/Libraries/Data/result_type.json
@@ -1,6 +1,6 @@
 {"name": "result_type",
   "VSName": "Result Type",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "NMRIC", "value": "Numeric"},
     {"key": "RANGE", "value": "Range"},
diff --git a/app/Libraries/Data/result_unit.json b/app/Libraries/Data/result_unit.json
index 97d4553..ae45dc5 100644
--- a/app/Libraries/Data/result_unit.json
+++ b/app/Libraries/Data/result_unit.json
@@ -1,6 +1,6 @@
 {"name": "result_unit",
   "VSName": "Result Unit",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "g/dL", "value": "g/dL"},
     {"key": "g/L", "value": "g/L"},
diff --git a/app/Libraries/Data/sex.json b/app/Libraries/Data/sex.json
index 11a3d16..70b4f0e 100644
--- a/app/Libraries/Data/sex.json
+++ b/app/Libraries/Data/sex.json
@@ -1,6 +1,6 @@
 {"name": "sex",
   "VSName": "Sex",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "1", "value": "Female"},
     {"key": "2", "value": "Male"},
diff --git a/app/Libraries/Data/site_class.json b/app/Libraries/Data/site_class.json
index cbe9988..ea33086 100644
--- a/app/Libraries/Data/site_class.json
+++ b/app/Libraries/Data/site_class.json
@@ -1,6 +1,6 @@
 {"name": "site_class",
   "VSName": "Site Class",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "A", "value": "Kelas A"},
     {"key": "B", "value": "Kelas B"},
diff --git a/app/Libraries/Data/site_type.json b/app/Libraries/Data/site_type.json
index e86ed50..f094d91 100644
--- a/app/Libraries/Data/site_type.json
+++ b/app/Libraries/Data/site_type.json
@@ -1,6 +1,6 @@
 {"name": "site_type",
   "VSName": "Site Type",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "GH", "value": "Government Hospital"},
     {"key": "PH", "value": "Private Hospital"},
diff --git a/app/Libraries/Data/specimen_activity.json b/app/Libraries/Data/specimen_activity.json
index 66aac84..4670c15 100644
--- a/app/Libraries/Data/specimen_activity.json
+++ b/app/Libraries/Data/specimen_activity.json
@@ -1,6 +1,6 @@
 {"name": "specimen_activity",
   "VSName": "Specimen Activity",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "SColl", "value": "Collection"},
     {"key": "STran", "value": "Transport"},
diff --git a/app/Libraries/Data/specimen_condition.json b/app/Libraries/Data/specimen_condition.json
index ec4c31a..9bc4ee0 100644
--- a/app/Libraries/Data/specimen_condition.json
+++ b/app/Libraries/Data/specimen_condition.json
@@ -1,6 +1,6 @@
 {"name": "specimen_condition",
   "VSName": "Specimen Condition",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "HEM", "value": "Hemolyzed"},
     {"key": "ITC", "value": "Icteric"},
diff --git a/app/Libraries/Data/specimen_role.json b/app/Libraries/Data/specimen_role.json
index 98dcd20..a378b8d 100644
--- a/app/Libraries/Data/specimen_role.json
+++ b/app/Libraries/Data/specimen_role.json
@@ -1,6 +1,6 @@
 {"name": "specimen_role",
   "VSName": "Specimen Role",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "P", "value": "Patient"},
     {"key": "B", "value": "Blind Sample"},
diff --git a/app/Libraries/Data/specimen_status.json b/app/Libraries/Data/specimen_status.json
index 2f0b3a4..fe9d7ea 100644
--- a/app/Libraries/Data/specimen_status.json
+++ b/app/Libraries/Data/specimen_status.json
@@ -1,6 +1,6 @@
 {"name": "specimen_status",
   "VSName": "Specimen Status",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "STC", "value": "To be collected"},
     {"key": "SCFld", "value": "Collection failed"},
diff --git a/app/Libraries/Data/specimen_type.json b/app/Libraries/Data/specimen_type.json
index 4a391e7..28f6c66 100644
--- a/app/Libraries/Data/specimen_type.json
+++ b/app/Libraries/Data/specimen_type.json
@@ -1,6 +1,6 @@
 {"name": "specimen_type",
   "VSName": "Specimen Type",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "BLD", "value": "Whole blood"},
     {"key": "BLDA", "value": "Blood arterial"},
diff --git a/app/Libraries/Data/test_activity.json b/app/Libraries/Data/test_activity.json
index 2af369d..0282514 100644
--- a/app/Libraries/Data/test_activity.json
+++ b/app/Libraries/Data/test_activity.json
@@ -1,6 +1,6 @@
 {"name": "test_activity",
   "VSName": "Test Activity",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "ORD", "value": "Order"},
     {"key": "ANA", "value": "Analyse"},
diff --git a/app/Libraries/Data/test_status.json b/app/Libraries/Data/test_status.json
index df4e306..31d1cdf 100644
--- a/app/Libraries/Data/test_status.json
+++ b/app/Libraries/Data/test_status.json
@@ -1,6 +1,6 @@
 {"name": "test_status",
   "VSName": "Test Status",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "PENDING", "value": "Waiting for Results"},
     {"key": "IN_PROCESS", "value": "Analyzing"},
diff --git a/app/Libraries/Data/test_type.json b/app/Libraries/Data/test_type.json
index ed91007..5bf50e1 100644
--- a/app/Libraries/Data/test_type.json
+++ b/app/Libraries/Data/test_type.json
@@ -1,6 +1,6 @@
 {"name": "test_type",
   "VSName": "Test Type",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "TEST", "value": "Test"},
     {"key": "PARAM", "value": "Parameter"},
diff --git a/app/Libraries/Data/text_ref_type.json b/app/Libraries/Data/text_ref_type.json
index 8b60c70..9dfef96 100644
--- a/app/Libraries/Data/text_ref_type.json
+++ b/app/Libraries/Data/text_ref_type.json
@@ -1,6 +1,6 @@
 {"name": "text_ref_type",
   "VSName": "Text Reference Type",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "VSET", "value": "Value Set"},
     {"key": "TEXT", "value": "Text"}
diff --git a/app/Libraries/Data/unit.json b/app/Libraries/Data/unit.json
index c0facfc..9527c1f 100644
--- a/app/Libraries/Data/unit.json
+++ b/app/Libraries/Data/unit.json
@@ -1,6 +1,6 @@
 {"name": "unit",
   "VSName": "Unit",
-  "VCategory": "User-defined",
+  "VCategory": "System",
   "values": [
     {"key": "L", "value": "Liter"},
     {"key": "mL", "value": "Mili Liter"},
diff --git a/app/Views/swagger.php b/app/Views/swagger.php
new file mode 100644
index 0000000..b9e45ac
--- /dev/null
+++ b/app/Views/swagger.php
@@ -0,0 +1,405 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>API Documentation - CLQMS</title>
+
+  <!-- Swagger UI CSS -->
+  <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5/swagger-ui.css">
+
+  <style>
+    html {
+      box-sizing: border-box;
+      overflow: -moz-scrollbars-vertical;
+      overflow-y: scroll;
+    }
+
+    /* Custom Scrollbar for Webkit */
+    ::-webkit-scrollbar {
+        width: 8px;
+        height: 8px;
+    }
+    ::-webkit-scrollbar-track {
+        background: transparent; 
+    }
+    ::-webkit-scrollbar-thumb {
+        background: #888; 
+        border-radius: 4px;
+    }
+    ::-webkit-scrollbar-thumb:hover {
+        background: #555; 
+    }
+
+    *,
+    *:before,
+    *:after {
+      box-sizing: inherit;
+    }
+
+    body {
+      margin: 0;
+      padding: 0;
+      font-family: 'Inter', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+      display: flex; /* Sidebar layout */
+    }
+
+    /* Sidebar Styles */
+    #custom-sidebar {
+      width: 280px;
+      height: 100vh;
+      position: fixed;
+      left: 0;
+      top: 0;
+      overflow-y: auto;
+      background: #fafafa;
+      border-right: 1px solid #ddd;
+      padding: 20px 0;
+      z-index: 1000;
+      transition: background 0.3s, border-color 0.3s;
+    }
+    
+    #custom-sidebar h2 {
+      padding: 0 20px;
+      font-size: 1.2rem;
+      margin-bottom: 1rem;
+      color: #3b4151;
+    }
+
+    .sidebar-link {
+      display: block;
+      padding: 8px 20px;
+      color: #3b4151;
+      text-decoration: none;
+      font-size: 0.9rem;
+      border-left: 3px solid transparent;
+      cursor: pointer;
+      transition: all 0.2s;
+    }
+
+    .sidebar-link:hover {
+      background: rgba(0,0,0,0.05);
+      color: #000;
+    }
+
+    .sidebar-link.active {
+      border-left-color: #49cc90; /* Swagger Green */
+      background: rgba(73, 204, 144, 0.1);
+      font-weight: 600;
+      color: #49cc90;
+    }
+
+    /* Main Content Adjustments */
+    #swagger-ui {
+      margin-left: 280px; /* Width of sidebar */
+      width: calc(100% - 280px);
+      height: 100vh;
+    }
+
+    #swagger-ui .information-container {
+      margin: 0;
+    }
+
+    /* Dark theme support */
+    [data-theme="dark"] body {
+      background: #0d1117;
+    }
+
+    [data-theme="dark"] #custom-sidebar {
+      background: #161b22;
+      border-right: 1px solid #30363d;
+    }
+
+    [data-theme="dark"] #custom-sidebar h2 {
+      color: #c9d1d9;
+    }
+
+    [data-theme="dark"] .sidebar-link {
+      color: #8b949e;
+    }
+
+    [data-theme="dark"] .sidebar-link:hover {
+      background: rgba(255,255,255,0.05);
+      color: #c9d1d9;
+    }
+
+    [data-theme="dark"] .sidebar-link.active {
+      border-left-color: #58a6ff;
+      background: rgba(88, 166, 255, 0.1);
+      color: #58a6ff;
+    }
+
+    [data-theme="dark"] #swagger-ui {
+      --swagger-ui-color: #8b949e;
+      --swagger-ui-bg: #0d1117;
+      --swagger-ui-primary: #58a6ff;
+      --swagger-ui-text: #c9d1d9;
+      --swagger-ui-border: #30363d;
+    }
+
+    [data-theme="dark"] .swagger-ui {
+      color-scheme: dark;
+    }
+
+    [data-theme="dark"] .swagger-ui .info {
+      margin: 20px 0;
+      background: #161b22;
+      box-shadow: 0 1px 3px 0 rgba(0,0,0,0.3);
+      border: 1px solid #30363d;
+    }
+
+    [data-theme="dark"] .swagger-ui .info .title {
+      color: #58a6ff;
+    }
+
+    [data-theme="dark"] .swagger-ui .info .description {
+      color: #8b949e;
+    }
+
+    [data-theme="dark"] .swagger-ui .opblock {
+      background: #0d1117;
+      border: 1px solid #30363d;
+      box-shadow: 0 1px 3px 0 rgba(0,0,0,0.3);
+    }
+
+    [data-theme="dark"] .swagger-ui .opblock .opblock-summary {
+      border-color: #30363d;
+      background: #161b22;
+    }
+
+    [data-theme="dark"] .swagger-ui .opblock .opblock-summary-description {
+      color: #8b949e;
+    }
+
+    [data-theme="dark"] .swagger-ui .opblock.opblock-get {
+      border-color: #3fb950;
+    }
+
+    [data-theme="dark"] .swagger-ui .opblock.opblock-post {
+      border-color: #58a6ff;
+    }
+
+    [data-theme="dark"] .swagger-ui .opblock.opblock-put {
+      border-color: #d29922;
+    }
+
+    [data-theme="dark"] .swagger-ui .opblock.opblock-delete {
+      border-color: #f85149;
+    }
+
+    [data-theme="dark"] .swagger-ui .opblock.opblock-patch {
+      border-color: #a371f7;
+    }
+
+    [data-theme="dark"] .swagger-ui .scheme-container {
+      background: #161b22;
+      box-shadow: 0 1px 3px 0 rgba(0,0,0,0.3);
+    }
+
+    [data-theme="dark"] .swagger-ui .loading-container {
+      background: #0d1117;
+    }
+
+    [data-theme="dark"] .swagger-ui .btn {
+      background: #21262d;
+      border-color: #30363d;
+      color: #c9d1d9;
+    }
+
+    [data-theme="dark"] .swagger-ui .btn:hover {
+      background: #30363d;
+    }
+
+    [data-theme="dark"] .swagger-ui input[type="text"],
+    [data-theme="dark"] .swagger-ui textarea {
+      background: #0d1117;
+      border-color: #30363d;
+      color: #c9d1d9;
+    }
+
+    [data-theme="dark"] .swagger-ui select {
+      background: #0d1117;
+      border-color: #30363d;
+      color: #c9d1d9;
+    }
+
+    [data-theme="dark"] .swagger-ui .model-title {
+      color: #58a6ff;
+    }
+
+    [data-theme="dark"] .swagger-ui .property-name {
+      color: #8b949e;
+    }
+
+    [data-theme="dark"] .swagger-ui .tab li {
+      color: #8b949e;
+    }
+
+    [data-theme="dark"] .swagger-ui .tab li.active {
+      color: #58a6ff;
+    }
+
+    [data-theme="dark"] .swagger-ui .responses-inner h4,
+    [data-theme="dark"] .swagger-ui .responses-inner h5 {
+      color: #c9d1d9;
+    }
+
+    [data-theme="dark"] .swagger-ui .response-col_status {
+      color: #8b949e;
+    }
+
+    [data-theme="dark"] .swagger-ui .response-col_description {
+      color: #8b949e;
+    }
+
+    /* Responsive adjustments */
+    @media (max-width: 768px) {
+      body {
+        display: block; /* Stack on mobile */
+      }
+      
+      #custom-sidebar {
+        width: 100%;
+        height: auto;
+        max-height: 200px;
+        position: relative;
+        border-right: none;
+        border-bottom: 1px solid #ddd;
+      }
+      
+      #swagger-ui {
+        margin-left: 0;
+        width: 100%;
+      }
+
+      #swagger-ui .information-container {
+        padding: 10px;
+      }
+
+      #swagger-ui .info {
+        margin: 10px 0;
+      }
+    }
+  </style>
+</head>
+<body>
+  <div id="custom-sidebar">
+    <h2>Resources</h2>
+    <div id="sidebar-links"></div>
+  </div>
+  <div id="swagger-ui"></div>
+
+  <!-- Swagger UI Bundle -->
+  <script src="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5/swagger-ui-bundle.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/swagger-ui-dist@5/swagger-ui-standalone-preset.js"></script>
+
+  <script>
+    // Custom Sidebar Logic
+    function initCustomSidebar(ui) {
+      const sidebarLinks = document.getElementById('sidebar-links');
+      
+      // Wait for Swagger UI to render tags
+      // We'll poll every 100ms for up to 5 seconds
+      let attempts = 0;
+      const maxAttempts = 50;
+      
+      const interval = setInterval(() => {
+        attempts++;
+        const tags = document.querySelectorAll('.opblock-tag-section');
+        
+        if (tags.length > 0 || attempts >= maxAttempts) {
+          clearInterval(interval);
+          buildSidebar(tags);
+        }
+      }, 100);
+    }
+
+    function buildSidebar(tags) {
+      const sidebarLinksContainer = document.getElementById('sidebar-links');
+      sidebarLinksContainer.innerHTML = ''; // Clear existing
+      
+      if (tags.length === 0) {
+        sidebarLinksContainer.innerHTML = '<div style="padding:0 20px;color:#888;">No resources found</div>';
+        return;
+      }
+
+      tags.forEach(tagSection => {
+        const tagHeader = tagSection.querySelector('.opblock-tag');
+        if (!tagHeader) return;
+
+        const tagName = tagHeader.getAttribute('data-tag');
+        const tagText = tagHeader.querySelector('a span') ? tagHeader.querySelector('a span').innerText : tagName;
+        const tagId = tagHeader.id; // e.g., operations-tag-Auth
+        
+        const link = document.createElement('a');
+        link.className = 'sidebar-link';
+        link.textContent = tagText;
+        link.href = '#' + tagId;
+        
+        link.onclick = (e) => {
+          e.preventDefault();
+          const target = document.getElementById(tagId);
+          if (target) {
+            target.scrollIntoView({ behavior: 'smooth' });
+            // Update active state
+            document.querySelectorAll('.sidebar-link').forEach(l => l.classList.remove('active'));
+            link.classList.add('active');
+          }
+        };
+
+        sidebarLinksContainer.appendChild(link);
+      });
+    }
+
+    window.onload = function() {
+      // Get JWT token from localStorage
+      // JWT token handled via HttpOnly cookie automatically
+
+      // Initialize Swagger UI
+      const ui = SwaggerUIBundle({
+        url: "<?= base_url('api-docs.yaml') ?>",
+        dom_id: '#swagger-ui',
+        deepLinking: true,
+        presets: [
+          SwaggerUIBundle.presets.apis,
+          SwaggerUIStandalonePreset
+        ],
+        plugins: [
+          SwaggerUIBundle.plugins.DownloadUrl
+        ],
+        layout: "StandaloneLayout",
+        defaultModelsExpandDepth: 1,
+        defaultModelExpandDepth: 1,
+        displayOperationId: false,
+        displayRequestDuration: true,
+        docExpansion: "list",
+        filter: true,
+        showRequestHeaders: true,
+        showCommonExtensions: true,
+        tryItOutEnabled: true,
+        persistAuthorization: true,
+        withCredentials: true, // Enable cookies
+        syntaxHighlight: {
+          activate: true,
+          theme: "monokai"
+        },
+        validatorUrl: null,
+
+        onComplete: () => {
+          // Initialize Custom Sidebar
+          initCustomSidebar(ui);
+        },
+
+        // Request interceptor to ensure cookies are sent
+        requestInterceptor: (request) => {
+          // Ensure credentials (cookies) are included in the request
+          request.credentials = 'include';
+          return request;
+        }
+      });
+
+      window.ui = ui;
+    };
+  </script>
+</body>
+</html>
diff --git a/app/Views/v2/layout/main_layout.php b/app/Views/v2/layout/main_layout.php
index de86511..aa81d9f 100644
--- a/app/Views/v2/layout/main_layout.php
+++ b/app/Views/v2/layout/main_layout.php
@@ -182,10 +182,10 @@
             <span x-show="sidebarOpen">Value Sets</span>
           </a>
         </li>
-        
+
         <!-- Settings -->
         <li class="mt-4">
-          <a href="<?= base_url('/v2/settings') ?>" 
+          <a href="<?= base_url('/v2/settings') ?>"
              :class="isActive('settings') ? 'active' : ''"
              class="group">
             <i class="fa-solid fa-cog w-5 text-center transition-transform group-hover:scale-110"></i>
diff --git a/docs/MIGRATION_VALUESET_VID_TO_VVALUE.md b/docs/MIGRATION_VALUESET_VID_TO_VVALUE.md
deleted file mode 100644
index 1f8eacf..0000000
--- a/docs/MIGRATION_VALUESET_VID_TO_VVALUE.md
+++ /dev/null
@@ -1,645 +0,0 @@
-# Migration Plan: Valueset VID → VValue
-
-## Overview
-
-Transition from using database `valueset` table (VID as primary key) to the new `App\Libraries\ValueSet` library (VValue as key). This eliminates database joins for lookup values and uses JSON-based static lookup files.
-
-## Current State
-
-- Database `valueset` table with columns: `VID` (PK, INT), `VValue` (VARCHAR), `VDesc` (VARCHAR)
-- 30+ places using `->join('valueset', 'valueset.VID = ...')`
-- Selects use `valueset.VValue` and `valueset.VDesc` for display text
-
-## Target State
-
-- Use `App\Libraries\ValueSet` library with `getLabel(lookupName, key)` method
-- Lookup names use table-prefixed PascalCase (e.g., `patient_Sex`, `test_TestType`, `container_ContainerCapColor`)
-- All fields store `VValue` codes directly (e.g., '1', '2', 'M', 'F', 'TEST')
-- Remove all `valueset` table joins from queries
-- Keep raw field values for codes; use `ValueSet::getLabel()` for display text
-- JSON files in `app/Libraries/Data/valuesets/` are already populated
-
----
-
-## Phase 1: JSON Files Rename
-
-Rename all JSON files in `app/Libraries/Data/valuesets/` to use table-prefixed PascalCase format:
-
-| Old Name | New Name | Source Table | Field |
-|----------|----------|--------------|-------|
-| `gender.json` | `patient_Sex.json` | patient | Gender |
-| `country.json` | `patient_Country.json` | patient | Country |
-| `race.json` | `patient_Race.json` | patient | Race |
-| `religion.json` | `patient_Religion.json` | patient | Religion |
-| `ethnic.json` | `patient_Ethnic.json` | patient | Ethnic |
-| `marital_status.json` | `patient_MaritalStatus.json` | patient | MaritalStatus |
-| `death_indicator.json` | `patient_DeathIndicator.json` | patient | DeathIndicator |
-| `test_type.json` | `test_TestType.json` | testdefsite | TestType |
-| `container_cap_color.json` | `container_ContainerCapColor.json` | containerdef | Color |
-| `container_class.json` | `container_ContainerClass.json` | containerdef | ConClass |
-| `additive.json` | `container_Additive.json` | containerdef | Additive |
-| `location_type.json` | `location_LocationType.json` | location | LocType |
-| `ws_type.json` | `organization_WorkstationType.json` | workstation | Type |
-| `enable_disable.json` | `organization_EnableDisable.json` | workstation | Enable |
-| `site_type.json` | `organization_SiteType.json` | site | SiteTypeID |
-| `site_class.json` | `organization_SiteClass.json` | site | SiteClassID |
-| `numeric_ref_type.json` | `ref_NumericRefType.json` | refnum | NumRefType |
-| `range_type.json` | `ref_RangeType.json` | refnum | RangeType |
-| `text_ref_type.json` | `ref_TextRefType.json` | reftxt | TxtRefType |
-| `reference_type.json` | `test_ReferenceType.json` | testdeftech | RefType |
-| `math_sign.json` | `ref_MathSign.json` | refnum | LowSign, HighSign |
-| `country.json` | `account_Country.json` | account | Country |
-| ... | ... | ... | ... |
-
-All lookup names use `{table}_{Field}` format for clarity and namespace isolation.
-
----
-
-## Phase 2: Database Schema Migration
-
-### Files to DELETE
-
-| File | Action |
-|------|--------|
-| `app\Database\Seeds\ValueSetSeeder.php` | DELETE |
-| `app\Database\Seeds\ValueSetCountrySeeder.php` | DELETE |
-| `app\Database\Seeds\MinimalMasterDataSeeder.php` | DELETE |
-| `app\Database\Seeds\PatientSeeder.php` | DELETE |
-| `app\Database\Migrations\2025-09-15-130122_ValueSet.php` | DELETE |
-
-### Migration: Modify Columns INT → VARCHAR(10)
-
-**File:** `app\Database\Migrations\2026-01-12-000001_ValuesetVidToVvalue.php`
-
-```php
-<?php
-
-namespace App\Database\Migrations;
-
-use CodeIgniter\Database\Migration;
-
-class ValuesetVidToVvalue extends Migration
-{
-    public function up()
-    {
-        // patient table
-        $this->forge->modifyColumn('patient', [
-            'Gender' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'Country' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'Race' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'Religion' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'Ethnic' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'MaritalStatus' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'DeathIndicator' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-        ]);
-
-        // testdefsite table
-        $this->forge->modifyColumn('testdefsite', [
-            'TestType' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => false],
-        ]);
-
-        // containerdef table
-        $this->forge->modifyColumn('containerdef', [
-            'Additive' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'ConClass' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'Color' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-        ]);
-
-        // location table
-        $this->forge->modifyColumn('location', [
-            'LocType' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-        ]);
-
-        // workstation table
-        $this->forge->modifyColumn('workstation', [
-            'Type' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'Enable' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-        ]);
-
-        // site table
-        $this->forge->modifyColumn('site', [
-            'SiteTypeID' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'SiteClassID' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-        ]);
-
-        // account table
-        $this->forge->modifyColumn('account', [
-            'Country' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-        ]);
-
-        // refnum table
-        $this->forge->modifyColumn('refnum', [
-            'Sex' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'NumRefType' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'RangeType' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'LowSign' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'HighSign' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-        ]);
-
-        // reftxt table
-        $this->forge->modifyColumn('reftxt', [
-            'Sex' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-            'TxtRefType' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => true],
-        ]);
-
-        // orderstatus table
-        $this->forge->modifyColumn('orderstatus', [
-            'OrderStatus' => ['type' => 'VARCHAR', 'constraint' => 10, 'null' => false],
-        ]);
-    }
-
-    public function down()
-    {
-        // Revert to INT
-        $this->forge->modifyColumn('patient', [
-            'Gender' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'Country' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'Race' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'Religion' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'Ethnic' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'MaritalStatus' => ['type' => 'TINYINT', 'null' => true],
-            'DeathIndicator' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-        ]);
-
-        $this->forge->modifyColumn('testdefsite', [
-            'TestType' => ['type' => 'INT', 'null' => false],
-        ]);
-
-        $this->forge->modifyColumn('containerdef', [
-            'Additive' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'ConClass' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'Color' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-        ]);
-
-        $this->forge->modifyColumn('location', [
-            'LocType' => ['type' => 'INT', 'null' => true],
-        ]);
-
-        $this->forge->modifyColumn('workstation', [
-            'Type' => ['type' => 'TINYINT', 'null' => true],
-            'Enable' => ['type' => 'INT', 'null' => true],
-        ]);
-
-        $this->forge->modifyColumn('site', [
-            'SiteTypeID' => ['type' => 'INT', 'null' => true],
-            'SiteClassID' => ['type' => 'INT', 'null' => true],
-        ]);
-
-        $this->forge->modifyColumn('account', [
-            'Country' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-        ]);
-
-        $this->forge->modifyColumn('refnum', [
-            'Sex' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'NumRefType' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'RangeType' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'LowSign' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'HighSign' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-        ]);
-
-        $this->forge->modifyColumn('reftxt', [
-            'Sex' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-            'TxtRefType' => ['type' => 'INT', 'constraint' => 11, 'null' => true],
-        ]);
-
-        $this->forge->modifyColumn('orderstatus', [
-            'OrderStatus' => ['type' => 'INT', 'null' => false],
-        ]);
-    }
-}
-```
-
-**Note:** No data migration needed - dummy data will be lost. This is acceptable for development/testing environments.
-
----
-
-## Phase 3: Library & Model Updates
-
-### ValueSet Library - Update to read from JSON files
-
-**File:** `app/Libraries/ValueSet.php`
-
-Ensure the library reads from JSON files in `app/Libraries/Data/valuesets/`:
-
-```php
-<?php
-
-namespace App\Libraries;
-
-class ValueSet
-{
-    private static $cache = [];
-
-    private static function loadFile(string $name): array
-    {
-        if (!isset(self::$cache[$name])) {
-            $path = APPPATH . 'Libraries/Data/valuesets/' . $name . '.json';
-            if (file_exists($path)) {
-                $content = file_get_contents($path);
-                self::$cache[$name] = json_decode($content, true)['values'] ?? [];
-            } else {
-                self::$cache[$name] = [];
-            }
-        }
-        return self::$cache[$name];
-    }
-
-    public static function getLabel(string $lookupName, string $key): ?string
-    {
-        $values = self::loadFile($lookupName);
-        foreach ($values as $item) {
-            if (($item['key'] ?? $item['value'] ?? null) === $key) {
-                return $item['value'] ?? $item['label'] ?? null;
-            }
-        }
-        return null;
-    }
-
-    public static function getOptions(string $lookupName): array
-    {
-        $values = self::loadFile($lookupName);
-        return array_map(function ($item) {
-            return [
-                'key' => $item['key'] ?? '',
-                'value' => $item['value'] ?? $item['label'] ?? '',
-            ];
-        }, $values);
-    }
-
-    public static function transformLabels(array $data, array $fieldMappings): array
-    {
-        foreach ($data as &$row) {
-            foreach ($fieldMappings as $field => $lookupName) {
-                if (isset($row[$field]) && $row[$field] !== null) {
-                    $row[$field . 'Text'] = self::getLabel($lookupName, $row[$field]) ?? '';
-                }
-            }
-        }
-        return $data;
-    }
-}
-```
-
-### ValueSetModel - Deprecate or Repurpose
-
-**File:** `app/Models/ValueSet/ValueSetModel.php`
-
-Options:
-1. **Deprecate entirely** - No longer needed after migration
-2. **Repurpose for JSON file management** - Read/write to JSON files
-3. **Keep as-is for backward compatibility** - If database valuesets are still needed
-
-Recommended: Deprecate and remove references after migration.
-
----
-
-## Phase 4: Model Changes
-
-### Pattern for Model Updates
-
-**Before:**
-```php
-$this->select("..., gender.VValue as Gender, gender.VDesc as GenderText")
-     ->join('valueset gender', 'gender.VID = patient.Gender', 'left')
-```
-
-**After:**
-```php
-use App\Libraries\ValueSet;
-
-$this->select("..., patient.Gender");
-// After fetching:
-$rows = ValueSet::transformLabels($rows, [
-    'Gender' => 'patient_Sex',
-    'Country' => 'patient_Country',
-    'Race' => 'patient_Race',
-    'Religion' => 'patient_Religion',
-    'Ethnic' => 'patient_Ethnic',
-    'DeathIndicator' => 'patient_DeathIndicator',
-    'MaritalStatus' => 'patient_MaritalStatus',
-]);
-```
-
-### Models to Modify (8 files)
-
-#### 1. `app/Models/Patient/PatientModel.php`
-
-**Remove:**
-- Line 27: `$this->join('valueset vs', 'vs.vid = Gender', 'left');`
-- Lines 52-64: All `*.VID as *VID` aliases
-- Lines 75-81: All `valueset.*` joins
-
-**Add transformation in `getPatient()`:**
-```php
-$patient = ValueSet::transformLabels([$patient], [
-    'Gender' => 'patient_gender',
-    'Country' => 'patient_country',
-    'Race' => 'patient_race',
-    'Religion' => 'patient_religion',
-    'Ethnic' => 'patient_ethnic',
-    'DeathIndicator' => 'patient_death_indicator',
-    'MaritalStatus' => 'patient_marital_status',
-])[0];
-```
-
-#### 2. `app/Models/Location/LocationModel.php`
-
-**Remove:**
-- Lines 18, 30: `->join("valueset v", "v.VID=location.loctype", ...)`
-
-**Add transformation:**
-```php
-$rows = ValueSet::transformLabels($rows, [
-    'LocType' => 'location_LocationType',
-]);
-```
-
-#### 3. `app/Models/Test/TestDefSiteModel.php`
-
-**Remove:**
-- Lines 42, 75, 103: `->join("valueset", "valueset.VID=...")`
-
-**Add transformation:**
-```php
-$rows = ValueSet::transformLabels($rows, [
-    'TestType' => 'test_TestType',
-]);
-```
-
-#### 4. `app/Models/Test/TestDefGrpModel.php`
-
-**Remove:**
-- Line 32: `->join('valueset vs', 'vs.VID=t.TestType', 'left')`
-
-#### 5. `app/Models/Specimen/ContainerDefModel.php`
-
-**Remove:**
-- Lines 20-22, 37-39: All 6 `valueset.*` joins
-
-**Add transformation:**
-```php
-$rows = ValueSet::transformLabels($rows, [
-    'Color' => 'container_ContainerCapColor',
-    'ConClass' => 'container_ContainerClass',
-    'Additive' => 'container_Additive',
-]);
-```
-
-#### 6. `app/Models/Organization/SiteModel.php`
-
-**Remove:**
-- Lines 38-39: `->join('valueset sitetype'...)` and `->join('valueset siteclass'...)`
-
-**Add transformation:**
-```php
-$row = ValueSet::transformLabels([$row], [
-    'SiteTypeID' => 'organization_SiteType',
-    'SiteClassID' => 'organization_SiteClass',
-])[0];
-```
-
-#### 7. `app/Models/Organization/AccountModel.php`
-
-**Remove:**
-- Line 41: `->join('valueset country'...)`
-
-**Remove from select:**
-- Line 36: `country.VID as country`
-
-**Add transformation in controller if needed:**
-```php
-$rows = ValueSet::transformLabels($rows, [
-    'Country' => 'account_Country',
-]);
-```
-
-#### 8. `app/Models/Organization/WorkstationModel.php`
-
-**Remove:**
-- Lines 36-37: `->join('valueset wstype'...)` and `->join('valueset enable'...)`
-
-**Add transformation:**
-```php
-$row = ValueSet::transformLabels([$row], [
-    'Type' => 'organization_WorkstationType',
-    'Enable' => 'organization_EnableDisable',
-])[0];
-```
-
----
-
-## Phase 5: Controller Changes
-
-### `app/Controllers/TestsController.php`
-
-**Remove:**
-- Line 69: `->join("valueset", "valueset.VID=testdefsite.TestType", "left")`
-- Line 111: `->join("valueset", "valueset.VID=testdefsite.TestType", "left")`
-- Line 140: `->join('valueset vs', 'vs.VID=t.TestType', 'left')`
-
-**Replace `getVValue()` method:**
-```php
-private function getVValue($vsetID, $vid) {
-    // DEPRECATED - Use ValueSet::getLabel() instead
-    return null;
-}
-```
-
-**Update references from `getVValue()` to `ValueSet::getLabel()`:**
-```php
-// Before:
-'NumRefTypeVValue' => $this->getVValue(46, $r['NumRefType']),
-
-// After:
-'NumRefTypeVValue' => \App\Libraries\ValueSet::getLabel('ref_NumericRefType', $r['NumRefType']),
-```
-
-**VSetID to Lookup Name Mapping:**
-| VSetID | Constant | Lookup Name |
-|--------|----------|-------------|
-| 44 | `VALUESET_REF_TYPE` | `test_ReferenceType` |
-| 45 | `VALUESET_RANGE_TYPE` | `ref_RangeType` |
-| 46 | `VALUESET_NUM_REF_TYPE` | `ref_NumericRefType` |
-| 47 | `VALUESET_TXT_REF_TYPE` | `ref_TextRefType` |
-| 3 | `VALUESET_SEX` | `patient_Sex` |
-| 41 | `VALUESET_MATH_SIGN` | `ref_MathSign` |
-
-**Update `getValuesetOptions()` to use JSON:**
-```php
-private function getValuesetOptions($lookupName)
-{
-    return \App\Libraries\ValueSet::getOptions($lookupName);
-}
-```
-
----
-
-## Phase 6: API Endpoints - Replace with JSON-based endpoints
-
-### New API Controller: `app/Controllers/ValueSetApiController.php`
-
-```php
-<?php
-
-namespace App\Controllers;
-
-use App\Libraries\ValueSet;
-
-class ValueSetApiController extends \CodeIgniter\Controller
-{
-    use \CodeIgniter\API\ResponseTrait;
-
-    public function index(string $lookupName)
-    {
-        $data = ValueSet::getOptions($lookupName);
-        return $this->respond([
-            'status' => 'success',
-            'data' => $data
-        ], 200);
-    }
-
-    public function all()
-    {
-        $dir = APPPATH . 'Libraries/Data/valuesets/';
-        $files = glob($dir . '*.json');
-        $result = [];
-        foreach ($files as $file) {
-            $name = basename($file, '.json');
-            $result[] = [
-                'name' => $name,
-                'options' => ValueSet::getOptions($name)
-            ];
-        }
-        return $this->respond([
-            'status' => 'success',
-            'data' => $result
-        ], 200);
-    }
-}
-```
-
-### Update Routes: `app/Config/Routes.php`
-
-```php
-$routes->group('api', function ($routes) {
-    $routes->get('valueset/(:segment)', 'ValueSetApiController::index/$1');
-    $routes->get('valueset', 'ValueSetApiController::all');
-});
-```
-
----
-
-## Phase 7: View Updates
-
-### 1. `app/Views/v2/master/valuesets/valuesets_index.php`
-
-Repurpose to manage JSON-based valuesets instead of database table.
-
-| Before | After |
-|--------|-------|
-| `fetch(...api/valueset...)` | `fetch(...api/valueset/lookupName...)` |
-| Database CRUD operations | File-based CRUD operations |
-
-### 2. `app/Views/v2/master/valuesets/valueset_nested_crud.php`
-
-Repurpose for JSON file management.
-
-### 3. `app/Views/v2/master/valuesets/valueset_dialog.php`
-
-Update for JSON file format.
-
-### 4. `app/Views/v2/master/tests/tests_index.php`
-
-| Before | After |
-|--------|-------|
-| `type?.VID` | `type?.key` |
-| `type?.VValue` | `type?.value` |
-| `type?.VDesc` | `type?.label` |
-| `{ VID: 1, VValue: 'TEST', ... }` | `{ key: 'TEST', value: 'Test', ... }` |
-| `getTypeName(vid)` | `getTypeName(value)` |
-| `api/valuesetdef/27` | `api/valueset/test_TestType` |
-| Hardcoded fallback: `{ VID: 1, VValue: 'TEST', VDesc: 'Test' }` | `{ key: 'TEST', value: 'Test' }` |
-
-### 5. Additional Views to Update
-
-| View File | Fields to Update | Lookup Name |
-|-----------|------------------|-------------|
-| `app/Views/v2/patients/patients_index.php` | Gender, Country, Race, Religion, Ethnic, MaritalStatus, DeathIndicator | `patient_*` |
-| `app/Views/v2/master/specimen/containers_index.php` | Color, ConClass, Additive | `container_*` |
-| `app/Views/v2/master/organization/sites_index.php` | SiteTypeID, SiteClassID | `organization_*` |
-| `app/Views/v2/master/organization/workstations_index.php` | Type, Enable | `organization_*` |
-| `app/Views/v2/master/organization/accounts_index.php` | Country | `account_Country` |
-| `app/Views/v2/master/organization/locations_index.php` | LocType | `location_LocationType` |
-
----
-
-## Phase 8: Test Files Update
-
-### `tests/feature/ValueSet/ValueSetApiControllerTest.php`
-
-Update tests to use new JSON-based API endpoints.
-
-### `tests/_support/v2/MasterTestCase.php`
-
-Update any valueset-related test data setup.
-
----
-
-## Testing Checklist
-
-1. **Unit Tests**
-   - Test `ValueSet::getLabel('patient_Sex', '1')` returns 'Female'
-   - Test `ValueSet::getLabel('test_TestType', 'TEST')` returns 'Test'
-   - Test `ValueSet::getOptions('container_ContainerCapColor')` returns correct format
-   - Test `ValueSet::transformLabels()` with table-prefixed field mappings
-
-2. **Integration Tests**
-   - Patient CRUD (create, read, update, delete)
-   - Test definition CRUD
-   - Location CRUD
-   - Container definition CRUD
-   - Organization (site, account, workstation) CRUD
-
-3. **Manual Testing**
-   - Verify all dropdowns display correct labels
-   - Verify filtering by valueset fields works
-   - Verify form submissions save correct VValue codes
-
----
-
-## Rollback Plan
-
-1. Run migration `down()` to revert column types
-2. Restore deleted seeders from git if needed
-3. Restore deleted migration file from git
-
----
-
-## Files Summary
-
-| Phase | Action | Files |
-|-------|--------|-------|
-| 1 | RENAME | ~50 JSON files in `app/Libraries/Data/valuesets/` |
-| 2 | DELETE | 5 seeders, 1 migration |
-| 2 | CREATE | 1 migration (column changes) |
-| 3 | UPDATE | 1 library (ValueSet.php), ValueSetModel.php deprecation |
-| 4 | UPDATE | 8 Model files |
-| 5 | UPDATE | 1 Controller, Routes |
-| 6 | CREATE | 1 Controller (ValueSetApiController.php) |
-| 6 | UPDATE | ~6+ View files |
-| 8 | UPDATE | 2+ Test files |
-
----
-
-## Estimated Effort
-
-- Phase 1 (JSON Rename): 15 minutes
-- Phase 2 (Migration): 30 minutes
-- Phase 3 (Library + Model): 30 minutes
-- Phase 4 (Models): 1.5 hours
-- Phase 5 (Controller): 30 minutes
-- Phase 6 (API + Views): 2 hours
-- Phase 8 (Tests): 30 minutes
-- Testing: 1 hour
-
-**Total Estimated Time: ~7 hours**
diff --git a/docs/VUE_SPA_IMPLEMENTATION_PLAN.md b/docs/VUE_SPA_IMPLEMENTATION_PLAN.md
deleted file mode 100644
index c2a8f86..0000000
--- a/docs/VUE_SPA_IMPLEMENTATION_PLAN.md
+++ /dev/null
@@ -1,1069 +0,0 @@
-# Vue 3 SPA Implementation Plan for CLQMS
-
-## Executive Summary
-
-This document outlines the implementation of a keyboard-friendly Single Page Application (SPA) using Vue 3 to replace the current Alpine.js frontend. The new SPA will integrate with the existing CodeIgniter 4 backend API, providing a more robust architecture for complex, heavy UI requirements while maintaining full keyboard accessibility.
-
-**Key Technologies:**
-- Vue 3 (Composition API)
-- Vite (build tool)
-- Pinia (state management)
-- Vue Router
-- PrimeVue 4 (component library)
-- @vueuse/core (utilities)
-- Headless UI for Vue (accessible primitives)
-
----
-
-## 1. Architecture Overview
-
-### 1.1 System Architecture
-
-```
-┌─────────────────────────────────────────────────────────────────┐
-│                        Vue 3 SPA (Port 5173)                    │
-│  ┌─────────────┐  ┌─────────────┐  ┌─────────────────────────┐ │
-│  │   Views     │  │  Components │  │      Stores (Pinia)     │ │
-│  │  (Pages)    │  │  (UI)       │  │  (State Management)     │ │
-│  └──────┬──────┘  └──────┬──────┘  └───────────┬─────────────┘ │
-│         │                │                      │               │
-│         └────────────────┼──────────────────────┘               │
-│                          ▼                                      │
-│  ┌─────────────────────────────────────────────────────────┐   │
-│  │              Vue Router (Client-side Routing)           │   │
-│  └───────────────────────────┬─────────────────────────────┘   │
-│                              ▼                                  │
-│  ┌─────────────────────────────────────────────────────────┐   │
-│  │                   API Service Layer                     │   │
-│  │              (Axios + JWT Interceptor)                  │   │
-│  └───────────────────────────┬─────────────────────────────┘   │
-└──────────────────────────────┼─────────────────────────────────┘
-                               │
-                               ▼
-┌─────────────────────────────────────────────────────────────────┐
-│               CodeIgniter 4 REST API (Port 8080)                │
-│  ┌─────────────┐  ┌─────────────┐  ┌─────────────────────────┐ │
-│  │ Controllers │  │   Models    │  │      Libraries          │ │
-│  │  (API)      │  │  (DB)       │  │  (Lookups, Auth)       │ │
-│  └─────────────┘  └─────────────┘  └─────────────────────────┘ │
-└─────────────────────────────────────────────────────────────────┘
-```
-
-### 1.2 Communication Pattern
-
-- SPA runs on separate port (Vite dev server: 5173)
-- Backend API runs on port 8080
-- CORS configured to allow SPA to communicate with API
-- JWT authentication via HTTP-only cookies or Bearer tokens
-- All dates in UTC, ISO 8601 format
-
----
-
-## 2. Implementation Phases
-
-### Phase 1: Project Setup (Days 1-2)
-
-#### 2.1.1 Initialize Vue 3 Project
-
-```bash
-# Create Vue 3 project with Vite
-npm create vite@latest clqms-frontend -- --template vue-ts
-
-# Navigate to project
-cd clqms-frontend
-
-# Install dependencies
-npm install
-```
-
-#### 2.1.2 Core Dependencies
-
-```bash
-# State Management
-npm install pinia
-
-# Router
-npm install vue-router
-
-# HTTP Client
-npm install axios
-
-# Component Library with excellent accessibility
-npm install primevue @primevue/themes primeicons
-
-# VueUse utilities (keyboard, focus, shortcuts)
-npm install @vueuse/core
-
-# Headless UI for accessible primitives
-npm install @headlessui/vue
-
-# Validation
-npm install zod
-
-# Date handling
-npm install dayjs
-
-# CSS utility (optional, can use PrimeVue styling)
-npm install -D tailwindcss postcss autoprefixer
-```
-
-#### 2.1.3 Project Structure
-
-```
-clqms-frontend/
-├── public/
-│   └── favicon.ico
-├── src/
-│   ├── assets/
-│   │   ├── images/
-│   │   └── styles/
-│   │       └── main.css
-│   ├── components/
-│   │   ├── common/
-│   │   │   ├── BaseButton.vue
-│   │   │   ├── BaseInput.vue
-│   │   │   ├── BaseModal.vue
-│   │   │   ├── BaseDataTable.vue
-│   │   │   ├── PageHeader.vue
-│   │   │   └── KeyboardShortcuts.vue
-│   │   ├── layout/
-│   │   │   ├── AppHeader.vue
-│   │   │   ├── AppSidebar.vue
-│   │   │   └── AppFooter.vue
-│   │   └── domain/
-│   │       ├── patient/
-│   │       │   ├── PatientList.vue
-│   │       │   ├── PatientForm.vue
-│   │       │   └── PatientDetail.vue
-│   │       └── ...
-│   ├── composables/
-│   │   ├── useAuth.ts
-│   │   ├── useApi.ts
-│   │   ├── useKeyboard.ts
-│   │   └── useFocusTrap.ts
-│   ├── router/
-│   │   └── index.ts
-│   ├── services/
-│   │   ├── api.ts
-│   │   ├── authService.ts
-│   │   ├── patientService.ts
-│   │   └── ...
-│   ├── stores/
-│   │   ├── auth.ts
-│   │   ├── patient.ts
-│   │   └── ...
-│   ├── types/
-│   │   ├── api.ts
-│   │   ├── patient.ts
-│   │   └── ...
-│   ├── utils/
-│   │   ├── constants.ts
-│   │   └── helpers.ts
-│   ├── views/
-│   │   ├── Dashboard.vue
-│   │   ├── Login.vue
-│   │   ├── NotFound.vue
-│   │   ├── patient/
-│   │   │   ├── PatientIndex.vue
-│   │   │   ├── PatientCreate.vue
-│   │   │   └── PatientEdit.vue
-│   │   └── ...
-│   ├── App.vue
-│   └── main.ts
-├── index.html
-├── package.json
-├── tsconfig.json
-├── vite.config.ts
-├── tailwind.config.js
-└── .env
-```
-
-### Phase 2: Core Infrastructure (Days 3-4)
-
-#### 2.2.1 Vite Configuration
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite'
-import vue from '@vitejs/plugin-vue'
-import { resolve } from 'path'
-
-export default defineConfig({
-  plugins: [vue()],
-  resolve: {
-    alias: {
-      '@': resolve(__dirname, 'src'),
-    },
-  },
-  server: {
-    port: 5173,
-    proxy: {
-      '/api': {
-        target: 'http://localhost:8080',
-        changeOrigin: true,
-      },
-    },
-  },
-})
-```
-
-#### 2.2.2 Main Entry Point
-
-```typescript
-// src/main.ts
-import { createApp } from 'vue'
-import { createPinia } from 'pinia'
-import PrimeVue from 'primevue/config'
-import ToastService from 'primevue/toastservice'
-import ConfirmationService from 'primevue/confirmationservice'
-import App from './App.vue'
-import router from './router'
-
-import 'primevue/resources/themes/aura-light-blue/theme.css'
-import 'primeicons/primeicons.css'
-import './assets/styles/main.css'
-
-const app = createApp(App)
-
-app.use(createPinia())
-app.use(router)
-app.use(PrimeVue, { ripple: true })
-app.use(ToastService)
-app.use(ConfirmationService)
-
-app.mount('#app')
-```
-
-#### 2.2.3 Router Configuration
-
-```typescript
-// src/router/index.ts
-import { createRouter, createWebHistory } from 'vue-router'
-import type { RouteRecordRaw } from 'vue-router'
-import { useAuthStore } from '@/stores/auth'
-
-const routes: RouteRecordRaw[] = [
-  {
-    path: '/login',
-    name: 'Login',
-    component: () => import('@/views/Login.vue'),
-    meta: { requiresAuth: false },
-  },
-  {
-    path: '/',
-    component: () => import('@/components/layout/AppLayout.vue'),
-    meta: { requiresAuth: true },
-    children: [
-      {
-        path: '',
-        name: 'Dashboard',
-        component: () => import('@/views/Dashboard.vue'),
-      },
-      {
-        path: 'patients',
-        name: 'PatientIndex',
-        component: () => import('@/views/patient/PatientIndex.vue'),
-      },
-      {
-        path: 'patients/create',
-        name: 'PatientCreate',
-        component: () => import('@/views/patient/PatientCreate.vue'),
-      },
-      {
-        path: 'patients/:id',
-        name: 'PatientEdit',
-        component: () => import('@/views/patient/PatientEdit.vue'),
-      },
-    ],
-  },
-  {
-    path: '/:pathMatch(.*)*',
-    name: 'NotFound',
-    component: () => import('@/views/NotFound.vue'),
-  },
-]
-
-const router = createRouter({
-  history: createWebHistory(),
-  routes,
-})
-
-router.beforeEach((to, _from, next) => {
-  const authStore = useAuthStore()
-  
-  if (to.meta.requiresAuth && !authStore.isAuthenticated) {
-    next({ name: 'Login', query: { redirect: to.fullPath } })
-  } else if (to.name === 'Login' && authStore.isAuthenticated) {
-    next({ name: 'Dashboard' })
-  } else {
-    next()
-  }
-})
-
-export default router
-```
-
-#### 2.2.4 API Service Layer
-
-```typescript
-// src/services/api.ts
-import axios, type AxiosInstance, type AxiosError } from 'axios'
-import { useAuthStore } from '@/stores/auth'
-import router from '@/router'
-
-const apiClient: AxiosInstance = axios.create({
-  baseURL: import.meta.env.VITE_API_BASE_URL || '/api',
-  timeout: 30000,
-  headers: {
-    'Content-Type': 'application/json',
-  },
-})
-
-apiClient.interceptors.request.use((config) => {
-  const authStore = useAuthStore()
-  if (authStore.token) {
-    config.headers.Authorization = `Bearer ${authStore.token}`
-  }
-  return config
-})
-
-apiClient.interceptors.response.use(
-  (response) => response,
-  async (error: AxiosError) => {
-    if (error.response?.status === 401) {
-      const authStore = useAuthStore()
-      authStore.logout()
-      router.push({ name: 'Login' })
-    }
-    return Promise.reject(error)
-  }
-)
-
-export default apiClient
-```
-
-### Phase 3: Authentication (Days 5-6)
-
-#### 2.3.1 Auth Store (Pinia)
-
-```typescript
-// src/stores/auth.ts
-import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
-import authService from '@/services/authService'
-
-export const useAuthStore = defineStore('auth', () => {
-  const token = ref<string | null>(localStorage.getItem('auth_token'))
-  const user = ref<Record<string, unknown> | null>(null)
-  const loading = ref(false)
-
-  const isAuthenticated = computed(() => !!token.value)
-
-  async function login(credentials: { username: string; password: string }) {
-    loading.value = true
-    try {
-      const response = await authService.login(credentials)
-      token.value = response.data.token
-      user.value = response.data.user
-      localStorage.setItem('auth_token', response.data.token)
-      return { success: true }
-    } catch (error) {
-      return { success: false, error: (error as Error).message }
-    } finally {
-      loading.value = false
-    }
-  }
-
-  function logout() {
-    token.value = null
-    user.value = null
-    localStorage.removeItem('auth_token')
-  }
-
-  return {
-    token,
-    user,
-    loading,
-    isAuthenticated,
-    login,
-    logout,
-  }
-})
-```
-
-#### 2.3.2 Login View with Keyboard Navigation
-
-```vue
-<!-- src/views/Login.vue -->
-<script setup lang="ts">
-import { ref } from 'vue'
-import { useRouter } from 'vue-router'
-import { useAuthStore } from '@/stores/auth'
-import { useToast } from 'primevue/usetoast'
-import InputText from 'primevue/inputtext'
-import Password from 'primevue/password'
-import Button from 'primevue/button'
-
-const router = useRouter()
-const authStore = useAuthStore()
-const toast = useToast()
-
-const username = ref('')
-const password = ref('')
-const loading = ref(false)
-const usernameInput = ref<InstanceType<typeof InputText> | null>(null)
-
-async function handleSubmit() {
-  loading.value = true
-  const result = await authStore.login({ username: username.value, password: password.value })
-  loading.value = false
-
-  if (result.success) {
-    router.push({ name: 'Dashboard' })
-  } else {
-    toast.add({
-      severity: 'error',
-      summary: 'Login Failed',
-      detail: 'Invalid username or password',
-      life: 3000,
-    })
-  }
-}
-
-function handleKeydown(event: KeyboardEvent) {
-  if (event.key === 'Enter' && !event.shiftKey) {
-    handleSubmit()
-  }
-}
-
-import { onMounted } from 'vue'
-onMounted(() => {
-  usernameInput.value?.$el.focus()
-})
-</script>
-
-<template>
-  <div class="min-h-screen flex items-center justify-center bg-gray-100">
-    <div class="bg-white p-8 rounded-lg shadow-lg w-full max-w-md">
-      <h1 class="text-2xl font-bold mb-6 text-center">CLQMS Login</h1>
-      
-      <form @submit.prevent="handleSubmit" class="space-y-4">
-        <div>
-          <label for="username" class="block text-sm font-medium text-gray-700 mb-1">
-            Username
-          </label>
-          <InputText
-            id="username"
-            ref="usernameInput"
-            v-model="username"
-            class="w-full"
-            autocomplete="username"
-            @keydown="handleKeydown"
-          />
-        </div>
-
-        <div>
-          <label for="password" class="block text-sm font-medium text-gray-700 mb-1">
-            Password
-          </label>
-          <Password
-            id="password"
-            v-model="password"
-            class="w-full"
-            :feedback="false"
-            toggleMask
-            autocomplete="current-password"
-            inputClass="w-full"
-            @keydown="handleKeydown"
-          />
-        </div>
-
-        <Button
-          type="submit"
-          label="Sign In"
-          class="w-full"
-          :loading="loading"
-        />
-      </form>
-    </div>
-  </div>
-</template>
-```
-
-### Phase 4: Patient Management Module (Days 7-10)
-
-#### 2.4.1 Patient List with DataTable
-
-```vue
-<!-- src/views/patient/PatientIndex.vue -->
-<script setup lang="ts">
-import { ref, onMounted, computed } from 'vue'
-import { usePatientStore } from '@/stores/patient'
-import { useKeyboard } from '@/composables/useKeyboard'
-import DataTable from 'primevue/datatable'
-import Column from 'primevue/column'
-import InputText from 'primevue/inputtext'
-import Button from 'primevue/button'
-import Tag from 'primevue/tag'
-
-const patientStore = usePatientStore()
-const { shortcuts } = useKeyboard()
-
-const searchQuery = ref('')
-const loading = ref(false)
-
-const patients = computed(() => patientStore.patients)
-const totalRecords = computed(() => patientStore.totalRecords)
-const lazyParams = ref({
-  first: 0,
-  rows: 10,
-  page: 0,
-  sortField: '',
-  sortOrder: 1,
-  filters: {},
-})
-
-onMounted(() => {
-  loadPatients()
-  setupKeyboardShortcuts()
-})
-
-function setupKeyboardShortcuts() {
-  shortcuts.add('c', () => navigateToCreate(), { ctrl: true })
-  shortcuts.add('f', () => searchInput.value?.$el.focus(), { ctrl: true })
-}
-
-function loadPatients() {
-  loading.value = true
-  patientStore.fetchPatients({
-    ...lazyParams.value,
-    search: searchQuery.value,
-  }).finally(() => {
-    loading.value = false
-  })
-}
-
-function onPage(event: { first: number; rows: number; page: number }) {
-  lazyParams.value = event
-  loadPatients()
-}
-
-function onSort(event: { sortField: string; sortOrder: number }) {
-  lazyParams.value.sortField = event.sortField
-  lazyParams.value.sortOrder = event.sortOrder
-  loadPatients()
-}
-
-function navigateToCreate() {
-  // Use router to navigate
-}
-
-const searchInput = ref<InstanceType<typeof InputText> | null>(null)
-</script>
-
-<template>
-  <div class="p-4">
-    <div class="flex justify-between items-center mb-4">
-      <h1 class="text-2xl font-bold">Patients</h1>
-      <div class="flex gap-2">
-        <span class="p-input-icon-left">
-          <i class="pi pi-search" />
-          <InputText
-            ref="searchInput"
-            v-model="searchQuery"
-            placeholder="Search patients... (Ctrl+F)"
-            @input="loadPatients"
-          />
-        </span>
-        <Button
-          label="Add Patient (Ctrl+C)"
-          icon="pi pi-plus"
-          @click="navigateToCreate"
-        />
-      </div>
-    </div>
-
-    <DataTable
-      :value="patients"
-      :loading="loading"
-      :paginator="true"
-      :first="lazyParams.first"
-      :rows="lazyParams.rows"
-      :totalRecords="totalRecords"
-      :lazy="true"
-      :sortField="lazyParams.sortField"
-      :sortOrder="lazyParams.sortOrder"
-      :rowsPerPageOptions="[10, 25, 50]"
-      paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink RowsPerPageDropdown"
-      @page="onPage"
-      @sort="onSort"
-      stripedRows
-      responsiveLayout="scroll"
-      keyboardKey="n"
-      selectionMode="single"
-      class="p-datatable-sm"
-    >
-      <Column field="InternalPID" header="ID" sortable></Column>
-      <Column field="PatientID" header="Patient ID" sortable></Column>
-      <Column field="FullName" header="Full Name" sortable></Column>
-      <Column field="Sex" header="Sex">
-        <template #body="{ data }">
-          <Tag :value="data.Sex === '1' ? 'Female' : 'Male'" />
-        </template>
-      </Column>
-      <Column field="DOB" header="Date of Birth" sortable>
-        <template #body="{ data }">
-          {{ new Date(data.DOB).toLocaleDateString() }}
-        </template>
-      </Column>
-      <Column header="Actions">
-        <template #body="{ data }">
-          <Button
-            icon="pi pi-pencil"
-            text
-            rounded
-            @click="navigateToEdit(data.InternalPID)"
-          />
-        </template>
-      </Column>
-    </DataTable>
-
-    <div class="mt-4 text-sm text-gray-600">
-      <p>Keyboard shortcuts:</p>
-      <ul class="list-disc list-inside">
-        <li>Ctrl+C - Create new patient</li>
-        <li>Ctrl+F - Focus search</li>
-        <li>Arrow keys - Navigate between rows</li>
-      </ul>
-    </div>
-  </div>
-</template>
-```
-
-### Phase 5: Accessibility Infrastructure (Days 11-12)
-
-#### 2.5.1 Keyboard Shortcut Composable
-
-```typescript
-// src/composables/useKeyboard.ts
-import { onMounted, onUnmounted } from 'vue'
-import { useMagicKeys, whenever } from '@vueuse/core'
-
-interface ShortcutOptions {
-  ctrl?: boolean
-  shift?: boolean
-  alt?: boolean
-  key?: string
-}
-
-export function useKeyboard() {
-  const { ctrl, shift, alt, k, n, f, s, e, escape } = useMagicKeys()
-
-  const shortcuts = new Map<string, () => void>()
-
-  function add(key: string, callback: () => void, options: ShortcutOptions = {}) {
-    const keyLower = key.toLowerCase()
-    const fullKey = [
-      options.ctrl ? 'ctrl' : '',
-      options.shift ? 'shift' : '',
-      options.alt ? 'alt' : '',
-      keyLower,
-    ]
-      .filter(Boolean)
-      .join('+')
-
-    shortcuts.set(fullKey, callback)
-  }
-
-  function remove(key: string, options: ShortcutOptions = {}) {
-    const keyLower = key.toLowerCase()
-    const fullKey = [
-      options.ctrl ? 'ctrl' : '',
-      options.shift ? 'shift' : '',
-      options.alt ? 'alt' : '',
-      keyLower,
-    ]
-      .filter(Boolean)
-      .join('+')
-
-    shortcuts.delete(fullKey)
-  }
-
-  function execute(event: KeyboardEvent) {
-    const parts = ['ctrl', 'shift', 'alt'].filter((mod) => event[`${mod}Key`])
-    parts.push(event.key.toLowerCase())
-    const fullKey = parts.join('+')
-
-    const callback = shortcuts.get(fullKey)
-    if (callback) {
-      event.preventDefault()
-      callback()
-    }
-  }
-
-  onMounted(() => {
-    window.addEventListener('keydown', execute)
-  })
-
-  onUnmounted(() => {
-    window.removeEventListener('keydown', execute)
-  })
-
-  return {
-    shortcuts: { add, remove },
-    keys: { ctrl, shift, alt, k, n, f, s, e, escape },
-  }
-}
-```
-
-#### 2.5.2 Focus Trap Composable (for Modals/Dialogs)
-
-```typescript
-// src/composables/useFocusTrap.ts
-import { ref, onMounted, onUnmounted } from 'vue'
-import { onKeyStroke } from '@vueuse/core'
-
-export function useFocusTrap(containerRef: Ref<HTMLElement | null>, active: Ref<boolean>) {
-  const focusableElements = ref<HTMLElement[]>([])
-  const firstFocusable = ref<HTMLElement | null>(null)
-  const lastFocusable = ref<HTMLElement | null>(null)
-
-  function updateFocusableElements() {
-    if (!containerRef.value) return
-
-    const focusable = containerRef.value.querySelectorAll<HTMLElement>(
-      'button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])'
-    )
-    focusableElements.value = Array.from(focusable)
-
-    firstFocusable.value = focusableElements.value[0] || null
-    lastFocusable.value = focusableElements.value[focusableElements.value.length - 1] || null
-  }
-
-  function focusFirst() {
-    firstFocusable.value?.focus()
-  }
-
-  function handleTab(event: KeyboardEvent) {
-    if (!active.value || !containerRef.value) return
-
-    if (event.shiftKey) {
-      if (document.activeElement === firstFocusable.value) {
-        event.preventDefault()
-        lastFocusable.value?.focus()
-      }
-    } else {
-      if (document.activeElement === lastFocusable.value) {
-        event.preventDefault()
-        firstFocusable.value?.focus()
-      }
-    }
-  }
-
-  function handleEscape() {
-    if (active.value) {
-      active.value = false
-    }
-  }
-
-  onMounted(() => {
-    updateFocusableElements()
-  })
-
-  onKeyStroke('Tab', handleTab, { target: containerRef })
-  onKeyStroke('Escape', handleEscape, { target: containerRef })
-
-  return {
-    updateFocusableElements,
-    focusFirst,
-  }
-}
-```
-
-### Phase 6: Layout Components (Days 13-14)
-
-#### 2.6.1 App Layout with Sidebar
-
-```vue
-<!-- src/components/layout/AppLayout.vue -->
-<script setup lang="ts">
-import { ref } from 'vue'
-import AppSidebar from './AppSidebar.vue'
-import AppHeader from './AppHeader.vue'
-import Toast from 'primevue/toast'
-import ConfirmDialog />
-</script>
-
-<template>
-  <div class="min-h-screen flex">
-    <AppSidebar :collapsed="sidebarCollapsed" @toggle="sidebarCollapsed = !sidebarCollapsed" />
-    
-    <div class="flex-1 flex flex-col">
-      <AppHeader @toggle-sidebar="sidebarCollapsed = !sidebarCollapsed" />
-      
-      <main class="flex-1 bg-gray-50 p-4">
-        <router-view />
-      </main>
-    </div>
-
-    <Toast position="top-right" />
-    <ConfirmDialog />
-  </div>
-</template>
-```
-
-### Phase 7: Migration from Alpine.js (Days 15-18)
-
-#### 2.7.1 Migration Strategy
-
-1. **Parallel Development**: Keep Alpine.js version running alongside Vue
-2. **Incremental Migration**: Migrate one view at a time
-3. **Shared API**: Both frontends use the same CodeIgniter API
-4. **Routing Switch**: Routes point to Vue app for migrated views
-5. **Feature Flags**: Use feature flags to control which views use Vue
-
-#### 2.7.2 Shared Constants/Types
-
-```typescript
-// src/types/api.ts
-export interface ApiResponse<T> {
-  status: 'success' | 'error'
-  message: string
-  data: T
-}
-
-export interface Patient {
-  InternalPID: number
-  PatientID: string
-  FirstName: string
-  LastName: string
-  FullName: string
-  Sex: string
-  DOB: string
-  EmailAddress?: string
-  Phone?: string
-  [key: string]: unknown
-}
-```
-
-### Phase 8: Testing (Days 19-20)
-
-#### 2.8.1 Testing Stack
-
-```bash
-# Unit and Component Testing
-npm install -D vitest @vue/test-utils happy-dom @testing-library/jest-dom
-
-# E2E Testing
-npm install -D cypress
-```
-
-#### 2.8.2 Example Component Test
-
-```typescript
-// src/components/__tests__/PatientList.spec.ts
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { mount } from '@vue/test-utils'
-import PatientIndex from '@/views/patient/PatientIndex.vue'
-import { createTestingPinia } from '@pinia/testing'
-
-describe('PatientIndex', () => {
-  beforeEach(() => {
-    vi.resetAllMocks()
-  })
-
-  it('renders patient list', async () => {
-    const wrapper = mount(PatientIndex, {
-      global: {
-        plugins: [
-          createTestingPinia({
-            createSpy: vi.fn,
-            initialState: {
-              patient: {
-                patients: [
-                  { InternalPID: 1, PatientID: 'P001', FullName: 'John Doe' },
-                ],
-                totalRecords: 1,
-              },
-            },
-          }),
-        ],
-        stubs: {
-          DataTable: {
-            template: '<div><slot name="body"></slot></div>',
-          },
-        },
-      },
-    })
-
-    expect(wrapper.text()).toContain('Patients')
-  })
-})
-```
-
----
-
-## 3. Environment Configuration
-
-### 3.1 Environment Variables (.env)
-
-```env
-# API Configuration
-VITE_API_BASE_URL=http://localhost:8080/api
-
-# App Configuration
-VITE_APP_TITLE=CLQMS
-VITE_APP_VERSION=1.0.0
-
-# Feature Flags
-VITE_ENABLE_MOCK_API=false
-```
-
-### 3.2 API Endpoints Integration
-
-| Endpoint | Method | Description |
-|----------|--------|-------------|
-| `/auth/login` | POST | User authentication |
-| `/auth/logout` | POST | User logout |
-| `/patients` | GET | List patients with filters |
-| `/patients` | POST | Create new patient |
-| `/patients/:id` | GET | Get patient details |
-| `/patients/:id` | PUT | Update patient |
-| `/patients/:id` | DELETE | Soft delete patient |
-
----
-
-## 4. Keyboard Accessibility Standards
-
-### 4.1 Required Keyboard Interactions
-
-| Component | Keyboard Behavior |
-|-----------|------------------|
-| **Modals/Dialogs** | Focus trap, Escape to close, Tab cycles focus |
-| **Menus** | Arrow keys navigate, Enter selects, Escape closes |
-| **Data Tables** | Arrow keys row/col, Ctrl+Arrow scroll |
-| **Forms** | Auto-focus first field, Tab order preserved |
-| **Shortcuts** | Ctrl+Key global, prevent default browser shortcuts |
-| **Skip Links** | Skip to main content, skip to navigation |
-
-### 4.2 Global Keyboard Shortcuts
-
-| Shortcut | Action |
-|----------|--------|
-| Ctrl+C | Create new record |
-| Ctrl+F | Focus search |
-| Ctrl+S | Save form |
-| Ctrl+N | New form |
-| Ctrl+E | Edit selected |
-| Ctrl+D | Duplicate |
-| Ctrl+Z | Undo |
-| Ctrl+Shift+Z | Redo |
-| Escape | Cancel/Close modal |
-| Tab | Move to next focusable |
-| Shift+Tab | Move to previous focusable |
-
-### 4.3 ARIA Attributes Required
-
-```html
-<!-- Landmark regions -->
-<header role="banner">AppHeader.vue</header>
-<nav role="navigation">AppSidebar.vue</nav>
-<main role="main">Main content area</main>
-<footer role="contentinfo">AppFooter.vue</footer>
-
-<!-- Live regions for notifications -->
-<div role="status" aria-live="polite"></div>
-<div role="alert" aria-live="assertive"></div>
-
-<!-- Focus management -->
-<button aria-expanded="true">...</button>
-<button aria-haspopup="true">...</button>
-```
-
----
-
-## 5. Implementation Checklist
-
-### Week 1
-- [ ] Initialize Vue 3 project with Vite
-- [ ] Configure TypeScript and build settings
-- [ ] Set up Pinia store structure
-- [ ] Configure Vue Router with auth guards
-- [ ] Implement API service layer with Axios
-- [ ] Create authentication flow (login/logout)
-- [ ] Set up PrimeVue theming
-
-### Week 2
-- [ ] Build main layout (header, sidebar, content)
-- [ ] Create Patient List view with DataTable
-- [ ] Create Patient Create/Edit forms
-- [ ] Implement search and filtering
-- [ ] Add pagination
-- [ ] Create global keyboard shortcuts
-- [ ] Implement focus trap for modals
-
-### Week 3
-- [ ] Migrate additional domain modules
-- [ ] Add Toast/Notification system
-- [ ] Implement form validation
-- [ ] Add loading states
-- [ ] Create error handling
-- [ ] Implement optimistic UI updates
-- [ ] Add keyboard navigation for DataTable
-
-### Week 4
-- [ ] Write unit tests (Vitest)
-- [ ] Write component tests (Vue Test Utils)
-- [ ] Set up E2E tests (Cypress)
-- [ ] Accessibility audit (axe-core)
-- [ ] Performance optimization
-- [ ] Build and deployment setup
-- [ ] Documentation
-
----
-
-## 6. Estimated Timeline
-
-| Phase | Duration | Total Days |
-|-------|----------|------------|
-| Phase 1: Project Setup | 2 days | Day 1-2 |
-| Phase 2: Core Infrastructure | 2 days | Day 3-4 |
-| Phase 3: Authentication | 2 days | Day 5-6 |
-| Phase 4: Patient Module | 4 days | Day 7-10 |
-| Phase 5: Accessibility | 2 days | Day 11-12 |
-| Phase 6: Layout Components | 2 days | Day 13-14 |
-| Phase 7: Migration | 4 days | Day 15-18 |
-| Phase 8: Testing | 2 days | Day 19-20 |
-
-**Total: 20 working days (4 weeks)**
-
----
-
-## 7. Rollback Plan
-
-If Vue migration encounters issues:
-
-1. **Feature Flag Rollback**: Routes can be switched back to Alpine.js views
-2. **Database Changes**: None required (shared API)
-3. **API Compatibility**: Both frontends use identical API contracts
-4. **Deployment**: Can deploy Alpine.js version independently
-
----
-
-## 8. References
-
-- [Vue 3 Documentation](https://vuejs.org/)
-- [PrimeVue 4 Documentation](https://primevue.org/)
-- [VueUse Documentation](https://vueuse.org/)
-- [Headless UI Documentation](https://headlessui.com/)
-- [WAI-ARIA Practices](https://www.w3.org/WAI/ARIA/apg/)
-- [WCAG 2.1 Guidelines](https://www.w3.org/WAI/WCAG21/quickref/)
-
----
-
-## 9. Next Steps
-
-1. Review and approve this plan
-2. Confirm development environment (Node.js version, package manager)
-3. Set up Git repository for frontend
-4. Begin Phase 1: Project Setup
diff --git a/public/api-docs.yaml b/public/api-docs.yaml
new file mode 100644
index 0000000..4d4ceea
--- /dev/null
+++ b/public/api-docs.yaml
@@ -0,0 +1,2751 @@
+openapi: 3.0.3
+info:
+  title: CLQMS - Clinical Laboratory Quality Management System API
+  description: |
+    API for Clinical Laboratory Quality Management System supporting patient management,
+    specimen tracking, test ordering, instrument integration, and laboratory operations.
+  version: 1.0.0
+  contact:
+    name: CLQMS API Support
+  license:
+    name: Proprietary
+
+servers:
+  - url: http://localhost/clqms01/
+    description: Local development server
+  - url: https://clqms01-api.services-summit.my.id/
+    description: Production server
+
+tags:
+  - name: Authentication
+    description: User authentication and session management
+  - name: Patients
+    description: Patient registration and management
+  - name: Patient Visits
+    description: Patient visit/encounter management
+  - name: Organization
+    description: Organization structure (accounts, sites, disciplines, departments, workstations)
+  - name: Specimen
+    description: Specimen and container management
+  - name: Tests
+    description: Test definitions and test catalog
+  - name: Orders
+    description: Laboratory order management
+  - name: Results
+    description: Patient results reporting
+  - name: Edge API
+    description: Instrument integration endpoints
+  - name: Master Data
+    description: Lookup and reference data
+  - name: ValueSets
+    description: Value set definitions and items
+  - name: Demo
+    description: Demo/test endpoints (no authentication)
+
+components:
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+      bearerFormat: JWT
+      description: JWT token from login endpoint
+    cookieAuth:
+      type: apiKey
+      in: cookie
+      name: token
+      description: JWT token stored in HTTP-only cookie
+
+  schemas:
+    # Common Schemas
+    SuccessResponse:
+      type: object
+      properties:
+        status:
+          type: string
+          example: success
+        message:
+          type: string
+        code:
+          type: integer
+          example: 200
+
+    ErrorResponse:
+      type: object
+      properties:
+        status:
+          type: string
+          example: error
+        message:
+          type: string
+        errors:
+          type: object
+
+    # Authentication
+    LoginRequest:
+      type: object
+      required:
+        - username
+        - password
+      properties:
+        username:
+          type: string
+          example: labuser01
+        password:
+          type: string
+          format: password
+          example: secret123
+
+    LoginResponse:
+      type: object
+      properties:
+        status:
+          type: string
+          example: success
+        code:
+          type: integer
+          example: 200
+        message:
+          type: string
+          example: Login successful
+
+    RegisterRequest:
+      type: object
+      required:
+        - username
+        - password
+        - email
+      properties:
+        username:
+          type: string
+        password:
+          type: string
+          format: password
+        email:
+          type: string
+          format: email
+        full_name:
+          type: string
+
+    # Patient
+    PatientIdentifier:
+      type: object
+      properties:
+        IdentifierType:
+          type: string
+          enum: [KTP, PASS, SSN, SIM, KTAS]
+          description: |
+            KTP: 16 digit numeric
+            PASS: alphanumeric max 9
+            SSN: 9 digit numeric
+            SIM: 19-20 digit numeric
+            KTAS: 11 digit numeric
+        Identifier:
+          type: string
+          maxLength: 255
+
+    Patient:
+      type: object
+      required:
+        - PatientID
+        - Sex
+        - NameFirst
+        - Birthdate
+      properties:
+        PatientID:
+          type: string
+          maxLength: 30
+          pattern: '^[A-Za-z0-9]+$'
+          description: Internal patient identifier
+        AlternatePID:
+          type: string
+          maxLength: 30
+          pattern: '^[A-Za-z0-9]+$'
+        Prefix:
+          type: string
+          maxLength: 10
+          enum: [Mr, Mrs, Ms, Dr, Prof]
+        Sex:
+          type: string
+          enum: ['1', '2']
+          description: '1: Female, 2: Male'
+        NameFirst:
+          type: string
+          minLength: 1
+          maxLength: 60
+          pattern: "^[A-Za-z'\\. ]+$"
+        NameMiddle:
+          type: string
+          minLength: 1
+          maxLength: 60
+        NameMaiden:
+          type: string
+          minLength: 1
+          maxLength: 60
+        NameLast:
+          type: string
+          minLength: 1
+          maxLength: 60
+        Suffix:
+          type: string
+          maxLength: 10
+        Birthdate:
+          type: string
+          format: date-time
+          description: ISO 8601 UTC datetime
+        PlaceOfBirth:
+          type: string
+          maxLength: 100
+        Citizenship:
+          type: string
+          maxLength: 100
+        Street_1:
+          type: string
+          maxLength: 255
+        Street_2:
+          type: string
+          maxLength: 255
+        Street_3:
+          type: string
+          maxLength: 255
+        ZIP:
+          type: string
+          maxLength: 10
+          pattern: '^[0-9]+$'
+        Phone:
+          type: string
+          pattern: "^\\+?[0-9]{8,15}$"
+        MobilePhone:
+          type: string
+          pattern: "^\\+?[0-9]{8,15}$"
+        EmailAddress1:
+          type: string
+          format: email
+          maxLength: 100
+        EmailAddress2:
+          type: string
+          format: email
+          maxLength: 100
+        PatIdt:
+          $ref: '#/components/schemas/PatientIdentifier'
+
+    PatientListResponse:
+      type: object
+      properties:
+        status:
+          type: string
+          example: success
+        data:
+          type: array
+          items:
+            $ref: '#/components/schemas/Patient'
+        pagination:
+          type: object
+          properties:
+            page:
+              type: integer
+            perPage:
+              type: integer
+            total:
+              type: integer
+
+    # Patient Visit
+    PatientVisit:
+      type: object
+      properties:
+        VisitID:
+          type: string
+        PatientID:
+          type: string
+        VisitDate:
+          type: string
+          format: date-time
+        VisitType:
+          type: string
+        SiteID:
+          type: integer
+        LocationID:
+          type: integer
+        DepartmentID:
+          type: integer
+        AttendingPhysician:
+          type: string
+        ReferringPhysician:
+          type: string
+
+    # Organization
+    Account:
+      type: object
+      properties:
+        id:
+          type: integer
+        AccountName:
+          type: string
+        AccountCode:
+          type: string
+        AccountType:
+          type: string
+
+    Site:
+      type: object
+      properties:
+        id:
+          type: integer
+        SiteName:
+          type: string
+        SiteCode:
+          type: string
+        AccountID:
+          type: integer
+
+    Discipline:
+      type: object
+      properties:
+        id:
+          type: integer
+        DisciplineName:
+          type: string
+        DisciplineCode:
+          type: string
+
+    Department:
+      type: object
+      properties:
+        id:
+          type: integer
+        DeptName:
+          type: string
+        DeptCode:
+          type: string
+        SiteID:
+          type: integer
+
+    Workstation:
+      type: object
+      properties:
+        id:
+          type: integer
+        WorkstationName:
+          type: string
+        WorkstationCode:
+          type: string
+        SiteID:
+          type: integer
+        DepartmentID:
+          type: integer
+
+    # Specimen
+    Specimen:
+      type: object
+      properties:
+        id:
+          type: integer
+        SpecimenID:
+          type: string
+        PatientID:
+          type: string
+        specimenType:
+          type: string
+          description: Specimen type code
+        specimenTypeLabel:
+          type: string
+          description: Specimen type display text
+        CollectionDate:
+          type: string
+          format: date-time
+        collectionMethod:
+          type: string
+          description: Collection method code
+        collectionMethodLabel:
+          type: string
+          description: Collection method display text
+        ContainerID:
+          type: integer
+        specimenStatus:
+          type: string
+          description: Specimen status code
+        specimenStatusLabel:
+          type: string
+          description: Specimen status display text
+        bodySite:
+          type: string
+          description: Body site code
+        bodySiteLabel:
+          type: string
+          description: Body site display text
+
+    ContainerDef:
+      type: object
+      properties:
+        id:
+          type: integer
+        ContainerCode:
+          type: string
+        ContainerName:
+          type: string
+        conCategory:
+          type: string
+          description: Container category code
+        conCategoryLabel:
+          type: string
+          description: Container category display text
+        conSize:
+          type: string
+          description: Container size code
+        conSizeLabel:
+          type: string
+          description: Container size display text
+        capColor:
+          type: string
+          description: Cap color code
+        capColorLabel:
+          type: string
+          description: Cap color display text
+
+    SpecimenPrep:
+      type: object
+      properties:
+        id:
+          type: integer
+        PrepCode:
+          type: string
+        PrepName:
+          type: string
+        Description:
+          type: string
+
+    SpecimenStatus:
+      type: object
+      properties:
+        id:
+          type: integer
+        StatusCode:
+          type: string
+        StatusName:
+          type: string
+        Description:
+          type: string
+        status:
+          type: string
+          description: Status code (lowercase)
+        statusLabel:
+          type: string
+          description: Status display text
+        activity:
+          type: string
+          description: Activity code (lowercase)
+        activityLabel:
+          type: string
+          description: Activity display text
+
+    SpecimenCollection:
+      type: object
+      properties:
+        id:
+          type: integer
+        CollectionCode:
+          type: string
+        CollectionName:
+          type: string
+        Description:
+          type: string
+        collectionMethod:
+          type: string
+          description: Collection method code
+        collectionMethodLabel:
+          type: string
+          description: Collection method display text
+        additive:
+          type: string
+          description: Additive code
+        additiveLabel:
+          type: string
+          description: Additive display text
+        specimenRole:
+          type: string
+          description: Specimen role code
+        specimenRoleLabel:
+          type: string
+          description: Specimen role display text
+
+    # Tests
+    TestDefinition:
+      type: object
+      properties:
+        id:
+          type: integer
+        TestCode:
+          type: string
+        TestName:
+          type: string
+        TestType:
+          type: string
+          enum: [TEST, PARAM, CALC, GROUP, TITLE]
+          description: |
+            TEST: Technical test
+            PARAM: Parameter
+            CALC: Calculated
+            GROUP: Panel/Profile
+            TITLE: Section header
+        DisciplineID:
+          type: integer
+        DepartmentID:
+          type: integer
+        SpecimenType:
+          type: string
+        Unit:
+          type: string
+        Formula:
+          type: string
+
+    TestMap:
+      type: object
+      properties:
+        id:
+          type: integer
+        TestMapID:
+          type: integer
+        TestCode:
+          type: string
+        HostCode:
+          type: string
+        HostName:
+          type: string
+        ClientCode:
+          type: string
+        ClientName:
+          type: string
+        hostType:
+          type: string
+          description: Host type code
+        hostTypeLabel:
+          type: string
+          description: Host type display text
+        clientType:
+          type: string
+          description: Client type code
+        clientTypeLabel:
+          type: string
+          description: Client type display text
+
+    # Orders
+    OrderTest:
+      type: object
+      properties:
+        OrderID:
+          type: string
+        PatientID:
+          type: string
+        VisitID:
+          type: string
+        OrderDate:
+          type: string
+          format: date-time
+        orderStatus:
+          type: string
+          description: Order status code
+        orderStatusLabel:
+          type: string
+          description: Order status display text
+        priority:
+          type: string
+          description: Priority code
+        priorityLabel:
+          type: string
+          description: Priority display text
+        SiteID:
+          type: integer
+        RequestingPhysician:
+          type: string
+
+    OrderItem:
+      type: object
+      properties:
+        id:
+          type: integer
+        OrderID:
+          type: string
+        TestID:
+          type: integer
+        SpecimenID:
+          type: string
+        Status:
+          type: string
+
+    # Edge API
+    EdgeResultRequest:
+      type: object
+      required:
+        - sample_id
+        - instrument_id
+      properties:
+        sample_id:
+          type: string
+          description: Sample barcode/identifier
+        instrument_id:
+          type: string
+          description: Instrument identifier
+        patient_id:
+          type: string
+          description: Patient identifier (optional)
+        results:
+          type: array
+          items:
+            type: object
+            properties:
+              test_code:
+                type: string
+              result_value:
+                type: string
+              unit:
+                type: string
+              flags:
+                type: string
+                enum: [H, L, N, A]
+                description: H=High, L=Low, N=Normal, A=Abnormal
+
+    EdgeResultResponse:
+      type: object
+      properties:
+        status:
+          type: string
+          example: success
+        message:
+          type: string
+          example: Result received and queued
+        data:
+          type: object
+          properties:
+            edge_res_id:
+              type: integer
+            sample_id:
+              type: string
+            instrument_id:
+              type: string
+
+    EdgeOrder:
+      type: object
+      properties:
+        OrderID:
+          type: string
+        PatientID:
+          type: string
+        SampleID:
+          type: string
+        Tests:
+          type: array
+          items:
+            type: object
+            properties:
+              TestCode:
+                type: string
+              TestName:
+                type: string
+              SpecimenType:
+                type: string
+        Priority:
+          type: string
+        DueDateTime:
+          type: string
+          format: date-time
+
+    # ValueSets
+    ValueSetDef:
+      type: object
+      properties:
+        id:
+          type: integer
+        VSetCode:
+          type: string
+        VSetName:
+          type: string
+        Description:
+          type: string
+        Category:
+          type: string
+
+    ValueSetItem:
+      type: object
+      properties:
+        id:
+          type: integer
+        VSetID:
+          type: integer
+        VValue:
+          type: string
+        VLabel:
+          type: string
+        VSeq:
+          type: integer
+        IsActive:
+          type: boolean
+
+    # Master Data
+    Location:
+      type: object
+      properties:
+        id:
+          type: integer
+        LocationCode:
+          type: string
+        LocationName:
+          type: string
+        LocationType:
+          type: string
+        SiteID:
+          type: integer
+
+    Contact:
+      type: object
+      properties:
+        id:
+          type: integer
+        ContactName:
+          type: string
+        ContactType:
+          type: string
+        Phone:
+          type: string
+        Email:
+          type: string
+        Address:
+          type: string
+        specialty:
+          type: string
+          description: Specialty code
+        specialtyLabel:
+          type: string
+          description: Specialty display text
+        occupation:
+          type: string
+          description: Occupation code
+        occupationLabel:
+          type: string
+          description: Occupation display text
+
+    Occupation:
+      type: object
+      properties:
+        id:
+          type: integer
+        OccupationCode:
+          type: string
+        OccupationName:
+          type: string
+
+    MedicalSpecialty:
+      type: object
+      properties:
+        id:
+          type: integer
+        SpecialtyCode:
+          type: string
+        SpecialtyName:
+          type: string
+
+    Counter:
+      type: object
+      properties:
+        id:
+          type: integer
+        CounterName:
+          type: string
+        Prefix:
+          type: string
+        CurrentValue:
+          type: integer
+        SiteID:
+          type: integer
+
+    # Dashboard
+    DashboardSummary:
+      type: object
+      properties:
+        pendingOrders:
+          type: integer
+        todayResults:
+          type: integer
+        criticalResults:
+          type: integer
+        activePatients:
+          type: integer
+
+paths:
+  # ========================================
+  # Authentication Routes
+  # ========================================
+  /api/auth/login:
+    post:
+      tags: [Authentication]
+      summary: User login
+      description: Authenticate user and receive JWT token via HTTP-only cookie
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/LoginRequest'
+          application/x-www-form-urlencoded:
+            schema:
+              $ref: '#/components/schemas/LoginRequest'
+      responses:
+        '200':
+          description: Login successful
+          headers:
+            Set-Cookie:
+              description: JWT token in HTTP-only cookie
+              schema:
+                type: string
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/LoginResponse'
+        '400':
+          description: Missing username
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+        '401':
+          description: Invalid credentials
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+
+  /api/auth/logout:
+    post:
+      tags: [Authentication]
+      summary: User logout
+      description: Clear JWT token cookie
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Logout successful
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SuccessResponse'
+
+  /api/auth/check:
+    get:
+      tags: [Authentication]
+      summary: Check authentication status
+      security:
+        - bearerAuth: []
+        - cookieAuth: []
+      responses:
+        '200':
+          description: Authenticated
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  authenticated:
+                    type: boolean
+                  user:
+                    type: object
+        '401':
+          description: Not authenticated
+
+  /api/auth/register:
+    post:
+      tags: [Authentication]
+      summary: Register new user
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterRequest'
+      responses:
+        '201':
+          description: User created
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SuccessResponse'
+
+  /api/auth/change_pass:
+    post:
+      tags: [Authentication]
+      summary: Change password
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - current_password
+                - new_password
+              properties:
+                current_password:
+                  type: string
+                  format: password
+                new_password:
+                  type: string
+                  format: password
+      responses:
+        '200':
+          description: Password changed successfully
+
+  # ========================================
+  # V2 Authentication Routes
+  # ========================================
+  /v2/auth/login:
+    post:
+      tags: [Authentication]
+      summary: V2 User login
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/LoginRequest'
+      responses:
+        '200':
+          description: Login successful
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/LoginResponse'
+
+  /v2/auth/logout:
+    post:
+      tags: [Authentication]
+      summary: V2 User logout
+      responses:
+        '200':
+          description: Logout successful
+
+  /v2/auth/check:
+    get:
+      tags: [Authentication]
+      summary: V2 Check authentication
+      responses:
+        '200':
+          description: Auth check result
+
+  /v2/auth/register:
+    post:
+      tags: [Authentication]
+      summary: V2 Register new user
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterRequest'
+      responses:
+        '201':
+          description: User created
+
+  # ========================================
+  # Patient Routes
+  # ========================================
+  /api/patient:
+    get:
+      tags: [Patients]
+      summary: List patients
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: page
+          in: query
+          schema:
+            type: integer
+            default: 1
+        - name: perPage
+          in: query
+          schema:
+            type: integer
+            default: 20
+        - name: search
+          in: query
+          schema:
+            type: string
+          description: Search by PatientID or name
+      responses:
+        '200':
+          description: List of patients
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PatientListResponse'
+
+    post:
+      tags: [Patients]
+      summary: Create new patient
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Patient'
+      responses:
+        '201':
+          description: Patient created successfully
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SuccessResponse'
+        '422':
+          description: Validation error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ErrorResponse'
+
+    patch:
+      tags: [Patients]
+      summary: Update patient
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Patient'
+      responses:
+        '200':
+          description: Patient updated successfully
+
+    delete:
+      tags: [Patients]
+      summary: Delete patient
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: PatientID
+          in: query
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Patient deleted successfully
+
+  /api/patient/check:
+    get:
+      tags: [Patients]
+      summary: Check if patient exists
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: PatientID
+          in: query
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Patient check result
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  exists:
+                    type: boolean
+                  data:
+                    $ref: '#/components/schemas/Patient'
+
+  /api/patient/{id}:
+    get:
+      tags: [Patients]
+      summary: Get patient by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+          description: Internal patient record ID
+      responses:
+        '200':
+          description: Patient details
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    type: string
+                  data:
+                    $ref: '#/components/schemas/Patient'
+
+  # ========================================
+  # Patient Visit Routes
+  # ========================================
+  /api/patvisit:
+    get:
+      tags: [Patient Visits]
+      summary: List patient visits
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: page
+          in: query
+          schema:
+            type: integer
+        - name: perPage
+          in: query
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: List of patient visits
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    type: string
+                  data:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/PatientVisit'
+
+    post:
+      tags: [Patient Visits]
+      summary: Create patient visit
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PatientVisit'
+      responses:
+        '201':
+          description: Visit created successfully
+
+    patch:
+      tags: [Patient Visits]
+      summary: Update patient visit
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PatientVisit'
+      responses:
+        '200':
+          description: Visit updated successfully
+
+    delete:
+      tags: [Patient Visits]
+      summary: Delete patient visit
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Visit deleted successfully
+
+  /api/patvisit/{id}:
+    get:
+      tags: [Patient Visits]
+      summary: Get visit by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Visit details
+
+  /api/patvisit/patient/{patientId}:
+    get:
+      tags: [Patient Visits]
+      summary: Get visits by patient ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: patientId
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Patient visits list
+
+  /api/patvisitadt:
+    post:
+      tags: [Patient Visits]
+      summary: Create ADT visit (Admission/Discharge/Transfer)
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                PatientID:
+                  type: string
+                VisitType:
+                  type: string
+                ADTEvent:
+                  type: string
+                  enum: [A01, A02, A03, A04, A08]
+                  description: |
+                    A01: Admit
+                    A02: Transfer
+                    A03: Discharge
+                    A04: Register
+                    A08: Update
+      responses:
+        '201':
+          description: ADT visit created
+
+    patch:
+      tags: [Patient Visits]
+      summary: Update ADT visit
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PatientVisit'
+      responses:
+        '200':
+          description: ADT visit updated
+
+  # ========================================
+  # Organization - Account Routes
+  # ========================================
+  /api/organization/account:
+    get:
+      tags: [Organization]
+      summary: List accounts
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of accounts
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    type: string
+                  data:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/Account'
+
+    post:
+      tags: [Organization]
+      summary: Create account
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Account'
+      responses:
+        '201':
+          description: Account created
+
+    patch:
+      tags: [Organization]
+      summary: Update account
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Account'
+      responses:
+        '200':
+          description: Account updated
+
+    delete:
+      tags: [Organization]
+      summary: Delete account
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Account deleted
+
+  /api/organization/account/{id}:
+    get:
+      tags: [Organization]
+      summary: Get account by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Account details
+
+  # ========================================
+  # Organization - Site Routes
+  # ========================================
+  /api/organization/site:
+    get:
+      tags: [Organization]
+      summary: List sites
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of sites
+
+    post:
+      tags: [Organization]
+      summary: Create site
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Site'
+      responses:
+        '201':
+          description: Site created
+
+    patch:
+      tags: [Organization]
+      summary: Update site
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Site'
+      responses:
+        '200':
+          description: Site updated
+
+    delete:
+      tags: [Organization]
+      summary: Delete site
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Site deleted
+
+  /api/organization/site/{id}:
+    get:
+      tags: [Organization]
+      summary: Get site by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Site details
+
+  # ========================================
+  # Organization - Discipline Routes
+  # ========================================
+  /api/organization/discipline:
+    get:
+      tags: [Organization]
+      summary: List disciplines
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of disciplines
+
+    post:
+      tags: [Organization]
+      summary: Create discipline
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Discipline'
+      responses:
+        '201':
+          description: Discipline created
+
+    patch:
+      tags: [Organization]
+      summary: Update discipline
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Discipline updated
+
+    delete:
+      tags: [Organization]
+      summary: Delete discipline
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Discipline deleted
+
+  /api/organization/discipline/{id}:
+    get:
+      tags: [Organization]
+      summary: Get discipline by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Discipline details
+
+  # ========================================
+  # Organization - Department Routes
+  # ========================================
+  /api/organization/department:
+    get:
+      tags: [Organization]
+      summary: List departments
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of departments
+
+    post:
+      tags: [Organization]
+      summary: Create department
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Department'
+      responses:
+        '201':
+          description: Department created
+
+    patch:
+      tags: [Organization]
+      summary: Update department
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Department updated
+
+    delete:
+      tags: [Organization]
+      summary: Delete department
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Department deleted
+
+  /api/organization/department/{id}:
+    get:
+      tags: [Organization]
+      summary: Get department by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Department details
+
+  # ========================================
+  # Organization - Workstation Routes
+  # ========================================
+  /api/organization/workstation:
+    get:
+      tags: [Organization]
+      summary: List workstations
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of workstations
+
+    post:
+      tags: [Organization]
+      summary: Create workstation
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Workstation'
+      responses:
+        '201':
+          description: Workstation created
+
+    patch:
+      tags: [Organization]
+      summary: Update workstation
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Workstation updated
+
+    delete:
+      tags: [Organization]
+      summary: Delete workstation
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Workstation deleted
+
+  /api/organization/workstation/{id}:
+    get:
+      tags: [Organization]
+      summary: Get workstation by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Workstation details
+
+  # ========================================
+  # Specimen Routes
+  # ========================================
+  /api/specimen:
+    get:
+      tags: [Specimen]
+      summary: List specimens
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of specimens
+
+    post:
+      tags: [Specimen]
+      summary: Create specimen
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Specimen'
+      responses:
+        '201':
+          description: Specimen created
+
+    patch:
+      tags: [Specimen]
+      summary: Update specimen
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Specimen updated
+
+  /api/specimen/{id}:
+    get:
+      tags: [Specimen]
+      summary: Get specimen by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Specimen details
+
+  /api/specimen/container:
+    get:
+      tags: [Specimen]
+      summary: List container definitions
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of container definitions
+
+    post:
+      tags: [Specimen]
+      summary: Create container definition
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ContainerDef'
+      responses:
+        '201':
+          description: Container definition created
+
+    patch:
+      tags: [Specimen]
+      summary: Update container definition
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Container definition updated
+
+  /api/specimen/container/{id}:
+    get:
+      tags: [Specimen]
+      summary: Get container definition by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Container definition details
+
+  /api/specimen/prep:
+    get:
+      tags: [Specimen]
+      summary: List specimen preparations
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of specimen preparations
+
+    post:
+      tags: [Specimen]
+      summary: Create specimen preparation
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/SpecimenPrep'
+      responses:
+        '201':
+          description: Specimen preparation created
+
+    patch:
+      tags: [Specimen]
+      summary: Update specimen preparation
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Specimen preparation updated
+
+  /api/specimen/prep/{id}:
+    get:
+      tags: [Specimen]
+      summary: Get specimen preparation by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Specimen preparation details
+
+  /api/specimen/status:
+    get:
+      tags: [Specimen]
+      summary: List specimen statuses
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of specimen statuses
+
+    post:
+      tags: [Specimen]
+      summary: Create specimen status
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/SpecimenStatus'
+      responses:
+        '201':
+          description: Specimen status created
+
+    patch:
+      tags: [Specimen]
+      summary: Update specimen status
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Specimen status updated
+
+  /api/specimen/status/{id}:
+    get:
+      tags: [Specimen]
+      summary: Get specimen status by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Specimen status details
+
+  /api/specimen/collection:
+    get:
+      tags: [Specimen]
+      summary: List specimen collection methods
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of collection methods
+
+    post:
+      tags: [Specimen]
+      summary: Create specimen collection method
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/SpecimenCollection'
+      responses:
+        '201':
+          description: Collection method created
+
+    patch:
+      tags: [Specimen]
+      summary: Update specimen collection method
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Collection method updated
+
+  /api/specimen/collection/{id}:
+    get:
+      tags: [Specimen]
+      summary: Get specimen collection method by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Collection method details
+
+  # ========================================
+  # Tests Routes
+  # ========================================
+  /api/tests:
+    get:
+      tags: [Tests]
+      summary: List test definitions
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: page
+          in: query
+          schema:
+            type: integer
+        - name: perPage
+          in: query
+          schema:
+            type: integer
+        - name: TestType
+          in: query
+          schema:
+            type: string
+            enum: [TEST, PARAM, CALC, GROUP, TITLE]
+          description: Filter by test type
+      responses:
+        '200':
+          description: List of test definitions
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    type: string
+                  data:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/TestDefinition'
+
+    post:
+      tags: [Tests]
+      summary: Create test definition
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/TestDefinition'
+      responses:
+        '201':
+          description: Test definition created
+
+    patch:
+      tags: [Tests]
+      summary: Update test definition
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/TestDefinition'
+      responses:
+        '200':
+          description: Test definition updated
+
+  /api/tests/{id}:
+    get:
+      tags: [Tests]
+      summary: Get test definition by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Test definition details
+
+  # ========================================
+  # Orders Routes
+  # ========================================
+  /api/ordertest:
+    get:
+      tags: [Orders]
+      summary: List orders
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: page
+          in: query
+          schema:
+            type: integer
+        - name: OrderStatus
+          in: query
+          schema:
+            type: string
+            enum: [pending, in-progress, completed, cancelled]
+        - name: PatientID
+          in: query
+          schema:
+            type: string
+      responses:
+        '200':
+          description: List of orders
+
+    post:
+      tags: [Orders]
+      summary: Create order
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - PatientID
+                - Tests
+              properties:
+                PatientID:
+                  type: string
+                VisitID:
+                  type: string
+                Priority:
+                  type: string
+                  enum: [routine, stat, urgent]
+                SiteID:
+                  type: integer
+                RequestingPhysician:
+                  type: string
+                Tests:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      TestID:
+                        type: integer
+                      SpecimenType:
+                        type: string
+      responses:
+        '201':
+          description: Order created successfully
+
+    patch:
+      tags: [Orders]
+      summary: Update order
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderTest'
+      responses:
+        '200':
+          description: Order updated
+
+    delete:
+      tags: [Orders]
+      summary: Delete order
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Order deleted
+
+  /api/ordertest/status:
+    post:
+      tags: [Orders]
+      summary: Update order status
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - OrderID
+                - OrderStatus
+              properties:
+                OrderID:
+                  type: string
+                OrderStatus:
+                  type: string
+                  enum: [pending, in-progress, completed, cancelled]
+      responses:
+        '200':
+          description: Order status updated
+
+  /api/ordertest/{id}:
+    get:
+      tags: [Orders]
+      summary: Get order by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Order details
+
+  # ========================================
+  # Edge API Routes
+  # ========================================
+  /api/edge/results:
+    post:
+      tags: [Edge API]
+      summary: Receive results from instrument (tiny-edge)
+      description: |
+        Receives instrument results and stores them in the edgeres table for processing.
+        This endpoint is typically called by the tiny-edge middleware connected to laboratory analyzers.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/EdgeResultRequest'
+      responses:
+        '201':
+          description: Result received and queued
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/EdgeResultResponse'
+        '400':
+          description: Invalid JSON payload
+
+  /api/edge/orders:
+    get:
+      tags: [Edge API]
+      summary: Fetch pending orders for instruments
+      description: Returns orders that need to be sent to laboratory instruments for testing
+      parameters:
+        - name: instrument_id
+          in: query
+          schema:
+            type: string
+          description: Filter by instrument
+        - name: status
+          in: query
+          schema:
+            type: string
+          enum: [pending, acknowledged]
+          description: Filter by status
+      responses:
+        '200':
+          description: List of orders
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    type: string
+                  data:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/EdgeOrder'
+
+  /api/edge/orders/{orderId}/ack:
+    post:
+      tags: [Edge API]
+      summary: Acknowledge order delivery
+      description: Mark order as acknowledged by the instrument
+      parameters:
+        - name: orderId
+          in: path
+          required: true
+          schema:
+            type: integer
+          description: Edge order ID
+      responses:
+        '200':
+          description: Order acknowledged
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SuccessResponse'
+
+  /api/edge/status:
+    post:
+      tags: [Edge API]
+      summary: Log instrument status update
+      description: Receive status updates from laboratory instruments
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - instrument_id
+                - status
+              properties:
+                instrument_id:
+                  type: string
+                status:
+                  type: string
+                  enum: [online, offline, error, maintenance]
+                message:
+                  type: string
+                timestamp:
+                  type: string
+                  format: date-time
+      responses:
+        '200':
+          description: Status logged
+
+  # ========================================
+  # ValueSet Routes
+  # ========================================
+  /api/valueset:
+    get:
+      tags: [ValueSets]
+      summary: List value set definitions
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: VSetCode
+          in: path
+          description: Optional value set code to get specific valueset
+          schema:
+            type: string
+      responses:
+        '200':
+          description: List of value sets
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    type: string
+                  data:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/ValueSetDef'
+
+  /api/valueset/refresh:
+    post:
+      tags: [ValueSets]
+      summary: Refresh ValueSet cache
+      description: Clear and reload the ValueSet library cache
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Cache refreshed
+
+  /api/valueset/items:
+    get:
+      tags: [ValueSets]
+      summary: List value set items
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: VSetID
+          in: query
+          schema:
+            type: integer
+          description: Filter by ValueSet ID
+      responses:
+        '200':
+          description: List of value set items
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  data:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/ValueSetItem'
+
+    post:
+      tags: [ValueSets]
+      summary: Create value set item
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ValueSetItem'
+      responses:
+        '201':
+          description: Value set item created
+
+  /api/valueset/items/{id}:
+    get:
+      tags: [ValueSets]
+      summary: Get value set item by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Value set item details
+
+    put:
+      tags: [ValueSets]
+      summary: Update value set item
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ValueSetItem'
+      responses:
+        '200':
+          description: Value set item updated
+
+    delete:
+      tags: [ValueSets]
+      summary: Delete value set item
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Value set item deleted
+
+  /api/valuesetdef:
+    get:
+      tags: [ValueSets]
+      summary: List value set definitions
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of value set definitions
+
+    post:
+      tags: [ValueSets]
+      summary: Create value set definition
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ValueSetDef'
+      responses:
+        '201':
+          description: Value set definition created
+
+  /api/valuesetdef/{id}:
+    get:
+      tags: [ValueSets]
+      summary: Get value set definition by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Value set definition details
+
+    put:
+      tags: [ValueSets]
+      summary: Update value set definition
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ValueSetDef'
+      responses:
+        '200':
+          description: Value set definition updated
+
+    delete:
+      tags: [ValueSets]
+      summary: Delete value set definition
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Value set definition deleted
+
+  # ========================================
+  # Master Data Routes
+  # ========================================
+  /api/location:
+    get:
+      tags: [Master Data]
+      summary: List locations
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of locations
+
+    post:
+      tags: [Master Data]
+      summary: Create location
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Location'
+      responses:
+        '201':
+          description: Location created
+
+    patch:
+      tags: [Master Data]
+      summary: Update location
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Location updated
+
+    delete:
+      tags: [Master Data]
+      summary: Delete location
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Location deleted
+
+  /api/location/{id}:
+    get:
+      tags: [Master Data]
+      summary: Get location by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Location details
+
+  /api/contact:
+    get:
+      tags: [Master Data]
+      summary: List contacts
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of contacts
+
+    post:
+      tags: [Master Data]
+      summary: Create contact
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Contact'
+      responses:
+        '201':
+          description: Contact created
+
+    patch:
+      tags: [Master Data]
+      summary: Update contact
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Contact updated
+
+    delete:
+      tags: [Master Data]
+      summary: Delete contact
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Contact deleted
+
+  /api/contact/{id}:
+    get:
+      tags: [Master Data]
+      summary: Get contact by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Contact details
+
+  /api/occupation:
+    get:
+      tags: [Master Data]
+      summary: List occupations
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of occupations
+
+    post:
+      tags: [Master Data]
+      summary: Create occupation
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Occupation'
+      responses:
+        '201':
+          description: Occupation created
+
+    patch:
+      tags: [Master Data]
+      summary: Update occupation
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Occupation updated
+
+  /api/occupation/{id}:
+    get:
+      tags: [Master Data]
+      summary: Get occupation by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Occupation details
+
+  /api/medicalspecialty:
+    get:
+      tags: [Master Data]
+      summary: List medical specialties
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of medical specialties
+
+    post:
+      tags: [Master Data]
+      summary: Create medical specialty
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/MedicalSpecialty'
+      responses:
+        '201':
+          description: Medical specialty created
+
+    patch:
+      tags: [Master Data]
+      summary: Update medical specialty
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Medical specialty updated
+
+  /api/medicalspecialty/{id}:
+    get:
+      tags: [Master Data]
+      summary: Get medical specialty by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Medical specialty details
+
+  /api/counter:
+    get:
+      tags: [Master Data]
+      summary: List counters
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of counters
+
+    post:
+      tags: [Master Data]
+      summary: Create counter
+      security:
+        - bearerAuth: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Counter'
+      responses:
+        '201':
+          description: Counter created
+
+    patch:
+      tags: [Master Data]
+      summary: Update counter
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Counter updated
+
+    delete:
+      tags: [Master Data]
+      summary: Delete counter
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Counter deleted
+
+  /api/counter/{id}:
+    get:
+      tags: [Master Data]
+      summary: Get counter by ID
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Counter details
+
+  /api/areageo:
+    get:
+      tags: [Master Data]
+      summary: List geographical areas
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of geographical areas
+
+  /api/areageo/provinces:
+    get:
+      tags: [Master Data]
+      summary: Get list of provinces
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: List of provinces
+
+  /api/areageo/cities:
+    get:
+      tags: [Master Data]
+      summary: Get list of cities
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: province_id
+          in: query
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: List of cities
+
+  # ========================================
+  # Dashboard & Results (Protected)
+  # ========================================
+  /api/dashboard:
+    get:
+      tags: [Dashboard]
+      summary: Get dashboard summary
+      security:
+        - bearerAuth: []
+      responses:
+        '200':
+          description: Dashboard summary data
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/DashboardSummary'
+
+  /api/result:
+    get:
+      tags: [Results]
+      summary: Get patient results
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: PatientID
+          in: query
+          schema:
+            type: string
+        - name: page
+          in: query
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: List of results
+
+  /api/sample:
+    get:
+      tags: [Specimen]
+      summary: Get samples
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: status
+          in: query
+          schema:
+            type: string
+      responses:
+        '200':
+          description: List of samples
+
+  # ========================================
+  # Demo Routes (No Auth)
+  # ========================================
+  /api/demo/order:
+    post:
+      tags: [Demo]
+      summary: Create demo order (no authentication)
+      description: Test endpoint for creating orders without authentication
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                PatientID:
+                  type: string
+                Tests:
+                  type: array
+                  items:
+                    type: object
+      responses:
+        '201':
+          description: Demo order created
+
+  /api/demo/orders:
+    get:
+      tags: [Demo]
+      summary: List demo orders (no authentication)
+      responses:
+        '200':
+          description: List of demo orders
\ No newline at end of file
diff --git a/tests/unit/ValueSet/ValueSetTest.php b/tests/unit/ValueSet/ValueSetTest.php
index b846f83..11e212a 100644
--- a/tests/unit/ValueSet/ValueSetTest.php
+++ b/tests/unit/ValueSet/ValueSetTest.php
@@ -355,8 +355,8 @@ class ValueSetTest extends CIUnitTestCase
     public function testTransformLabels()
     {
         $data = [
-            ['Gender' => '1', 'Country' => 'ID'],
-            ['Gender' => '2', 'Country' => 'US']
+            ['Gender' => '1', 'Country' => 'IDN'],
+            ['Gender' => '2', 'Country' => 'USA']
         ];
         
         $result = ValueSet::transformLabels($data, [