IG QA fixes (#69)

* IG QA fixes

* Updates and fixes

* Updates

* Cleanup

---------

Co-authored-by: Piotr Mankowski <pmanko@uw.edu>

ig.ini

@@ -1,5 +1,5 @@
 [IG]
 ig = fsh-generated/resources/ImplementationGuide-smart.who.int.hiv.json
 
-#template = #local-template
-template = who.template.root#current
+template = #local-template
+;template = who.template.root#current

input/cql/HIVCommon.cql

@@ -254,7 +254,7 @@ define fluent function dailyDose(Dispense "MedicationDispense"):
   define STI_testing:
     [Procedure] P
   where P.status = 'completed'
-  and P.code ~ Concepts."STI testing and treatment services"
+  and P.code ~ Concepts."STI testing and treatment services" 
 
 
 /**

input/cql/HIVConcepts.cql

@@ -7,7 +7,8 @@
 // Codes are provided for each Data Dictionary concept
 // Specific Data Element IDs are appended to the label if the label is not unique within the DAK
 
-library HIVConcepts
+library HIVConcepts version '0.0.2'
+
 codesystem "HIVConcepts": 'http://smart.who.int/hiv/CodeSystem/HIVConcepts'
 
 valueset "Referred by Choices": 'http://smart.who.int/hiv/ValueSet/HIV.A.DE5'

input/cql/HIVConceptsCustom.cql

@@ -1,13 +1,13 @@
-library HIVConceptsCustom
-codesystem "HIVConceptsCustom": 'http://smart.who.int/hiv/CodeSystem/HIVConceptsCustom'
+library HIVConceptsCustom version '0.0.1'
+// codesystem "HIVConceptsCustom": 'http://smart.who.int/hiv/CodeSystem/HIVConceptsCustom'
 
 codesystem "ConditionCategoryCodes": 'http://terminology.hl7.org/CodeSystem/condition-category'
 codesystem "ConditionClinicalStatusCodes": 'http://terminology.hl7.org/CodeSystem/condition-clinical'
 codesystem "ObservationCategoryCodes": 'http://terminology.hl7.org/CodeSystem/observation-category'
-codesystem "missing concepts": 'missing concepts'
+codesystem "missing concepts": 'https://worldhealthorganization.github.io/smart-hiv/CodeSystem/missing-concepts'
 codesystem "Devicestatement-status": 'http://hl7.org/fhir/device-statement-status'
-codesystem "SNOMEDCT:2018-03": 'urn:oid:2.16.840.1.113883.6.96' version 'urn:hl7:version:2018-03'
-codesystem "SNOMEDCT": 'urn:oid:2.16.840.1.113883.6.96'
+codesystem "SNOMEDCT:2018-03": 'http://snomed.info/sct' version '2018-03'
+codesystem "SNOMEDCT": 'http://snomed.info/sct'
 codesystem "AdverseEventSeverity": 'http://terminology.hl7.org/CodeSystem/adverse-event-severity'
 codesystem "RoleCode": 'http://terminology.hl7.org/CodeSystem/v3-RoleCode'
 
@@ -61,7 +61,7 @@ code "Two to four times a day (qualifier value)": '396111001' from "SNOMEDCT" di
 
 
 // Encounter Types
-code "HTS Visit": 'HTS Visit' from "HIVConceptsCustom"
+code "HTS Visit": 'HTS Visit' from "missing concepts"
 
 //not currently provided
 code "needle-syringe": 'needle syringe' from "missing concepts"