Skip to content

Commit 0aa1182

Browse files
mlterryMitre1mlterryMitre1
authored
Merge pull request #49 from HL7/mlt-narrative-changes
toc example adjustments.
2 parents 7d777ff + 9ecd42b commit 0aa1182

7 files changed

Lines changed: 262 additions & 220 deletions

File tree

‎FHIR-us-pacio-toc.xml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,12 @@
4949
<artifact id="Location/org-Loc-HomeHealth-Motown" key="Location-org-Loc-HomeHealth-Motown" name="Example: Location of the Motown Home Health Facility"/>
5050
<artifact id="Location/org-Loc-Neuro-Care-Inc" key="Location-org-Loc-Neuro-Care-Inc" name="Example: Location of the Neuro Care Inc. facility"/>
5151
<artifact id="Location/org-Loc-NED-Contract-Pharm" key="Location-org-Loc-NED-Contract-Pharm" name="Example: Location of the Not Every Day Contract Pharmacy"/>
52-
<artifact id="MedicationRequest/BSJ-SMPMedReq7" key="MedicationRequest-BSJ-SMPMedReq7" name="Example: Medication request for Acetaminophen 650 MG Oral Tablet"/>
5352
<artifact id="MedicationRequest/BSJ-SMPMedReq1" key="MedicationRequest-BSJ-SMPMedReq1" name="Example: Medication request for Atorvastatin 40 MG Oral Tablet"/>
54-
<artifact id="MedicationRequest/BSJ-SMPMedReq4" key="MedicationRequest-BSJ-SMPMedReq4" name="Example: Medication request for Carvedilol 6.25 MG Oral Tablet"/>
55-
<artifact id="MedicationRequest/BSJ-SMPMedReq8" key="MedicationRequest-BSJ-SMPMedReq8" name="Example: Medication request for Ferrous sulfate 325 MG (iron 65 MG) Oral Tablet"/>
56-
<artifact id="MedicationRequest/BSJ-SMPMedReq3" key="MedicationRequest-BSJ-SMPMedReq3" name="Example: Medication request for Furosemide 20 MG Oral Tablet"/>
57-
<artifact id="MedicationRequest/BSJ-SMPMedReq5" key="MedicationRequest-BSJ-SMPMedReq5" name="Example: Medication request for Glipizide 2.5 MG Extended Release Oral Tablet"/>
58-
<artifact id="MedicationRequest/BSJ-SMPMedReq6" key="MedicationRequest-BSJ-SMPMedReq6" name="Example: Medication request for Rosuvastatin calcium 5 MG Oral Tablet"/>
59-
<artifact id="MedicationRequest/BSJ-SMPMedReq2" key="MedicationRequest-BSJ-SMPMedReq2" name="Example: Medication request for Sertraline 25 MG Oral Tablet"/>
60-
<artifact id="MedicationStatement/BSJ-SMPMedStmt7" key="MedicationStatement-BSJ-SMPMedStmt7" name="Example: Medication statement for Acetaminophen 650 MG Oral Tablet"/>
53+
<artifact id="MedicationRequest/BSJ-SMPMedReq4" key="MedicationRequest-BSJ-SMPMedReq4" name="Example: Medication request for Losartan 6.25 MG Oral Tablet"/>
54+
<artifact id="MedicationRequest/BSJ-SMPMedReq9" key="MedicationRequest-BSJ-SMPMedReq9" name="Example: Medication request for clopidogrel 75 MG Oral Tablet"/>
6155
<artifact id="MedicationStatement/BSJ-SMPMedStmt1" key="MedicationStatement-BSJ-SMPMedStmt1" name="Example: Medication statement for Atorvastatin 40 MG Oral Tablet"/>
62-
<artifact id="MedicationStatement/BSJ-SMPMedStmt4" key="MedicationStatement-BSJ-SMPMedStmt4" name="Example: Medication statement for Carvedilol 6.25 MG Oral Tablet"/>
63-
<artifact id="MedicationStatement/BSJ-SMPMedStmt8" key="MedicationStatement-BSJ-SMPMedStmt8" name="Example: Medication statement for Ferrous sulfate 325 MG (iron 65 MG) Oral Tablet"/>
64-
<artifact id="MedicationStatement/BSJ-SMPMedStmt3" key="MedicationStatement-BSJ-SMPMedStmt3" name="Example: Medication statement for Furosemide 20 MG Oral Tablet"/>
65-
<artifact id="MedicationStatement/BSJ-SMPMedStmt5" key="MedicationStatement-BSJ-SMPMedStmt5" name="Example: Medication statement for Glipizide 2.5 MG Extended Release Oral Tablet"/>
66-
<artifact id="MedicationStatement/BSJ-SMPMedStmt6" key="MedicationStatement-BSJ-SMPMedStmt6" name="Example: Medication statement for Rosuvastatin calcium 5 MG Oral Tablet"/>
67-
<artifact id="MedicationStatement/BSJ-SMPMedStmt2" key="MedicationStatement-BSJ-SMPMedStmt2" name="Example: Medication statement for Sertraline 25 MG Oral Tablet"/>
56+
<artifact id="MedicationStatement/BSJ-SMPMedStmt9" key="MedicationStatement-BSJ-SMPMedStmt9" name="Example: Medication statement for clopidogrel 75 MG Oral Tablet"/>
57+
<artifact id="MedicationStatement/BSJ-SMPMedStmt4" key="MedicationStatement-BSJ-SMPMedStmt4" name="Example: Medication statement for losartan potassium 25 MG Oral Tablet"/>
6858
<artifact id="Organization/org-PC-Primary-Care-Michigan" key="Organization-org-PC-Primary-Care-Michigan" name="Example: Michigan Primary Health Care Associates Organization"/>
6959
<artifact id="Organization/org-SNF-HomeHealth-Motown" key="Organization-org-SNF-HomeHealth-Motown" name="Example: Motown Home Health Organization"/>
7060
<artifact id="Condition/BSJ-NauseaAndVomiting" key="Condition-BSJ-NauseaAndVomiting" name="Example: Nausea and vomiting"/>
@@ -87,6 +77,18 @@
8777
<artifact id="Composition/BSJ-TOCComposition" key="Composition-BSJ-TOCComposition" name="Example: Transitions of Care Clinical Document"/>
8878
<artifact id="Condition/BSJ-UndressingConcern" key="Condition-BSJ-UndressingConcern" name="Example: Undressing Concern"/>
8979
<artifact deprecated="true" id="Condition/BSJ-KidneyDiseaseDiagnosis" key="Condition-BSJ-KidneyDiseaseDiagnosis" name="Kidney Disease Diagnosis"/>
80+
<artifact deprecated="true" id="MedicationRequest/BSJ-SMPMedReq7" key="MedicationRequest-BSJ-SMPMedReq7" name="Medication request for Acetaminophen 650 MG Oral Tablet"/>
81+
<artifact deprecated="true" id="MedicationRequest/BSJ-SMPMedReq8" key="MedicationRequest-BSJ-SMPMedReq8" name="Medication request for Ferrous sulfate 325 MG (iron 65 MG) Oral Tablet"/>
82+
<artifact deprecated="true" id="MedicationRequest/BSJ-SMPMedReq3" key="MedicationRequest-BSJ-SMPMedReq3" name="Medication request for Furosemide 20 MG Oral Tablet"/>
83+
<artifact deprecated="true" id="MedicationRequest/BSJ-SMPMedReq5" key="MedicationRequest-BSJ-SMPMedReq5" name="Medication request for Glipizide 2.5 MG Extended Release Oral Tablet"/>
84+
<artifact deprecated="true" id="MedicationRequest/BSJ-SMPMedReq6" key="MedicationRequest-BSJ-SMPMedReq6" name="Medication request for Rosuvastatin calcium 5 MG Oral Tablet"/>
85+
<artifact deprecated="true" id="MedicationRequest/BSJ-SMPMedReq2" key="MedicationRequest-BSJ-SMPMedReq2" name="Medication request for Sertraline 25 MG Oral Tablet"/>
86+
<artifact deprecated="true" id="MedicationStatement/BSJ-SMPMedStmt7" key="MedicationStatement-BSJ-SMPMedStmt7" name="Medication statement for Acetaminophen 650 MG Oral Tablet"/>
87+
<artifact deprecated="true" id="MedicationStatement/BSJ-SMPMedStmt8" key="MedicationStatement-BSJ-SMPMedStmt8" name="Medication statement for Ferrous sulfate 325 MG (iron 65 MG) Oral Tablet"/>
88+
<artifact deprecated="true" id="MedicationStatement/BSJ-SMPMedStmt3" key="MedicationStatement-BSJ-SMPMedStmt3" name="Medication statement for Furosemide 20 MG Oral Tablet"/>
89+
<artifact deprecated="true" id="MedicationStatement/BSJ-SMPMedStmt5" key="MedicationStatement-BSJ-SMPMedStmt5" name="Medication statement for Glipizide 2.5 MG Extended Release Oral Tablet"/>
90+
<artifact deprecated="true" id="MedicationStatement/BSJ-SMPMedStmt6" key="MedicationStatement-BSJ-SMPMedStmt6" name="Medication statement for Rosuvastatin calcium 5 MG Oral Tablet"/>
91+
<artifact deprecated="true" id="MedicationStatement/BSJ-SMPMedStmt2" key="MedicationStatement-BSJ-SMPMedStmt2" name="Medication statement for Sertraline 25 MG Oral Tablet"/>
9092
<artifact id="StructureDefinition/point-of-contact-extension" key="StructureDefinition-point-of-contact-extension" name="Point of Contact"/>
9193
<artifact id="CapabilityStatement/toc" key="CapabilityStatement-toc" name="TOC CapabilityStatement"/>
9294
<artifact id="StructureDefinition/TOC-DocumentReference" key="StructureDefinition-TOC-DocumentReference" name="TOC Document Reference"/>

