Updates to category value sets

FHIR-us-pco.xml

@@ -10,7 +10,7 @@
 <artifact id="MedicationRequest/pcoAntiInflammatoryMedication" key="MedicationRequest-pcoAntiInflammatoryMedication" name="Care Plan: Anti-Inflammatory Medication"/>
 <artifact id="ServiceRequest/pcoPhysicalTherapyReferral" key="ServiceRequest-pcoPhysicalTherapyReferral" name="Care Plan: Clinical action step for PT"/>
 <artifact id="ServiceRequest/pcoWalkOutsideActionStep" key="ServiceRequest-pcoWalkOutsideActionStep" name="Care Plan: Personal action step"/>
-<artifact id="CodeSystem/pco-cs" key="CodeSystem-pco-cs" name="Codes for PCO"/>
+<artifact id="CodeSystem/pco-codes" key="CodeSystem-pco-codes" name="Codes for PCO"/>
 <artifact id="Patient/pcoPatientLopez" key="Patient-pcoPatientLopez" name="Example Patient Camila"/>
 <artifact id="Patient/pcoPatientJones" key="Patient-pcoPatientJones" name="Example Patient Dorothy"/>
 <artifact id="Library/FHIRHelpers" key="Library-FHIRHelpers" name="FHIRHelpers"/>
@@ -28,17 +28,17 @@
 <artifact id="Library/GoalFollowUpMeasure" key="Library-GoalFollowUpMeasure" name="GoalFollowUpMeasure"/>
 <artifact id="Library/GoalIdentificationMeasure" key="Library-GoalIdentificationMeasure" name="GoalIdentificationMeasure"/>
 <artifact id="Practitioner/pcoPractitionerGonzalez" key="Practitioner-pcoPractitionerGonzalez" name="Health &amp; Wellness Coach"/>
-<artifact id="CodeSystem/ncqa-goal-domains" key="CodeSystem-ncqa-goal-domains" name="NCQA Goal Domains"/>
+<artifact id="CodeSystem/pco-goal-domains" key="CodeSystem-pco-goal-domains" name="NCQA Goal Domains"/>
 <artifact id="ValueSet/pco-domain-category-valueset" key="ValueSet-pco-domain-category-valueset" name="PCO Domain Categories"/>
 <artifact id="Library/PCOCommon" key="Library-PCOCommon" name="PCOCommon"/>
 <artifact id="Questionnaire/44249-1" key="Questionnaire-44249-1" name="PHQ-9 quick depression assessment panel"/>
 <artifact id="ValueSet/prom-target-measures" key="ValueSet-prom-target-measures" name="PROM Target Measures"/>
 <artifact id="Observation/pcoGASScorePatientFollowupExample" key="Observation-pcoGASScorePatientFollowupExample" name="Patient GAS Follow-up Score"/>
 <artifact id="StructureDefinition/pco-prom-score" key="StructureDefinition-pco-prom-score" name="Patient-Reported Outcome Measure (PROM) score"/>
 <artifact id="StructureDefinition/pco-care-plan" key="StructureDefinition-pco-care-plan" name="Person-Centered Care Plan"/>
-<artifact id="ValueSet/pco-category-vs" key="ValueSet-pco-category-vs" name="Person-Centered Category Value Set"/>
 <artifact id="StructureDefinition/pco-gas-goal-profile" key="StructureDefinition-pco-gas-goal-profile" name="Person-Centered GAS Goal"/>
 <artifact id="StructureDefinition/pco-goal-profile" key="StructureDefinition-pco-goal-profile" name="Person-Centered Goal"/>
+<artifact id="ValueSet/pco-category-vs" key="ValueSet-pco-category-vs" name="Person-Centered Goal Category Value Set"/>
 <artifact id="Measure/GoalFollowUpMeasure" key="Measure-GoalFollowUpMeasure" name="Person-Centered Goal Follow-Up"/>
 <artifact id="Measure/GoalIdentificationMeasure" key="Measure-GoalIdentificationMeasure" name="Person-Centered Goal Identification"/>
 <artifact id="ValueSet/pco-survey-category-vs" key="ValueSet-pco-survey-category-vs" name="Person-Centered Outcomes Survey Value Set"/>
@@ -47,8 +47,8 @@
 <artifact id="Practitioner/pcoPractitionerAnderson" key="Practitioner-pcoPractitionerAnderson" name="Primary Care Physician"/>
 <artifact id="CodeSystem/va-whole-health" key="CodeSystem-va-whole-health" name="VA Whole Health Concepts"/>
 <artifact id="StructureDefinition/pco-what-matters-assessment" key="StructureDefinition-pco-what-matters-assessment" name="What Matters Assessment"/>
