jheaps/Media.JoshHeaps.Net
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Feature/breadboard #4

Merged
jheaps merged 25 commits from feature/breadboard into master 2026-08-26 17:36:05 -06:00
Conversation 0 Commits 25 Files Changed 99
+315 -183
17 changed files with 315 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 91ef4f41dd - Show all commits
Media.JoshHeaps.Net/Api/MedicalDocsApi.cs
+32 -52
View File
@@ -112,7 +112,7 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
[HttpGet("documents/search")]
public async Task<IActionResult> SearchDocuments(
[FromQuery] long personId,
[FromQuery] long? personId = null,
[FromQuery] string? search = null,
[FromQuery] string? classification = null,
[FromQuery] string? documentType = null,
@@ -128,30 +128,24 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (personId <= 0)
return BadRequest(new { error = "personId is required" });
if (!await HasPersonAccess(userId.Value, personId)) return Forbid();
if (personId.HasValue && !await HasPersonAccess(userId.Value, personId.Value)) return Forbid();
if (limit < 1 || limit > 100) limit = 50;
if (offset < 0) offset = 0;
var documents = await medicalDocsService.SearchDocumentsAsync(personId, search, classification, documentType, doctorId, tagId, conditionId, fromDate, toDate, aiProcessed, offset, limit);
var documents = await medicalDocsService.SearchDocumentsAsync(personId, search, classification, documentType, doctorId, tagId, conditionId, fromDate, toDate, aiProcessed, accessUserId: personId.HasValue ? null : userId, offset: offset, limit: limit);
return Ok(documents);
}
[HttpGet("tags")]
public async Task<IActionResult> GetPersonTags([FromQuery] long personId)
public async Task<IActionResult> GetPersonTags([FromQuery] long? personId = null)
{
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (personId.HasValue && !await HasPersonAccess(userId.Value, personId.Value)) return Forbid();
if (personId <= 0)
return BadRequest(new { error = "personId is required" });
if (!await HasPersonAccess(userId.Value, personId)) return Forbid();
var tags = await medicalDocsService.GetPersonTagsAsync(personId);
var tags = await medicalDocsService.GetPersonTagsAsync(personId, accessUserId: personId.HasValue ? null : userId);
return Ok(tags);
}
@@ -334,13 +328,14 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
// --- Doctors (shared, no per-person access check) ---
[HttpGet("doctors")]
public async Task<IActionResult> GetDoctors()
public async Task<IActionResult> GetDoctors([FromQuery] long? personId = null)
{
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (personId.HasValue && !await HasPersonAccess(userId.Value, personId.Value)) return Forbid();
var doctors = await medicalDocsService.GetDoctorsAsync();
var doctors = await medicalDocsService.GetDoctorsAsync(personId, accessUserId: personId.HasValue ? null : userId);
return Ok(doctors);
}
@@ -350,11 +345,12 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (!await HasPersonAccess(userId.Value, request.PersonId)) return Forbid();
if (string.IsNullOrWhiteSpace(request.Name))
return BadRequest(new { error = "Name is required" });
var doctor = await medicalDocsService.CreateDoctorAsync(request.Name.Trim(), request.Specialty, request.Phone, request.Address, request.Notes);
var doctor = await medicalDocsService.CreateDoctorAsync(request.PersonId, request.Name.Trim(), request.Specialty, request.Phone, request.Address, request.Notes);
if (doctor == null)
return StatusCode(500, new { error = "Failed to create doctor" });
@@ -367,6 +363,7 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (!await HasResourceAccess(userId.Value, "doctor", id)) return Forbid();
if (string.IsNullOrWhiteSpace(request.Name))
return BadRequest(new { error = "Name is required" });
@@ -383,6 +380,7 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (!await HasResourceAccess(userId.Value, "doctor", id)) return Forbid();
var success = await medicalDocsService.DeleteDoctorAsync(id);
if (!success) return NotFound(new { error = "Doctor not found" });
@@ -393,17 +391,14 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
// --- Conditions ---
[HttpGet("conditions")]
public async Task<IActionResult> GetConditions([FromQuery] long personId)
public async Task<IActionResult> GetConditions([FromQuery] long? personId = null)
{
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (personId.HasValue && !await HasPersonAccess(userId.Value, personId.Value)) return Forbid();
if (personId <= 0)
return BadRequest(new { error = "personId is required" });
if (!await HasPersonAccess(userId.Value, personId)) return Forbid();
var conditions = await medicalDocsService.GetConditionsAsync(personId);
var conditions = await medicalDocsService.GetConditionsAsync(personId, accessUserId: personId.HasValue ? null : userId);
return Ok(conditions);
}
@@ -461,17 +456,14 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
// --- Prescriptions ---
[HttpGet("prescriptions")]
public async Task<IActionResult> GetPrescriptions([FromQuery] long personId)
public async Task<IActionResult> GetPrescriptions([FromQuery] long? personId = null)
{
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (personId.HasValue && !await HasPersonAccess(userId.Value, personId.Value)) return Forbid();
if (personId <= 0)
return BadRequest(new { error = "personId is required" });
if (!await HasPersonAccess(userId.Value, personId)) return Forbid();
var prescriptions = await medicalDocsService.GetPrescriptionsAsync(personId);
var prescriptions = await medicalDocsService.GetPrescriptionsAsync(personId, accessUserId: personId.HasValue ? null : userId);
return Ok(prescriptions);
}
@@ -572,17 +564,14 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
// --- Billing Providers ---
[HttpGet("providers")]
public async Task<IActionResult> GetProviders([FromQuery] long personId)
public async Task<IActionResult> GetProviders([FromQuery] long? personId = null)
{
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (personId.HasValue && !await HasPersonAccess(userId.Value, personId.Value)) return Forbid();
if (personId <= 0)
return BadRequest(new { error = "personId is required" });
if (!await HasPersonAccess(userId.Value, personId)) return Forbid();
var providers = await medicalDocsService.GetProvidersAsync(personId);
var providers = await medicalDocsService.GetProvidersAsync(personId, accessUserId: personId.HasValue ? null : userId);
return Ok(providers);
}
@@ -686,17 +675,14 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
// --- Bills ---
[HttpGet("bills")]
public async Task<IActionResult> GetBills([FromQuery] long personId, [FromQuery] long? providerId = null)
public async Task<IActionResult> GetBills([FromQuery] long? personId = null, [FromQuery] long? providerId = null)
{
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (personId.HasValue && !await HasPersonAccess(userId.Value, personId.Value)) return Forbid();
if (personId <= 0)
return BadRequest(new { error = "personId is required" });
if (!await HasPersonAccess(userId.Value, personId)) return Forbid();
var bills = await medicalDocsService.GetBillsAsync(personId, providerId);
var bills = await medicalDocsService.GetBillsAsync(personId, providerId, accessUserId: personId.HasValue ? null : userId);
return Ok(bills);
}
@@ -834,20 +820,17 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
// --- Timeline ---
[HttpGet("timeline")]
public async Task<IActionResult> GetTimeline([FromQuery] long personId, [FromQuery] int offset = 0, [FromQuery] int limit = 100)
public async Task<IActionResult> GetTimeline([FromQuery] long? personId = null, [FromQuery] int offset = 0, [FromQuery] int limit = 100)
{
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (personId <= 0)
return BadRequest(new { error = "personId is required" });
if (!await HasPersonAccess(userId.Value, personId)) return Forbid();
if (personId.HasValue && !await HasPersonAccess(userId.Value, personId.Value)) return Forbid();
if (limit < 1 || limit > 200) limit = 100;
if (offset < 0) offset = 0;
var events = await medicalDocsService.GetTimelineAsync(personId, offset, limit);
var events = await medicalDocsService.GetTimelineAsync(personId, accessUserId: personId.HasValue ? null : userId, offset: offset, limit: limit);
return Ok(events);
}
@@ -889,17 +872,14 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
}
[HttpGet("bills/summary")]
public async Task<IActionResult> GetBillSummary([FromQuery] long personId)
public async Task<IActionResult> GetBillSummary([FromQuery] long? personId = null)
{
var userId = GetUserIdFromAuth();
if (userId == null) return Unauthorized();
if (!await HasMedicalAccess(userId.Value)) return Forbid();
if (personId.HasValue && !await HasPersonAccess(userId.Value, personId.Value)) return Forbid();
if (personId <= 0)
return BadRequest(new { error = "personId is required" });
if (!await HasPersonAccess(userId.Value, personId)) return Forbid();
var summary = await medicalDocsService.GetBillSummaryAsync(personId);
var summary = await medicalDocsService.GetBillSummaryAsync(personId, accessUserId: personId.HasValue ? null : userId);
return Ok(summary);
}
@@ -945,7 +925,7 @@ public class MedicalDocsApi(DbExecutor dbExecutor, MedicalDocsService medicalDoc
public record CreatePersonRequest(string Name, DateTime? DateOfBirth = null, string? Notes = null);
public record CreateNoteRequest(long PersonId, string Title, string? Description = null, DateTime? DocumentDate = null, string? Classification = null);
public record UpdateDocumentRequest(string? Title = null, string? Description = null, DateTime? DocumentDate = null, string? Classification = null, long? DoctorId = null);
public record CreateDoctorRequest(string Name, string? Specialty = null, string? Phone = null, string? Address = null, string? Notes = null);
public record CreateDoctorRequest(long PersonId, string Name, string? Specialty = null, string? Phone = null, string? Address = null, string? Notes = null);
public record CreateConditionRequest(long PersonId, string Name, DateTime? DiagnosedDate = null, string? Notes = null);
public record UpdateConditionRequest(string Name, DateTime? DiagnosedDate = null, string? Notes = null, bool IsActive = true);
public record CreatePrescriptionRequest(long PersonId, string MedicationName, string? Dosage = null, string? Frequency = null, long? DoctorId = null, DateTime? StartDate = null, string? Notes = null, string? RxNumber = null);
Media.JoshHeaps.Net/Database/027_medical_doctors_person_id.sql
+7
View File
@@ -0,0 +1,7 @@
-- Add person_id to medical_doctors to scope doctors per person
ALTER TABLE app.medical_doctors ADD COLUMN IF NOT EXISTS person_id BIGINT REFERENCES app.medical_people(id);
CREATE INDEX IF NOT EXISTS idx_medical_doctors_person_id ON app.medical_doctors(person_id);
CREATE UNIQUE INDEX IF NOT EXISTS idx_medical_doctors_person_name
ON app.medical_doctors(person_id, LOWER(name)) WHERE person_id IS NOT NULL;
Media.JoshHeaps.Net/Models/MedicalDoctor.cs
+1
View File
@@ -3,6 +3,7 @@ namespace Media.JoshHeaps.Net.Models;
public class MedicalDoctor
{
public long Id { get; set; }
public long PersonId { get; set; }
public string Name { get; set; } = string.Empty;
public string? Specialty { get; set; }
public string? Phone { get; set; }
Media.JoshHeaps.Net/Models/TimelineEvent.cs
+1
View File
@@ -4,6 +4,7 @@ public class TimelineEvent
{
public string EventType { get; set; } = "";
public long Id { get; set; }
public long PersonId { get; set; }
public string? Label { get; set; }
public string? Detail { get; set; }
public string? SubType { get; set; }
Media.JoshHeaps.Net/Services/MedicalAiService.cs
+37 -1
View File
@@ -123,7 +123,7 @@ public class MedicalAiService
{
try
{
var doctor = await medicalDocsService.FindOrCreateDoctorByNameAsync(doctorName.Trim());
var doctor = await medicalDocsService.FindOrCreateDoctorByNameAsync(doc.PersonId, doctorName.Trim(), this);
doctorId = doctor?.Id;
}
catch (Exception ex)
@@ -631,6 +631,42 @@ Consider abbreviations, slight misspellings, and variations (e.g., ""Intermounta
}
}
public async Task<string?> FuzzyMatchDoctorAsync(string extractedName, List<string> existingDoctorNames)
{
try
{
var doctorList = string.Join("\n", existingDoctorNames.Select(n => $" - {n}"));
var systemPrompt = @"You are matching a doctor name extracted from a medical document against a list of known doctors for a patient. Return ONLY a JSON object with:
- ""matchedName"": the exact string from the existing list that matches, or null if no match
- ""confidence"": ""high"", ""medium"", or ""low""
Consider abbreviations, titles, and variations (e.g., ""Dr. John Smith"" matches ""John Smith"", ""J. Smith MD"" matches ""John Smith"", ""Smith, John"" matches ""John Smith""). Only return a match with medium or high confidence.";
var userPrompt = $"Extracted doctor name: \"{extractedName}\"\n\nExisting doctors:\n{doctorList}";
var response = await CallClaudeCliAsync(systemPrompt, userPrompt, HaikuModel);
if (response == null) return null;
var json = ExtractJson(response);
using var doc = JsonDocument.Parse(json);
var root = doc.RootElement;
var matchedName = root.TryGetProperty("matchedName", out var mn) && mn.ValueKind == JsonValueKind.String ? mn.GetString() : null;
var confidence = root.TryGetProperty("confidence", out var conf) ? conf.GetString() : "low";
if (matchedName != null && confidence != "low")
return matchedName;
return null;
}
catch (Exception ex)
{
_logger.LogWarning(ex, "Fuzzy doctor matching failed for \"{ExtractedName}\"", extractedName);
return null;
}
}
public async Task<string?> FuzzyMatchConditionAsync(string extractedName, List<string> existingConditionNames)
{
try
Media.JoshHeaps.Net/Services/MedicalDocsService.cs
+129 -71
View File
@@ -155,6 +155,7 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
var sql = resourceType switch
{
"document" => "SELECT person_id FROM app.medical_documents WHERE id = @id",
"doctor" => "SELECT person_id FROM app.medical_doctors WHERE id = @id",
"condition" => "SELECT person_id FROM app.medical_conditions WHERE id = @id",
"prescription" => "SELECT person_id FROM app.medical_prescriptions WHERE id = @id",
"pickup" => "SELECT p.person_id FROM app.medical_prescription_pickups pk JOIN app.medical_prescriptions p ON pk.prescription_id = p.id WHERE pk.id = @id",
@@ -297,11 +298,14 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
}
}
public async Task<List<MedicalDocument>> SearchDocumentsAsync(long personId, string? search = null, string? classification = null, string? documentType = null, long? doctorId = null, long? tagId = null, long? conditionId = null, DateTime? fromDate = null, DateTime? toDate = null, bool? aiProcessed = null, int offset = 0, int limit = 50)
public async Task<List<MedicalDocument>> SearchDocumentsAsync(long? personId = null, string? search = null, string? classification = null, string? documentType = null, long? doctorId = null, long? tagId = null, long? conditionId = null, DateTime? fromDate = null, DateTime? toDate = null, bool? aiProcessed = null, long? accessUserId = null, int offset = 0, int limit = 50)
{
try
{
var conditions = new List<string> { "person_id = @personId" };
var personFilter = personId.HasValue
? "person_id = @personId"
: "person_id IN (SELECT person_id FROM app.medical_people_access WHERE user_id = @accessUserId)";
var conditions = new List<string> { personFilter };
if (!string.IsNullOrWhiteSpace(search))
conditions.Add("(title ILIKE @search OR description ILIKE @search OR extracted_text ILIKE @search)");
@@ -339,7 +343,8 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
return await db.ExecuteListReaderAsync(query, MapDocument, new
{
personId,
personId = personId ?? 0L,
accessUserId = accessUserId ?? 0L,
search = !string.IsNullOrWhiteSpace(search) ? $"%{search}%" : (string?)null,
classification,
documentType,
@@ -360,16 +365,20 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
}
}
public async Task<List<MedicalTag>> GetPersonTagsAsync(long personId)
public async Task<List<MedicalTag>> GetPersonTagsAsync(long? personId = null, long? accessUserId = null)
{
try
{
var personFilter = personId.HasValue
? "d.person_id = @personId"
: "d.person_id IN (SELECT person_id FROM app.medical_people_access WHERE user_id = @accessUserId)";
return await db.ExecuteListReaderAsync(
@"SELECT DISTINCT t.id, t.name, t.created_at
$@"SELECT DISTINCT t.id, t.name, t.created_at
FROM app.medical_tags t
JOIN app.medical_document_tags dt ON dt.tag_id = t.id
JOIN app.medical_documents d ON dt.document_id = d.id
WHERE d.person_id = @personId
WHERE {personFilter}
ORDER BY t.name",
reader => new MedicalTag
{
@@ -377,7 +386,7 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
Name = reader.GetString(1),
CreatedAt = reader.GetDateTime(2)
},
new { personId });
new { personId = personId ?? 0L, accessUserId = accessUserId ?? 0L });
}
catch (Exception ex)
{
@@ -497,39 +506,45 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
// --- Doctors ---
public async Task<List<MedicalDoctor>> GetDoctorsAsync()
public async Task<List<MedicalDoctor>> GetDoctorsAsync(long? personId = null, long? accessUserId = null)
{
try
{
var personFilter = personId.HasValue
? "person_id = @personId"
: "person_id IN (SELECT person_id FROM app.medical_people_access WHERE user_id = @accessUserId)";
return await db.ExecuteListReaderAsync(
"SELECT id, name, specialty, phone, address, notes, created_at, updated_at FROM app.medical_doctors ORDER BY name",
$"SELECT id, person_id, name, specialty, phone, address, notes, created_at, updated_at FROM app.medical_doctors WHERE {personFilter} ORDER BY name",
reader => new MedicalDoctor
{
Id = reader.GetInt64(0),
Name = reader.GetString(1),
Specialty = reader.IsDBNull(2) ? null : reader.GetString(2),
Phone = reader.IsDBNull(3) ? null : reader.GetString(3),
Address = reader.IsDBNull(4) ? null : reader.GetString(4),
Notes = reader.IsDBNull(5) ? null : reader.GetString(5),
CreatedAt = reader.GetDateTime(6),
UpdatedAt = reader.GetDateTime(7)
});
PersonId = reader.GetInt64(1),
Name = reader.GetString(2),
Specialty = reader.IsDBNull(3) ? null : reader.GetString(3),
Phone = reader.IsDBNull(4) ? null : reader.GetString(4),
Address = reader.IsDBNull(5) ? null : reader.GetString(5),
Notes = reader.IsDBNull(6) ? null : reader.GetString(6),
CreatedAt = reader.GetDateTime(7),
UpdatedAt = reader.GetDateTime(8)
},
new { personId = personId ?? 0L, accessUserId = accessUserId ?? 0L });
}
catch (Exception ex)
{
logger.LogError(ex, "Failed to get doctors");
logger.LogError(ex, "Failed to get doctors for person {PersonId}", personId);
return [];
}
}
public async Task<MedicalDoctor?> CreateDoctorAsync(string name, string? specialty = null, string? phone = null, string? address = null, string? notes = null)
public async Task<MedicalDoctor?> CreateDoctorAsync(long personId, string name, string? specialty = null, string? phone = null, string? address = null, string? notes = null)
{
try
{
var now = DateTime.UtcNow;
return await db.ExecuteReaderAsync(
@"INSERT INTO app.medical_doctors (name, specialty, phone, address, notes, created_at, updated_at)
VALUES (@name, @specialty, @phone, @address, @notes, @createdAt, @updatedAt)
@"INSERT INTO app.medical_doctors (person_id, name, specialty, phone, address, notes, created_at, updated_at)
VALUES (@personId, @name, @specialty, @phone, @address, @notes, @createdAt, @updatedAt)
RETURNING id, name, specialty, phone, address, notes, created_at, updated_at",
reader => new MedicalDoctor
{
@@ -542,11 +557,11 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
CreatedAt = reader.GetDateTime(6),
UpdatedAt = reader.GetDateTime(7)
},
new { name, specialty, phone, address, notes, createdAt = now, updatedAt = now });
new { personId, name, specialty, phone, address, notes, createdAt = now, updatedAt = now });
}
catch (Exception ex)
{
logger.LogError(ex, "Failed to create doctor");
logger.LogError(ex, "Failed to create doctor for person {PersonId}", personId);
return null;
}
}
@@ -610,12 +625,16 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
// --- Conditions ---
public async Task<List<MedicalCondition>> GetConditionsAsync(long personId)
public async Task<List<MedicalCondition>> GetConditionsAsync(long? personId = null, long? accessUserId = null)
{
try
{
var personFilter = personId.HasValue
? "person_id = @personId"
: "person_id IN (SELECT person_id FROM app.medical_people_access WHERE user_id = @accessUserId)";
return await db.ExecuteListReaderAsync(
"SELECT id, person_id, name, diagnosed_date, notes, is_active, created_at, updated_at FROM app.medical_conditions WHERE person_id = @personId ORDER BY name",
$"SELECT id, person_id, name, diagnosed_date, notes, is_active, created_at, updated_at FROM app.medical_conditions WHERE {personFilter} ORDER BY name",
reader => new MedicalCondition
{
Id = reader.GetInt64(0),
@@ -627,7 +646,7 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
CreatedAt = reader.GetDateTime(6),
UpdatedAt = reader.GetDateTime(7)
},
new { personId });
new { personId = personId ?? 0L, accessUserId = accessUserId ?? 0L });
}
catch (Exception ex)
{
@@ -698,17 +717,21 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
// --- Prescriptions ---
public async Task<List<MedicalPrescription>> GetPrescriptionsAsync(long personId)
public async Task<List<MedicalPrescription>> GetPrescriptionsAsync(long? personId = null, long? accessUserId = null)
{
try
{
var personFilter = personId.HasValue
? "p.person_id = @personId"
: "p.person_id IN (SELECT person_id FROM app.medical_people_access WHERE user_id = @accessUserId)";
return await db.ExecuteListReaderAsync(
@"SELECT p.id, p.person_id, p.doctor_id, p.medication_name, p.dosage, p.frequency, p.is_active, p.start_date, p.end_date, p.notes, p.created_at, p.updated_at, p.rx_number,
$@"SELECT p.id, p.person_id, p.doctor_id, p.medication_name, p.dosage, p.frequency, p.is_active, p.start_date, p.end_date, p.notes, p.created_at, p.updated_at, p.rx_number,
d.name AS doctor_name,
(SELECT MAX(pk.pickup_date) FROM app.medical_prescription_pickups pk WHERE pk.prescription_id = p.id) AS last_pickup
FROM app.medical_prescriptions p
LEFT JOIN app.medical_doctors d ON p.doctor_id = d.id
WHERE p.person_id = @personId
WHERE {personFilter}
ORDER BY p.medication_name",
reader => new MedicalPrescription
{
@@ -728,7 +751,7 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
DoctorName = reader.IsDBNull(13) ? null : reader.GetString(13),
LastPickupDate = reader.IsDBNull(14) ? null : reader.GetDateTime(14)
},
new { personId });
new { personId = personId ?? 0L, accessUserId = accessUserId ?? 0L });
}
catch (Exception ex)
{
@@ -990,12 +1013,13 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
}
}
public async Task<MedicalDoctor?> FindOrCreateDoctorByNameAsync(string doctorName)
public async Task<MedicalDoctor?> FindOrCreateDoctorByNameAsync(long personId, string doctorName, MedicalAiService aiService)
{
try
{
// Step 1: Exact match
var existing = await db.ExecuteReaderAsync(
"SELECT id, name, specialty, phone, address, notes, created_at, updated_at FROM app.medical_doctors WHERE LOWER(name) = LOWER(@name) LIMIT 1",
"SELECT id, name, specialty, phone, address, notes, created_at, updated_at FROM app.medical_doctors WHERE person_id = @personId AND LOWER(name) = LOWER(@name) LIMIT 1",
reader => new MedicalDoctor
{
Id = reader.GetInt64(0),
@@ -1007,15 +1031,29 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
CreatedAt = reader.GetDateTime(6),
UpdatedAt = reader.GetDateTime(7)
},
new { name = doctorName });
new { personId, name = doctorName });
if (existing != null) return existing;
return await CreateDoctorAsync(doctorName);
// Step 2: AI fuzzy match
var allDoctors = await GetDoctorsAsync(personId);
if (allDoctors.Count > 0)
{
var existingNames = allDoctors.Select(d => d.Name).ToList();
var matchedName = await aiService.FuzzyMatchDoctorAsync(doctorName, existingNames);
if (matchedName != null)
{
var matched = allDoctors.FirstOrDefault(d => string.Equals(d.Name, matchedName, StringComparison.OrdinalIgnoreCase));
if (matched != null) return matched;
}
}
// Step 3: Create new
return await CreateDoctorAsync(personId, doctorName);
}
catch (Exception ex)
{
logger.LogError(ex, "Failed to find or create doctor by name \"{DoctorName}\"", doctorName);
logger.LogError(ex, "Failed to find or create doctor by name \"{DoctorName}\" for person {PersonId}", doctorName, personId);
return null;
}
}
@@ -1032,7 +1070,7 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
var docName = rxInfo.DoctorName ?? doctorName;
if (!string.IsNullOrWhiteSpace(docName))
{
var doctor = await FindOrCreateDoctorByNameAsync(docName.Trim());
var doctor = await FindOrCreateDoctorByNameAsync(personId, docName.Trim(), aiService);
doctorId = doctor?.Id;
}
@@ -1198,18 +1236,22 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
// --- Billing Providers ---
public async Task<List<MedicalBillingProvider>> GetProvidersAsync(long personId)
public async Task<List<MedicalBillingProvider>> GetProvidersAsync(long? personId = null, long? accessUserId = null)
{
try
{
var personFilter = personId.HasValue
? "p.person_id = @personId"
: "p.person_id IN (SELECT person_id FROM app.medical_people_access WHERE user_id = @accessUserId)";
return await db.ExecuteListReaderAsync(
@"SELECT p.id, p.name, p.person_id, p.notes, p.created_at, p.updated_at,
$@"SELECT p.id, p.name, p.person_id, p.notes, p.created_at, p.updated_at,
COALESCE(SUM(b.total_amount), 0) AS total_charged,
COALESCE((SELECT SUM(pp.amount) FROM app.medical_provider_payments pp WHERE pp.provider_id = p.id), 0) AS total_paid,
COUNT(DISTINCT b.id) AS bill_count
FROM app.medical_billing_providers p
LEFT JOIN app.medical_bills b ON b.provider_id = p.id
WHERE p.person_id = @personId
WHERE {personFilter}
GROUP BY p.id, p.name, p.person_id, p.notes, p.created_at, p.updated_at
ORDER BY p.name",
reader => new MedicalBillingProvider
@@ -1224,7 +1266,7 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
TotalPaid = reader.GetDecimal(7),
BillCount = reader.GetInt32(8)
},
new { personId });
new { personId = personId ?? 0L, accessUserId = accessUserId ?? 0L });
}
catch (Exception ex)
{
@@ -1480,10 +1522,13 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
// --- Bills ---
public async Task<List<MedicalBill>> GetBillsAsync(long personId, long? providerId = null)
public async Task<List<MedicalBill>> GetBillsAsync(long? personId = null, long? providerId = null, long? accessUserId = null)
{
try
{
var personFilter = personId.HasValue
? "b.person_id = @personId"
: "b.person_id IN (SELECT person_id FROM app.medical_people_access WHERE user_id = @accessUserId)";
var providerFilter = providerId.HasValue ? "AND b.provider_id = @providerId" : "";
var query = $@"SELECT b.id, b.person_id, b.total_amount, b.summary, b.category, b.bill_date, b.doctor_id, b.provider_id, b.source, b.created_at, b.updated_at,
@@ -1496,10 +1541,10 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
FROM app.medical_bills b
LEFT JOIN app.medical_doctors d ON b.doctor_id = d.id
LEFT JOIN app.medical_billing_providers bp ON b.provider_id = bp.id
WHERE b.person_id = @personId {providerFilter}
WHERE {personFilter} {providerFilter}
ORDER BY b.bill_date DESC NULLS LAST, b.created_at DESC";
return await db.ExecuteListReaderAsync(query, MapBill, new { personId, providerId });
return await db.ExecuteListReaderAsync(query, MapBill, new { personId = personId ?? 0L, accessUserId = accessUserId ?? 0L, providerId });
}
catch (Exception ex)
{
@@ -1619,26 +1664,34 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
// --- Bill Summary ---
public async Task<BillSummary> GetBillSummaryAsync(long personId)
public async Task<BillSummary> GetBillSummaryAsync(long? personId = null, long? accessUserId = null)
{
try
{
var personFilter = personId.HasValue
? "b.person_id = @personId"
: "b.person_id IN (SELECT person_id FROM app.medical_people_access WHERE user_id = @accessUserId)";
var providerPersonFilter = personId.HasValue
? "prov.person_id = @personId"
: "prov.person_id IN (SELECT person_id FROM app.medical_people_access WHERE user_id = @accessUserId)";
var filterParams = new { personId = personId ?? 0L, accessUserId = accessUserId ?? 0L };
var totals = await db.ExecuteReaderAsync(
@"SELECT COALESCE(SUM(b.total_amount), 0),
$@"SELECT COALESCE(SUM(b.total_amount), 0),
COALESCE((SELECT SUM(pp.amount) FROM app.medical_provider_payments pp
JOIN app.medical_billing_providers prov ON pp.provider_id = prov.id
WHERE prov.person_id = @personId), 0)
WHERE {providerPersonFilter}), 0)
FROM app.medical_bills b
WHERE b.person_id = @personId",
WHERE {personFilter}",
reader => new { Charged = reader.GetDecimal(0), TotalPaid = reader.GetDecimal(1) },
new { personId });
filterParams);
var byYear = await db.ExecuteListReaderAsync(
@"SELECT EXTRACT(YEAR FROM COALESCE(b.bill_date, b.created_at))::int AS year,
$@"SELECT EXTRACT(YEAR FROM COALESCE(b.bill_date, b.created_at))::int AS year,
SUM(b.total_amount),
COUNT(b.id)
FROM app.medical_bills b
WHERE b.person_id = @personId
WHERE {personFilter}
GROUP BY EXTRACT(YEAR FROM COALESCE(b.bill_date, b.created_at))::int
ORDER BY year DESC",
reader => new YearBreakdown
@@ -1647,15 +1700,15 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
Total = reader.GetDecimal(1),
Count = reader.GetInt32(2)
},
new { personId });
filterParams);
var byProvider = await db.ExecuteListReaderAsync(
@"SELECT COALESCE(prov.name, 'Unassigned'),
$@"SELECT COALESCE(prov.name, 'Unassigned'),
COALESCE(SUM(b.total_amount), 0),
COUNT(b.id)
FROM app.medical_bills b
LEFT JOIN app.medical_billing_providers prov ON b.provider_id = prov.id
WHERE b.person_id = @personId
WHERE {personFilter}
GROUP BY COALESCE(prov.name, 'Unassigned')
ORDER BY COALESCE(SUM(b.total_amount), 0) DESC",
reader => new ProviderBreakdown
@@ -1664,7 +1717,7 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
Total = reader.GetDecimal(1),
Count = reader.GetInt32(2)
},
new { personId });
filterParams);
var charged = totals?.Charged ?? 0;
var totalPaid = totals?.TotalPaid ?? 0;
@@ -2284,30 +2337,34 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
// --- Timeline ---
public async Task<List<TimelineEvent>> GetTimelineAsync(long personId, int offset = 0, int limit = 100)
public async Task<List<TimelineEvent>> GetTimelineAsync(long? personId = null, long? accessUserId = null, int offset = 0, int limit = 100)
{
try
{
var personFilter = personId.HasValue
? "= @personId"
: "IN (SELECT person_id FROM app.medical_people_access WHERE user_id = @accessUserId)";
return await db.ExecuteListReaderAsync(
@"SELECT event_type, id, label, detail, sub_type, event_date, doctor_id, created_at
$@"SELECT event_type, id, person_id, label, detail, sub_type, event_date, doctor_id, created_at
FROM (
SELECT 'document' AS event_type, d.id, COALESCE(d.title, d.file_name) AS label, d.description AS detail,
SELECT 'document' AS event_type, d.id, d.person_id, COALESCE(d.title, d.file_name) AS label, d.description AS detail,
d.classification AS sub_type, d.document_date AS event_date, d.doctor_id, d.created_at
FROM app.medical_documents d WHERE d.person_id = @personId
FROM app.medical_documents d WHERE d.person_id {personFilter}
UNION ALL
SELECT 'condition', c.id, c.name, c.notes,
SELECT 'condition', c.id, c.person_id, c.name, c.notes,
CASE WHEN c.is_active THEN 'active' ELSE 'resolved' END, c.diagnosed_date, NULL, c.created_at
FROM app.medical_conditions c WHERE c.person_id = @personId
FROM app.medical_conditions c WHERE c.person_id {personFilter}
UNION ALL
SELECT 'prescription', p.id, p.medication_name, CONCAT_WS(' - ', p.dosage, p.frequency),
SELECT 'prescription', p.id, p.person_id, p.medication_name, CONCAT_WS(' - ', p.dosage, p.frequency),
CASE WHEN p.is_active THEN 'active' ELSE 'ended' END, p.start_date, p.doctor_id, p.created_at
FROM app.medical_prescriptions p WHERE p.person_id = @personId
FROM app.medical_prescriptions p WHERE p.person_id {personFilter}
UNION ALL
SELECT 'bill', b.id, b.summary, bp.name,
SELECT 'bill', b.id, b.person_id, b.summary, bp.name,
b.category, b.bill_date, b.doctor_id, b.created_at
FROM app.medical_bills b
LEFT JOIN app.medical_billing_providers bp ON b.provider_id = bp.id
WHERE b.person_id = @personId
WHERE b.person_id {personFilter}
) AS timeline
ORDER BY COALESCE(event_date, created_at) DESC
LIMIT @limit OFFSET @offset",
@@ -2315,14 +2372,15 @@ public class MedicalDocsService(DbExecutor db, IWebHostEnvironment environment,
{
EventType = reader.GetString(0),
Id = reader.GetInt64(1),
Label = reader.IsDBNull(2) ? null : reader.GetString(2),
Detail = reader.IsDBNull(3) ? null : reader.GetString(3),
SubType = reader.IsDBNull(4) ? null : reader.GetString(4),
EventDate = reader.IsDBNull(5) ? null : reader.GetDateTime(5),
DoctorId = reader.IsDBNull(6) ? null : reader.GetInt64(6),
CreatedAt = reader.GetDateTime(7)
PersonId = reader.GetInt64(2),
Label = reader.IsDBNull(3) ? null : reader.GetString(3),
Detail = reader.IsDBNull(4) ? null : reader.GetString(4),
SubType = reader.IsDBNull(5) ? null : reader.GetString(5),
EventDate = reader.IsDBNull(6) ? null : reader.GetDateTime(6),
DoctorId = reader.IsDBNull(7) ? null : reader.GetInt64(7),
CreatedAt = reader.GetDateTime(8)
},
new { personId, limit, offset });
new { personId = personId ?? 0L, accessUserId = accessUserId ?? 0L, limit, offset });
}
catch (Exception ex)
{
Media.JoshHeaps.Net/wwwroot/css/medical-docs.css
+20
View File
@@ -1527,6 +1527,26 @@
line-height: 1.6;
}
/* ======================== */
/* All-mode (read-only) */
/* ======================== */
.all-mode .add-form-toggle { display: none; }
.all-mode .add-form-collapsible { display: none; }
.person-badge {
display: inline-block;
padding: 1px 7px;
background: var(--accent-primary);
color: #fff;
border-radius: 10px;
font-size: 10px;
font-weight: 600;
letter-spacing: 0.3px;
vertical-align: middle;
margin-right: 4px;
}
/* ======================== */
/* Responsive (<=768px) */
/* ======================== */
Media.JoshHeaps.Net/wwwroot/js/medical-docs/bills.js
+21 -16
View File
@@ -4,11 +4,10 @@
// --- Providers ---
app.loadBills = async function () {
if (!state.selectedPersonId) return;
const personParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const [providersRes, summaryRes] = await Promise.all([
fetch(`${app.API}/providers?personId=${state.selectedPersonId}`),
fetch(`${app.API}/bills/summary?personId=${state.selectedPersonId}`)
fetch(`${app.API}/providers${personParam}`),
fetch(`${app.API}/bills/summary${personParam}`)
]);
if (providersRes.ok) {
@@ -78,7 +77,8 @@
if (!container) return;
// Fetch unassigned bills
const unassignedRes = await fetch(`${app.API}/bills?personId=${state.selectedPersonId}`);
const unassignedBillParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const unassignedRes = await fetch(`${app.API}/bills${unassignedBillParam}`);
let unassignedBills = [];
if (unassignedRes.ok) {
const allBills = await unassignedRes.json();
@@ -99,7 +99,7 @@
<div class="prescription-info">
<div class="prescription-name">
<span class="expand-btn" id="provider-expand-${p.id}">&#9654;</span>
${app.escapeHtml(p.name)}
${app.personBadge(p.personId)}${app.escapeHtml(p.name)}
<span class="bill-status ${statusClass}">${statusLabel}</span>
</div>
<div class="prescription-meta">
@@ -164,8 +164,9 @@
const section = document.getElementById(`provider-details-${providerId}`);
if (!section) return;
const billsParam = state.selectedPersonId ? `personId=${state.selectedPersonId}&` : '';
const [billsRes, paymentsRes] = await Promise.all([
fetch(`${app.API}/bills?personId=${state.selectedPersonId}&providerId=${providerId}`),
fetch(`${app.API}/bills?${billsParam}providerId=${providerId}`),
fetch(`${app.API}/providers/${providerId}/payments`)
]);
@@ -213,7 +214,7 @@
${docNames ? `<div style="margin-left:18px;">${docNames}</div>` : ''}
<div id="bill-charges-${b.id}" style="display:none;margin-left:18px;margin-top:4px;">
<div class="charges-header">Charges</div>
<div class="pickup-form">
<div class="pickup-form" ${showForms}>
<div class="inline-form-row">
<input type="text" id="chargeDesc-${b.id}" placeholder="Description *" class="form-input" />
<input type="number" id="chargeAmount-${b.id}" placeholder="Amount *" class="form-input" step="0.01" min="0.01" />
@@ -221,8 +222,8 @@
</div>
</div>
<div class="charge-list" id="chargeList-${b.id}"></div>
<div class="section-divider"></div>
<div class="pickup-form">
<div class="section-divider" ${showForms}></div>
<div class="pickup-form" ${showForms}>
<div class="inline-form-row">
<select id="linkDoc-${b.id}" class="form-input">
<option value="">Link document...</option>
@@ -248,10 +249,11 @@
</div>`;
}).join('');
const showForms = state.selectedPersonId ? '' : 'style="display:none"';
section.innerHTML = `
<div class="charges-section">
<div class="charges-header">Bills</div>
<div class="pickup-form">
<div class="pickup-form" ${showForms}>
<div class="inline-form-row">
<input type="number" id="newBillAmount-${providerId}" placeholder="Amount *" class="form-input" step="0.01" min="0.01" />
<input type="text" id="newBillSummary-${providerId}" placeholder="Summary" class="form-input" />
@@ -265,7 +267,7 @@
<div class="section-divider"></div>
<div class="payments-section">
<div class="charges-header">Payments</div>
<div class="pickup-form">
<div class="pickup-form" ${showForms}>
<div class="inline-form-row">
<input type="number" id="provPayAmount-${providerId}" placeholder="Amount *" class="form-input" step="0.01" min="0.01" />
<input type="date" id="provPayDate-${providerId}" class="form-input" title="Payment date" />
@@ -281,7 +283,8 @@
const section = document.getElementById('provider-details-unassigned');
if (!section) return;
const res = await fetch(`${app.API}/bills?personId=${state.selectedPersonId}`);
const unassignedParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const res = await fetch(`${app.API}/bills${unassignedParam}`);
if (!res.ok) return;
const allBills = await res.json();
const bills = allBills.filter(b => !b.providerId);
@@ -531,7 +534,8 @@
if (!providerId) { alert('Select a provider'); return; }
// Get current bill details first
const getRes = await fetch(`${app.API}/bills?personId=${state.selectedPersonId}`);
const assignParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const getRes = await fetch(`${app.API}/bills${assignParam}`);
if (!getRes.ok) return;
const allBills = await getRes.json();
const bill = allBills.find(b => b.id === billId);
@@ -561,9 +565,10 @@
app.refreshProvider = async function (providerId) {
// Refresh the summary and provider header, then reload details
const refreshParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const [providersRes, summaryRes] = await Promise.all([
fetch(`${app.API}/providers?personId=${state.selectedPersonId}`),
fetch(`${app.API}/bills/summary?personId=${state.selectedPersonId}`)
fetch(`${app.API}/providers${refreshParam}`),
fetch(`${app.API}/bills/summary${refreshParam}`)
]);
if (providersRes.ok) {
Media.JoshHeaps.Net/wwwroot/js/medical-docs/conditions.js
+5 -4
View File
@@ -2,8 +2,8 @@
const { state } = app;
app.loadConditions = async function () {
if (!state.selectedPersonId) return;
const res = await fetch(`${app.API}/conditions?personId=${state.selectedPersonId}`);
const personParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const res = await fetch(`${app.API}/conditions${personParam}`);
if (!res.ok) return;
const conditions = await res.json();
app.renderConditions(conditions);
@@ -24,7 +24,7 @@
: '<span class="badge-inactive">Inactive</span>';
return `<div class="condition-item" id="condition-${c.id}">
<div class="condition-info">
<div class="condition-name">${app.escapeHtml(c.name)} ${statusBadge}</div>
<div class="condition-name">${app.personBadge(c.personId)}${app.escapeHtml(c.name)} ${statusBadge}</div>
${meta.length ? `<div class="condition-meta">${meta.join(' &middot; ')}</div>` : ''}
${c.notes ? `<div class="condition-meta">${app.escapeHtml(c.notes)}</div>` : ''}
</div>
@@ -64,7 +64,8 @@
};
app.toggleConditionActive = async function (id, isActive) {
const res = await fetch(`${app.API}/conditions?personId=${state.selectedPersonId}`);
const toggleParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const res = await fetch(`${app.API}/conditions${toggleParam}`);
if (!res.ok) return;
const conditions = await res.json();
const condition = conditions.find(c => c.id === id);
Media.JoshHeaps.Net/wwwroot/js/medical-docs/doctors.js
+4 -2
View File
@@ -2,7 +2,8 @@
const { state } = app;
app.loadDoctors = async function () {
const res = await fetch(`${app.API}/doctors`);
const personParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const res = await fetch(`${app.API}/doctors${personParam}`);
if (!res.ok) return;
state.doctors = await res.json();
app.renderDoctors();
@@ -26,7 +27,7 @@
return `<div class="doctor-card-wrapper" id="doctor-wrapper-${doc.id}">
<div class="doctor-card" id="doctor-${doc.id}">
<div class="doctor-info">
<div class="doctor-name">${app.escapeHtml(doc.name)}</div>
<div class="doctor-name">${app.personBadge(doc.personId)}${app.escapeHtml(doc.name)}</div>
<div class="doctor-details">${details.map(d => app.escapeHtml(d)).join(' &middot; ')}</div>
${doc.notes ? `<div class="doctor-notes">${app.escapeHtml(doc.notes)}</div>` : ''}
</div>
@@ -68,6 +69,7 @@
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
personId: state.selectedPersonId,
name,
specialty: document.getElementById('newDoctorSpecialty').value.trim() || null,
phone: document.getElementById('newDoctorPhone').value.trim() || null,
Media.JoshHeaps.Net/wwwroot/js/medical-docs/documents.js
+6 -8
View File
@@ -5,7 +5,7 @@
app.buildFilterQuery = function () {
const params = new URLSearchParams();
params.set('personId', state.selectedPersonId);
if (state.selectedPersonId) params.set('personId', state.selectedPersonId);
const search = document.getElementById('filterSearch').value.trim();
if (search) params.set('search', search);
@@ -47,8 +47,8 @@
};
app.loadFilterTags = async function () {
if (!state.selectedPersonId) return;
const res = await fetch(`${app.API}/tags?personId=${state.selectedPersonId}`);
const personParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const res = await fetch(`${app.API}/tags${personParam}`);
if (!res.ok) return;
const tags = await res.json();
const select = document.getElementById('filterTag');
@@ -59,8 +59,8 @@
};
app.loadFilterConditions = async function () {
if (!state.selectedPersonId) return;
const res = await fetch(`${app.API}/conditions?personId=${state.selectedPersonId}`);
const personParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const res = await fetch(`${app.API}/conditions${personParam}`);
if (!res.ok) return;
const conditions = await res.json();
const select = document.getElementById('filterCondition');
@@ -93,8 +93,6 @@
// --- Documents ---
app.loadDocuments = async function () {
if (!state.selectedPersonId) return;
const query = app.buildFilterQuery();
const res = await fetch(`${app.API}/documents/search?${query}`);
if (!res.ok) return;
@@ -172,7 +170,7 @@
<div class="doc-info">
<div class="doc-title">
<span class="expand-btn" id="doc-expand-${doc.id}">&#9654;</span>
${app.escapeHtml(displayTitle)}
${app.personBadge(doc.personId)}${app.escapeHtml(displayTitle)}
</div>
<div class="doc-meta">
<span>${meta.join(' &middot; ')}</span>
Media.JoshHeaps.Net/wwwroot/js/medical-docs/init.js
+2 -4
View File
@@ -1,7 +1,6 @@
(function (app) {
document.addEventListener('DOMContentLoaded', async function () {
await app.loadPeople();
await app.loadDoctors();
// Add person
document.getElementById('addPersonBtn').addEventListener('click', () => app.addPerson());
@@ -49,8 +48,7 @@
document.getElementById(id).addEventListener('change', () => app.loadDocuments());
});
// Default state
app.switchMainTab('doctors');
app.updateTabStates();
// Default: load all-persons view
app.selectAll();
});
})(MedDocs);
Media.JoshHeaps.Net/wwwroot/js/medical-docs/people.js
+32 -1
View File
@@ -10,7 +10,10 @@
app.renderPeople = function () {
const container = document.getElementById('peopleList');
container.innerHTML = state.people.map(p =>
const allPill = `<div class="person-pill-row">
<button class="person-pill ${!state.selectedPersonId ? 'active' : ''}" onclick="medDocsSelectAll()">All</button>
</div>`;
container.innerHTML = allPill + state.people.map(p =>
`<div class="person-pill-row">
<button class="person-pill ${p.id === state.selectedPersonId ? 'active' : ''}" onclick="medDocsSelectPerson(${p.id})">${app.escapeHtml(p.name)}</button>
<button class="person-share-btn" onclick="medDocsOpenShareModal(${p.id}, event)" title="Share access">
@@ -47,6 +50,7 @@
state.selectedPersonId = personId;
app.renderPeople();
document.querySelector('.medical-main').classList.remove('all-mode');
document.getElementById('summaryCards').style.display = '';
document.getElementById('filterBar').style.display = '';
app.updateTabStates();
@@ -58,6 +62,32 @@
app.populateFilterDoctorDropdown();
app.loadDocuments();
app.loadDoctors();
app.loadConditions();
app.loadPrescriptions();
app.loadBills();
app.loadTimeline();
app.switchMainTab('documents');
};
app.selectAll = function () {
state.selectedPersonId = null;
app.renderPeople();
document.querySelector('.medical-main').classList.add('all-mode');
document.getElementById('summaryCards').style.display = '';
document.getElementById('filterBar').style.display = '';
app.updateTabStates();
app.clearFilters(false);
app.loadFilterTags();
app.loadFilterConditions();
app.populateFilterDoctorDropdown();
app.loadDocuments();
app.loadDoctors();
app.loadConditions();
app.loadPrescriptions();
app.loadBills();
@@ -144,6 +174,7 @@
};
window.medDocsSelectPerson = (id) => app.selectPerson(id);
window.medDocsSelectAll = () => app.selectAll();
window.medDocsOpenShareModal = (id, event) => app.openShareModal(id, event);
window.medDocsCloseShareModal = (event) => app.closeShareModal(event);
window.medDocsGrantAccess = () => app.grantAccess();
Media.JoshHeaps.Net/wwwroot/js/medical-docs/prescriptions.js
+5 -5
View File
@@ -2,8 +2,8 @@
const { state } = app;
app.loadPrescriptions = async function () {
if (!state.selectedPersonId) return;
const res = await fetch(`${app.API}/prescriptions?personId=${state.selectedPersonId}`);
const personParam = state.selectedPersonId ? `?personId=${state.selectedPersonId}` : '';
const res = await fetch(`${app.API}/prescriptions${personParam}`);
if (!res.ok) return;
const prescriptions = await res.json();
state.currentPrescriptions = prescriptions;
@@ -33,7 +33,7 @@
<div class="prescription-info">
<div class="prescription-name">
<span class="expand-btn" id="expand-${rx.id}">&#9654;</span>
${app.escapeHtml(rx.medicationName)} ${statusBadge}
${app.personBadge(rx.personId)}${app.escapeHtml(rx.medicationName)} ${statusBadge}
</div>
<div class="prescription-meta">${meta.map(m => app.escapeHtml(m)).join(' &middot; ')}</div>
<div class="prescription-meta">Last pickup: ${app.escapeHtml(lastPickup)}</div>
@@ -44,7 +44,7 @@
</div>
</div>
<div class="pickup-section" id="pickups-${rx.id}" style="display: none;">
<div class="pickup-form">
${state.selectedPersonId ? `<div class="pickup-form">
<div class="inline-form-row">
<input type="date" id="pickupDate-${rx.id}" class="form-input" title="Pickup date" />
<input type="text" id="pickupQty-${rx.id}" placeholder="Quantity" class="form-input" />
@@ -52,7 +52,7 @@
<input type="number" id="pickupCost-${rx.id}" placeholder="Cost" class="form-input" step="0.01" />
<button class="btn btn-primary btn-sm" onclick="medDocsAddPickup(${rx.id})">Log Pickup</button>
</div>
</div>
</div>` : ''}
<div class="pickup-list" id="pickupList-${rx.id}"></div>
</div>
</div>`;
Media.JoshHeaps.Net/wwwroot/js/medical-docs/state.js
+6
View File
@@ -73,5 +73,11 @@ window.MedDocs = {
updateSummaryCount(id, count) {
const el = document.getElementById(id);
if (el) el.textContent = count;
},
personBadge(personId) {
if (this.state.selectedPersonId) return '';
const person = this.state.people.find(p => p.id === personId);
return person ? `<span class="person-badge">${this.escapeHtml(person.name)}</span>` : '';
}
};
Media.JoshHeaps.Net/wwwroot/js/medical-docs/tabs.js
+1 -11
View File
@@ -2,8 +2,6 @@
const { state } = app;
app.switchMainTab = function (tabName) {
if (!state.selectedPersonId && tabName !== 'doctors') return;
state.activeTab = tabName;
document.querySelectorAll('.main-tab').forEach(btn => {
@@ -32,16 +30,8 @@
};
app.updateTabStates = function () {
var personTabs = ['documents', 'conditions', 'prescriptions', 'bills', 'timeline'];
personTabs.forEach(function (tab) {
var btn = document.querySelector('.main-tab[data-tab="' + tab + '"]');
if (btn) {
if (state.selectedPersonId) {
document.querySelectorAll('.main-tab.disabled').forEach(function (btn) {
btn.classList.remove('disabled');
} else {
btn.classList.add('disabled');
}
}
});
};
Media.JoshHeaps.Net/wwwroot/js/medical-docs/timeline.js
+5 -7
View File
@@ -21,12 +21,11 @@
};
app.loadTimeline = async function () {
if (!state.selectedPersonId) return;
state.timelineOffset = 0;
state.timelineEvents = [];
var res = await fetch(app.API + '/timeline?personId=' + state.selectedPersonId + '&offset=0&limit=' + TIMELINE_LIMIT);
var personParam = state.selectedPersonId ? 'personId=' + state.selectedPersonId + '&' : '';
var res = await fetch(app.API + '/timeline?' + personParam + 'offset=0&limit=' + TIMELINE_LIMIT);
if (!res.ok) return;
var events = await res.json();
@@ -39,9 +38,8 @@
};
app.loadMoreTimeline = async function () {
if (!state.selectedPersonId) return;
var res = await fetch(app.API + '/timeline?personId=' + state.selectedPersonId + '&offset=' + state.timelineOffset + '&limit=' + TIMELINE_LIMIT);
var morePersonParam = state.selectedPersonId ? 'personId=' + state.selectedPersonId + '&' : '';
var res = await fetch(app.API + '/timeline?' + morePersonParam + 'offset=' + state.timelineOffset + '&limit=' + TIMELINE_LIMIT);
if (!res.ok) return;
var events = await res.json();
@@ -90,7 +88,7 @@
+ '<div class="timeline-icon">' + icon + '</div>'
+ '<div class="timeline-content">'
+ '<div class="timeline-date">' + dateStr + ' ' + typeBadge + ' ' + subBadge + '</div>'
+ '<div class="timeline-label">' + app.escapeHtml(ev.label || 'Untitled') + '</div>'
+ '<div class="timeline-label">' + app.personBadge(ev.personId) + app.escapeHtml(ev.label || 'Untitled') + '</div>'
+ detail
+ '</div>'
+ '</div>';