Clean up

FHIR-cpg.xml

@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/uv/cpg/2024Jan" ciUrl="http://build.fhir.org/ig/HL7/cqf-recommendations" defaultVersion="2.0.0-ballot" defaultWorkgroup="cds" gitUrl="https://github.com/HL7/cqf-recommendations" url="http://hl7.org/fhir/uv/cpg">
+<specification xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ballotUrl="http://hl7.org/fhir/uv/cpg/2024Jan" ciUrl="http://build.fhir.org/ig/HL7/cqf-recommendations" defaultVersion="1.0.0" defaultWorkgroup="cds" gitUrl="https://github.com/HL7/cqf-recommendations" url="http://hl7.org/fhir/uv/cpg">
 <version code="current" url="http://build.fhir.org/ig/HL7/cqf-recommendations"/>
 <version code="2.0.0-ballot" url="http://hl7.org/fhir/uv/cpg/2024Jan"/>
 <version code="1.0.0" url="http://hl7.org/fhir/uv/cpg/STU1"/>
 <version code="0.1.0" deprecated="true" url="http://hl7.org/fhir/uv/cpg/2019Sep"/>
+<version code="0.1" deprecated="true" url="http://hl7.org/fhir/uv/cpg/2019Sep"/>
 <artifactPageExtension value="-definitions"/>
 <artifactPageExtension value="-examples"/>
 <artifactPageExtension value="-mappings"/>
-<artifact id="Library/activity-example-administermedication-library" key="Library-activity-example-administermedication-library" name="Activity Example - Administer Medication Library Collection"/>
+<artifact id="Questionnaire/anc-quick-check" key="Questionnaire-anc-quick-check" name="ANC Quick Check Questionnaire"/>
+<artifact id="CodeSystem/anc-reason-for-visit-cs" key="CodeSystem-anc-reason-for-visit-cs" name="ANC Reason for Visit Codesystem"/>
+<artifact id="ValueSet/anc-reason-for-visit-vs" key="ValueSet-anc-reason-for-visit-vs" name="ANC Reason for Visit ValueSet"/>
+<artifact id="Library/administermedication-asset-collection" key="Library-activity-example-administermedication-library" name="Activity Example - Administer Medication Library Collection"/>
 <artifact id="ActivityDefinition/activity-example-administermedication-ad" key="ActivityDefinition-activity-example-administermedication-ad" name="Activity Example Administer Medication AD"/>
 <artifact id="PlanDefinition/activity-example-administermedication-pd" key="PlanDefinition-activity-example-administermedication-pd" name="Activity Example Administer Medication PD"/>
 <artifact id="ActivityDefinition/activity-example-collectinformation-ad" key="ActivityDefinition-activity-example-collectinformation-ad" name="Activity Example Collect Information AD"/>
@@ -94,6 +98,10 @@
 <artifact id="StructureDefinition/chf-egfr" key="StructureDefinition-chf-egfr" name="CHF eGFR"/>
 <artifact id="ActivityDefinition/chf-egfr-ad" key="ActivityDefinition-chf-egfr-ad" name="CHF eGFR Activity Defintion"/>
 <artifact id="PlanDefinition/chf-egfr-pd" key="PlanDefinition-chf-egfr-pd" name="CHF eGFR Recommendation"/>
+<artifact id="PlanDefinition/cc-cpg-plan-ckd" key="PlanDefinition-cc-cpg-plan-ckd" name="CKD Ambulatory Plan Definition"/>
+<artifact id="ActivityDefinition/cc-cpg-activity-referral-dietitian" key="ActivityDefinition-cc-cpg-activity-referral-dietitian" name="CKD Referral Dietitian"/>
+<artifact id="ActivityDefinition/cc-cpg-activity-referral-nephrology" key="ActivityDefinition-cc-cpg-activity-referral-nephrology" name="CKD Referral Nephrology"/>
+<artifact id="PlanDefinition/va-ckd-recommendations" key="PlanDefinition-va-ckd-recommendations" name="CKD VA Recommendations Plan Definition"/>
 <artifact id="ValueSet/cpg-active-condition-vs" key="ValueSet-cpg-active-condition-vs" name="CPG Active Condition Value Set"/>
 <artifact id="CodeSystem/cpg-activity-type-cs" key="CodeSystem-cpg-activity-type-cs" name="CPG Activity Type Code System"/>
 <artifact id="ValueSet/cpg-activity-type-vs" key="ValueSet-cpg-activity-type-vs" name="CPG Activity Type Value Set"/>
