Skip to content

add uris #125

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
avirgulto merged 5 commits into from
Jan 11, 2024
Merged

add uris #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5ec150
add uris
KeeyanGhoreshi Dec 15, 2023
5a32f61
change urls
KeeyanGhoreshi Dec 21, 2023
a49cc6c
delete unused function
KeeyanGhoreshi Jan 2, 2024
34bb7f5
Merge branch 'dev' into canonical-url
avirgulto Jan 11, 2024
08ba21e
Merge branch 'dev' into canonical-url
avirgulto Jan 11, 2024
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
1 change: 1 addition & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-AssessmentAndPlan.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resourceType": "Questionnaire",
"id": "assessment-and-plan",
"name": "Assessment and Plan Module",
"url": "http://hl7.org/fhir/Questionnaire/assessment-and-plan",
"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
1 change: 1 addition & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-Encounter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resourceType": "Questionnaire",
"id": "encounter",
"name": "Encounter Module",
"url": "http://hl7.org/fhir/Questionnaire/encounter",
"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
1 change: 1 addition & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-PatientInfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resourceType": "Questionnaire",
"id": "patient-info",
"name": "Patient Module",
"url": "http://hl7.org/fhir/Questionnaire/patient-info",
"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
1 change: 1 addition & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-PatientInfoBase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resourceType": "Questionnaire",
"id": "patient-info-base",
"name": "Base Patient Module",
"url": "http://hl7.org/fhir/Questionnaire/patient-info-base",
"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
1 change: 1 addition & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-PatientSignature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resourceType": "Questionnaire",
"id": "patient-signature",
"name": "Patient Signature",
"url": "http://hl7.org/fhir/Questionnaire/patient-signature",
"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
1 change: 1 addition & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-PhysicalExam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resourceType": "Questionnaire",
"id": "physical-exam",
"name": "Physican Exam Module",
"url": "http://hl7.org/fhir/Questionnaire/physical-exam",
"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
1 change: 1 addition & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-PractitionerInfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resourceType": "Questionnaire",
"id": "practitioner-info",
"name": "Practitioner Module",
"url": "http://hl7.org/fhir/Questionnaire/practitioner-info",
"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
1 change: 1 addition & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-PractitionerInfoBase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resourceType": "Questionnaire",
"id": "practitioner-info-base",
"name": "Base Practitioner Module",
"url": "http://hl7.org/fhir/Questionnaire/practitioner-info-base",
"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
2 changes: 2 additions & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-ProviderSignature.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"resourceType": "Questionnaire",
"id": "provider-signature",
"name": "Provider Signature",
"url": "http://hl7.org/fhir/Questionnaire/provider-signature",

"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
1 change: 1 addition & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-ReviewOfSystem.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"resourceType": "Questionnaire",
"id": "review-of-system",
"url": "http://hl7.org/fhir/Questionnaire/review-of-system",
"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
2 changes: 2 additions & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-Subjective.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"resourceType": "Questionnaire",
"id": "subjective",
"name": "Subjective Module",
"url": "http://hl7.org/fhir/Questionnaire/subjective",

"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
2 changes: 2 additions & 0 deletions src/cds-library/CRD-DTR/Shared/R4/resources/Questionnaire-R4-VitalSigns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"resourceType": "Questionnaire",
"id": "vital-signs",
"url": "http://hl7.org/fhir/Questionnaire/vital-signs",

