update resource ids, use answerValueSet in questionnaire

hl7-be · Dec 11, 2024 · 9ed5280 · 9ed5280
1 parent 4aef64a
commit 9ed5280
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 64 deletions.
diff --git a/...biotics/Bundle-getdatatocollect2-data.fsh → ...iotics/Bundle-getdatatocollect-a-data.fsh b/...biotics/Bundle-getdatatocollect2-data.fsh → ...iotics/Bundle-getdatatocollect-a-data.fsh
@@ -1,5 +1,5 @@
 
-Instance: getdatatocollect2-data
+Instance: getdatatocollect-a-data
 InstanceOf: Bundle
 Title: "Antibiology - S2 Get data to collect - Request - 2. - Bundle"
 Description: "Antibiology - S2 Get data to collect - Request - 2. Bundle"

diff --git a/...otics/Bundle-getdatatocollect2-return.fsh → ...tics/Bundle-getdatatocollect-a-return.fsh b/...otics/Bundle-getdatatocollect2-return.fsh → ...tics/Bundle-getdatatocollect-a-return.fsh
@@ -1,21 +1,21 @@
 
-Instance: getdatatocollect-return2
+Instance: getdatatocollect-a-return
 InstanceOf: Bundle
 Title: "Antibiology - S2 Get data to collect - Response - 1. Bundle"
 Description: "Antibiology - S2 Get data to collect - Response - 1. Bundle"
 Usage: #example
 * type = #collection
-* entry[0].resource = getdatatocollect-return2-v
+* entry[0].resource = getdatatocollect-a-return-group
 * entry[=].fullUrl = "urn:uuid:30551ce1-5a28-4356-b684-2e639094ad4d"
-* entry[+].resource = q-collect-information2
+* entry[+].resource = q-collect-information-a
 * entry[=].fullUrl = "urn:uuid:30551ce1-5a28-4356-b684-2e639094ad4c"
 // * entry[+].resource = collect-patient_variables
 // * entry[=].fullUrl = "urn:uuid:30551ce1-5a28-4356-b684-2e639094ad4b"
 * entry[+].resource = patient-v
 * entry[=].fullUrl = "urn:uuid:30551ce1-5a28-4356-b684-2e639094adff"
 
 
-Instance: getdatatocollect-return2-v
+Instance: getdatatocollect-a-return-group
 InstanceOf: RequestGroup
 Title: "Antibiology - S2 Get data to collect - Response - 1.1. RequestGroup"
 Description: "Antibiology - S2 Get data to collect - Response - 1.1. RequestGroup"
@@ -35,10 +35,10 @@ Usage: #example
 * subject = Reference(patient-v)
 * action[0]
   * textEquivalent = "Collect pregnancy status"
-  * resource = Reference(q-collect-information2)
+  * resource = Reference(q-collect-information-a)
 
 
-Instance: collect-information2
+Instance: collect-information-a
 Title: "Antibiology - S2 Get data to collect - Response - 1.2. Task for collecting information"
 Description: "Antibiology - S2 Get data to collect - Response - 1.2. Task for collecting information"
 InstanceOf: Task
@@ -50,62 +50,62 @@ Usage: #example
 * for = Reference(patient-y)
 * input
   * type = $cpg-activity-type-cs#collect-information "Collect information"
