update

.gitignore

@@ -22,4 +22,9 @@ Thumbs.db
 *.bak
 /input-cache
 /thunder-tests/thunderActivity.json
-/bundles
+/bundles
+*bundle.json
+Group-*
+
+# secrets #
+.env

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": "<div xmlns=\"http://www.w3.org/1999/xhtml\">Test patient for PSA tracking.<br/>Age: 60</div>"

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",

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",

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",

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",

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",

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",

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":"<div xmlns=\"http://www.w3.org/1999/xhtml\">Test patient for PSA tracking.<br/>Age: 60</div>"},"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"}}]}
+{"resourceType":"Bundle","id":"tests-psa-female-bundle","type":"transaction","entry":[{"resource":{"resourceType":"Patient","id":"psa-female","text":{"status":"generated","div":"<div xmlns=\"http://www.w3.org/1999/xhtml\">Test patient for PSA tracking.<br/>Age: 60</div>"},"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"}}]}

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"}}]}
+{"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"}}]}

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"}}]}
+{"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"}}]}

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"}}]}
+{"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"}}]}

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"}}]}
+{"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"}}]}

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"}}]}
+{"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"}}]}