@@ -185,7 +193,7 @@
 <artifact id="StructureDefinition/cpg-itemImage" key="StructureDefinition-cpg-itemImage" name="CPG Item Image Extension"/>
 <artifact id="StructureDefinition/cpg-location" key="StructureDefinition-cpg-location" name="CPG Location"/>
 <artifact id="StructureDefinition/cpg-locationdefinition" key="StructureDefinition-cpg-locationdefinition" name="CPG Location Definition"/>
-<artifact id="StructureDefinition/cpg-medicationrequest" key="StructureDefinition-cpg-medicationrequest" name="CPG Medicaiton Request"/>
+<artifact id="StructureDefinition/cpg-medicationrequest" key="StructureDefinition-cpg-medicationrequest" name="CPG Medication Request"/>
 <artifact id="StructureDefinition/cpg-medicationadministration" key="StructureDefinition-cpg-medicationadministration" name="CPG Medication Administration"/>
 <artifact id="StructureDefinition/cpg-medicationdispense" key="StructureDefinition-cpg-medicationdispense" name="CPG Medication Dispense"/>
 <artifact id="StructureDefinition/cpg-medicationrequestactivity" key="StructureDefinition-cpg-medicationrequestactivity" name="CPG Medication Request Activity"/>
@@ -237,8 +245,6 @@
 <artifact id="StructureDefinition/cpg-task" key="StructureDefinition-cpg-task" name="CPG Task"/>
 <artifact id="StructureDefinition/cpg-testcasebundle" key="StructureDefinition-cpg-testcasebundle" name="CPG Test Case Bundle"/>
 <artifact id="StructureDefinition/cpg-workflowdefinition" key="StructureDefinition-cpg-workflowdefinition" name="CPG Workflow Definition"/>
-<artifact id="PlanDefinition/cc-cpg-plan-ckd" key="PlanDefinition-cc-cpg-plan-ckd" name="Chronic Kidney Disease - Ambulatory Plan Definition"/>
-<artifact id="CodeSystem/anc-reason-for-visit-cs" key="CodeSystem-anc-reason-for-visit-cs" name="CodeSystem - ANC Reason for Visit"/>
 <artifact id="Library/collectinformation-library" key="Library-collectinformation-library" name="Collect Information Library"/>
 <artifact id="PlanDefinition/chf-pathway" key="PlanDefinition-chf-pathway" name="Congestive Heart Failure Care Pathway"/>
 <artifact id="Composition/chf-scenario1-casesummary" key="Composition-chf-scenario1-casesummary" name="Congestive Heart Failure Case Summary"/>
@@ -260,16 +266,11 @@
 <artifact id="Library/orderservice-library" key="Library-orderservice-library" name="Order Service Library"/>
 <artifact id="PlanDefinition/cpg-common-registration" key="PlanDefinition-cpg-common-registration" name="PlanDefinition - CPG Common Registration"/>
 <artifact id="Library/proposediagnosis-library" key="Library-proposediagnosis-library" name="Propose Diagnosis Library"/>
-<artifact id="Questionnaire/anc-quick-check" key="Questionnaire-anc-quick-check" name="Questionnaire - ANC Quick Check"/>
 <artifact id="Library/recommendimmunization-library" key="Library-recommendimmunization-library" name="Recommend Immunization"/>
 <artifact id="Library/recorddetectedissue-library" key="Library-recorddetectedissue-library" name="Record Detected Issue Library"/>
 <artifact id="Library/recordinference-library" key="Library-recordinference-library" name="Record Inference"/>
-<artifact id="ActivityDefinition/cc-cpg-activity-referral-dietitian" key="ActivityDefinition-cc-cpg-activity-referral-dietitian" name="Referral: Dietitian; History: chronic kidney disease; Question: [add reason for referral]"/>
-<artifact id="ActivityDefinition/cc-cpg-activity-referral-nephrology" key="ActivityDefinition-cc-cpg-activity-referral-nephrology" name="Referral: Nephrology; History: [add diagnosis, symptom(s)]; Question: [add reason for referral]"/>
 <artifact id="Library/reportflag-library" key="Library-reportflag-library" name="Report Flag"/>
 <artifact id="Library/sendmessage-library" key="Library-sendmessage-library" name="Send Message Library"/>
-<artifact id="PlanDefinition/va-ckd-recommendations" key="PlanDefinition-va-ckd-recommendations" name="VA CKD Recommendations Plan Definition"/>
-<artifact id="ValueSet/anc-reason-for-visit-vs" key="ValueSet-anc-reason-for-visit-vs" name="ValueSet - ANC Reason for Visit"/>
 <artifact id="Bundle/activity-example-administermedication-bundle" key="Bundle-activity-example-administermedication-bundle" name="activity-example-administermedication-bundle"/>
 <artifact id="MedicationRequest/am-scenario1" key="MedicationRequest-am-scenario1" name="am-scenario1"/>
 <artifact id="Patient/am-scenario1-patient" key="Patient-am-scenario1-patient" name="am-scenario1-patient"/>
