Merge branch 'master' into clean-up

input/fsh/mappings/appointment-status-concept-map.fsh → input/fsh/mappings/conceptMap-ajanvarauksenTila-appointmentStatus.fsh

@@ -1,11 +1,13 @@
-Instance: appointment-status-concept-map
+Instance: ajanvarauksentila-appointmentstatus
 InstanceOf: ConceptMap
-Title: "FHIR Appointment status codes and Ajanvaraus - Ajanvarauksen tila"
-Description: "Mapping between the Finnish logical model [*Ajanvaraus - Ajanvarauksen tila*](https://koodistopalvelu.kanta.fi/codeserver/pages/classification-view-page.xhtml?classificationKey=1943) (oid `1.2.246.537.6.881`) and FHIR Appoinment status codes, in both directions."
+Title: "Ajanvarauksen tila to Appointment status"
+Description: "Mapping between the Finnish logical model [*Ajanvaraus - Ajanvarauksen tila*](https://koodistopalvelu.kanta.fi/codeserver/pages/classification-view-page.xhtml?classificationKey=1943) (oid `1.2.246.537.6.881`) and FHIR Appoinment status codes."
 Usage: #definition
+* name = "FiAppointmentStatusCodeMap"
 * status = #draft
+* experimental = false
 * sourceUri = "https://koodistopalvelu.kanta.fi/codeserver/pages/classification-view-page.xhtml?classificationKey=1943"
-* targetCanonical = "http://hl7.org/fhir/appointmentstatus"
+* targetCanonical = "http://hl7.org/fhir/ValueSet/appointmentstatus"
 * group
   * source = "https://koodistopalvelu.kanta.fi/codeserver/pages/classification-view-page.xhtml?classificationKey=1943"
   * target = "http://hl7.org/fhir/appointmentstatus"
@@ -57,7 +59,7 @@ Usage: #definition
     * code = #7
     * display = "Toteutunut"
     * target
-      * code = #fullfilled
+      * code = #fulfilled
       * display = "Fulfilled"
       * equivalence = #inexact
       * comment = "There is no status for an appointment being in process in FHIR. In FHIR this information is tracked with the status of the Encounter resource."
@@ -88,92 +90,3 @@ Usage: #definition
       * code = #checked-in
       * display = "Checked In"
       * equivalence = #equal
-* group[+]
-  * source = "http://hl7.org/fhir/appointmentstatus"
-  * target = "https://koodistopalvelu.kanta.fi/codeserver/pages/classification-view-page.xhtml?classificationKey=1943"
-  * element
-    * code = #proposed
-    * display = "Proposed"
-    * target
-      * code = #8
-      * display = "Ehdotettu"
-      * equivalence = #wider
-      * comment = "The Finnish logical model does not separate between proposed and pending codes"
-  * element[+]
-    * code = #pending
-    * display = "Pending"
-    * target
-      * code = #8
-      * display = "Ehdotettu"
-      * equivalence = #wider
-      * comment = "The Finnish logical model does not separate between proposed and pending codes"
-  * element[+]
-    * code = #booked
-    * display = "Booked"
-    * target
-      * code = #3
-      * display = "Varattu"
-      * equivalence = #equal
-  * element[+]
-    * code = #arrived
-    * display = "Arrived"
-    * target
-      * code = #10
-      * display = "Ilmoittautunut"
-      * equivalence = #wider
-      * comment = "The Finnish logical model does not separate between arrived and checked-in codes"
-  * element[+]
-    * code = #fulfilled
-    * display = "Fulfilled"
-    * target
-      * code = #6
-      * display = "Alkanut"
-      * equivalence = #narrower
-      * comment = "Use Alkanut when the encounter of this Appointment is in progress"
-    * target
-      * code = #7
-      * display = "Toteutunut"
-      * equivalence = #narrower
-      * comment = "Use Toteutunut when the service related to the Appointment has begun or is completed"
-  * element[+]
-    * code = #cancelled
-    * display = "Cancelled"
-    * target
-      * code = #4
-      * display = "Peruttu"
-      * equivalence = #equal
-  * element[+]
-    * code = #noshow
-    * display = "No Show"
-    * target
-      * code = #9
-      * display = "Saapumatta"
-      * equivalence = #equal
-  * element[+]
-    * code = #entered-in-error
-    * display = "Entered in error"
-    * target
-      * equivalence = #unmatched
-      * comment = "There is no code for erroneously entered records in the Finnish logical model"
-  * element[+]
-    * code = #checked-in
-    * display = "Checked In"
-    * target
-      * code = #10
-      * display = "Ilmoittautunut"
-      * equivalence = #equivalent
-      * comment = "The Finnish logical model does not separate between arrived and checked-in codes"
-  * element[+]
-    * code = #waitlist
-    * display = "Waitlisted"
-    * target
-      * code = #1
-      * display = "Suunniteltu"
-      * equivalence = #narrower
-      * comment = "Use Suunniteltu when no service provider has been identified"
-    * target[+]
-      * code = #2
-      * display = "Tilattu"
-      * equivalence = #narrower
-      * comment = "Use Tilattu when a service provider has been identified"
-

