Skip to content

Commit 7144d17

Browse files
mlterryMitre1mlterryMitre1
authored
Merge pull request #18 from HL7/mlt_ballotrecon_fixes01
Pre-applied FHIR-50315 and fix for FHIR-53540.
2 parents d6448e7 + 447f4e5 commit 7144d17

File tree

5 files changed

+127
-105
lines changed

5 files changed

+127
-105
lines changed

‎FHIR-us-pacio-toc.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,10 @@
8383
<artifact id="Condition/BSJ-UndressingConcern" key="Condition-BSJ-UndressingConcern" name="Example: Undressing Concern"/>
8484
<artifact id="CapabilityStatement/toc" key="CapabilityStatement-toc" name="TOC CapabilityStatement"/>
8585
<artifact id="StructureDefinition/TOC-Composition" key="StructureDefinition-TOC-Composition" name="Transition of Care Composition"/>
86+
<artifact id="StructureDefinition/TOC-Bundle" key="StructureDefinition-TOC-Bundle" name="Transitions of Care Bundle"/>
8687
<artifact id="ValueSet/toc-del-loinc-vs" key="ValueSet-toc-del-loinc-vs" name="Transitions of Care DEL LOINC Terms Value Set"/>
87-
<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"/>
88-
<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"/>
88+
<artifact deprecated="true" 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"/>
89+
<artifact deprecated="true" 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"/>
8990
<page key="NA" name="(NA)"/>
9091
<page key="many" name="(many)"/>
9192
<page key="downloads" name="Downloads"/>

‎ig.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[IG]
22
ig = fsh-generated/resources/ImplementationGuide-hl7.fhir.us.pacio-toc.json
3-
template = hl7.fhir.template#current
3+
template = hl7.fhir.template

‎input/fsh/TOCBundle.fsh‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
Profile: TOCBundle
2+
Parent: Bundle
3+
Id: TOC-Bundle
4+
Title: "Transitions of Care Bundle"
5+
Description: "This is a profile for a Transitions of Care Bundle, which includes the necessary resources for documenting a patient's transition from one care setting to another."
6+
7+
* type = #collection
8+
* identifier 1..1 MS
9+
* entry 1..*
10+
* entry ^slicing.discriminator.type = #profile
11+
* entry ^slicing.discriminator.path = "resource"
12+
* entry ^slicing.rules = #open
13+
* entry ^slicing.description = "Slice based on the entry.resource profile"
14+
15+
* entry contains patient 1..1 MS and
16+
toc-composition 1..1 MS
17+
18+
* entry[patient].resource only $USCorePatient
19+
// * entry[patient].^description = "The patient resource representing the individual whose transition of care is being documented."
20+
* entry[toc-composition].resource only TOCComposition
21+
// * entry[toc-composition].^description = "The Composition resource that serves as the root document for the Transition of Care."

‎input/fsh/valueset.fsh‎

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -435,99 +435,99 @@ Id: toc-del-loinc-vs
435435
// ----------
436436

437437

