Updated patient.

Validator has been finalised, all associated files have been updated to match.
Now stores patient ethnicity. Uses mongodb id as patient id (removed redundancy).

schemas/patient_validator.json

@@ -6,25 +6,32 @@
 			"name",
 			"age",
 			"sex",
-			"assigned_doctor_id",
+			"ethnicity",
 			"created_at",
 			"updated_at"
 		],
 		"properties": {
-			"assigned_doctor_id": {
-				"bsonType": ""
-			},
 			"name": {
 				"bsonType": "string",
 				"description": "'name' must be a string is required."
 			},
 			"age": {
-				"bsonType": "uint",
+				"bsonType": "int",
+				"minimum": 0,
+				"maximum": 200,
 				"description": "'description' must be an unsigned int and is required."
 			},
 			"sex": {
+				"enum": [
+					"Male",
+					"Female",
+					"Intersex"
+				],
+				"description": "'sex' must be one of: ['Male', 'Female', 'Intersex'] and is required."
+			},
+			"ethnicity": {
 				"bsonType": "string",
-				"description": "sex must be string and is required."
+				"description": "'ethnicity' must be a string and is required"
 			},
 			"address": {
 				"bsonType": "string",
@@ -39,13 +46,18 @@
 				"description": "'email' must be a string and is optional."
 			},
 			"medications": {
-				"bsonType": "string",
-				"description": "'medication' must be a  and is optional."
+				"bsonType": "array",
+				"items": { "bsonType": "string" },
+				"description": "'medication' must be an array of strings and is optional."
 			},
 			"past_assessment_summary": {
 				"bsonType": "string",
 				"description": "'past_assessment_summary' must be a string and is optional."
 			},
+			"assigned_doctor_id": {
+				"bsonType": "string",
+				"description": "'assigned_docter_id' must be a string and is optional."
+			},
 			"created_at": {
 				"bsonType": "date",
 				"description": "'created_at' must be a date and is required."

src/api/routes/patient.py

@@ -1,5 +1,7 @@
 # api/routes/patient.py
 
+from bson import ObjectId
+from bson.errors import InvalidId
 from fastapi import APIRouter, HTTPException
 
 from src.data.repositories.patient import (create_patient, get_patient_by_id,
@@ -9,26 +11,27 @@ from src.data.repositories.session import list_patient_sessions
 from src.models.user import PatientCreateRequest, PatientUpdateRequest
 from src.utils.logger import logger
 
-router = APIRouter(prefix="/patient", tags=["Patients"])
+router = APIRouter(prefix="/patient", tags=["Patient"])
 
 @router.post("")
 async def create_patient_profile(req: PatientCreateRequest):
 	try:
 		logger().info(f"POST /patient name={req.name}")
-		patient = create_patient(
-			name=req.name,
-			age=req.age,
-			sex=req.sex,
-			address=req.address,
-			phone=req.phone,
-			email=req.email,
-			medications=req.medications,
-			past_assessment_summary=req.past_assessment_summary,
-			assigned_doctor_id=req.assigned_doctor_id
+		patient_id = create_patient(
+			req.name,
+			req.age,
+			req.sex,
+			req.ethnicity,
+			req.address,
+			req.phone,
+			req.email,
+			req.medications,
+			req.past_assessment_summary,
+			req.assigned_doctor_id
 		)
-		patient["_id"] = str(patient.get("_id")) if patient.get("_id") else None
-		logger().info(f"Created patient {patient.get('name')} id={patient.get('patient_id')}")
-		return patient
+		#patient_id["_id"] = str(patient_id.get("_id")) if patient_id.get("_id") else None
+		logger().info(f"Created patient {req.name} id={patient_id}")
+		return { "patient_id": patient_id }
 	except Exception as e:
 		logger().error(f"Error creating patient: {e}")
 		raise HTTPException(status_code=500, detail=str(e))
@@ -48,10 +51,19 @@ async def search_patients_route(q: str, limit: int = 20):
 async def get_patient(patient_id: str):
 	try:
 		logger().info(f"GET /patient/{patient_id}")
+		try:
+			# Validate ObjectId format
+			if not ObjectId.is_valid(patient_id):
+				raise HTTPException(status_code=400, detail="Invalid patient ID format")
+		except InvalidId:
+			raise HTTPException(status_code=400, detail="Invalid patient ID format")
+
 		patient = get_patient_by_id(patient_id)
 		if not patient:
 			raise HTTPException(status_code=404, detail="Patient not found")
-		patient["_id"] = str(patient.get("_id")) if patient.get("_id") else None
+
+		# Convert ObjectId to string for JSON response
+		patient["_id"] = str(patient["_id"])
 		return patient
 	except HTTPException:
 		raise
@@ -62,12 +74,18 @@ async def get_patient(patient_id: str):
 @router.patch("/{patient_id}")
 async def update_patient(patient_id: str, req: PatientUpdateRequest):
 	try:
+		# Validate ObjectId format
+		if not ObjectId.is_valid(patient_id):
+			raise HTTPException(status_code=400, detail="Invalid patient ID format")
+
 		payload = {k: v for k, v in req.model_dump().items() if v is not None}
 		logger().info(f"PATCH /patient/{patient_id} fields={list(payload.keys())}")
 		modified = update_patient_profile(patient_id, payload)
 		if modified == 0:
 			return {"message": "No changes"}
 		return {"message": "Updated"}
+	except HTTPException:
+		raise
 	except Exception as e:
 		logger().error(f"Error updating patient: {e}")
 		raise HTTPException(status_code=500, detail=str(e))

src/data/repositories/patient.py

@@ -5,23 +5,25 @@ A patient is a person who has been assigned to a doctor for treatment.
 
 ## Fields
 	_id: index
-	name:
-	age:
-	sex:
-	address:
-	phone:
-	email:
-	medications:
-	past_assessment_summary:
-	assigned_doctor_id:
-	created_at:
-	updated_at:
+	name: The name of the patient
+	age: How old the patient is
+	sex: Male or female
+	ethnicity: Geneological information
+	address: Where they live
+	phone: What their phone number is
+	email: What their email address it
+	medications: Any medications they are currently taking
+	past_assessment_summary: Summarisation of past assessments
+	assigned_doctor_id: The id of the account assigned to this patient
+	created_at: The timestamp when the patient was created
+	updated_at: The timestamp when the patient data was last modified
 """
 
 import re
 from datetime import datetime, timezone
 from typing import Any
 
+from bson import ObjectId
 from pymongo import ASCENDING
 from pymongo.errors import (ConnectionFailure, DuplicateKeyError,
                             OperationFailure, PyMongoError)
@@ -32,64 +34,59 @@ from src.utils.logger import logger
 PATIENTS_COLLECTION = "patients"
 
 def create():
+	#get_collection(PATIENTS_COLLECTION).drop()
 	create_collection(PATIENTS_COLLECTION, "schemas/patient_validator.json")
-
-def _generate_patient_id() -> str:
-	"""Generate zero-padded 8-digit ID"""
-	import random
-	return f"{random.randint(0, 99999999):08d}"
-
+	get_collection(PATIENTS_COLLECTION).create_index("assigned_doctor_id")
 
 def get_patient_by_id(patient_id: str) -> dict[str, Any] | None:
-	collection = get_collection(PATIENTS_COLLECTION)
-	return collection.find_one({"patient_id": patient_id})
-
+	logger().info(f"Searching for patient with id '{patient_id}'")
+	try:
+		collection = get_collection(PATIENTS_COLLECTION)
+		return collection.find_one({"_id": ObjectId(patient_id)})
+	except Exception as e:
+		logger().error(f"Error in get_patient_by_id: {e}")
+		return None
 
 def create_patient(
-	*,
 	name: str,
 	age: int,
 	sex: str,
+	ethnicity: str,
 	address: str | None = None,
 	phone: str | None = None,
 	email: str | None = None,
 	medications: list[str] | None = None,
 	past_assessment_summary: str | None = None,
 	assigned_doctor_id: str | None = None
-) -> dict[str, Any]:
+) -> str:
 	collection = get_collection(PATIENTS_COLLECTION)
 	now = datetime.now(timezone.utc)
-	# Ensure unique 8-digit id
-	for _ in range(10):
-		pid = _generate_patient_id()
-		if not collection.find_one({"patient_id": pid}):
-			break
-	else:
-		raise RuntimeError("Failed to generate unique patient ID")
 	doc = {
-		"patient_id": pid,
 		"name": name,
 		"age": age,
 		"sex": sex,
-		"address": address,
-		"phone": phone,
-		"email": email,
+		"ethnicity": ethnicity,
+		"address": address or "",
+		"phone": phone or "",
+		"email": email or "",
 		"medications": medications or [],
 		"past_assessment_summary": past_assessment_summary or "",
-		"assigned_doctor_id": assigned_doctor_id,
+		"assigned_doctor_id": assigned_doctor_id or "",
 		"created_at": now,
 		"updated_at": now
 	}
-	collection.insert_one(doc)
-	return doc
-
+	result = collection.insert_one(doc)
+	return str(result.inserted_id)
 
 def update_patient_profile(patient_id: str, updates: dict[str, Any]) -> int:
-	collection = get_collection(PATIENTS_COLLECTION)
-	updates["updated_at"] = datetime.now(timezone.utc)
-	result = collection.update_one({"patient_id": patient_id}, {"$set": updates})
-	return result.modified_count
-
+	try:
+		collection = get_collection(PATIENTS_COLLECTION)
+		updates["updated_at"] = datetime.now(timezone.utc)
+		result = collection.update_one({"_id": ObjectId(patient_id)}, {"$set": updates})
+		return result.modified_count
+	except Exception as e:
+		logger().error(f"Error in update_patient_profile: {e}")
+		return 0
 
 def search_patients(query: str, limit: int = 10) -> list[dict[str, Any]]:
 	"""Search patients by name (case-insensitive starts-with/contains) or partial patient_id."""

src/models/user.py

@@ -12,6 +12,7 @@ class PatientCreateRequest(BaseModel):
 	name: str
 	age: int
 	sex: str
+	ethnicity: str
 	address: str | None = None
 	phone: str | None = None
 	email: str | None = None
@@ -23,6 +24,7 @@ class PatientUpdateRequest(BaseModel):
 	name: str | None = None
 	age: int | None = None
 	sex: str | None = None
+	ethnicity: str | None = None
 	address: str | None = None
 	phone: str | None = None
 	email: str | None = None

static/css/emr.css

@@ -95,19 +95,27 @@
 }
 
 .emr-grid {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+}
+
+.emr-grid .row {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
-    gap: 1.5rem;
+    gap: 16px;
 }
 
-.emr-field {
-    display: flex;
-    flex-direction: column;
-    gap: 0.5rem;
+.emr-grid .row:not(.contact-info) {
+    grid-template-columns: repeat(2, 1fr);
 }
 
-.emr-field.full-width {
-    grid-column: 1 / -1;
+.emr-grid .row.contact-info {
+    grid-template-columns: repeat(3, 1fr);
+}
+
+.emr-field {
+    display: grid;
+    gap: 6px;
 }
 
 .emr-field label {
@@ -300,30 +308,37 @@
         align-items: stretch;
         text-align: center;
     }
-    
+
     .patient-info-header {
         align-items: center;
         text-align: center;
     }
-    
+
     .emr-main {
         padding: 1rem;
     }
-    
+
     .emr-grid {
         grid-template-columns: 1fr;
     }
-    
+
     .emr-actions {
         flex-direction: column;
     }
-    
+
     .add-medication {
         flex-direction: column;
         align-items: stretch;
     }
 }
 
+@media (max-width: 720px) {
+    .emr-grid .row,
+    .emr-grid .row.contact-info {
+        grid-template-columns: 1fr;
+    }
+}
+
 /* Dark Theme Adjustments */
 [data-theme="dark"] .emr-field input,
 [data-theme="dark"] .emr-field select,

static/css/patient.css

@@ -3,7 +3,10 @@ body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxyge
 .back-link { display:inline-flex; align-items:center; gap:8px; color:#93c5fd; text-decoration:none; margin-bottom:12px; }
 .back-link:hover { text-decoration:underline; }
 h1 { margin-bottom: 16px; font-size: 1.6rem; }
-.grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 16px; }
+.grid { display: flex; flex-direction: column; gap: 16px; }
+.grid .row { display: grid; gap: 16px; }
+.grid .row:not(.contact-info) { grid-template-columns: repeat(2, 1fr); }
+.grid .row.contact-info { grid-template-columns: repeat(3, 1fr); }
 label { display: grid; gap: 6px; font-size: 0.9rem; }
 input, select, textarea { padding: 10px; border-radius: 8px; border: 1px solid #334155; background: #0b1220; color: #e2e8f0; }
 textarea { min-height: 100px; }
@@ -11,7 +14,11 @@ textarea { min-height: 100px; }
 .primary { background: #2563eb; color: #fff; border: none; padding: 10px 14px; border-radius: 8px; cursor: pointer; }
 .secondary { background: transparent; color: #e2e8f0; border: 1px solid #334155; padding: 10px 14px; border-radius: 8px; cursor: pointer; }
 .result { margin-top: 12px; color: #93c5fd; }
-@media (max-width: 720px) { .grid { grid-template-columns: 1fr; } }
+@media (max-width: 720px) {
+	.grid .row, .grid .row.contact-info {
+		grid-template-columns: 1fr;
+	}
+}
 .modal { position: fixed; inset:0; display:none; align-items:center; justify-content:center; background: rgba(0,0,0,0.45); z-index: 3000; }
 .modal.show { display:flex; }
 .modal-content { background:#111827; color:#e2e8f0; width: 520px; max-width: 92vw; border-radius: 12px; overflow:hidden; box-shadow: 0 10px 30px rgba(0,0,0,0.4); }

static/emr.html

@@ -31,34 +31,46 @@
             <section class="emr-section">
                 <h2><i class="fas fa-user"></i> Patient Overview</h2>
                 <div class="emr-grid">
-                    <div class="emr-field">
-                        <label>Full Name</label>
-                        <input type="text" id="patientNameInput" placeholder="Enter patient name">
-                    </div>
-                    <div class="emr-field">
-                        <label>Age</label>
-                        <input type="number" id="patientAgeInput" placeholder="Enter age" min="0" max="150">
-                    </div>
-                    <div class="emr-field">
-                        <label>Sex</label>
-                        <select id="patientSexInput">
-                            <option value="">Select sex</option>
-                            <option value="Male">Male</option>
-                            <option value="Female">Female</option>
-                            <option value="Other">Other</option>
-                        </select>
-                    </div>
-                    <div class="emr-field">
-                        <label>Phone</label>
-                        <input type="tel" id="patientPhoneInput" placeholder="Enter phone number">
+                    <!-- Row 1: Name and Age -->
+                    <div class="row">
+                        <div class="emr-field">
+                            <label>Full Name</label>
+                            <input type="text" id="patientNameInput" placeholder="Enter patient name">
+                        </div>
+                        <div class="emr-field">
+                            <label>Age</label>
+                            <input type="number" id="patientAgeInput" placeholder="Enter age" min="0" max="150">
+                        </div>
                     </div>
-                    <div class="emr-field">
-                        <label>Email</label>
-                        <input type="email" id="patientEmailInput" placeholder="Enter email address">
+                    <!-- Row 2: Sex and Ethnicity -->
+                    <div class="row">
+                        <div class="emr-field">
+                            <label>Sex</label>
+                            <select id="patientSexInput">
+                                <option value="Male">Male</option>
+                                <option value="Female">Female</option>
+                                <option value="Intersex">Intersex</option>
+                            </select>
+                        </div>
+                        <div class="emr-field">
+                            <label>Ethnicity</label>
+                            <input type="ethnicity" id="patientEthnicityInput" placeholder="Enter ethnicity">
+                        </div>
                     </div>
-                    <div class="emr-field full-width">
-                        <label>Address</label>
-                        <textarea id="patientAddressInput" placeholder="Enter full address" rows="3"></textarea>
+                    <!-- Row 3: Contact Information -->
+                    <div class="row contact-info">
+                        <div class="emr-field">
+                            <label>Phone</label>
+                            <input type="tel" id="patientPhoneInput" placeholder="Enter phone number">
+                        </div>
+                        <div class="emr-field">
+                            <label>Email</label>
+                            <input type="email" id="patientEmailInput" placeholder="Enter email address">
+                        </div>
+                        <div class="emr-field">
+                            <label>Address</label>
+                            <input type="text" id="patientAddressInput" placeholder="Enter full address">
+                        </div>
                     </div>
                 </div>
             </section>
@@ -67,23 +79,25 @@
             <section class="emr-section">
                 <h2><i class="fas fa-pills"></i> Medical Information</h2>
                 <div class="emr-grid">
-                    <div class="emr-field full-width">
-                        <label>Current Medications</label>
-                        <div class="medications-container">
-                            <div class="medications-list" id="medicationsList">
-                                <!-- Medications will be added here dynamically -->
-                            </div>
-                            <div class="add-medication">
-                                <input type="text" id="newMedicationInput" placeholder="Add new medication">
-                                <button id="addMedicationBtn" class="btn-secondary">
-                                    <i class="fas fa-plus"></i> Add
-                                </button>
+                    <div class="row">
+                        <div class="emr-field">
+                            <label>Current Medications</label>
+                            <div class="medications-container">
+                                <div class="medications-list" id="medicationsList">
+                                    <!-- Medications will be added here dynamically -->
+                                </div>
+                                <div class="add-medication">
+                                    <input type="text" id="newMedicationInput" placeholder="Add new medication">
+                                    <button id="addMedicationBtn" class="btn-secondary">
+                                        <i class="fas fa-plus"></i> Add
+                                    </button>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="emr-field full-width">
-                        <label>Past Assessment Summary</label>
-                        <textarea id="pastAssessmentInput" placeholder="Enter past assessment summary" rows="4"></textarea>
+                        <div class="emr-field">
+                            <label>Past Assessment Summary</label>
+                            <textarea id="pastAssessmentInput" placeholder="Enter past assessment summary" rows="4"></textarea>
+                        </div>
                     </div>
                 </div>
             </section>

static/js/app.js

@@ -1212,12 +1212,14 @@ How can I assist you today?`;
             return storedPatients.filter(p => {
                 // Check name match (case-insensitive contains)
                 const nameMatch = p.name.toLowerCase().includes(query.toLowerCase());
-                // Check patient_id match
-                let idMatch = p.patient_id.includes(query);
-                // Special handling for numeric queries - check if patient_id starts with the query
-                if (/^\d+$/.test(query)) {
-                    idMatch = p.patient_id.startsWith(query) || p.patient_id.includes(query);
-                }
+                // Check _id match
+                let idMatch = p._id.includes(query);
+                //// Check patient_id match
+                //let idMatch = p.patient_id.includes(query);
+                //// Special handling for numeric queries - check if patient_id starts with the query
+                //if (/^\d+$/.test(query)) {
+                //    idMatch = p.patient_id.startsWith(query) || p.patient_id.includes(query);
+                //}
                 return nameMatch || idMatch;
             });
         } catch (e) {
@@ -1263,7 +1265,7 @@ How can I assist you today?`;
     }
     async loadSavedPatientId() {
         const pid = localStorage.getItem('medicalChatbotPatientId');
-        if (pid && /^\d{8}$/.test(pid)) {
+        if (pid) {
             this.currentPatientId = pid;
             const status = document.getElementById('patientStatus');
             const actions = document.getElementById('patientActions');
@@ -1275,7 +1277,7 @@ How can I assist you today?`;
                     const resp = await fetch(`/patient/${pid}`);
                     if (resp.ok) {
                         const patient = await resp.json();
-                        status.textContent = `Patient: ${patient.name || 'Unknown'} (${pid})`;
+                        status.textContent = `Patient: ${patient.name || 'Unknown'} (${patient._id})`;
                     } else {
                         status.textContent = `Patient: ${pid}`;
                     }
@@ -1331,29 +1333,8 @@ How can I assist you today?`;
             return;
         }
 
-        // If it's a complete 8-digit ID, use it directly
-        if (/^\d{8}$/.test(value)) {
-            console.log('[DEBUG] Valid 8-digit ID provided');
-            this.currentPatientId = value;
-            this.savePatientId();
-            // Try to get patient name for display
-            try {
-                const resp = await fetch(`/patient/${value}`);
-                if (resp.ok) {
-                    const patient = await resp.json();
-                    this.updatePatientDisplay(value, patient.name || 'Unknown');
-            } else {
-                    this.updatePatientDisplay(value);
-                }
-            } catch (e) {
-                this.updatePatientDisplay(value);
-            }
-            await this.fetchAndRenderPatientSessions();
-            return;
-        }
-
-        // Otherwise, search for patient by name or partial ID
-        console.log('[DEBUG] Searching for patient by name/partial ID');
+        // Search for patient by name or ID
+        console.log('[DEBUG] Searching for patient');
         try {
             const resp = await fetch(`/patient/search?q=${encodeURIComponent(value)}&limit=1`);
             console.log('[DEBUG] Search response status:', resp.status);
@@ -1363,10 +1344,10 @@ How can I assist you today?`;
                 const first = (data.results || [])[0];
                 if (first) {
                     console.log('[DEBUG] Found patient, setting as current:', first);
-                    this.currentPatientId = first.patient_id;
+                    this.currentPatientId = first._id;
                     this.savePatientId();
-                    input.value = first.patient_id;
-                    this.updatePatientDisplay(first.patient_id, first.name || 'Unknown');
+                    input.value = first._id;
+                    this.updatePatientDisplay(first._id, first.name || 'Unknown');
                     await this.fetchAndRenderPatientSessions();
                     return;
                 }

static/js/emr.js

@@ -85,12 +85,13 @@ class PatientEMR {
 
         // Update header
         document.getElementById('patientName').textContent = this.patientData.name || 'Unknown';
-        document.getElementById('patientId').textContent = `ID: ${this.patientData.patient_id}`;
+        document.getElementById('patientId').textContent = `ID: ${this.patientData._id}`;
 
         // Populate form fields
         document.getElementById('patientNameInput').value = this.patientData.name || '';
         document.getElementById('patientAgeInput').value = this.patientData.age || '';
         document.getElementById('patientSexInput').value = this.patientData.sex || '';
+        document.getElementById('patientEthnicityInput').value = this.patientData.ethnicity || '';
         document.getElementById('patientPhoneInput').value = this.patientData.phone || '';
         document.getElementById('patientEmailInput').value = this.patientData.email || '';
         document.getElementById('patientAddressInput').value = this.patientData.address || '';
@@ -235,7 +236,7 @@ class PatientEMR {
         }
 
         const exportData = {
-            patient_id: this.patientData.patient_id,
+            _id: this.patientData._id,
             name: this.patientData.name,
             age: this.patientData.age,
             sex: this.patientData.sex,
@@ -253,7 +254,7 @@ class PatientEMR {
         const url = URL.createObjectURL(blob);
         const a = document.createElement('a');
         a.href = url;
-        a.download = `patient-${this.patientData.patient_id}-emr.json`;
+        a.download = `patient-${this.patientData._id}-emr.json`;
         document.body.appendChild(a);
         a.click();
         document.body.removeChild(a);

static/js/patient.js

@@ -28,6 +28,7 @@ document.addEventListener('DOMContentLoaded', () => {
 			document.getElementById('name').value = data.name || '';
 			document.getElementById('age').value = data.age ?? '';
 			document.getElementById('sex').value = data.sex || 'Other';
+			document.getElementById('ethnicity').value = data.ethnicity || '';
 			document.getElementById('address').value = data.address || '';
 			document.getElementById('phone').value = data.phone || '';
 			document.getElementById('email').value = data.email || '';
@@ -64,6 +65,7 @@ document.addEventListener('DOMContentLoaded', () => {
 			name: document.getElementById('name').value.trim(),
 			age: parseInt(document.getElementById('age').value, 10),
 			sex: document.getElementById('sex').value,
+			ethnicity: document.getElementById('ethnicity').value,
 			address: document.getElementById('address').value.trim() || null,
 			phone: document.getElementById('phone').value.trim() || null,
 			email: document.getElementById('email').value.trim() || null,

static/patient.html

@@ -14,20 +14,33 @@
         <h1>Create Patient</h1>
         <form id="patientForm">
             <div class="grid">
-                <label>Name<input type="text" id="name" required></label>
-                <label>Age<input type="number" id="age" min="0" max="130" required></label>
-                <label>Sex
-                    <select id="sex" required>
-                        <option value="Male">Male</option>
-                        <option value="Female">Female</option>
-                        <option value="Other">Other</option>
-                    </select>
-                </label>
-                <label>Phone<input type="tel" id="phone"></label>
-                <label>Email<input type="email" id="email"></label>
-                <label>Address<input type="text" id="address"></label>
-                <label>Active Medications<textarea id="medications" placeholder="One per line"></textarea></label>
-                <label>Past Assessment Summary<textarea id="summary"></textarea></label>
+                <!-- Row 1: Name and Age -->
+                <div class="row">
+                    <label>Name<input type="text" id="name" required></label>
+                    <label>Age<input type="number" id="age" min="0" max="130" required></label>
+                </div>
+                <!-- Row 2: Sex and Ethnicity -->
+                <div class="row">
+                    <label>Sex
+                        <select id="sex" required>
+                            <option value="Male">Male</option>
+                            <option value="Female">Female</option>
+                            <option value="Intersex">Intersex</option>
+                        </select>
+                    </label>
+                    <label>Ethnicity<input type="ethnicity" id="ethnicity"></label>
+                </div>
+                <!-- Row 3: Contact Information -->
+                <div class="row contact-info">
+                    <label>Phone<input type="tel" id="phone"></label>
+                    <label>Email<input type="email" id="email"></label>
+                    <label>Address<input type="text" id="address"></label>
+                </div>
+                <!-- Row 4: Medical Information -->
+                <div class="row">
+                    <label>Active Medications<textarea id="medications" placeholder="One per line"></textarea></label>
+                    <label>Past Assessment Summary<textarea id="summary"></textarea></label>
+                </div>
             </div>
             <div class="actions">
                 <button type="button" id="cancelBtn" class="secondary">Cancel</button>