@@ -312,7 +313,8 @@
 <artifact id="MeasureReport/chf-scenario1-bodyweight4" key="MeasureReport-chf-scenario1-bodyweight4" name="chf-scenario1-bodyweight4"/>
 <artifact id="Observation/chf-scenario1-bodyweight4-observation" key="Observation-chf-scenario1-bodyweight4-observation" name="chf-scenario1-bodyweight4-observation"/>
 <artifact id="Procedure/chf-scenario1-cardiology-consult" key="Procedure-chf-scenario1-cardiology-consult" name="chf-scenario1-cardiology-consult"/>
-<artifact id="ServiceRequest/chf-scenario1-cardiology-consultation" key="ServiceRequest-chf-scenario1-cardiology-consultation" name="chf-scenario1-cardiology-consultation"/>
+<artifact id="ServiceRequest/chf-scenario1-cardiology-consult-request" key="ServiceRequest-chf-scenario1-cardiology-consult-request" name="chf-scenario1-cardiology-consult-request"/>
+<artifact deprecated="true" id="ServiceRequest/chf-scenario1-cardiology-consultation" key="ServiceRequest-chf-scenario1-cardiology-consultation" name="chf-scenario1-cardiology-consultation"/>
 <artifact id="Goal/chf-scenario1-cardiology-consultation-goal" key="Goal-chf-scenario1-cardiology-consultation-goal" name="chf-scenario1-cardiology-consultation-goal"/>
 <artifact id="CareTeam/chf-scenario1-careteam" key="CareTeam-chf-scenario1-careteam" name="chf-scenario1-careteam"/>
 <artifact id="ClinicalImpression/chf-scenario1-clinicalimpression" key="ClinicalImpression-chf-scenario1-clinicalimpression" name="chf-scenario1-clinicalimpression"/>

input/examples/ImplementationGuide-chf-ig.json

@@ -1147,7 +1147,7 @@
         "valueString" : "ServiceRequest"
       }],
       "reference" : {
-        "reference" : "ServiceRequest/chf-scenario1-cardiology-consultation"
+        "reference" : "ServiceRequest/chf-scenario1-cardiology-consult-request"
       },
       "name" : "chf-scenario1-cardiology-consultation",
       "description" : "CHF Scenario One",

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-administermedication.fsh

@@ -1,7 +1,7 @@
 Instance: activity-example-administermedication-ad
 InstanceOf: CPGAdministerMedicationActivity
 Usage: #example
-* insert KnowledgeArtifactADMetadata(activity-example-administermedication-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-administermedication-ad)
 * title = "Activity Example Administer Medication AD"
 * description = "Example Activity Definition for a recommendation to administer a medication"
 * name = "ActivityExampleAdministerMedicationAD"

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-collectinformation.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-collectinformation-ad
 InstanceOf: CPGCollectInformationActivity
 Usage: #example
 * title = "Activity Example Collect Information AD"
-* insert KnowledgeArtifactADMetadata(activity-example-collectinformation-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-collectinformation-ad)
 * description = "Example Activity Definition for a recommendation to collect information"
 * extension[+]
   * url = $cpg-collectWith

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-dispensemedication.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-dispensemedication-ad
 InstanceOf: CPGDispenseMedicationActivity
 Usage: #example
 * title = "Activity Example Dispense Medication AD"
-* insert KnowledgeArtifactADMetadata(activity-example-dispensemedication-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-dispensemedication-ad)
 * description = "Example Activity Definition for a recommendation to dispense a medication"
 * name = "ActivityExampleDispenseMedicationAD"
 * kind = #Task

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-documentmedication.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-documentmedication-ad
 InstanceOf: CPGDocumentMedicationActivity
 Usage: #example
 * title = "Activity Example Document Medication AD"
-* insert KnowledgeArtifactADMetadata(activity-example-documentmedication-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-documentmedication-ad)
 * description = "Example Activity Definition for a recommendation to document a medication"
 * name = "ActivityExampleDocumentMedicationAD"
 * kind = #Task

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-donotcollectinformation.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-donotcollectinformation-ad
 InstanceOf: CPGCollectInformationActivity
 Usage: #example
 * title = "Activity Example Do Not Collect Information AD"
-* insert KnowledgeArtifactADMetadata(activity-example-donotcollectinformation-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-donotcollectinformation-ad)
 * description = "Example Activity Definition for a recommendation not to collect information"
 * extension[+]
   * url = $cpg-collectWith

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-donotsendmessage.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-donotsendmessage-ad
 InstanceOf: CPGCommunicationActivity
 Usage: #example
 * title = "Activity Example Do Not Send Message AD"
