Merge pull request #240 from abdullah-git1/master

QA fix - updated profiles removing constraints that were already in t…

input/ignoreWarnings.txt

@@ -10,15 +10,15 @@ WARNING: StructureDefinition.where(url = 'http://hl7.org/fhir/us/qicore/Structur
 # The following warnings in the examples are being generated due to no code within the codeable concept but referencing a valueset instead, consistent with the negation pattern
 WARNING: Immunization/negation-example: Immunization.vaccineCode: No code provided, and a code should be provided from the value set 'CVX Vaccines Administered Vaccine Set' (http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.6|20220701)
 WARNING: MedicationDispense/negation-example: MedicationDispense.medication.ofType(CodeableConcept): No code provided, and a code should be provided from the value set 'Medication Clinical Drug' (http://cts.nlm.nih.gov/fhir/ValueSet/2.16.840.1.113762.1.4.1010.4|20170601)
-WARNING: Procedure/negation-example: Procedure.code: No code provided, and a code should be provided from the value set 'US Core Procedure Codes' (http://hl7.org/fhir/us/core/ValueSet/us-core-procedure-code|6.1.0-snapshot1)
-WARNING: ServiceRequest/negation-example: ServiceRequest.code: No code provided, and a code should be provided from the value set 'US Core Procedure Codes' (http://hl7.org/fhir/us/core/ValueSet/us-core-procedure-code|6.1.0-snapshot1)
+WARNING: Procedure/negation-example: Procedure.code: No code provided, and a code should be provided from the value set 'US Core Procedure Codes' (http://hl7.org/fhir/us/core/ValueSet/us-core-procedure-code|6.1.0)
+WARNING: ServiceRequest/negation-example: ServiceRequest.code: No code provided, and a code should be provided from the value set 'US Core Procedure Codes' (http://hl7.org/fhir/us/core/ValueSet/us-core-procedure-code|6.1.0)
 
 
 # The following examples are using valid codes in the CPT/SOPT codesystems but THO doesn't define the codes.
 The definition for the Code System with URI 'http://www.ama-assn.org/go/cpt' doesnt provide any codes so the code cannot be validated
 The definition for the Code System with URI 'https://nahdo.org/sopt' doesnt provide any codes so the code cannot be validated
-WARNING: Encounter/encounter-ed-example: Encounter.type[0]: Unable to check whether the code is in the value set http://hl7.org/fhir/us/core/ValueSet/us-core-encounter-type|6.1.0-snapshot1
-WARNING: Encounter/example: Encounter.type[0]: Unable to check whether the code is in the value set http://hl7.org/fhir/us/core/ValueSet/us-core-encounter-type|6.1.0-snapshot1
+WARNING: Encounter/encounter-ed-example: Encounter.type[0]: Unable to check whether the code is in the value set http://hl7.org/fhir/us/core/ValueSet/us-core-encounter-type|6.1.0
+WARNING: Encounter/example: Encounter.type[0]: Unable to check whether the code is in the value set http://hl7.org/fhir/us/core/ValueSet/us-core-encounter-type|6.1.0
 
 # The slices in the examples are present in the SimpleObservation.value[x] profile element as valueQuantity
 INFORMATION: Observation/example: Observation.value.ofType(Quantity): This element does not match any known slice defined in the profile http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-simple-observation|6.0.0-ballot

input/profiles/StructureDefinition-qicore-laboratory-result-observation.json

@@ -377,28 +377,6 @@
           "us-core-3",
           "us-core-4"
         ],
-        "constraint" : [
-          {
-            "extension" : [
-              {
-                "url" : "http://hl7.org/fhir/StructureDefinition/elementdefinition-bestpractice",
-                "valueBoolean" : true
-              }
-            ],
-            "key" : "us-core-4",
-            "severity" : "warning",
-            "human" : "SHOULD use Snomed CT for coded Results",
-            "expression" : "valueCodeableConcept.coding.system.empty() or valueCodeableConcept.coding.system = 'http://snomed.info/sct'",
-            "xpath" : "not(exists(f:valueCodeableConcept/f:coding/f:system) ) or f:valueCodeableConcept/f:coding/f:system[@value='http://snomed.info/sct']"
-          },
-          {
-            "key" : "us-core-3",
-            "severity" : "error",
-            "human" : "SHALL use UCUM for coded quantity units.",
-            "expression" : "valueQuantity.system.empty() or valueQuantity.system = 'http://unitsofmeasure.org'",
-            "xpath" : "not(exists(f:valueQuantity/f:system) ) or f:valueQuantity/f:system[@value='http://unitsofmeasure.org']"
-          }
-        ],
         "mustSupport" : true,
         "mapping" : [
           {

input/profiles/StructureDefinition-qicore-practitioner.json

@@ -117,21 +117,6 @@
           "us-core-16",
           "us-core-17"
         ],
-        "constraint" : [
-          {
-            "key" : "us-core-16",
-            "severity" : "error",
-            "human" : "NPI must be 10 digits",
-            "expression" : "value.matches('^[0-9]{10}$')",
-            "xpath" : "f:value/f:matches(value,/^[0-9]{10}$/)"
-          },
-          {
-            "key" : "us-core-17",
-            "severity" : "error",
-            "human" : "NPI check digit must be valid (Luhn algorithm check)",
-            "expression" : "(((select(value.substring(0,1).toInteger()).select(iif($this<5, $this*2, (($this*2)-9))))+(value.substring(1,1).toInteger())+(select(value.substring(2,1).toInteger()).select(iif($this<5, $this*2, (($this*2)-9))))+(value.substring(3,1).toInteger())+(select(value.substring(4,1).toInteger()).select(iif($this<5, $this*2, (($this*2)-9))))+(value.substring(5,1).toInteger())+(select(value.substring(6,1).toInteger()).select(iif($this<5, $this*2, (($this*2)-9))))+(value.substring(7,1).toInteger())+(select(value.substring(8,1).toInteger()).select(iif($this<5, $this*2, (($this*2)-9))))+(value.substring(9,1).toInteger()) + 24)mod 10=0)"
-          }
-        ],
         "mustSupport" : true
       },
             {