‎input/fsh/examples/BSJ-SMPMedList.fsh‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,20 @@ Usage: #example
1212
* date = "2024-08-11"
1313
* entry[0].date = "2024-08-11"
1414
* entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt1) "atorvastatin 40 MG Oral Tablet"
15+
// * entry[+].date = "2024-08-11"
16+
// * entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt2) "sertraline 25 MG Oral Tablet"
17+
// * entry[+].date = "2024-08-11"
18+
// * entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt3) "furosemide 20 MG Oral Tablet"
1519
* entry[+].date = "2024-08-11"
16-
* entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt2) "sertraline 25 MG Oral Tablet"
20+
* entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt4) "Cozaar 25 MG Oral Tablet"
21+
// * entry[+].date = "2024-08-11"
22+
// * entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt5) "24 HR glipizide 2.5 MG Extended Release Oral Tablet"
23+
// * entry[+].date = "2024-08-11"
24+
// * entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt6) "rosuvastatin calcium 5 MG Oral Tablet"
25+
// * entry[+].date = "2024-08-11"
26+
// * entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt7) "acetaminophen 650 MG Oral Tablet"
27+
// * entry[+].date = "2024-08-11"
28+
// * entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt8) "ferrous sulfate 325 MG (iron 65 MG) Oral Tablet"
1729
* entry[+].date = "2024-08-11"
18-
* entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt3) "furosemide 20 MG Oral Tablet"
19-
* entry[+].date = "2024-08-11"
20-
* entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt4) "carvedilol 6.25 MG Oral Tablet"
21-
* entry[+].date = "2024-08-11"
22-
* entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt5) "24 HR glipizide 2.5 MG Extended Release Oral Tablet"
23-
* entry[+].date = "2024-08-11"
24-
* entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt6) "rosuvastatin calcium 5 MG Oral Tablet"
25-
* entry[+].date = "2024-08-11"
26-
* entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt7) "acetaminophen 650 MG Oral Tablet"
27-
* entry[+].date = "2024-08-11"
28-
* entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt8) "ferrous sulfate 325 MG (iron 65 MG) Oral Tablet"
30+
* entry[=].item = Reference(MedicationStatement/BSJ-SMPMedStmt9) "clopidogrel 75 MG Oral Tablet"
31+
// * entry[+].date = "2024-08-11"

0 commit comments

Comments
 (0)