Skip to content

Fix: 'Only' Procedure Filter #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luke-Schreiber wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix: 'Only' Procedure Filter #418

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51eb9df
'Only' procedure fix
Luke-Schreiber Jun 19, 2025
0339f5e
Clean-up, commenting
Luke-Schreiber Jul 1, 2025
d32245d
Current store logic
Luke-Schreiber Jul 3, 2025
8f61caa
Occasionally make one surgery
Luke-Schreiber Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions frontend/src/Components/Utilities/LeftToolBox/LeftToolBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,20 @@ function LeftToolBox() {
const procedureFetch = await fetch(`${import.meta.env.VITE_QUERY_URL}get_procedure_counts`);
const procedureInput = await procedureFetch.json() as { result: { procedureName: string, procedureCodes: string[], count: number, overlapList: { [key: string]: number } }[] };

// Process the result into the data type required.
const result = procedureInput.result.map((procedure) => {
const procedureOverlapList = Object.keys(procedure.overlapList).map((subProcedureName) => ({
procedureName: subProcedureName,
count: procedure.overlapList[subProcedureName],
codes: procedureInput.result.find((p) => p.procedureName === subProcedureName)?.procedureCodes || [],
}));
// For each procedure, create a ProcedureEntry object
const procedures = procedureInput.result.map((procedure) => {
// Overlap List (Co-occurences of procedures)
const procedureOverlapList = Object.keys(procedure.overlapList).map((subProcedureName) => {
// Strip "Only " prefix for lookup
const baseSubProcedureName = subProcedureName.startsWith('Only ') ? subProcedureName.replace(/^Only\s+/, '') : subProcedureName;
return {
procedureName: subProcedureName,
count: procedure.overlapList[subProcedureName],
// Access the codes for this sub-procedure by looking up the procedure's codes for that name
codes: procedureInput.result.find((p) => p.procedureName === baseSubProcedureName)?.procedureCodes || [],
};
});
// Sort the co-occurrence list by count, and prioritize "Only" procedures
procedureOverlapList.sort((a, b) => {
if (a.procedureName.includes('Only')) {
return -1;
Expand All @@ -40,15 +47,17 @@ function LeftToolBox() {

return b.count - a.count;
});
// Return the ProcedureEntry object
return {
procedureName: procedure.procedureName,
count: procedure.count,
codes: procedure.procedureCodes,
overlapList: procedureOverlapList,
};
});
const tempSurgeryList: ProcedureEntry[] = result;
let tempMaxCaseCount = (max(result, (d) => d.count)) || 0;

const tempSurgeryList: ProcedureEntry[] = procedures;
let tempMaxCaseCount = (max(procedures, (d) => d.count)) || 0;

tempMaxCaseCount *= 1.1;
setMaxCaseCount(tempMaxCaseCount);
Expand Down