-  * valueReference.reference = Canonical(q-collect-information2)
+  * valueReference.reference = Canonical(q-collect-information-a)
 
 
 
 
-// Instance: contained-valueset
-// InstanceOf: ValueSet
-// Usage: #example
-// * status = #active
-// * expansion
-//   * contains[0]
-//     * code = http://snomed.info/sct#419760006
-//     * display = "Bacterial vaginosis"
-//   * contains[+]
-//     * code = http://snomed.info/sct#276877003
-//     * display = "Trichomonal vaginitis"
-//   * contains[+]
-//     * code = http://snomed.info/sct#72934000
-//     * display = "Candidiasis of vagina"
-//   * timestamp = "2015-06-22T13:56:07Z"
+Instance: condition-valueset
+InstanceOf: ValueSet
+Usage: #example
+* status = #active
+* expansion
+  * contains[0]
+    * code = http://snomed.info/sct#419760006
+    * display = "Bacterial vaginosis"
+  * contains[+]
+    * code = http://snomed.info/sct#276877003
+    * display = "Trichomonal vaginitis"
+  * contains[+]
+    * code = http://snomed.info/sct#72934000
+    * display = "Candidiasis of vagina"
+  * timestamp = "2015-06-22T13:56:07Z"
 
 
-Instance: q-collect-information2
+Instance: q-collect-information-a
 Title: "Antibiology - S2 Get data to collect - Response - 1.3. Questionnaire"
 Description: "Antibiology - S2 Get data to collect - Response - 1.3. Questionnaire"
 InstanceOf: Questionnaire
 Usage: #example
 //* meta.profile = "http://hl7.org/fhir/uv/cpg/StructureDefinition/cpg-collectinformationactivity"
-//* contained = contained-valueset
+* contained = condition-valueset
 * status = #active
-// * item[0]
-//   * linkId = "conditions"
-//   * text = "Which conditions are you considering?"
-//   * type = #choice
-//   * repeats = true
-//   * answerValueSet = "#contained-valueset"
 * item[0]
   * linkId = "conditions"
   * text = "Which conditions are you considering?"
-  * type = #group
-  * repeats = false
-  * item[0]
-    * linkId = "condition1"
-    * text = "Bacterial vaginosis"
-    * type = #boolean
-    * code = http://snomed.info/sct#419760006
-  * item[+]
-    * linkId = "condition2"
-    * text = "Trichomonal vaginitis"
-    * type = #boolean
-    * code.coding[+] = http://snomed.info/sct#276877003
-  * item[+]
-    * linkId = "condition3"
-    * text = "Candidiasis of vagina"
-    * type = #boolean
-    * code.coding[+] = http://snomed.info/sct#72934000
+  * type = #choice
+  * repeats = true
+  * answerValueSet = "#condition-valueset"
+// * item[0]
+//   * linkId = "conditions"
+//   * text = "Which conditions are you considering?"
+//   * type = #group
+//   * repeats = false
+//   * item[0]
+//     * linkId = "condition1"
+//     * text = "Bacterial vaginosis"
+//     * type = #boolean
+//     * code = http://snomed.info/sct#419760006
+//   * item[+]
+//     * linkId = "condition2"
+//     * text = "Trichomonal vaginitis"
+//     * type = #boolean
+//     * code.coding[+] = http://snomed.info/sct#276877003
+//   * item[+]
+//     * linkId = "condition3"
+//     * text = "Candidiasis of vagina"
+//     * type = #boolean
+//     * code.coding[+] = http://snomed.info/sct#72934000
 
 
 * item[+]
@@ -116,6 +116,6 @@ Usage: #example
 * item[+]
   * linkId = "recurrent"
   * text = "Recurrent?"
-  * code.coding[+] = $sct#708126004
+  * code = $sct#708126004
   * type = #boolean
 
diff --git a/...ntibiotics/Bundle-getdiagnoses-data2.fsh2 → ...tibiotics/Bundle-getdiagnoses-a-data.fsh2 b/...ntibiotics/Bundle-getdiagnoses-data2.fsh2 → ...tibiotics/Bundle-getdiagnoses-a-data.fsh2
@@ -5,7 +5,7 @@ Alias: $condition-ver-status = http://terminology.hl7.org/CodeSystem/condition-v
 Alias: $condition-category = http://terminology.hl7.org/CodeSystem/condition-category
 Alias: $sct = http://snomed.info/sct
 
-Instance: getdiagnoses-data2
+Instance: getdiagnoses-a-data
 Description: "Get Diagnoses Data"
 InstanceOf: Bundle
 Usage: #example

diff --git a/...ibiotics/Bundle-getdiagnoses-return2.fsh2 → ...biotics/Bundle-getdiagnoses-a-return.fsh2 b/...ibiotics/Bundle-getdiagnoses-return2.fsh2 → ...biotics/Bundle-getdiagnoses-a-return.fsh2
diff --git a/...iotics/Bundle-getrecommendations-data.fsh → ...tics/Bundle-getrecommendations-a-data.fsh b/...iotics/Bundle-getrecommendations-data.fsh → ...tics/Bundle-getrecommendations-a-data.fsh
@@ -1,4 +1,4 @@
-Instance: getrecommendations2-data
+Instance: getrecommendations-a-data
 Title: "Antibiology - S3 Get Recommendations - Request- 1. Bundle"
 Description: "Antibiology - S3 Get Recommendations - Request- 1. Bundle"
 InstanceOf: Bundle
@@ -24,7 +24,7 @@ Description: "Antibiology - S3 Get Recommendations - Request- 1.1. Questionnaire
 Usage: #example
 * status = #completed
 * authored = "2023-10-18T19:20:20.913Z"
-* questionnaire = Canonical(q-collect-information2)
+* questionnaire = Canonical(q-collect-information-a)
 * subject = Reference(patient-v)
 
 // * item[+]

diff --git a/...tics/Bundle-getrecommendations-return.fsh → ...cs/Bundle-getrecommendations-a-return.fsh b/...tics/Bundle-getrecommendations-return.fsh → ...cs/Bundle-getrecommendations-a-return.fsh
@@ -1,10 +1,10 @@
-Instance: getrecommendations2-return
+Instance: getrecommendations-a-return
 Title: "Antibiology - S3 Get Recommendations - Response - 1. Bundle"
 Description: "Antibiology - S3 Get Recommendations - Response - 1. Bundle"
 InstanceOf: Bundle
 Usage: #example
 * type = #collection
-* entry[0].resource = getrecommendations2-return-1
+* entry[0].resource = getrecommendations-a-return-group
 * entry[=].fullUrl = "urn:uuid:30551ce1-5a28-4356-b684-1e639094ad21"
 * entry[+].resource = metronidazol
 * entry[=].fullUrl = "urn:uuid:30551ce1-5a28-4356-b684-1e639094ad22"
@@ -15,12 +15,12 @@ Usage: #example
 * entry[+].resource = miconazol
 * entry[=].fullUrl = "urn:uuid:30551ce1-5a28-4356-b684-1e639094ad29"
 
-Instance: getrecommendations2-return-1
+Instance: getrecommendations-a-return-group
 InstanceOf: RequestGroup
 Title: "Antibiology - S3 Get Recommendations - Response - 1.1. RequestGroup"
 Description: "Antibiology - S3 Get Recommendations - Response - 1.1. RequestGroup"
 Usage: #example
-* id = "getrecommendations2-return-1"
+* id = "getrecommendations-a-return-group"
 * status = #active
 * intent = #proposal
 * subject = Reference(X)

diff --git a/sushi-config.yaml b/sushi-config.yaml
@@ -121,23 +121,23 @@ groups:
     name: Antibiology
     description: Antibiology PSS resource examples
     resources:
-      - Bundle/getdatatocollect2-data
+      - Bundle/getdatatocollect-a-data
       - Patient/patient-v
       - vulvovaginitis
       - AllergyIntolerance/allergy-to-sulfonamide
       - MedicationRequest/proposal-clindamycin
 
-      - Bundle/getdatatocollect-return2
-      - RequestGroup/getdatatocollect-return2-v
-      - Task/collect-information2
-      - Questionnaire/q-collect-information2
+      - Bundle/getdatatocollect-a-return
+      - RequestGroup/getdatatocollect-a-return-group
+      - Task/collect-information-a
+      - Questionnaire/q-collect-information-a
 
-      - Bundle/getrecommendations2-data
+      - Bundle/getrecommendations-a-data
       - QuestionnaireResponse/qresponse-v
       - Patient/patient-v
 
-      - Bundle/getrecommendations2-return
-      - RequestGroup/getrecommendations2-return-1
+      - Bundle/getrecommendations-a-return
+      - RequestGroup/getrecommendations-a-return-group
       - MedicationRequest/metronidazol
       - MedicationRequest/30551ce1-5a28-4356-b684-1e639094ad24
       - MedicationRequest/fluconazol