-<artifact id="StructureDefinition/pco-what-matters-focus-area" key="StructureDefinition-pco-what-matters-focus-area" name="What Matters Focus Area"/>
 <artifact id="ValueSet/what-matters-focus-areas" key="ValueSet-what-matters-focus-areas" name="What Matters Focus Areas"/>
+<artifact id="StructureDefinition/pco-what-matters-priority" key="StructureDefinition-pco-what-matters-priority" name="What Matters Priority Flag"/>
 <artifact id="CodeSystem/what-matters-rating" key="CodeSystem-what-matters-rating" name="What Matters Rating Concepts"/>
 <artifact id="StructureDefinition/pco-what-matters-statement" key="StructureDefinition-pco-what-matters-statement" name="What Matters Statement"/>
 <artifact id="Observation/pcoWhatMattersRelationshipsExample" key="Observation-pcoWhatMattersRelationshipsExample" name="What Matters: Family &amp; Friends"/>

input/fsh/GASExamples.fsh

@@ -6,8 +6,8 @@ Description: "Person-centered goal with attainment scaling extensions"
 Usage: #example
 * lifecycleStatus = #active
 * achievementStatus = $GoalAchievement#in-progress
-* category[pcoCategory] = PCOCodes#person-centered "Person-Centered"
-* category[domainCategory] = NCQAGoalDomains#physical-function "Physical Function"
+* category[pcoCategory] = PCOCodes#person-centered-goal "Person-Centered Goal"
+* category[domainCategory] = PCOGoalDomains#physical-function "Physical Function"
 * subject = Reference(pcoPatientJones)
 * expressedBy = Reference(pcoPatientJones)
 * startDate = "2024-04-03"

input/fsh/PCOExamples.fsh

@@ -47,8 +47,8 @@ Description: "Person-centered goal without attainment scaling or PROM"
 Usage: #example
 * lifecycleStatus = #active
 * achievementStatus = $GoalAchievement#in-progress
-* category[pcoCategory] = PCOCodes#person-centered "Person-Centered"
-* category[domainCategory] = NCQAGoalDomains#physical-function "Physical Function"
+* category[pcoCategory] = PCOCodes#person-centered-goal "Person-Centered Goal"
+* category[domainCategory] = PCOGoalDomains#physical-function "Physical Function"
 * subject = Reference(pcoPatientJones)
 * expressedBy = Reference(pcoPatientJones)
 * startDate = "2024-02-15"

input/fsh/PCOProfiles.fsh

@@ -1,16 +1,16 @@
 
 RuleSet: PCOCategory
-* category
+* category MS
   * ^slicing.discriminator.type = #pattern
   * ^slicing.discriminator.path = "$this"
   * ^slicing.rules = #open
 * category contains
-    pcoCategory 1..1 MS
+    pcoCategory 0..1 MS
 * category[pcoCategory] from PCOCategoryValueSet (required)
-  * ^short = "Person-Centered category"
+  * ^short = "Person-Centered Goal category"
 
 RuleSet: PCODomainCategory
-* category
+* category MS
   * ^slicing.discriminator.type = #pattern
   * ^slicing.discriminator.path = "$this"
   * ^slicing.rules = #open
@@ -29,9 +29,11 @@ RuleSet: PCOSurveyCategory
 * category ^slicing.rules = #open
 * category ^requirements = "To identify that observation is derived from a questionnaire or other assessment instrument."
 * category contains
-	survey 1..1 MS
-* category[survey] from PCOSurveyCategoryVS 
+	  survey 1..1 MS
+* category[survey] from PCOSurveyCategoryVS (required)
 * category[survey] ^requirements = "Indicates the person-centered outcomes observation is of type survey"
+* category[survey]
+  * ^binding.description = "Include 'survey' category to facilitate searching for this Observation as a kind of Assessment"
 
 Profile: PCOGoalProfile
 Parent: USCoreGoalProfile

input/fsh/PCOTerminology.fsh

@@ -11,15 +11,15 @@ Description: "Codes to identify content associated with this IG"
 * #pco-data-submission-standing-order "PCO Submission Standing Order"
 
 ValueSet: PCOCategoryValueSet
-Title: "Person-Centered Category Value Set"
+Title: "Person-Centered Goal Category Value Set"
 Id: pco-category-vs
-Description: "Used to categorize resources as being Person-Centered"
+Description: "Used to categorize resources as being a Person-Centered Goal"
 * ^experimental = false