input/fsh/mappings/conceptMap-appointmentStatus-ajanvarauksenTila.fsh

@@ -0,0 +1,98 @@
+Instance: appointmentstatus-ajanvarauksentila
+InstanceOf: ConceptMap
+Title: "Appointment status to Ajanvarauksen tila"
+Description: "Mapping between FHIR Appoinment status codes and the Finnish logical model [*Ajanvaraus - Ajanvarauksen tila*](https://koodistopalvelu.kanta.fi/codeserver/pages/classification-view-page.xhtml?classificationKey=1943) (oid `1.2.246.537.6.881`)."
+Usage: #definition
+* name = "FiAppointmentStatusCodeMap"
+* status = #draft
+* experimental = false
+* sourceCanonical = "http://hl7.org/fhir/ValueSet/appointmentstatus"
+* targetUri = "https://koodistopalvelu.kanta.fi/codeserver/pages/classification-view-page.xhtml?classificationKey=1943"
+* group
+  * source = "http://hl7.org/fhir/appointmentstatus"
+  * target = "https://koodistopalvelu.kanta.fi/codeserver/pages/classification-view-page.xhtml?classificationKey=1943"
+  * element
+    * code = #proposed
+    * display = "Proposed"
+    * target
+      * code = #8
+      * display = "Ehdotettu"
+      * equivalence = #wider
+      * comment = "The Finnish logical model does not separate between proposed and pending codes"
+  * element[+]
+    * code = #pending
+    * display = "Pending"
+    * target
+      * code = #8
+      * display = "Ehdotettu"
+      * equivalence = #wider
+      * comment = "The Finnish logical model does not separate between proposed and pending codes"
+  * element[+]
+    * code = #booked
+    * display = "Booked"
+    * target
+      * code = #3
+      * display = "Varattu"
+      * equivalence = #equal
+  * element[+]
+    * code = #arrived
+    * display = "Arrived"
+    * target
+      * code = #10
+      * display = "Ilmoittautunut"
+      * equivalence = #wider
+      * comment = "The Finnish logical model does not separate between arrived and checked-in codes"
+  * element[+]
+    * code = #fulfilled
+    * display = "Fulfilled"
+    * target
+      * code = #6
+      * display = "Alkanut"
+      * equivalence = #narrower
+      * comment = "Use Alkanut when the encounter of this Appointment is in progress"
+    * target
+      * code = #7
+      * display = "Toteutunut"
+      * equivalence = #narrower
+      * comment = "Use Toteutunut when the service related to the Appointment has begun or is completed"
+  * element[+]
+    * code = #cancelled
+    * display = "Cancelled"
+    * target
+      * code = #4
+      * display = "Peruttu"
+      * equivalence = #equal
+  * element[+]
+    * code = #noshow
+    * display = "No Show"
+    * target
+      * code = #9
+      * display = "Saapumatta"
+      * equivalence = #equal
+  * element[+]
+    * code = #entered-in-error
+    * display = "Entered in error"
+    * target
+      * equivalence = #unmatched
+      * comment = "There is no code for erroneously entered records in the Finnish logical model"
+  * element[+]
+    * code = #checked-in
+    * display = "Checked In"
+    * target
+      * code = #10
+      * display = "Ilmoittautunut"
+      * equivalence = #equivalent
+      * comment = "The Finnish logical model does not separate between arrived and checked-in codes"
+  * element[+]
+    * code = #waitlist
+    * display = "Waitlisted"
+    * target
+      * code = #1
+      * display = "Suunniteltu"
+      * equivalence = #narrower
+      * comment = "Use Suunniteltu when no service provider has been identified"
+    * target[+]
+      * code = #2
+      * display = "Tilattu"
+      * equivalence = #narrower
+      * comment = "Use Tilattu when a service provider has been identified"

