Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

recreated assembled questionnaires and adapted structure map and transformed bundles from qr #147

Merged
merged 10 commits into from
Jun 14, 2023
Merged

recreated assembled questionnaires and adapted structure map and transformed bundles from qr #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d39267d
fix Display values
oliveregger Jun 12, 2023
152aa5c
set version to 1.1.0 insead of 2.0.0
oliveregger Jun 12, 2023
3f9ffd4
fix assembled questionnaire
oliveregger Jun 12, 2023
b87e6bc
adjust maps and examples
oliveregger Jun 13, 2023
d5d7afc
Definition Elements do not resolve #144
oliveregger Jun 13, 2023
a07fe60
answerOption #145
oliveregger Jun 13, 2023
517b9fa
english / german mismatch coding
oliveregger Jun 13, 2023
89b21e9
StructureMap validation errors #146
oliveregger Jun 13, 2023
5cae6fe
display english / german error
oliveregger Jun 13, 2023
d72df87
mend
oliveregger Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions assembleandprepop.http
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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