-* insert KnowledgeArtifactADMetadata(activity-example-donotsendmessage-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-donotsendmessage-ad)
 * description = "Example Activity Definition for a recommendation not to send a message"
 * name = "ActivityExampleDoNotSendMessageAD"
 * kind = #CommunicationRequest

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-enrollment.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-enrollment-ad
 InstanceOf: CPGEnrollmentActivity
 Usage: #example
 * title = "Activity Example Enrollment AD"
-* insert KnowledgeArtifactADMetadata(activity-example-enrollment-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-enrollment-ad)
 * description = "Example Activity Definition for a recommendation to enroll a patient in a pathway"
 * extension[+]
   * url = $cpg-enrollIn

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-generatereport.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-generatereport-ad
 InstanceOf: http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-generatereportactivity
 Usage: #example
 * title = "Activity Example Generate Report AD"
-* insert KnowledgeArtifactADMetadata(activity-example-generatereport-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-generatereport-ad)
 * description = "Example Activity Definition for a recommendation to generate a report"
 * extension[+]
   * url = $cpg-reportWith

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-ordermedication.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-ordermedication-ad
 InstanceOf: CPGMedicationRequestActivity
 Usage: #example
 * title = "Activity Example Order Medication AD"
-* insert KnowledgeArtifactADMetadata(activity-example-ordermedication-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-ordermedication-ad)
 * description = "Example Activity Definition for a recommendation to order a medication"
 * name = "ActivityExampleOrderMedicationAD"
 * kind = #MedicationRequest

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-orderservice.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-orderservice-ad
 InstanceOf: CPGServiceRequestActivity
 Usage: #example
 * title = "Activity Example Order Service AD"
-* insert KnowledgeArtifactADMetadata(activity-example-orderservice-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-orderservice-ad)
 * description = "Example Activity Definition for a recommendation to order a service"
 * name = "ActivityExampleOrderServiceAD"
 * kind = #ServiceRequest

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-proposediagnosis.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-proposediagnosis-ad
 InstanceOf: CPGProposeDiagnosisActivity
 Usage: #example
 * title = "Activity Example Propose Diagnosis AD"
-* insert KnowledgeArtifactADMetadata(activity-example-proposediagnosis-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-proposediagnosis-ad)
 * description = "Example Activity Definition for a recommendation to propose a diagnosis"
 * name = "ActivityExampleProposeDiagnosisAD"
 * kind = #Task

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-recommendimmunization.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-recommendimmunization-ad
 InstanceOf: CPGImmunizationActivity
 Usage: #example
 * title = "Activity Example Recommend Immunization AD"
-* insert KnowledgeArtifactADMetadata(activity-example-recommendimmunization-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-recommendimmunization-ad)
 * description = "Example Activity Definition for a recommendation to provide an immunization"
 * name = "ActivityExampleRecommendImmunizationAD"
 * kind = #MedicationRequest

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-recorddetectedissue.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-recorddetectedissue-ad
 InstanceOf: CPGRecordDetectedIssueActivity
 Usage: #example
 * title = "Activity Example Record Detected Issue AD"
-* insert KnowledgeArtifactADMetadata(activity-example-recorddetectedissue-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-recorddetectedissue-ad)
 * description = "Example Activity Definition for a recommendation to record a detected issue"
 * name = "ActivityExampleRecordDetectedIssueAD"
 * kind = #Task

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-recordinference.fsh

@@ -2,7 +2,7 @@ Instance: activity-example-recordinference-ad
 InstanceOf: CPGRecordInferenceActivity
 Usage: #example
 * title = "Activity Example Record Inference AD"
-* insert KnowledgeArtifactADMetadata(activity-example-recordinference-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-recordinference-ad)
 * description = "Example Activity Definition for a recommendation to record an inference"
 * name = "ActivityExampleRecordInferenceAD"
 * kind = #Task

input/fsh/examples/activity-examples/resources/activitydefinition-activity-example-reportflag.fsh

@@ -3,7 +3,7 @@ InstanceOf: CPGReportFlagActivity
 Usage: #example
 * title = "Activity Example Report Flag AD"
 * description = "Example Activity Definition for a recommendation to report a flag"
-* insert KnowledgeArtifactADMetadata(activity-example-reportflag-ad)
+* insert ExampleActivityDefinitionMetadata(activity-example-reportflag-ad)
 * name = "ActivityExampleReportFlagAD"
 * kind = #Task
 * profile = Canonical(CPGReportFlagTask)