input/pagecontent/ConceptMap-appointment-status-concept-map-intro.md → input/includes/fragment-status-concept-map.md

@@ -24,8 +24,12 @@ and when the service is in progress or completed
 ([#7, Toteutunut](https://koodistopalvelu.kanta.fi/codeserver/pages/code-view-page.xhtml?conceptCodeKey=101027624)).
 
 The Finnish logical model does not have a separate state for when the patient has arrived (FHIR
-status `#arrived`). It does have a code #10 Ilmoittautunut that matches the FHIR code
-`#checked-in`.
+status
+[`#arrived`](https://hl7.org/fhir/R4/codesystem-appointmentstatus.html#appointmentstatus-arrived)).
+It does have a code
+[#10 Ilmoittautunut](https://koodistopalvelu.kanta.fi/codeserver/pages/code-view-page.xhtml?conceptCodeKey=200188374)
+that matches the FHIR code
+[`#checked-in`](https://hl7.org/fhir/R4/codesystem-appointmentstatus.html#appointmentstatus-checked-in).
 
 The Finnish logical model used to have a separate code for an appointment that has been rescheduled
 ([#5, Siirretty](https://koodistopalvelu.kanta.fi/codeserver/pages/code-view-page.xhtml?conceptCodeKey=101027622)),

input/pagecontent/ConceptMap-ajanvarauksentila-appointmentstatus-intro.md

@@ -0,0 +1 @@
+{% include fragment-status-concept-map.md %}

input/pagecontent/ConceptMap-appointmentstatus-ajanvarauksentila-intro.md

@@ -0,0 +1 @@
+{% include fragment-status-concept-map.md %}

input/pagecontent/StructureDefinition-fi-scheduling-appointment-intro.md

@@ -0,0 +1 @@
+### Scope and Usage

input/pagecontent/StructureDefinition-fi-scheduling-healthcare-service-intro.md

@@ -0,0 +1 @@
+### Scope and Usage

input/pagecontent/StructureDefinition-fi-scheduling-location-intro.md

@@ -0,0 +1 @@
+### Scope and Usage

input/pagecontent/StructureDefinition-fi-scheduling-schedule-intro.md

@@ -0,0 +1 @@
+### Scope and Usage

input/pagecontent/StructureDefinition-fi-scheduling-slot-intro.md

@@ -0,0 +1 @@
+### Scope and Usage

input/pagecontent/terminology.md

@@ -1,26 +1,44 @@
 ### CodeSystems
-
-<ul>
-{% include list-simple-codesystems.xhtml %}
-</ul>
+{% capture codeSystemsCapture %}
+{% include list-simple-codesystems.xhtml raw="<ul>" endraw="</ul>" %}
+{% endcapture %}
+{% if codeSystemsCapture contains "<li>" %}
+{{ codeSystemsCapture }}
+{% else %}
+No CodeSystems are defined by this implementation guide.
+{% endif %}
 
 ### ValueSets
-
-<ul>
-{% include list-simple-valuesets.xhtml %}
-</ul>
+{% capture valueSetsCapture %}
+{% include list-simple-valuesets.xhtml raw="<ul>" endraw="</ul>" %}
+{% endcapture %}
+{% if valueSetsCapture contains "<li>" %}
+{{ valueSetsCapture }}
+{% else %}
+No ValueSets are defined by this implementation guide.
+{% endif %}
 
 ### ConceptMaps
-
-<ul>
-{% include list-simple-conceptmaps.xhtml %}
-</ul>
+{% capture conceptMapsCapture %}
+{% include list-simple-conceptmaps.xhtml raw="<ul>" endraw="</ul>" %}
+{% endcapture %}
+{% if conceptMapsCapture contains "<li>" %}
+{{ conceptMapsCapture }}
+{% else %}
+No ConceptMaps are defined by this implementation guide.
+{% endif %}
 
 ### NamingSystems
+{% capture namingSystemsCapture %}
+{% include list-simple-namingsystems.xhtml raw="<ul>" endraw="</ul>" %}
+{% endcapture %}
+{% if namingSystemsCapture contains "<li>" %}
+{{ namingSystemsCapture }}
+{% else %}
+No NamingSystems are defined by this implementation guide.
+{% endif %}
 
-<ul>
-{% include list-simple-namingsystems.xhtml %}
-</ul>
+### Other Terminologies
 
 There are also many other notable terminologies used in Finland. Please see the
 [terminology section](https://hl7.fi/fhir/finnish-base-profiles/terminology.html) of the Finnish