Merge pull request #1270 from yanheras/master

updates to DaVinci Risk Adjustment STU2.1

Author: lmckenzi

xml/FHIR-us-davinci-ra.xml

@@ -76,11 +76,14 @@
 <artifact id="Encounter/ra-encounter15pat03" key="Encounter-ra-encounter15pat03" name="Encounter with Dr Osler on 2021-08-08 for Patient 03"/>
 <artifact id="Encounter/ra-encounter31pat02" key="Encounter-ra-encounter31pat02" name="Encounter with Dr Pump on 2021-08-06 for Patient 02"/>
 <artifact id="OperationDefinition/ra.evaluate-measure" key="OperationDefinition-ra.evaluate-measure" name="Evaluate Measure"/>
+<artifact id="ValueSet/evidence-status" key="ValueSet-evidence-status" name="Evidence Status"/>
 <artifact id="StructureDefinition/ra-evidenceStatusDate" key="StructureDefinition-ra-evidenceStatusDate" name="Evidence Status Date Extension"/>
 <artifact id="StructureDefinition/ra-evidenceStatus" key="StructureDefinition-ra-evidenceStatus" name="Evidence Status Extension"/>
 <artifact deprecated="true" id="ValueSet/example-cmshcc" key="ValueSet-example-cmshcc" name="Example CMS Hierarchical Condition Category Value Set"/>
 <artifact id="StructureDefinition/ra-groupReference" key="StructureDefinition-ra-groupReference" name="Group Reference Extension"/>
+<artifact deprecated="true" id="ValueSet/hiearchical-status" key="ValueSet-hiearchical-status" name="Hiearchical Status"/>
 <artifact deprecated="true" id="StructureDefinition/ra-hiearchicalStatus" key="StructureDefinition-ra-hiearchicalStatus" name="Hiearchical Status Extension"/>
+<artifact id="ValueSet/hierarchical-status" key="ValueSet-hierarchical-status" name="Hierarchical Status"/>
 <artifact id="StructureDefinition/ra-hierarchicalStatus" key="StructureDefinition-ra-hierarchicalStatus" name="Hierarchical Status Extension"/>
 <artifact id="SearchParameter/measurereport-category" key="SearchParameter-measurereport-category" name="MeasureReportCategory"/>
 <artifact id="Organization/ra-laboratory01" key="Organization-ra-laboratory01" name="Organization Example: XYZ Laboratory"/>
@@ -131,11 +134,8 @@
 <artifact id="CapabilityStatement/ra-data-submission-client" key="CapabilityStatement-ra-data-submission-client" name="Risk Adjustment Data Submission Client Capability Statement"/>
 <artifact id="CapabilityStatement/ra-data-submission-server" key="CapabilityStatement-ra-data-submission-server" name="Risk Adjustment Data Submission Server Capability Statement"/>
 <artifact id="CodeSystem/evidence-status" key="CodeSystem-evidence-status" name="Risk Adjustment Evidence Status Codes"/>
-<artifact id="ValueSet/evidence-status" key="ValueSet-evidence-status" name="Evidence Status"/>
-<artifact id="CodeSystem/hiearchical-status" key="CodeSystem-hiearchical-status" name="Risk Adjustment Hiearchical Status Codes"/>
-<artifact id="ValueSet/hiearchical-status" key="ValueSet-hiearchical-status" name="Hiearchical Status"/>
+<artifact deprecated="true" id="CodeSystem/hiearchical-status" key="CodeSystem-hiearchical-status" name="Risk Adjustment Hiearchical Status Codes"/>
 <artifact deprecated="true" id="CodeSystem/hierarchical-status" key="CodeSystem-hierarchical-status" name="Risk Adjustment Hierarchical Status Codes"/>
-<artifact id="ValueSet/hierarchical-status" key="ValueSet-hierarchical-status" name="Hierarchical Status"/>
 <artifact id="Bundle/ra-bundle01" key="Bundle-ra-bundle01" name="Risk Adjustment MeasureReport Bundle example, MeasureReport01: Patient01"/>
 <artifact id="StructureDefinition/ra-model-measure" key="StructureDefinition-ra-model-measure" name="Risk Adjustment Model Measure"/>
 <artifact deprecated="true" id="CapabilityStatement/ra-remediation-client" key="CapabilityStatement-ra-remediation-client" name="Risk Adjustment Remediation Client Capability Statement"/>