438-
ValueSet: TocLoincTermsAnsweredByLL5571
439-
Title: "Transitions of Care LOINC Terms Answered by LL5571-6 Answer List Value Set"
440-
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."
441-
Id: toc-loinc-answered-by-LL5571-6-vs
442-
* ^experimental = false
443-
* ^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."
444-
// * include codes from system http://loinc.org where answer-list = "LL5571-6"
445-
* $LOINC#94933-9
446-
* $LOINC#94934-7
447-
* $LOINC#94935-4
448-
* $LOINC#94936-2
449-
* $LOINC#94937-0
450-
* $LOINC#94938-8
451-
* $LOINC#94939-6
452-
* $LOINC#94940-4
453-
* $LOINC#94941-2
454-
* $LOINC#94942-0
455-
* $LOINC#94943-8
456-
* $LOINC#94944-6
457-
* $LOINC#94945-3
458-
* $LOINC#94946-1
459-
* $LOINC#94947-9
460-
* $LOINC#94948-7
461-
* $LOINC#94949-5
462-
* $LOINC#94950-3
463-
* $LOINC#94951-1
464-
* $LOINC#94952-9
465-
* $LOINC#94953-7
466-
* $LOINC#94954-5
467-
* $LOINC#94955-2
468-
* $LOINC#94956-0
469-
* $LOINC#94957-8
470-
* $LOINC#94958-6
471-
* $LOINC#94959-4
472-
* $LOINC#94960-2
473-
* $LOINC#94961-0
474-
* $LOINC#94962-8
475-
* $LOINC#94963-6
476-
* $LOINC#94964-4
477-
* $LOINC#94965-1
478-
* $LOINC#94966-9
479-
* $LOINC#94967-7
480-
* $LOINC#94968-5
481-
* $LOINC#94969-3
482-
* $LOINC#94970-1
483-
* $LOINC#94971-9
484-
* $LOINC#94972-7
485-
* $LOINC#94973-5
486-
* $LOINC#94974-3
487-
* $LOINC#94976-8
488-
* $LOINC#94977-6
489-
* $LOINC#94978-4
490-
* $LOINC#94979-2
491-
* $LOINC#94980-0
492-
* $LOINC#94981-8
493-
* $LOINC#94982-6
494-
* $LOINC#94983-4
495-
* $LOINC#94984-2
496-
* $LOINC#94985-9
497-
* $LOINC#94986-7
498-
* $LOINC#94987-5
499-
* $LOINC#94989-1
500-
* $LOINC#94990-9
501-
* $LOINC#94991-7
502-
* $LOINC#94992-5
503-
* $LOINC#94993-3
504-
* $LOINC#94994-1
505-
* $LOINC#94995-8
506-
* $LOINC#94996-6
507-
* $LOINC#94997-4
508-
* $LOINC#94998-2
509-
* $LOINC#94999-0
510-
* $LOINC#95000-6
511-
* $LOINC#95001-4
512-
* $LOINC#95002-2
513-
* $LOINC#95003-0
514-
* $LOINC#95004-8
515-
* $LOINC#95005-5
516-
* $LOINC#95006-3
517-
* $LOINC#95007-1
518-
* $LOINC#95008-9
519-
* $LOINC#95009-7
520-
* $LOINC#95010-5
521-
* $LOINC#95011-3
522-
* $LOINC#95012-1
523-
* $LOINC#95013-9
524-
* $LOINC#95014-7
525-
* $LOINC#95015-4
526-
* $LOINC#95016-2
527-
* $LOINC#95017-0
528-
* $LOINC#95018-8
529-
* $LOINC#95019-6
530-
* $LOINC#95043-6
438+
// ValueSet: TocLoincTermsAnsweredByLL5571
439+
// Title: "Transitions of Care LOINC Terms Answered by LL5571-6 Answer List Value Set"
440+
// 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."
441+
// Id: toc-loinc-answered-by-LL5571-6-vs
442+
// * ^experimental = false
443+
// * ^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."
444+
// // * include codes from system http://loinc.org where answer-list = "LL5571-6"
445+
// * $LOINC#94933-9
446+
// * $LOINC#94934-7
447+
// * $LOINC#94935-4
448+
// * $LOINC#94936-2
449+
// * $LOINC#94937-0
450+
// * $LOINC#94938-8
451+
// * $LOINC#94939-6
452+
// * $LOINC#94940-4
453+
// * $LOINC#94941-2
454+
// * $LOINC#94942-0
455+
// * $LOINC#94943-8
456+
// * $LOINC#94944-6
457+
// * $LOINC#94945-3
458+
// * $LOINC#94946-1
459+
// * $LOINC#94947-9
460+
// * $LOINC#94948-7
461+
// * $LOINC#94949-5
462+
// * $LOINC#94950-3
463+
// * $LOINC#94951-1
464+
// * $LOINC#94952-9
465+
// * $LOINC#94953-7
466+
// * $LOINC#94954-5
467+
// * $LOINC#94955-2
468+
// * $LOINC#94956-0
469+
// * $LOINC#94957-8
470+
// * $LOINC#94958-6
471+
// * $LOINC#94959-4
472+
// * $LOINC#94960-2
473+
// * $LOINC#94961-0
474+
// * $LOINC#94962-8
475+
// * $LOINC#94963-6
476+
// * $LOINC#94964-4
477+
// * $LOINC#94965-1
478+
// * $LOINC#94966-9
479+
// * $LOINC#94967-7
480+
// * $LOINC#94968-5
481+
// * $LOINC#94969-3
482+
// * $LOINC#94970-1
483+
// * $LOINC#94971-9
484+
// * $LOINC#94972-7
485+
// * $LOINC#94973-5
486+
// * $LOINC#94974-3
487+
// * $LOINC#94976-8
488+
// * $LOINC#94977-6
489+
// * $LOINC#94978-4
490+
// * $LOINC#94979-2
491+
// * $LOINC#94980-0
492+
// * $LOINC#94981-8
493+
// * $LOINC#94982-6
494+
// * $LOINC#94983-4
495+
// * $LOINC#94984-2
496+
// * $LOINC#94985-9
497+
// * $LOINC#94986-7
498+
// * $LOINC#94987-5
499+
// * $LOINC#94989-1
500+
// * $LOINC#94990-9
501+
// * $LOINC#94991-7
502+
// * $LOINC#94992-5
503+
// * $LOINC#94993-3
504+
// * $LOINC#94994-1
505+
// * $LOINC#94995-8
506+
// * $LOINC#94996-6
507+
// * $LOINC#94997-4
508+
// * $LOINC#94998-2
509+
// * $LOINC#94999-0
510+
// * $LOINC#95000-6
511+
// * $LOINC#95001-4
512+
// * $LOINC#95002-2
513+
// * $LOINC#95003-0
514+
// * $LOINC#95004-8
515+
// * $LOINC#95005-5
516+
// * $LOINC#95006-3
517+
// * $LOINC#95007-1
518+
// * $LOINC#95008-9
519+
// * $LOINC#95009-7
520+
// * $LOINC#95010-5
521+
// * $LOINC#95011-3
522+
// * $LOINC#95012-1
523+
// * $LOINC#95013-9
524+
// * $LOINC#95014-7
525+
// * $LOINC#95015-4
526+
// * $LOINC#95016-2
527+
// * $LOINC#95017-0
528+
// * $LOINC#95018-8
529+
// * $LOINC#95019-6
530+
// * $LOINC#95043-6
531531