"meta": {
"profile": [
"http://hl7.org/fhir/StructureDefinition/cqf-questionnaire",
Expand Down
12 changes: 6 additions & 6 deletions ...rary/CRD-DTR/TIRF/R4/resources/Questionnaire-R4-Prescriber-Knowledge-Assessment-TIRF.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"linkId": "1.1",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/practitioner-info-base"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/practitioner-info-base"
},
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire-expand",
"valueBoolean": true
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-collapsible",
"valueCode": "default-open"
}
],
"type": "display"
Expand Down Expand Up @@ -366,8 +366,8 @@
"linkId": "2.2",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/provider-signature"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/provider-signature"
}
],
"type": "display"
Expand Down
12 changes: 6 additions & 6 deletions src/cds-library/CRD-DTR/TIRF/R4/resources/Questionnaire-R4-PrescriberEnrollment-TIRF.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"linkId": "1.1",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/practitioner-info-base"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/practitioner-info-base"
},
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire-expand",
"valueBoolean": true
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-collapsible",
"valueCode": "default-open"
}
],
"type": "display"
Expand Down Expand Up @@ -413,8 +413,8 @@
"linkId": "4.2",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/provider-signature"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/provider-signature"
}
],
"type": "display"
Expand Down
16 changes: 8 additions & 8 deletions src/cds-library/CRD-DTR/TIRF/R4/resources/Questionnaire-R4-TIRF.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"linkId": "1.1",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/patient-info-base"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/patient-info-base"
},
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire-expand",
"valueBoolean": true
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-collapsible",
"valueCode": "default-open"
}
],
"type": "display"
Expand Down Expand Up @@ -277,8 +277,8 @@
"linkId": "3.2",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/patient-signature"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/patient-signature"
}
],
"type": "display"
Expand Down Expand Up @@ -842,8 +842,8 @@
"linkId": "7.2",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/provider-signature"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/provider-signature"
}
],
"type": "display"
Expand Down
4 changes: 2 additions & 2 deletions src/cds-library/CRD-DTR/Turalio/R4/resources/Questionnaire-R4-PrescriberEnrollment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,8 @@
"linkId": "4.2",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/provider-signature"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/provider-signature"
}
],
"type": "display"
Expand Down
24 changes: 12 additions & 12 deletions src/cds-library/CRD-DTR/Turalio/R4/resources/Questionnaire-R4-Turalio.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"linkId": "1.1",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/patient-info-base"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/patient-info-base"
},
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire-expand",
"valueBoolean": true
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-collapsible",
"valueCode": "default-open"
}
],
"type": "display"
Expand Down Expand Up @@ -325,12 +325,12 @@
"linkId": "2.1",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/practitioner-info-base"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/practitioner-info-base"
},
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire-expand",
"valueBoolean": true
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-collapsible",
"valueCode": "default-open"
}
],
"type": "display"
Expand Down Expand Up @@ -1137,8 +1137,8 @@
"linkId": "6.2",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/provider-signature"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/provider-signature"
}
],
"type": "display"
Expand All @@ -1160,8 +1160,8 @@
"linkId": "7.2",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/patient-signature"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/patient-signature"
}
],
"type": "display"
Expand Down
16 changes: 8 additions & 8 deletions src/cds-library/CRD-DTR/Turalio/R4/resources/Questionnaire-R4-TuralioProgressNote.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"linkId": "1",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/patient-info"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/patient-info"
}
],
"type": "display",
Expand All @@ -37,12 +37,12 @@
"linkId": "2",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/practitioner-info-base"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/practitioner-info-base"
},
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire-expand",
"valueBoolean": true
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-collapsible",
"valueCode": "default-open"
}
],
"type": "display",
Expand Down Expand Up @@ -504,8 +504,8 @@
"linkId": "5",
"extension": [
{
"url": "http://hl7.org/fhir/StructureDefinition/sub-questionnaire",
"valueCanonical": "questionnaire/provider-signature"
"url": "http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire",
"valueCanonical": "http://hl7.org/fhir/Questionnaire/provider-signature"
}
],
"type": "display",
Expand Down
21 changes: 9 additions & 12 deletions src/fhir/questionnaireUtilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,9 @@ export class QuestionnaireUtilities {
const returnValue = this.vsacCache.cacheLibrary(library);
return returnValue;
}
static async findQuestionnaire(id: string): Promise<Questionnaire | null | undefined> {
return await QuestionnaireModel.findOne({ id: id.toString() });

static async findQuestionnaireByUrl(url: string): Promise<Questionnaire | null | undefined> {
return await QuestionnaireModel.findOne({ url: url.toString() });
}
static async findLibraryByUrl(url: string): Promise<Library | null | undefined> {
return await LibraryModel.findOne({ url: url.toString() });
Expand Down Expand Up @@ -167,26 +168,22 @@ export class QuestionnaireUtilities {
) {
const ext = this.getExtension(
item,
'http://hl7.org/fhir/StructureDefinition/sub-questionnaire'
'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-subQuestionnaire'
);
if (ext) {
const subQ = ext.valueCanonical;
console.log(subQ);
if (subQ) {
// not undefind
let id = subQ;
const parts = subQ.split('/');
if (id.length > 1) {
id = parts[1];
}
// not undefined
let expandRootItem = false;
const expandExt = this.getExtension(
item,
'http://hl7.org/fhir/StructureDefinition/sub-questionnaire-expand'
'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-collapsible'
);
if (expandExt && expandExt.valueBoolean) {
expandRootItem = expandExt.valueBoolean;
expandRootItem = expandExt.valueCode === 'default-open';
}
const subQuestionnaire = await this.findQuestionnaire(id);
const subQuestionnaire = await this.findQuestionnaireByUrl(subQ);
if (subQuestionnaire) {
const subExtensions = subQuestionnaire.extension || [];
subExtensions.forEach(ext => {
Expand Down