Skip to content

Subject group #113

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

Merged
lmd59 merged 3 commits into from
Sep 11, 2025
Merged

Subject group #113

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4763550
subjectGroup All evaluate option
lmd59 Sep 7, 2025
b85e0b9
Add subject group reference
lmd59 Sep 9, 2025
ba67962
Allow option for population/subjectGroup
lmd59 Sep 11, 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
51 changes: 38 additions & 13 deletions components/calculation/PopulationCalculation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import { useDisclosure } from '@mantine/hooks';
import { evaluationState } from '../../state/atoms/evaluation';
import { dataRequirementsLookupByType } from '../../state/selectors/dataRequirementsLookupByType';
import { minimizeTestCaseResources } from '../../util/ValueSetHelper';
import { v4 as uuidv4 } from 'uuid';

export default function PopulationCalculation() {
const router = useRouter();
Expand Down Expand Up @@ -186,13 +187,13 @@ export default function PopulationCalculation() {
message: `Successfully sent data for ${resolvedIds.length} patients for measure ${evaluationMeasureId}`, //TODO: update to canonical, currently using evaluationMeasureId here whereas it will be used for $submit-data in the future
color: 'green'
});
setSubjectData(
resolvedIds.map(idObj => {
return idObj
? { value: idObj.postedId, label: getPatientNameString(idObj.testCaseInfo.patient) }
: { value: '', label: '' };
})
);
const subjectData = resolvedIds.map(idObj => {
return idObj
? { value: idObj.postedId, label: getPatientNameString(idObj.testCaseInfo.patient) }
: { value: '', label: '' };
});
subjectData.unshift({ value: 'All', label: 'All' });
setSubjectData(subjectData);
setEnableEvaluateButton(true);
} else {
showNotification({
Expand Down Expand Up @@ -238,11 +239,35 @@ export default function PopulationCalculation() {
}
]
};
if (reportTypeValue === 'subject' && subjectValue) {
parameters.parameter?.push({
name: 'subject',
valueString: `Patient/${subjectValue}`
});
if (subjectValue) {
if (subjectValue === 'All') {
const groupId = uuidv4();
parameters.parameter?.push({
name: 'subjectGroup',
resource: {
resourceType: 'Group',
id: groupId,
type: 'person',
actual: true,
member: subjectData.slice(1).map(subjectInfo => {
return {
entity: {
reference: `Patient/${subjectInfo.value}`
}
};
})
}
});
parameters.parameter?.push({
name: 'subject',
valueString: `Group/${groupId}`
});
} else {
parameters.parameter?.push({
name: 'subject',
valueString: `Patient/${subjectValue}`
});
}
}
const response = await fetch(`${evaluationServiceUrl}/Measure/$evaluate`, {
method: 'POST',
Expand Down Expand Up @@ -522,8 +547,8 @@ export default function PopulationCalculation() {
data={subjectData}
value={subjectValue}
onChange={setSubjectValue}
disabled={reportTypeValue === 'population'}
searchable={true}
clearable
/>
</Center>
</Grid.Col>
Expand Down