532532

533533
// ValueSet: TocLoincTermsAnsweredByLL251
@@ -1334,14 +1334,14 @@ Id: toc-loinc-answered-by-LL5571-6-vs
13341334
// ----
13351335

13361336

1337-
ValueSet: TocDelLoincTermsAnsweredByLL5571
1338-
Title: "Transitions of Care LOINC Terms Included in the DEL Answered by LL5571-6 Answer List Value Set"
1339-
Description: "This value set includes those LOINC terms that included in the DEL which are defined to be answered by LOINC answer list LL5571-6."
1340-
Id: toc-del-loinc-answered-by-LL5571-6-vs
1341-
* ^experimental = false
1342-
* ^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."
1343-
* include codes from valueset TocLoincTermsAnsweredByLL5571
1344-
* include codes from valueset TocDELItemsLOINC
1337+
// ValueSet: TocDelLoincTermsAnsweredByLL5571
1338+
// Title: "Transitions of Care LOINC Terms Included in the DEL Answered by LL5571-6 Answer List Value Set"
1339+
// Description: "This value set includes those LOINC terms that included in the DEL which are defined to be answered by LOINC answer list LL5571-6."
1340+
// Id: toc-del-loinc-answered-by-LL5571-6-vs
1341+
// * ^experimental = false
1342+
// * ^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."
1343+
// * include codes from valueset TocLoincTermsAnsweredByLL5571
1344+
// * include codes from valueset TocDELItemsLOINC
13451345

13461346

13471347
// ValueSet: TocDelLoincTermsAnsweredByLL251

‎input/pagecontent/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@ This Guide is divided into several pages which are listed at the top of each pag
8383
{% include cross-version-analysis.xhtml %}
8484

8585
### Intellectual Property Considerations
86-
{% include ip-statements.xhtml %}
86+
{% include ip-statements.xhtml %}

0 commit comments

Comments
 (0)