-* PCOCodes#person-centered "Person-Centered"
+* PCOCodes#person-centered-goal "Person-Centered Goal"
 
 ValueSet: PCOSurveyCategoryVS
 Title: "Person-Centered Outcomes Survey Value Set"
 Id: pco-survey-category-vs
-Description: "Used to indicate that all PCO observations of of type Survey"
+Description: "Used to indicate that PCO observations of of type Survey, as defined by US-Core."
 * ^experimental = false
 * OBSCAT#survey "Survey"

input/fsh/PCOTerminologyExamples.fsh

@@ -2,10 +2,10 @@
  * Terminology used for example bindings in this specification.
 */
 
-CodeSystem: NCQAGoalDomains
-Id: ncqa-goal-domains
+CodeSystem: PCOGoalDomains
+Id: pco-goal-domains
 Title: "NCQA Goal Domains"
-Description: "NCQA goal domain codes used to identify the category for PCO resources."
+Description: "Goal domain codes used to identify the category for PCO resources."
 * ^caseSensitive = true
 * ^experimental = false
 * ^status = #active
@@ -40,16 +40,16 @@ Title: "PCO Domain Categories"
 Description: "Example value set to identify the domains category for PCO resources."
 * ^experimental = false
 // Cannot use "include codes" because cqframework -EnsureExecutableValueSet does not support this expansion
-// * include codes from system NCQAGoalDomains
-* NCQAGoalDomains#housing "Housing"
-* NCQAGoalDomains#access-to-services "Access To Services"
-* NCQAGoalDomains#caregiver-needs "Caregiver Needs"
-* NCQAGoalDomains#end-of-life "End Of Life"
-* NCQAGoalDomains#independence "Independence"
-* NCQAGoalDomains#legal "Legal"
-* NCQAGoalDomains#managing-conditions "Managing Conditions"
-* NCQAGoalDomains#medication-management "Medication Management"
-* NCQAGoalDomains#improving-health-and-wellness "Improving Health And Wellness"
-* NCQAGoalDomains#physical-function "Physical Function"
-* NCQAGoalDomains#social-functioning "Social Functioning"
-* NCQAGoalDomains#emotional-and-mental-health "Emotional And Mental Health"
+// * include codes from system PCOGoalDomains
+* PCOGoalDomains#housing "Housing"
+* PCOGoalDomains#access-to-services "Access To Services"
+* PCOGoalDomains#caregiver-needs "Caregiver Needs"
+* PCOGoalDomains#end-of-life "End Of Life"
+* PCOGoalDomains#independence "Independence"
+* PCOGoalDomains#legal "Legal"
+* PCOGoalDomains#managing-conditions "Managing Conditions"
+* PCOGoalDomains#medication-management "Medication Management"
+* PCOGoalDomains#improving-health-and-wellness "Improving Health And Wellness"
+* PCOGoalDomains#physical-function "Physical Function"
+* PCOGoalDomains#social-functioning "Social Functioning"
+* PCOGoalDomains#emotional-and-mental-health "Emotional And Mental Health"

input/fsh/PROMExamples.fsh

@@ -19,8 +19,8 @@ Description: "Person-centered goal with a PROM outcome target for GAD-7 score."
 Usage: #example
 * lifecycleStatus = #active
 * achievementStatus = $GoalAchievement#in-progress
-* category[pcoCategory] = PCOCodes#person-centered "Person-Centered"
-* category[domainCategory] = NCQAGoalDomains#emotional-and-mental-health "Emotional And Mental Health"
+* category[pcoCategory] = PCOCodes#person-centered-goal "Person-Centered Goal"
+* category[domainCategory] = PCOGoalDomains#emotional-and-mental-health "Emotional And Mental Health"
 * subject = Reference(pcoPatientLopez)
 * expressedBy = Reference(pcoPractitionerAnderson)
 * startDate = "2024-08-11"

input/fsh/WhatMatters.fsh

@@ -1,8 +1,8 @@
-Profile: WhatMattersFocusArea
+Profile: WhatMattersPriority
 Parent: USCoreSimpleObservationProfile
-Id: pco-what-matters-focus-area
-Title: "What Matters Focus Area"
-Description: "Assessment observation for one aspect of What Matters Most to a person, with a boolean value indicating if this is a current priority."
+Id: pco-what-matters-priority
+Title: "What Matters Priority Flag"
+Description: "Assessment observation for one aspect of What Matters Most to a person, with a boolean value indicating whether this is a current priority."
 * insert PCOSurveyCategory
 // Must have preferred binding because parent profile has a preferred binding.
 * code from WhatMattersFocusAreas (preferred)
