Fixed issues around extension. (#12)

dhill · web-flow · commit ad01f4cc6657 · 2025-03-26T15:21:58.000-04:00
* Moved exp-params.json out of input/resources and into input directory.  Updated path in publication request.

* Suppressed messages related to release 5.2.0 that comes from dependencies.

* Got rid of union vs intersection error on value set.

* LL5571-6 is not yet in tx.fhir.org.

* Added an encounter to the examples.'

* Don't need the extension.

* Updated JIRA Spec file from the one posted to the JIRA Spec project.
diff --git a/FHIR-us-pacio-toc.xml b/FHIR-us-pacio-toc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/us/pacio-toc/STU1" ciUrl="https://build.fhir.org/ig/HL7/fhir-transitions-of-care-ig/" defaultVersion="1.0.0-ballot" defaultWorkgroup="pc" url="http://hl7.org/fhir/us/pacio-toc">
-<version code="current" url="https://build.fhir.org/ig/HL7/fhir-transitions-of-care-ig/"/>
-<version code="1.0.0-ballot" url="http://hl7.org/fhir/us/pacio-toc/STU1"/>
+<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/us/pacio-toc/2025May" ciUrl="https://build.fhir.org/ig/HL7/fhir-transitions-of-care-ig" defaultVersion="1.0.0-ballot" defaultWorkgroup="pc" url="http://hl7.org/fhir/us/pacio-toc" gitUrl="https://github.com/HL7/fhir-transitions-of-care-ig">
+<version code="current" url="https://build.fhir.org/ig/HL7/fhir-transitions-of-care-ig"/>
+<version code="1.0.0-ballot" url="http://hl7.org/fhir/us/pacio-toc/2025May"/>
 <artifactPageExtension value="-definitions"/>
 <artifactPageExtension value="-examples"/>
 <artifactPageExtension value="-mappings"/>
@@ -31,6 +31,7 @@
 <artifact id="Practitioner/Example-Phil-Chekhov" key="Practitioner-Example-Phil-Chekhov" name="Dr. Phil Chekhov"/>
 <artifact id="Practitioner/Example-Tracy-Count" key="Practitioner-Example-Tracy-Count" name="Dr. Tracy Count"/>
 <artifact id="Condition/BSJ-DressingConcern" key="Condition-BSJ-DressingConcern" name="Dressing Concerns"/>
+<artifact id="Encounter/BSJ-Encounter" key="Encounter-BSJ-Encounter" name="Encounter"/>
 <artifact id="Organization/org-Pharm-Everyday-Community-Pharm" key="Organization-org-Pharm-Everyday-Community-Pharm" name="Everyday Community Pharmacy Organization"/>
 <artifact id="Organization/org-SNF-Happy-Nursing-Facility" key="Organization-org-SNF-Happy-Nursing-Facility" name="Happy Nursing Facility Organization"/>
 <artifact id="Condition/BSJ-HeartDiseaseDiagnosis" key="Condition-BSJ-HeartDiseaseDiagnosis" name="Heart Disease Diagnosis"/>
@@ -69,7 +70,6 @@
 <artifact id="Condition/OT-ProblemList-Decondition" key="Condition-OT-ProblemList-Decondition" name="OT Decondition Problem List"/>
 <artifact id="Condition/OT-ProblemList-RightWeak" key="Condition-OT-ProblemList-RightWeak" name="OT Right Weakness Problem List"/>
 <artifact id="Patient/Example-Smith-Johnson-Patient1" key="Patient-Example-Smith-Johnson-Patient1" name="Patient - Betsy Smith-Johnson"/>
-<artifact id="StructureDefinition/toc-reason-extension" key="StructureDefinition-toc-reason-extension" name="Reason"/>
 <artifact id="PractitionerRole/Role-IMMD-AnitaChu" key="PractitionerRole-Role-IMMD-AnitaChu" name="Role of Dr. Anita Chu"/>
 <artifact id="PractitionerRole/Role-SNFDoc-GeraldPark" key="PractitionerRole-Role-SNFDoc-GeraldPark" name="Role of Dr. Gerald Park"/>
 <artifact id="PractitionerRole/Role-OT-JenCadbury" key="PractitionerRole-Role-OT-JenCadbury" name="Role of Dr. Jen Cadbury"/>
@@ -86,7 +86,6 @@
 <artifact id="ValueSet/toc-loinc-answered-by-LL5571-6-vs" key="ValueSet-toc-loinc-answered-by-LL5571-6-vs" name="Transitions of Care LOINC Terms Answered by LL5571-6 Answer List Value Set"/>
 <artifact id="ValueSet/toc-del-loinc-answered-by-LL5571-6-vs" key="ValueSet-toc-del-loinc-answered-by-LL5571-6-vs" name="Transitions of Care LOINC Terms Included in the DEL Answered by LL5571-6 Answer List Value Set"/>
 <artifact id="Condition/BSJ-UndressingConcern" key="Condition-BSJ-UndressingConcern" name="Undressing Concern"/>
-<artifact id="Parameters/exp-params" key="Parameters-exp-params" name="exp-params"/>
 <page key="NA" name="(NA)"/>
 <page key="many" name="(many)"/>
 <page key="downloads" name="Downloads"/>
diff --git a/input/exp-params.json b/input/exp-params.json
diff --git a/input/fsh/Extensions.fsh b/input/fsh/Extensions.fsh
@@ -1,16 +1,17 @@
-Extension: Reason
-Id: toc-reason-extension
-Title: "Reason"
-Description: "Captures the reason for doing something"
-Context: Composition
-* extension contains
-	Code 0..* MS and
-	Reference 0..* MS
-* extension[Code] ^short = "(USCDI) Coded reason the encounter takes place"
-* extension[Code].value[x] 1..1
-* extension[Code].value[x] only CodeableConcept
-* extension[Reference].value[x] 1..1
-* extension[Reference].value[x] only Reference
-* extension[Reference].valueReference only Reference($USCoreConditionProblemsandHealthConcerns or $USCoreConditionEncounterDiagnosis or 
-														$USCoreProcedure or Observation or ImmunizationRecommendation or 
-														$CCDAonFHIRDischargeSummary or $USCoreEncounter)
+// Extension: transition-of-care-reason
+// Id: TransitionOfCareReason
+// Title: "Transition of Care Reason"
+// Description: "Captures the reason for a transition of care"
+// Context: Composition, CarePlan
+// * extension contains
+// 	Code 0..* MS and
+// 	Reference 0..* MS
+// * extension[Code] ^short = "Coded reason the transition of care takes place with references"
+// * extension[Code].value[x] 1..1
+// * extension[Code].value[x] only CodeableConcept
+// * extension[Code].value[x] from http://hl7.org/fhir/ValueSet/encounter-reason (extensible)
+// * extension[Reference].value[x] 1..1
+// * extension[Reference].value[x] only Reference
+// * extension[Reference].valueReference only Reference($USCoreConditionProblemsandHealthConcerns or $USCoreConditionEncounterDiagnosis or 
+// 														$USCoreProcedure or Observation or ImmunizationRecommendation or 
+// 														$CCDAonFHIRDischargeSummary or $USCoreEncounter)
diff --git a/input/fsh/TOCComposition.fsh b/input/fsh/TOCComposition.fsh
@@ -136,15 +136,23 @@ Description: "This profile defines constraints that represent common administrat
 * section[reason_for_referral].title 1..1 MS
 * section[reason_for_referral].code 1..1 
 * section[reason_for_referral].code = $LOINC#42349-1 "Reason for referral (narrative)"
-* section[reason_for_referral].extension contains
-    toc-reason-extension named ReasonExtension 0..1
+* section[reason_for_referral].entry
+* section[reason_for_referral].entry only Reference($USCoreConditionProblemsandHealthConcerns or $USCoreConditionEncounterDiagnosis or 
+ 														$USCoreProcedure or Observation or ImmunizationRecommendation or 
+ 														$CCDAonFHIRDischargeSummary or $USCoreEncounter)
+// * section[reason_for_referral].extension contains
+//     transition-of-care-reason named ReasonExtension 0..1
 
 * section[reason_for_visit] ^short = "Reason for Visit (Ambulatory)"
 * section[reason_for_visit].title 1..1 MS
 * section[reason_for_visit].code 1..1 
 * section[reason_for_visit].code = $LOINC#29299-5 "Reason for visit Narrative"
-* section[reason_for_visit].extension contains
-    toc-reason-extension named ReasonExtension 0..1
+* section[reason_for_visit].entry
+* section[reason_for_visit].entry only Reference($USCoreConditionProblemsandHealthConcerns or $USCoreConditionEncounterDiagnosis or 
+ 														$USCoreProcedure or Observation or ImmunizationRecommendation or 
+ 														$CCDAonFHIRDischargeSummary or $USCoreEncounter)
+// * section[reason_for_visit].extension contains
+//     transition-of-care-reason named ReasonExtension 0..1
 
 * section[results] ^short = "Recent Test Results"
 * section[results].title 1..1 MS
diff --git a/input/fsh/alias.fsh b/input/fsh/alias.fsh
@@ -108,4 +108,5 @@ Alias: $pfe-category-cs = http://hl7.org/fhir/us/pacio-pfe/CodeSystem/pfe-catego
 Alias: $v2-0203 = http://terminology.hl7.org/CodeSystem/v2-0203
 Alias: $v3-NullFlavor = http://terminology.hl7.org/CodeSystem/v3-NullFlavor
 Alias: $v3-RoleCode = http://terminology.hl7.org/CodeSystem/v3-RoleCode
+Alias: $v3-ActCode = http://terminology.hl7.org/CodeSystem/v3-ActCode
 Alias: $taxonomy = http://nucc.org/provider-taxonomy
diff --git a/input/fsh/examples/BSJ-Bundle.fsh b/input/fsh/examples/BSJ-Bundle.fsh
@@ -19,6 +19,11 @@ Description: "Example Transition of Care bundle for fictional patient Betsy Smit
 * entry[+].resource = Example-Smith-Johnson-Patient1
 * entry[=].fullUrl = "http://www.example.org/fhir/Patient/Example-Smith-Johnson-Patient1"
 
+//-------------------------- Encounters ---------------------------
+
+* entry[+].resource = BSJ-Encounter
+* entry[=].fullUrl = "http://www.example.org/fhir/Encounter/BSJ-Encounter"
+
 //-------------------------- Allergies ---------------------------
 
 * entry[+].resource = BSJ-AllergyACE
diff --git a/input/fsh/examples/BSJ-Encounter.fsh b/input/fsh/examples/BSJ-Encounter.fsh
@@ -0,0 +1,13 @@
+Instance: BSJ-Encounter
+InstanceOf: $USCoreEncounter
+Usage: #example
+Title: "Encounter"
+Description: "Home Health encounter for Betsy Smith-Johnson"
+
+* meta.profile = Canonical(us-core-encounter|6.1.0)
+* subject = Reference(Patient/Example-Smith-Johnson-Patient1)
+* status = #finished
+* class = $v3-ActCode#HH "Home Health"
+* type = $sct#50357006 "Evaluation and management of patient at home (procedure)"
+* period.start = "2024-01-18"
+* participant.individual = Reference(PractitionerRole/Role-OT-JenCadbury)
diff --git a/input/fsh/examples/BSJ-TOCComposition.fsh b/input/fsh/examples/BSJ-TOCComposition.fsh
@@ -106,12 +106,13 @@ Description: "Transitions of Care Clinical Document for fictional patient Betsy
 //* section[procedures].text.status = #additional
 //* section[procedures].text.div = "<div>List of procedures prescribed for Betsy Smith-Johnson</div>"
 
-//* section[reason_for_referral].title = "Reason for referring Betsy Smith-Johnson"
-//* section[reason_for_referral].code = $LOINC#42349-1 "Reason for referral (narrative)"
-//* section[reason_for_referral].text.status = #additional
-//* section[reason_for_referral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">Reason for referring Betsy Smith-Johnson</div>"
-//* section[reason_for_referral].reason.code = 
-//* section[reason_for_referral].reason.reference = 
+* section[reason_for_referral].title = "Reason for referring Betsy Smith-Johnson"
+* section[reason_for_referral].code = $LOINC#42349-1 "Reason for referral (narrative)"
+* section[reason_for_referral].text.status = #additional
+* section[reason_for_referral].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\">Reason for referring Betsy Smith-Johnson</div>"
+* section[reason_for_referral].entry[+] = Reference(Encounter/BSJ-Encounter)
+// * section[reason_for_referral] extension[ReasonExtension].code = $sct#404684003 "Clinical finding (finding)"
+// * section[reason_for_referral] extension[ReasonExtension].reference = Reference(Encounter/BSJ-Encounter)
 
 //* section[reason_for_visit].title = "Reason for visit (ambulatory) for Betsy Smith-Johnson"
 //* section[reason_for_visit].code = $LOINC#29299-5 "Reason for visit Narrative"
diff --git a/input/fsh/valueset.fsh b/input/fsh/valueset.fsh
@@ -437,9 +437,7 @@ Id: toc-del-loinc-vs
 
 ValueSet: TocLoincTermsAnsweredByLL5571
 Title: "Transitions of Care LOINC Terms Answered by LL5571-6 Answer List Value Set"
-Description: """This value set includes those LOINC terms that are defined to be answered by LOINC answer list LL5571-6.
-
-  Ideally, this could be intensionally defined as terms where the answer-list property is "LL5571-6", however at publication time, this property is not supported by the FHIR terminology server at tx.fhir.org."""
+Description: "This value set includes those LOINC terms that are defined to be answered by LOINC answer list LL5571-6.  Ideally, this could be intentionally defined as terms where the answer-list property is 'LL5571-6', however at publication time, this property is not supported by the FHIR terminology server at tx.fhir.org."
 Id: toc-loinc-answered-by-LL5571-6-vs
 * ^experimental = false
 * ^copyright = "This material contains content from LOINC (http://loinc.org). LOINC is copyright © 1995-2020, Regenstrief Institute, Inc. and the Logical Observation Identifiers Names and Codes (LOINC) Committee and is available at no cost under the license at http://loinc.org/license. LOINC® is a registered United States trademark of Regenstrief Institute, Inc."
@@ -1342,7 +1340,8 @@ Description: "This value set includes those LOINC terms that included in the DEL
 Id: toc-del-loinc-answered-by-LL5571-6-vs
 * ^experimental = false
 * ^copyright = "This material contains content from LOINC (http://loinc.org). LOINC is copyright © 1995-2020, Regenstrief Institute, Inc. and the Logical Observation Identifiers Names and Codes (LOINC) Committee and is available at no cost under the license at http://loinc.org/license. LOINC® is a registered United States trademark of Regenstrief Institute, Inc."
-* include codes from valueset TocLoincTermsAnsweredByLL5571 and TocDELItemsLOINC
+* include codes from valueset TocLoincTermsAnsweredByLL5571
+* include codes from valueset TocDELItemsLOINC
 
 
 // ValueSet: TocDelLoincTermsAnsweredByLL251
diff --git a/input/ignoreWarnings.txt b/input/ignoreWarnings.txt
@@ -18,6 +18,8 @@
 %Reference to draft CodeSystem http://terminology.hl7.org/CodeSystem/observation-category|4.2.0%
 %Reference to draft CodeSystem http://hl7.org/fhir/narrative-status|4.0.1%
 %Reference to draft ValueSet http://hl7.org/fhir/ValueSet/servicerequest-category|4.0.1%
+%The extension http://hl7.org/fhir/StructureDefinition/elementdefinition-maxValueSet|5.2.0 is deprecated%
+%The extension http://hl7.org/fhir/StructureDefinition/composition-clinicaldocument-versionNumber|5.2.0 is deprecated%
 
 # The values for these category do come from the recommended value sets
 %None of the codings provided are in the value set 'Observation Category Codes' (http://hl7.org/fhir/ValueSet/observation-category|4.0.1), and a coding is recommended to come from this value set (codes = http://hl7.org/fhir/us/pacio-pfe/CodeSystem/pfe-category-cs%
diff --git a/publication-request.json b/publication-request.json
@@ -1,7 +1,7 @@
 {
     "package-id" : "hl7.fhir.us.pacio-toc",
     "version" : "1.0.0-ballot",
-    "path" : "http://hl7.org/fhir/us/pacio-toc/STU1",
+    "path" : "http://hl7.org/fhir/us/pacio-toc/2025May",
     "status" : "ballot",
     "sequence" : "STU 1",
     "milestone": true,
diff --git a/sushi-config.yaml b/sushi-config.yaml
@@ -27,7 +27,7 @@ extension:
   - url: http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm
     valueInteger: 2
 parameters:
-  path-expansion-params: '../../input/resources/exp-params.json'  #path is relative to [base]/fsh-generated/resources
+  path-expansion-params: '../../input/exp-params.json'  #path is relative to [base]/fsh-generated/resources
 contact:
   - name: PACIO project
     telecom:
