Skip to content

Commit

Permalink
Merge pull request #147 from hl7ch/oe_fixerrors
Browse files Browse the repository at this point in the history 
recreated assembled questionnaires and adapted structure map and transformed bundles from qr
  • Loading branch information
@oliveregger
oliveregger authored Jun 14, 2023
2 parents 3cd4973 + d72df87 commit 25c0fbc
Show file tree
Hide file tree
Showing 22 changed files with 20,448 additions and 25,340 deletions.
5 changes: 3 additions & 2 deletions assembleandprepop.http
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@host = http://test.ahdis.ch/matchbox/fhir
@host = http://test.ahdis.ch/matchboxv3/fhir
### @host = http://localhost:8080/matchbox/fhir
### @host = https://lforms-smart-fhir.nlm.nih.gov/v/r4/fhir

### Create modular questionnaire with $assemble operation

### 1. Create FHS Questionnaires (modules)
### 2. Upload IG on matchbox https://test.ahdis.ch/matchbox/#/igs
### 2. Upload IG on matchbox https://test.ahdis.ch/matchboxv3/#/igs
### 3. Invoice $assemble operation on modular Questionnaire
POST {{host}}/Questionnaire/$assemble HTTP/1.1
Accept: application/json+fhir
Expand All @@ -15,6 +15,7 @@ Content-Type: application/json+fhir

### 4. If you want to provide the Questionnaire integrated in your IG translate the JSON response
### to fsh back with: https://fshschool.org/FSHOnline/#/
### remove appendix 'modular' form url and id

### end

Expand Down
15 changes: 2 additions & 13 deletions input/ch.fhir.ig.ch-orf.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@
<exampleBoolean value="false"/>
</resource>

<!-- Structure Maps temporär auskommentiert
<resource>
<reference>
<reference value="StructureMap/OrfQrToBundle"/>
Expand All @@ -325,8 +324,7 @@
<description value="Mapping ORF QuestionnaireResponse to Bundle"/>
<exampleBoolean value="false"/>
</resource>
-->
<!-- Example Instances -->

<resource>
<reference>
<reference value="Bundle/bundle-order-referral-form"/>
Expand All @@ -346,7 +344,6 @@
<exampleCanonical value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition"/>
</resource>

<!-- SEE https://github.com/hapifhir/org.hl7.fhir.core/issues/896-
<resource>
<reference>
<reference value="Bundle/radiology-order"/>
Expand All @@ -355,7 +352,7 @@
<description value="Example for Bundle"/>
<exampleCanonical value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-document"/>
</resource>
-->
<resource>
<reference>
<reference value="Bundle/external-diagnostics-order"/>
Expand Down Expand Up @@ -512,14 +509,6 @@
<description value="Example for QuestionnaireResponse"/>
<exampleCanonical value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-questionnaireresponse"/>
</resource>
<!--<resource>
<reference>
<reference value="QuestionnaireResponse/order-referral-form"/>
</reference>
<name value=")"/>
<description value="Example for QuestionnaireResponse"/>
<exampleCanonical value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-questionnaireresponse"/>
</resource> -->
<resource>
<reference>
<reference value="QuestionnaireResponse/qr-radiology-order"/>
Expand Down
10 changes: 5 additions & 5 deletions input/examples/bundle/bundle-canonical-fullurl.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,12 +496,12 @@
</item>
<item>
<linkId value="initiator"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.extension:initiator"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.extension"/>
<text value="Initiant dieser Anmeldung"/>
<type value="group"/>
<item>
<linkId value="initiator.legalrelation"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.extension:initator"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-initiator"/>
<text value="Juristische Beziehung zum Patienten"/>
<type value="choice"/>
<answerOption>
Expand All @@ -521,7 +521,7 @@
</item>
<item>
<linkId value="initiator.personalrelation"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.extension:initator"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-initiator"/>
<text value="Persönliche Beziehung zum Patienten?"/>
<type value="choice"/>
<answerOption>
Expand Down Expand Up @@ -2139,13 +2139,13 @@
</item>
<item>
<linkId value="appointment.location.phone"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-location#Location.telecom.value"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-location#Location.telecom"/>
<text value="Telefon"/>
<type value="string"/>
</item>
<item>
<linkId value="appointment.location.email"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-location#Location.telecom.value"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-location#Location.telecom"/>
<text value="E-Mail"/>
<type value="string"/>
</item>
Expand Down
10 changes: 5 additions & 5 deletions input/examples/bundle/bundle-canonical-uuid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,12 +500,12 @@ Success: 0 errors, 1 warnings, 1 notes
</item>
<item>
<linkId value="initiator"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.extension:initiator"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.extension"/>
<text value="Initiant dieser Anmeldung"/>
<type value="group"/>
<item>
<linkId value="initiator.legalrelation"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.extension:initator"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-initiator"/>
<text value="Juristische Beziehung zum Patienten"/>
<type value="choice"/>
<answerOption>
Expand All @@ -525,7 +525,7 @@ Success: 0 errors, 1 warnings, 1 notes
</item>
<item>
<linkId value="initiator.personalrelation"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-composition#Composition.extension:initator"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-initiator"/>
<text value="Persönliche Beziehung zum Patienten?"/>
<type value="choice"/>
<answerOption>
Expand Down Expand Up @@ -2143,13 +2143,13 @@ Success: 0 errors, 1 warnings, 1 notes
</item>
<item>
<linkId value="appointment.location.phone"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-location#Location.telecom.value"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-location#Location.telecom"/>
<text value="Telefon"/>
<type value="string"/>
</item>
<item>
<linkId value="appointment.location.email"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-location#Location.telecom.value"/>
<definition value="http://fhir.ch/ig/ch-orf/StructureDefinition/ch-orf-location#Location.telecom"/>
<text value="E-Mail"/>
<type value="string"/>
</item>
Expand Down
Loading

0 comments on commit 25c0fbc

Please sign in to comment.