@@ -111,7 +111,7 @@ Description: "Code system to identify \"What Matters\" concepts from the VA Whol
     "Staying up to date on prevention and understanding your health concerns, care options, treatment plan, and their role in your health."
 
 /*
- * TODO: ConceptMap between VAWholeHealth amd NCQAGoalDomains.
+ * TODO: ConceptMap between VAWholeHealth amd PCOGoalDomains.
 */
 
 ValueSet: WhatMattersFocusAreas

input/tests/GoalAttainmentLogic/3D4E56EA-2506-47D4-9753-2E6384A547F1/MyLotusData_CamilaLopez.json

@@ -654,7 +654,7 @@
               {
                 "code" : "physical-function",
                 "display" : "Physical Function",
-                "system" : "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains"
+                "system" : "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains"
               }
             ]
           }

input/tests/GoalAttainmentLogic/pcoPatientJones/CarePlan-pcoAnxietyCarePlanExample.json

@@ -15,7 +15,7 @@
       "coding": [
         {
           "code": "emotional-and-mental-health",
-          "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+          "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
           "display": "Emotional And Mental Health"
         }
       ]

input/tests/GoalAttainmentLogic/pcoPatientJones/CarePlan-pcoPhyicalFunctionCarePlanExample.json

@@ -6,7 +6,7 @@
       "coding": [
         {
           "code": "physical-function",
-          "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+          "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
           "display": "Physical Function"
         }
       ]
@@ -15,7 +15,7 @@
       "coding": [
         {
           "code": "independence",
-          "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+          "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
           "display": "Independence"
         }
       ]

input/tests/GoalAttainmentLogic/pcoPatientJones/Goal-pcoGoalPainLevelExample.json

@@ -6,7 +6,7 @@
       "coding": [
         {
           "code": "physical-function",
-          "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+          "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
           "display": "Physical Function"
         }
       ]

input/tests/GoalAttainmentLogic/pcoPatientJones/Goal-pcoGoalWalkDogExample.json

@@ -6,7 +6,7 @@
       "coding": [
         {
           "code": "physical-function",
-          "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+          "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
           "display": "Physical Function"
         }
       ]

input/tests/GoalAttainmentLogic/pcoPatientLopez/CarePlan-pcoAnxietyCarePlanExample.json

@@ -15,7 +15,7 @@
       "coding": [
         {
           "code": "emotional-and-mental-health",
-          "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+          "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
           "display": "Emotional And Mental Health"
         }
       ]

input/tests/GoalAttainmentLogic/pcoPatientLopez/CarePlan-pcoPhyicalFunctionCarePlanExample.json

@@ -6,7 +6,7 @@
       "coding": [
         {
           "code": "physical-function",
-          "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+          "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
           "display": "Physical Function"
         }
       ]
@@ -15,7 +15,7 @@
       "coding": [
         {
           "code": "independence",
-          "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+          "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
           "display": "Independence"
         }
       ]

input/tests/GoalAttainmentLogic/pcoPatientLopez/Goal-pcoGoalPainLevelExample.json

@@ -6,7 +6,7 @@
       "coding": [
         {
           "code": "physical-function",
-          "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+          "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
           "display": "Physical Function"
         }
       ]

input/tests/GoalAttainmentLogic/pcoPatientLopez/Goal-pcoGoalWalkDogExample.json

@@ -6,7 +6,7 @@
       "coding": [
         {
           "code": "physical-function",
-          "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+          "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
           "display": "Physical Function"
         }
       ]

vocabulary-internal/ValueSet/pco-category-valueset.json

@@ -19,7 +19,7 @@
   "description": "Example value set to identify the category for PCO resources.",
   "compose": {
     "include": [ {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "concept": [ {
         "code": "housing",
         "display": "Housing"
@@ -96,51 +96,51 @@
       "valueBoolean": true
     } ],
     "contains": [ {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "housing",
       "display": "Housing"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "access-to-services",
       "display": "Access To Services"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "caregiver-needs",
       "display": "Caregiver Needs"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "end-of-life",
       "display": "End Of Life"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "independence",
       "display": "Independence"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "legal",
       "display": "Legal"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "managing-conditions",
       "display": "Managing Conditions"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "medication-management",
       "display": "Medication Management"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "improving-health-and-wellness",
       "display": "Improving Health And Wellness"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "physical-function",
       "display": "Physical Function"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "social-functioning",
       "display": "Social Functioning"
     }, {
-      "system": "http://hl7.org/fhir/us/pco/CodeSystem/ncqa-goal-domains",
+      "system": "http://hl7.org/fhir/us/pco/CodeSystem/pco-goal-domains",
       "code": "emotional-and-mental-health",
       "display": "Emotional And Mental Health"
     }, {