From 038c3df2038cda370b72d7f8b1bc2a8423bbba4a Mon Sep 17 00:00:00 2001 From: Dan Heslinga Date: Fri, 6 Dec 2024 20:40:33 -1000 Subject: [PATCH] update --- .gitignore | 7 +- .../psa-female/Patient/psa-female.json | 6 ++ .../psa-follow-up-1-year-overdue.json | 6 ++ .../psa-follow-up-1-year.json | 6 ++ .../psa-more-than-2-years.json | 6 ++ .../psa-no-psa/psa-no-psa.json | 6 ++ .../psa-too-young/psa-too-young.json | 6 ++ .../psa-within-2-years.json | 6 ++ .../tests-psa-female-bundle.json | 2 +- .../tests-psa-follow-up-1-year-bundle.json | 2 +- ...s-psa-follow-up-1-year-overdue-bundle.json | 2 +- .../tests-psa-more-than-2-years-bundle.json | 2 +- .../tests-psa-no-psa-bundle.json | 2 +- .../tests-psa-too-young-bundle.json | 2 +- .../tests-psa-within-2-years-bundle.json | 2 +- .../collections/tc_col_maintenance.json | 6 +- thunder-tests/collections/tc_col_misc.json | 73 +++++++++++++++++-- thunder-tests/collections/tc_col_tests.json | 17 ++--- .../environments/tc_env_ig-walkthrough.json | 22 ------ .../environments/tc_env_local-env.json | 10 +++ 20 files changed, 142 insertions(+), 49 deletions(-) delete mode 100644 thunder-tests/environments/tc_env_ig-walkthrough.json create mode 100644 thunder-tests/environments/tc_env_local-env.json diff --git a/.gitignore b/.gitignore index 81bf9a0..9f1cc81 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,9 @@ Thumbs.db *.bak /input-cache /thunder-tests/thunderActivity.json -/bundles \ No newline at end of file +/bundles +*bundle.json +Group-* + +# secrets # +.env \ No newline at end of file diff --git a/input/tests/PlanDefinition/PSARecommendation/psa-female/Patient/psa-female.json b/input/tests/PlanDefinition/PSARecommendation/psa-female/Patient/psa-female.json index 5a61bdd..afbdd37 100644 --- a/input/tests/PlanDefinition/PSARecommendation/psa-female/Patient/psa-female.json +++ b/input/tests/PlanDefinition/PSARecommendation/psa-female/Patient/psa-female.json @@ -1,6 +1,12 @@ { "resourceType": "Patient", "id": "psa-female", + "identifier": [ + { + "system": "http://example.org/psa-screening", + "value": "female" + } + ], "text": { "status": "generated", "div": "
Test patient for PSA tracking.
Age: 60
" diff --git a/input/tests/PlanDefinition/PSARecommendation/psa-follow-up-1-year-overdue/psa-follow-up-1-year-overdue.json b/input/tests/PlanDefinition/PSARecommendation/psa-follow-up-1-year-overdue/psa-follow-up-1-year-overdue.json index 7c2b63d..fa4b3c3 100644 --- a/input/tests/PlanDefinition/PSARecommendation/psa-follow-up-1-year-overdue/psa-follow-up-1-year-overdue.json +++ b/input/tests/PlanDefinition/PSARecommendation/psa-follow-up-1-year-overdue/psa-follow-up-1-year-overdue.json @@ -1,6 +1,12 @@ { "resourceType": "Patient", "id": "psa-follow-up-1-year-overdue", + "identifier": [ + { + "system": "http://example.org/psa-screening", + "value": "follow-up-1-year-overdue" + } + ], "extension": [ { "url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex", diff --git a/input/tests/PlanDefinition/PSARecommendation/psa-follow-up-1-year/psa-follow-up-1-year.json b/input/tests/PlanDefinition/PSARecommendation/psa-follow-up-1-year/psa-follow-up-1-year.json index 5319ef5..509b97d 100644 --- a/input/tests/PlanDefinition/PSARecommendation/psa-follow-up-1-year/psa-follow-up-1-year.json +++ b/input/tests/PlanDefinition/PSARecommendation/psa-follow-up-1-year/psa-follow-up-1-year.json @@ -1,6 +1,12 @@ { "resourceType": "Patient", "id": "psa-follow-up-1-year", + "identifier": [ + { + "system": "http://example.org/psa-screening", + "value": "follow-up-1-year" + } + ], "extension": [ { "url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex", diff --git a/input/tests/PlanDefinition/PSARecommendation/psa-more-than-2-years/psa-more-than-2-years.json b/input/tests/PlanDefinition/PSARecommendation/psa-more-than-2-years/psa-more-than-2-years.json index 9a299f3..4413090 100644 --- a/input/tests/PlanDefinition/PSARecommendation/psa-more-than-2-years/psa-more-than-2-years.json +++ b/input/tests/PlanDefinition/PSARecommendation/psa-more-than-2-years/psa-more-than-2-years.json @@ -1,6 +1,12 @@ { "resourceType": "Patient", "id": "psa-more-than-2-years", + "identifier": [ + { + "system": "http://example.org/psa-screening", + "value": "more-than-2-years" + } + ], "extension": [ { "url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex", diff --git a/input/tests/PlanDefinition/PSARecommendation/psa-no-psa/psa-no-psa.json b/input/tests/PlanDefinition/PSARecommendation/psa-no-psa/psa-no-psa.json index df7ab93..8070714 100644 --- a/input/tests/PlanDefinition/PSARecommendation/psa-no-psa/psa-no-psa.json +++ b/input/tests/PlanDefinition/PSARecommendation/psa-no-psa/psa-no-psa.json @@ -1,6 +1,12 @@ { "resourceType": "Patient", "id": "psa-no-psa", + "identifier": [ + { + "system": "http://example.org/psa-screening", + "value": "no-psa" + } + ], "extension": [ { "url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex", diff --git a/input/tests/PlanDefinition/PSARecommendation/psa-too-young/psa-too-young.json b/input/tests/PlanDefinition/PSARecommendation/psa-too-young/psa-too-young.json index 0d403da..a43c170 100644 --- a/input/tests/PlanDefinition/PSARecommendation/psa-too-young/psa-too-young.json +++ b/input/tests/PlanDefinition/PSARecommendation/psa-too-young/psa-too-young.json @@ -1,6 +1,12 @@ { "resourceType": "Patient", "id": "psa-too-young", + "identifier": [ + { + "system": "http://example.org/psa-screening", + "value": "too-young" + } + ], "extension": [ { "url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex", diff --git a/input/tests/PlanDefinition/PSARecommendation/psa-within-2-years/psa-within-2-years.json b/input/tests/PlanDefinition/PSARecommendation/psa-within-2-years/psa-within-2-years.json index 40f77a4..5a3fcc1 100644 --- a/input/tests/PlanDefinition/PSARecommendation/psa-within-2-years/psa-within-2-years.json +++ b/input/tests/PlanDefinition/PSARecommendation/psa-within-2-years/psa-within-2-years.json @@ -1,6 +1,12 @@ { "resourceType": "Patient", "id": "psa-within-2-years", + "identifier": [ + { + "system": "http://example.org/psa-screening", + "value": "within-2-years" + } + ], "extension": [ { "url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex", diff --git a/input/tests/PlanDefinition/PSARecommendation/tests-psa-female-bundle.json b/input/tests/PlanDefinition/PSARecommendation/tests-psa-female-bundle.json index 018f14c..890c9de 100644 --- a/input/tests/PlanDefinition/PSARecommendation/tests-psa-female-bundle.json +++ b/input/tests/PlanDefinition/PSARecommendation/tests-psa-female-bundle.json @@ -1 +1 @@ -{"resourceType":"Bundle","id":"tests-psa-female-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Patient","id":"psa-female","text":{"status":"generated","div":"
Test patient for PSA tracking.
Age: 60
"},"extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"F"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"Female born 1964-05-31. Many values will be null. No action. "}],"active":true,"name":[{"use":"official","family":"Everywoman","given":["Eve"]}],"gender":"female","birthDate":"1964-05-31"},"request":{"method":"PUT","url":"Patient/psa-female"}}]} \ No newline at end of file +{"resourceType":"Bundle","id":"tests-psa-female-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Patient","id":"psa-female","text":{"status":"generated","div":"
Test patient for PSA tracking.
Age: 60
"},"extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"F"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"Female born 1964-05-31. Many values will be null. No action. "}],"identifier":[{"system":"http://example.org/psa-screening","value":"female"}],"active":true,"name":[{"use":"official","family":"Everywoman","given":["Eve"]}],"gender":"female","birthDate":"1964-05-31"},"request":{"method":"PUT","url":"Patient/psa-female"}}]} \ No newline at end of file diff --git a/input/tests/PlanDefinition/PSARecommendation/tests-psa-follow-up-1-year-bundle.json b/input/tests/PlanDefinition/PSARecommendation/tests-psa-follow-up-1-year-bundle.json index d9cf1b2..9580c47 100644 --- a/input/tests/PlanDefinition/PSARecommendation/tests-psa-follow-up-1-year-bundle.json +++ b/input/tests/PlanDefinition/PSARecommendation/tests-psa-follow-up-1-year-bundle.json @@ -1 +1 @@ -{"resourceType":"Bundle","id":"tests-psa-follow-up-1-year-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Observation","id":"psa-follow-up-1-year-lab","status":"final","category":[{"coding":[{"system":"http://terminology.hl7.org/CodeSystem/observation-category","code":"laboratory"}]}],"code":{"coding":[{"system":"http://loinc.org","code":"2857-1","display":"Prostate specific Ag [Mass/volume] in Serum or Plasma"}],"text":"PSA"},"subject":{"reference":"Patient/psa-follow-up-1-year","display":"Ferd Berfel"},"effectiveDateTime":"2023-08-31","performer":[{"reference":"Organization/clinical-labs-hawaii"}],"valueQuantity":{"value":0.9,"unit":"ng/mL","system":"http://unitsofmeasure.org","code":"ng/mL"},"referenceRange":[{"text":"0-4.5 ng/mL"}]},"request":{"method":"PUT","url":"Observation/psa-follow-up-1-year-lab"}},{"resource":{"resourceType":"Observation","id":"psa-follow-up-1-year-follow-up","status":"final","code":{"coding":[{"system":"http://loinc.org","code":"21979-0","display":"Planned/next follow-up"}]},"subject":{"reference":"Patient/psa-follow-up-1-year"},"valueQuantity":{"value":1,"unit":"years","system":"http://unitsofmeasure.org","code":"a"}},"request":{"method":"PUT","url":"Observation/psa-follow-up-1-year-follow-up"}},{"resource":{"resourceType":"Patient","id":"psa-follow-up-1-year","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 71 y.o. man whose last PSA was 2023-08-31 and follow-up interval is one year. So the most recent PSA is exactly one year ago. He tests as not due and receives no reminder."}],"active":true,"name":[{"use":"official","family":"Berfel","given":["Ferd"]}],"gender":"male","birthDate":"1953-05-05"},"request":{"method":"PUT","url":"Patient/psa-follow-up-1-year"}}]} \ No newline at end of file +{"resourceType":"Bundle","id":"tests-psa-follow-up-1-year-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Observation","id":"psa-follow-up-1-year-lab","status":"final","category":[{"coding":[{"system":"http://terminology.hl7.org/CodeSystem/observation-category","code":"laboratory"}]}],"code":{"coding":[{"system":"http://loinc.org","code":"2857-1","display":"Prostate specific Ag [Mass/volume] in Serum or Plasma"}],"text":"PSA"},"subject":{"reference":"Patient/psa-follow-up-1-year","display":"Ferd Berfel"},"effectiveDateTime":"2023-08-31","performer":[{"reference":"Organization/clinical-labs-hawaii"}],"valueQuantity":{"value":0.9,"unit":"ng/mL","system":"http://unitsofmeasure.org","code":"ng/mL"},"referenceRange":[{"text":"0-4.5 ng/mL"}]},"request":{"method":"PUT","url":"Observation/psa-follow-up-1-year-lab"}},{"resource":{"resourceType":"Observation","id":"psa-follow-up-1-year-follow-up","status":"final","code":{"coding":[{"system":"http://loinc.org","code":"21979-0","display":"Planned/next follow-up"}]},"subject":{"reference":"Patient/psa-follow-up-1-year"},"valueQuantity":{"value":1,"unit":"years","system":"http://unitsofmeasure.org","code":"a"}},"request":{"method":"PUT","url":"Observation/psa-follow-up-1-year-follow-up"}},{"resource":{"resourceType":"Patient","id":"psa-follow-up-1-year","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 71 y.o. man whose last PSA was 2023-08-31 and follow-up interval is one year. So the most recent PSA is exactly one year ago. He tests as not due and receives no reminder."}],"identifier":[{"system":"http://example.org/psa-screening","value":"follow-up-1-year"}],"active":true,"name":[{"use":"official","family":"Berfel","given":["Ferd"]}],"gender":"male","birthDate":"1953-05-05"},"request":{"method":"PUT","url":"Patient/psa-follow-up-1-year"}}]} \ No newline at end of file diff --git a/input/tests/PlanDefinition/PSARecommendation/tests-psa-follow-up-1-year-overdue-bundle.json b/input/tests/PlanDefinition/PSARecommendation/tests-psa-follow-up-1-year-overdue-bundle.json index 806b717..d542b47 100644 --- a/input/tests/PlanDefinition/PSARecommendation/tests-psa-follow-up-1-year-overdue-bundle.json +++ b/input/tests/PlanDefinition/PSARecommendation/tests-psa-follow-up-1-year-overdue-bundle.json @@ -1 +1 @@ -{"resourceType":"Bundle","id":"tests-psa-follow-up-1-year-overdue-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Observation","id":"psa-follow-up-1-year-overdue-lab","status":"final","category":[{"coding":[{"system":"http://terminology.hl7.org/CodeSystem/observation-category","code":"laboratory"}]}],"code":{"coding":[{"system":"http://loinc.org","code":"2857-1","display":"Prostate specific Ag [Mass/volume] in Serum or Plasma"}],"text":"PSA"},"subject":{"reference":"Patient/psa-follow-up-1-year-overdue","display":"Ferd Berfel"},"effectiveDateTime":"2023-08-30","performer":[{"reference":"Organization/clinical-labs-hawaii"}],"valueQuantity":{"value":0.9,"unit":"ng/mL","system":"http://unitsofmeasure.org","code":"ng/mL"},"referenceRange":[{"text":"0-4.5 ng/mL"}]},"request":{"method":"PUT","url":"Observation/psa-follow-up-1-year-overdue-lab"}},{"resource":{"resourceType":"Observation","id":"psa-follow-up-1-year-overdue-follow-up","status":"final","code":{"coding":[{"system":"http://loinc.org","code":"21979-0","display":"Planned/next follow-up"}]},"subject":{"reference":"Patient/psa-follow-up-1-year-overdue"},"valueQuantity":{"value":1,"unit":"years","system":"http://unitsofmeasure.org","code":"a"}},"request":{"method":"PUT","url":"Observation/psa-follow-up-1-year-overdue-follow-up"}},{"resource":{"resourceType":"Patient","id":"psa-follow-up-1-year-overdue","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 71 y.o. man whose last PSA was 2023-08-30 and follow-up interval is one year. So the most recent PSA is one year and one day ago. He tests as due and receives a reminder for repeat PSA."}],"active":true,"name":[{"use":"official","family":"Berfel","given":["Ferd"]}],"gender":"male","birthDate":"1953-05-05"},"request":{"method":"PUT","url":"Patient/psa-follow-up-1-year-overdue"}}]} \ No newline at end of file +{"resourceType":"Bundle","id":"tests-psa-follow-up-1-year-overdue-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Observation","id":"psa-follow-up-1-year-overdue-lab","status":"final","category":[{"coding":[{"system":"http://terminology.hl7.org/CodeSystem/observation-category","code":"laboratory"}]}],"code":{"coding":[{"system":"http://loinc.org","code":"2857-1","display":"Prostate specific Ag [Mass/volume] in Serum or Plasma"}],"text":"PSA"},"subject":{"reference":"Patient/psa-follow-up-1-year-overdue","display":"Ferd Berfel"},"effectiveDateTime":"2023-08-30","performer":[{"reference":"Organization/clinical-labs-hawaii"}],"valueQuantity":{"value":0.9,"unit":"ng/mL","system":"http://unitsofmeasure.org","code":"ng/mL"},"referenceRange":[{"text":"0-4.5 ng/mL"}]},"request":{"method":"PUT","url":"Observation/psa-follow-up-1-year-overdue-lab"}},{"resource":{"resourceType":"Observation","id":"psa-follow-up-1-year-overdue-follow-up","status":"final","code":{"coding":[{"system":"http://loinc.org","code":"21979-0","display":"Planned/next follow-up"}]},"subject":{"reference":"Patient/psa-follow-up-1-year-overdue"},"valueQuantity":{"value":1,"unit":"years","system":"http://unitsofmeasure.org","code":"a"}},"request":{"method":"PUT","url":"Observation/psa-follow-up-1-year-overdue-follow-up"}},{"resource":{"resourceType":"Patient","id":"psa-follow-up-1-year-overdue","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 71 y.o. man whose last PSA was 2023-08-30 and follow-up interval is one year. So the most recent PSA is one year and one day ago. He tests as due and receives a reminder for repeat PSA."}],"identifier":[{"system":"http://example.org/psa-screening","value":"follow-up-1-year-overdue"}],"active":true,"name":[{"use":"official","family":"Berfel","given":["Ferd"]}],"gender":"male","birthDate":"1953-05-05"},"request":{"method":"PUT","url":"Patient/psa-follow-up-1-year-overdue"}}]} \ No newline at end of file diff --git a/input/tests/PlanDefinition/PSARecommendation/tests-psa-more-than-2-years-bundle.json b/input/tests/PlanDefinition/PSARecommendation/tests-psa-more-than-2-years-bundle.json index 463dcc2..58bc22f 100644 --- a/input/tests/PlanDefinition/PSARecommendation/tests-psa-more-than-2-years-bundle.json +++ b/input/tests/PlanDefinition/PSARecommendation/tests-psa-more-than-2-years-bundle.json @@ -1 +1 @@ -{"resourceType":"Bundle","id":"tests-psa-more-than-2-years-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Observation","id":"psa-more-than-2-years-lab","status":"final","category":[{"coding":[{"system":"http://terminology.hl7.org/CodeSystem/observation-category","code":"laboratory"}]}],"code":{"coding":[{"system":"http://loinc.org","code":"2857-1","display":"Prostate specific Ag [Mass/volume] in Serum or Plasma"}],"text":"PSA"},"subject":{"reference":"Patient/psa-more-than-2-years","display":"Ferd Berfel"},"effectiveDateTime":"2022-08-30","performer":[{"reference":"Organization/clinical-labs-hawaii"}],"valueQuantity":{"value":0.9,"unit":"ng/mL","system":"http://unitsofmeasure.org","code":"ng/mL"},"referenceRange":[{"text":"0-4.5 ng/mL"}]},"request":{"method":"PUT","url":"Observation/psa-more-than-2-years-lab"}},{"resource":{"resourceType":"Observation","id":"psa-more-than-2-years-follow-up","status":"final","code":{"coding":[{"system":"http://loinc.org","code":"21979-0","display":"Planned/next follow-up"}]},"subject":{"reference":"Patient/psa-more-than-2-years"},"valueQuantity":{"value":2,"unit":"years","system":"http://unitsofmeasure.org","code":"a"}},"request":{"method":"PUT","url":"Observation/psa-more-than-2-years-follow-up"}},{"resource":{"resourceType":"Patient","id":"psa-more-than-2-years","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 71 y.o. man whose last PSA was 2022-08-30 and follow-up interval is the default two years. He is one day overdue. He should be flagged as due for PSA."}],"active":true,"name":[{"use":"official","family":"Berfel","given":["Ferd"]}],"gender":"male","birthDate":"1953-05-05"},"request":{"method":"PUT","url":"Patient/psa-more-than-2-years"}}]} \ No newline at end of file +{"resourceType":"Bundle","id":"tests-psa-more-than-2-years-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Observation","id":"psa-more-than-2-years-lab","status":"final","category":[{"coding":[{"system":"http://terminology.hl7.org/CodeSystem/observation-category","code":"laboratory"}]}],"code":{"coding":[{"system":"http://loinc.org","code":"2857-1","display":"Prostate specific Ag [Mass/volume] in Serum or Plasma"}],"text":"PSA"},"subject":{"reference":"Patient/psa-more-than-2-years","display":"Ferd Berfel"},"effectiveDateTime":"2022-08-30","performer":[{"reference":"Organization/clinical-labs-hawaii"}],"valueQuantity":{"value":0.9,"unit":"ng/mL","system":"http://unitsofmeasure.org","code":"ng/mL"},"referenceRange":[{"text":"0-4.5 ng/mL"}]},"request":{"method":"PUT","url":"Observation/psa-more-than-2-years-lab"}},{"resource":{"resourceType":"Observation","id":"psa-more-than-2-years-follow-up","status":"final","code":{"coding":[{"system":"http://loinc.org","code":"21979-0","display":"Planned/next follow-up"}]},"subject":{"reference":"Patient/psa-more-than-2-years"},"valueQuantity":{"value":2,"unit":"years","system":"http://unitsofmeasure.org","code":"a"}},"request":{"method":"PUT","url":"Observation/psa-more-than-2-years-follow-up"}},{"resource":{"resourceType":"Patient","id":"psa-more-than-2-years","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 71 y.o. man whose last PSA was 2022-08-30 and follow-up interval is the default two years. He is one day overdue. He should be flagged as due for PSA."}],"identifier":[{"system":"http://example.org/psa-screening","value":"more-than-2-years"}],"active":true,"name":[{"use":"official","family":"Berfel","given":["Ferd"]}],"gender":"male","birthDate":"1953-05-05"},"request":{"method":"PUT","url":"Patient/psa-more-than-2-years"}}]} \ No newline at end of file diff --git a/input/tests/PlanDefinition/PSARecommendation/tests-psa-no-psa-bundle.json b/input/tests/PlanDefinition/PSARecommendation/tests-psa-no-psa-bundle.json index d3fbb7e..52abba2 100644 --- a/input/tests/PlanDefinition/PSARecommendation/tests-psa-no-psa-bundle.json +++ b/input/tests/PlanDefinition/PSARecommendation/tests-psa-no-psa-bundle.json @@ -1 +1 @@ -{"resourceType":"Bundle","id":"tests-psa-no-psa-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Patient","id":"psa-no-psa","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 56 y.o. man has never had a PSA."}],"active":true,"name":[{"use":"official","family":"Dere","given":["Ben"]}],"gender":"male","birthDate":"1968-01-01"},"request":{"method":"PUT","url":"Patient/psa-no-psa"}}]} \ No newline at end of file +{"resourceType":"Bundle","id":"tests-psa-no-psa-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Patient","id":"psa-no-psa","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 56 y.o. man has never had a PSA."}],"identifier":[{"system":"http://example.org/psa-screening","value":"no-psa"}],"active":true,"name":[{"use":"official","family":"Dere","given":["Ben"]}],"gender":"male","birthDate":"1968-01-01"},"request":{"method":"PUT","url":"Patient/psa-no-psa"}}]} \ No newline at end of file diff --git a/input/tests/PlanDefinition/PSARecommendation/tests-psa-too-young-bundle.json b/input/tests/PlanDefinition/PSARecommendation/tests-psa-too-young-bundle.json index b334cee..c3d899f 100644 --- a/input/tests/PlanDefinition/PSARecommendation/tests-psa-too-young-bundle.json +++ b/input/tests/PlanDefinition/PSARecommendation/tests-psa-too-young-bundle.json @@ -1 +1 @@ -{"resourceType":"Bundle","id":"tests-psa-too-young-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Patient","id":"psa-too-young","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 30 y.o. man who is too young for screening. "}],"active":true,"name":[{"use":"official","family":"Everyman","given":["Dave"]}],"gender":"male","birthDate":"1994-05-31"},"request":{"method":"PUT","url":"Patient/psa-too-young"}}]} \ No newline at end of file +{"resourceType":"Bundle","id":"tests-psa-too-young-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Patient","id":"psa-too-young","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 30 y.o. man who is too young for screening. "}],"identifier":[{"system":"http://example.org/psa-screening","value":"too-young"}],"active":true,"name":[{"use":"official","family":"Everyman","given":["Dave"]}],"gender":"male","birthDate":"1994-05-31"},"request":{"method":"PUT","url":"Patient/psa-too-young"}}]} \ No newline at end of file diff --git a/input/tests/PlanDefinition/PSARecommendation/tests-psa-within-2-years-bundle.json b/input/tests/PlanDefinition/PSARecommendation/tests-psa-within-2-years-bundle.json index 302c8e9..b2acdef 100644 --- a/input/tests/PlanDefinition/PSARecommendation/tests-psa-within-2-years-bundle.json +++ b/input/tests/PlanDefinition/PSARecommendation/tests-psa-within-2-years-bundle.json @@ -1 +1 @@ -{"resourceType":"Bundle","id":"tests-psa-within-2-years-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Observation","id":"psa-within-2-years-lab11","status":"final","category":[{"coding":[{"system":"http://terminology.hl7.org/CodeSystem/observation-category","code":"laboratory"}]}],"code":{"coding":[{"system":"http://loinc.org","code":"2857-1","display":"Prostate specific Ag [Mass/volume] in Serum or Plasma"}],"text":"PSA"},"subject":{"reference":"Patient/psa-within-2-years","display":"Ferd Berfel"},"effectiveDateTime":"2022-08-31","performer":[{"reference":"Organization/clinical-labs-hawaii"}],"valueQuantity":{"value":0.9,"unit":"ng/mL","system":"http://unitsofmeasure.org","code":"ng/mL"},"referenceRange":[{"text":"0-4.5 ng/mL"}]},"request":{"method":"PUT","url":"Observation/psa-within-2-years-lab11"}},{"resource":{"resourceType":"Observation","id":"psa-within-2-years-follow-up","status":"final","code":{"coding":[{"system":"http://loinc.org","code":"21979-0","display":"Planned/next follow-up"}]},"subject":{"reference":"Patient/psa-within-2-years"},"valueQuantity":{"value":2,"unit":"years","system":"http://unitsofmeasure.org","code":"a"}},"request":{"method":"PUT","url":"Observation/psa-within-2-years-follow-up"}},{"resource":{"resourceType":"Patient","id":"psa-within-2-years","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 71 y.o. man whose last PSA was 2022-08-31 and follow-up interval is two years. In this case the personalized follow-up interval equals the default coded in the CQL."}],"active":true,"name":[{"use":"official","family":"Berfel","given":["Ferd"]}],"gender":"male","birthDate":"1953-05-05"},"request":{"method":"PUT","url":"Patient/psa-within-2-years"}}]} \ No newline at end of file +{"resourceType":"Bundle","id":"tests-psa-within-2-years-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Observation","id":"psa-within-2-years-lab11","status":"final","category":[{"coding":[{"system":"http://terminology.hl7.org/CodeSystem/observation-category","code":"laboratory"}]}],"code":{"coding":[{"system":"http://loinc.org","code":"2857-1","display":"Prostate specific Ag [Mass/volume] in Serum or Plasma"}],"text":"PSA"},"subject":{"reference":"Patient/psa-within-2-years","display":"Ferd Berfel"},"effectiveDateTime":"2022-08-31","performer":[{"reference":"Organization/clinical-labs-hawaii"}],"valueQuantity":{"value":0.9,"unit":"ng/mL","system":"http://unitsofmeasure.org","code":"ng/mL"},"referenceRange":[{"text":"0-4.5 ng/mL"}]},"request":{"method":"PUT","url":"Observation/psa-within-2-years-lab11"}},{"resource":{"resourceType":"Observation","id":"psa-within-2-years-follow-up","status":"final","code":{"coding":[{"system":"http://loinc.org","code":"21979-0","display":"Planned/next follow-up"}]},"subject":{"reference":"Patient/psa-within-2-years"},"valueQuantity":{"value":2,"unit":"years","system":"http://unitsofmeasure.org","code":"a"}},"request":{"method":"PUT","url":"Observation/psa-within-2-years-follow-up"}},{"resource":{"resourceType":"Patient","id":"psa-within-2-years","extension":[{"url":"http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex","valueCode":"M"},{"url":"http://example.org/fhir/StructureDefinition/patient-annotation","valueString":"With ReferenceDate of 2024-08-31 this is a 71 y.o. man whose last PSA was 2022-08-31 and follow-up interval is two years. In this case the personalized follow-up interval equals the default coded in the CQL."}],"identifier":[{"system":"http://example.org/psa-screening","value":"within-2-years"}],"active":true,"name":[{"use":"official","family":"Berfel","given":["Ferd"]}],"gender":"male","birthDate":"1953-05-05"},"request":{"method":"PUT","url":"Patient/psa-within-2-years"}}]} \ No newline at end of file diff --git a/thunder-tests/collections/tc_col_maintenance.json b/thunder-tests/collections/tc_col_maintenance.json index aa32e4b..935d432 100644 --- a/thunder-tests/collections/tc_col_maintenance.json +++ b/thunder-tests/collections/tc_col_maintenance.json @@ -36,10 +36,14 @@ { "name": "Content-Type", "value": "application/fhir+json" + }, + { + "name": "Authorization", + "value": "Basic {{HAPI_FHIR_AUTH}}" } ], "options": { - "baseUrl": "https://cds.hopena.info:8443/fhir/" + "baseUrl": "{{FHIR_SERVER_URL}}" } } } \ No newline at end of file diff --git a/thunder-tests/collections/tc_col_misc.json b/thunder-tests/collections/tc_col_misc.json index 4b84565..33bdf8d 100644 --- a/thunder-tests/collections/tc_col_misc.json +++ b/thunder-tests/collections/tc_col_misc.json @@ -9,17 +9,14 @@ { "name": "Content-Type", "value": "application/fhir+json" + }, + { + "name": "Authorization", + "value": "Basic {{HAPI_FHIR_AUTH}}" } ], - "auth": { - "type": "basic", - "basic": { - "username": "aequus", - "password": "AngryCuff2(" - } - }, "options": { - "baseUrl": "https://cds.hopena.info:8443/fhir/" + "baseUrl": "{{FHIR_SERVER_URL}}" } }, "requests": [ @@ -121,6 +118,66 @@ "created": "2024-11-28T16:19:01.411Z", "modified": "2024-11-28T16:24:11.778Z", "headers": [] + }, + { + "_id": "20d04e31-3c51-4abe-abd6-cfc6192d1c2f", + "colId": "496e7474-5e77-4b6a-bffd-c95a32f69333", + "containerId": "", + "name": "find test patient", + "url": "Patient/psa-female", + "method": "GET", + "sortNum": 70000, + "created": "2024-11-29T23:58:56.662Z", + "modified": "2024-11-30T00:15:15.193Z", + "headers": [] + }, + { + "_id": "463707c2-1e05-4537-9d03-872416cb3c6d", + "colId": "496e7474-5e77-4b6a-bffd-c95a32f69333", + "containerId": "", + "name": "find all test patients", + "url": "Patient?identifier=http://example.org/psa-screening|", + "method": "GET", + "sortNum": 80000, + "created": "2024-11-30T00:15:36.368Z", + "modified": "2024-11-30T00:18:18.692Z", + "headers": [], + "params": [ + { + "name": "identifier", + "value": "http://example.org/psa-screening|", + "isPath": false + } + ] + }, + { + "_id": "09a47352-12dd-475a-9e26-96b1ce6f1066", + "colId": "496e7474-5e77-4b6a-bffd-c95a32f69333", + "containerId": "", + "name": "display all PlanDefinitions", + "url": "PlanDefinition/", + "method": "GET", + "sortNum": 90000, + "created": "2024-12-02T01:22:37.615Z", + "modified": "2024-12-04T05:00:34.104Z", + "headers": [] + }, + { + "_id": "22016737-d11f-4fdf-9bc0-e268e1739e57", + "colId": "496e7474-5e77-4b6a-bffd-c95a32f69333", + "containerId": "", + "name": "update a PlanDefinition", + "url": "PlanDefinition/ColorectalCancerScreeningCDS", + "method": "PUT", + "sortNum": 100000, + "created": "2024-12-04T05:01:29.251Z", + "modified": "2024-12-04T05:02:20.059Z", + "headers": [], + "body": { + "type": "json", + "raw": "{\n \"resourceType\": \"PlanDefinition\",\n \"id\": \"ColorectalCancerScreeningCDS\",\n \"meta\": {\n \"versionId\": \"2\",\n \"lastUpdated\": \"2024-11-26T00:57:12.517+00:00\",\n \"source\": \"#3SoCvQAZyP0wGGF7\",\n \"profile\": [\n \"http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-recommendationdefinition\"\n ]\n },\n \"extension\": [\n {\n \"url\": \"http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability\",\n \"valueCode\": \"shareable\"\n },\n {\n \"url\": \"http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability\",\n \"valueCode\": \"computable\"\n },\n {\n \"url\": \"http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability\",\n \"valueCode\": \"executable\"\n },\n {\n \"url\": \"http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-knowledgeCapability\",\n \"valueCode\": \"publishable\"\n }\n ],\n \"name\": \"ColorectalCancerScreeningCDS\",\n \"title\": \"Colorectal cancer screening\",\n \"type\": {\n \"coding\": [\n {\n \"system\": \"http://terminology.hl7.org/CodeSystem/plan-definition-type\",\n \"code\": \"eca-rule\",\n \"display\": \"ECA Rule\"\n }\n ]\n },\n \"status\": \"active\",\n \"experimental\": true,\n \"date\": \"2019-05-15\",\n \"description\": \"The U.S. Preventive Services Task Force (2016) recommends screening for colorectal cancer starting at age 50 years and continuing until age 75 years. \",\n \"library\": [\n \"http://fhir.org/guides/cqf/ccc/Library/ColorectalCancerScreeningCDS\"\n ],\n \"action\": [\n {\n \"title\": \"Colorectal Cancer Screening\",\n \"description\": \"The U.S. Preventive Services Task Force (2016) recommends screening for colorectal cancer starting at age 50 years and continuing until age 75 years. This is a Grade A recommendation (U.S. Preventive Services Task Force, 2016).\",\n \"documentation\": [\n {\n \"type\": \"documentation\",\n \"display\": \"U.S. Preventive Services Task Force Final Recommendation Statement Colorectal Cancer: Screening\",\n \"url\": \"https://www.uspreventiveservicestaskforce.org/uspstf/recommendation/colorectal-cancer-screening\"\n }\n ],\n \"trigger\": [\n {\n \"type\": \"named-event\",\n \"name\": \"patient-view\"\n }\n ],\n \"condition\": [\n {\n \"kind\": \"applicability\",\n \"expression\": {\n \"language\": \"text/cql-identifier\",\n \"expression\": \"Is Recommendation Applicable\"\n }\n }\n ],\n \"selectionBehavior\": \"exactly-one\",\n \"dynamicValue\": [\n {\n \"path\": \"action.description\",\n \"expression\": {\n \"language\": \"text/cql-identifier\",\n \"expression\": \"Get Card Detail\"\n }\n },\n {\n \"path\": \"action.title\",\n \"expression\": {\n \"language\": \"text/cql-identifier\",\n \"expression\": \"Get Card Summary\"\n }\n },\n {\n \"path\": \"action.priority\",\n \"expression\": {\n \"language\": \"text/cql-identifier\",\n \"expression\": \"Get Card Indicator\"\n }\n }\n ],\n \"action\": [\n {\n \"description\": \"Will perform colorectal cancer screening\"\n },\n {\n \"description\": \"Will not perform colorectal cancer screening at this time - Snooze 1 month.\"\n },\n {\n \"description\": \"Will not perform colorectal cancer screening at this time - Snooze 12 months.\"\n },\n {\n \"description\": \"Will not perform colorectal cancer screening at this time - patient declined.\"\n }\n ]\n }\n ]\n }", + "form": [] + } } ] } \ No newline at end of file diff --git a/thunder-tests/collections/tc_col_tests.json b/thunder-tests/collections/tc_col_tests.json index c01aa07..6e97572 100644 --- a/thunder-tests/collections/tc_col_tests.json +++ b/thunder-tests/collections/tc_col_tests.json @@ -105,7 +105,7 @@ "method": "POST", "sortNum": 20000, "created": "2024-09-06T00:56:18.641Z", - "modified": "2024-11-28T20:24:19.252Z", + "modified": "2024-12-02T22:07:18.256Z", "headers": [ { "name": "Cache-Control", @@ -138,7 +138,7 @@ "", "let success = !containsOperationOutcome && !requestGroupWithAction;", "", - "tc.test(\"No OperationOutcome and no RequestGroup.actiont\", success);" + "tc.test(\"No OperationOutcome and no RequestGroup.action\", success);" ] } ] @@ -692,17 +692,14 @@ { "name": "Content-Type", "value": "application/fhir+json" + }, + { + "name": "Authorization", + "value": "Basic {{HAPI_FHIR_AUTH}}" } ], - "auth": { - "type": "basic", - "basic": { - "username": "aequus", - "password": "AngryCuff2(" - } - }, "options": { - "baseUrl": "https://cds.hopena.info:8443/fhir/" + "baseUrl": "{{FHIR_SERVER_URL}}" } } } \ No newline at end of file diff --git a/thunder-tests/environments/tc_env_ig-walkthrough.json b/thunder-tests/environments/tc_env_ig-walkthrough.json deleted file mode 100644 index b15df58..0000000 --- a/thunder-tests/environments/tc_env_ig-walkthrough.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "_id": "3be2c64b-b1bf-4c21-9851-9c0b3cc5c517", - "name": "IG Walkthrough", - "default": true, - "sortNum": 10000, - "created": "2022-10-04T14:11:30.733Z", - "modified": "2022-10-04T14:27:16.095Z", - "data": [ - { - "name": "CDSServer", - "value": "https://cloud.alphora.com/sandbox/r4/cds/" - }, - { - "name": "local (copy to CDSServer)", - "value": "http://localhost:8080/" - }, - { - "name": "public (copy to CDSServer)", - "value": "https://cloud.alphora.com/sandbox/r4/cds/" - } - ] -} \ No newline at end of file diff --git a/thunder-tests/environments/tc_env_local-env.json b/thunder-tests/environments/tc_env_local-env.json new file mode 100644 index 0000000..cd6358f --- /dev/null +++ b/thunder-tests/environments/tc_env_local-env.json @@ -0,0 +1,10 @@ +{ + "_id": "353986ee-374a-4787-bd70-5542e573b54f", + "name": "local env", + "default": true, + "sortNum": 20000, + "created": "2024-12-06T22:49:55.117Z", + "modified": "2024-12-06T22:49:55.117Z", + "data": [], + "envFile": "../.env" +} \ No newline at end of file