Skip to content

Commit

Permalink
Merge branch 'master' into restore-ci-mode
Browse files Browse the repository at this point in the history
  • Loading branch information
mrinnetmaki committed Nov 9, 2023
2 parents d7ce893 + 7811a3a commit 45197ce
Show file tree
Hide file tree
Showing 113 changed files with 1,542 additions and 706 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM node:lts-bullseye
RUN npm install -g fsh-sushi
RUN npm install -g fsh-sushi@3.3.3

RUN apt-get update && apt-get -y install openjdk-17-jdk-headless ruby-full build-essential zlib1g-dev
RUN gem install jekyll bundler
RUN gem install jekyll bundler
21 changes: 12 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ This repo contains the source code for the Finnish FHIR base profiles.
The profiling work is performed in a project driven by [HL7 Finland](https://www.hl7.fi).
See the
[announcement](https://www.hl7.fi/hl7-fhir-profilointityo-kaynnistyy-tule-mukaan-vaikuttamaan-kansalliseen-tekemiseen/),
the [running
memo](https://docs.google.com/document/d/1yNq6XMLhWJqi6OELQtWC1DFwdtD9CQulzVOfz-zZCko/edit#), and
[some more details](https://fhir.fi).
the
[running memo](https://docs.google.com/document/d/1yNq6XMLhWJqi6OELQtWC1DFwdtD9CQulzVOfz-zZCko/edit#),
and [some more details](https://fhir.fi).

The profiles are based on R4, [FHIR 4.0.1](http://hl7.org/fhir/R4/).

Expand All @@ -17,8 +17,9 @@ Read more about the profiling work in the [index page](input/pagecontent/index.m

### On build.fhir.org
The results of each commit to this repository are published automatically at the build.fhir.org
infrastructure. You can locate the built snapshot with the branch name. For instance, the latest
commit to the `master` branch is published at
infrastructure. You can select a built snapshot from the
[list of branches](https://build.fhir.org/ig/fhir-fi/finnish-base-profiles/branches/). For
instance, the latest commit to the `master` branch is published at
[https://build.fhir.org/ig/fhir-fi/finnish-base-profiles/branches/master](https://build.fhir.org/ig/fhir-fi/finnish-base-profiles/branches/master).

You can also browse the [list of all IG builds](https://fhir.github.io/auto-ig-builder/builds.html).
Expand Down Expand Up @@ -56,7 +57,7 @@ See also the repo for
* Java 17
* Jekyll (ruby)

Or you can use docker, see [Dockerfile](Dockerfile).
Or you can use Docker, see [Dockerfile](Dockerfile).

### Quick Start

Expand All @@ -65,19 +66,19 @@ With the above requirements installed locally, run
#### On OSX, Linux, or Unix

``` bash
npm install -g fsh-sushi
npm install -g fsh-sushi@3.3.3
./_updatePublisher.sh --yes
./_genonce.sh
```

#### On Windows
```
npm install -g fsh-sushi
npm install -g fsh-sushi@3.3.3
.\_updatePublisher.bat --yes
.\_genonce.bat
```

### Using Docker
#### Using Docker

Run

Expand All @@ -86,4 +87,6 @@ docker-compose run runner bash -c "cd /workdir && ./_updatePublisher.sh --yes"
docker-compose run runner bash -c "cd /workdir && ./_genonce.sh"
```

#### Results

The implementation guide will be generated to the `output/` directory.
3 changes: 3 additions & 0 deletions _updatePublisher.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,16 @@ if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then

curl -L $gencont_sh_url -o /tmp/_gencontinuous.new
cp /tmp/_gencontinuous.new _gencontinuous.sh
chmod +x _gencontinuous.sh
rm /tmp/_gencontinuous.new

curl -L $gen_sh_url -o /tmp/_genonce.new
cp /tmp/_genonce.new _genonce.sh
chmod +x _genonce.sh
rm /tmp/_genonce.new

curl -L $update_sh_url -o /tmp/_updatePublisher.new
cp /tmp/_updatePublisher.new _updatePublisher.sh
chmod +x _updatePublisher.sh
rm /tmp/_updatePublisher.new
fi
2 changes: 2 additions & 0 deletions fsh.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[FSH]
timeout=600
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
{
"resourceType": "Provenance",
"id": "custodian-public-healthcare-kela",
"meta": {
"profile": [
"https://tietohiisi.fi/fhir/teehoo-base-profiles/StructureDefinition/th-base-information-custodian-public"
]
},
"text": {
"status": "generated",
"div": "<div xmlns=\"http://www.w3.org/1999/xhtml\"><p><b>Generated Narrative: Provenance</b><a name=\"custodian-public-healthcare\"> </a></p><div style=\"display: inline-block; background-color: #d9e0e7; padding: 6px; margin: 4px; border: 1px solid #8da1b4; border-radius: 5px; line-height: 60%\"><p style=\"margin-bottom: 0px\">Resource Provenance &quot;custodian-public-healthcare&quot; </p><p style=\"margin-bottom: 0px\">Profile: <a href=\"StructureDefinition-fi-base-information-custodian-public.html\">FI Base Information Custodian (Public Organization)</a></p></div><p><b>target</b>: <a href=\"EpisodeOfCare-id-for-episode-1.html\">EpisodeOfCare/id-for-episode-1</a></p><p><b>recorded</b>: Aug 25, 2023, 1:42:17 PM</p><h3>Agents</h3><table class=\"grid\"><tr><td style=\"display: none\">-</td><td><b>Type</b></td><td><b>Role</b></td><td><b>Who</b></td></tr><tr><td style=\"display: none\">*</td><td>Rekisterinpitäjä <span style=\"background: LightGoldenRodYellow; margin: 4px; border: 1px solid khaki\"> (<a href=\"http://terminology.hl7.org/5.0.0/CodeSystem-v3-ParticipationType.html\">ParticipationType</a>#CST &quot;custodian&quot;)</span></td><td>Julkinen <span style=\"background: LightGoldenRodYellow; margin: 4px; border: 1px solid khaki\"> (unknown#1)</span></td><td><span>: Pirkanmaan hyvinvointialueen rekisterinpitäjä</span></td></tr></table><h3>Entities</h3><table class=\"grid\"><tr><td style=\"display: none\">-</td><td><b>Role</b></td><td><b>What</b></td></tr><tr><td style=\"display: none\">*</td><td>source</td><td><span>: Julkinen terveydenhuolto</span></td></tr></table></div>"
},
"contained": [
{
"resourceType": "Organization",
"id": "jarjestajaorg1",
"identifier": [
{
"system": "urn:oid:1.2.246.537.6.40174",
"value": "urn:oid:1.2.246.10.32213086.10.0"
}
],
"name": "Pirkanmaan hyvinvointialue"
},
{
"resourceType": "Organization",
"id": "tuottajaorg1",
"identifier": [
{
"system": "urn:oid:1.2.246.537.6.40174",
"value": "urn:oid:1.2.246.10.32213086.10.0"
}
],
"name": "Pirkanmaan hyvinvointialue"
}
],
"target": [
{
"reference": "EpisodeOfCare/id-for-episode-1"
}
],
"recorded": "2023-08-25T16:42:17.239+03:00",
"agent": [
{
"type": {
"coding": [
{
"system": "http://terminology.hl7.org/CodeSystem/v3-ParticipationType",
"code": "CST",
"display": "custodian"
}
],
"text": "Rekisterinpitäjä"
},
"role": [
{
"coding": [
{
"system": "urn:oid:1.2.246.537.5.40172",
"code": "1",
"display": "Julkinen"
}
],
"text": "Julkinen"
}
],
"who": {
"type": "Organization",
"identifier": {
"type": {
"coding": [
{
"system": "http://terminology.hl7.org/CodeSystem/v2-0203",
"code": "PRN"
}
]
},
"system": "urn:oid:1.2.246.537.6.40174",
"value": "urn:oid:1.2.246.10.32213086.19.0"
},
"display": "Pirkanmaan hyvinvointialueen rekisterinpitäjä"
}
},
{
"role": [
{
"coding": [
{
"system": "http://gen.kanta.fi/fikanta-cs-rolecategory",
"code": "8",
"display": "Palvelunjärjestäjä"
}
]
}
],
"who": {
"reference": "#jarjestajaorg1"
}
},
{
"role": [
{
"coding": [
{
"system": "http://gen.kanta.fi/fikanta-cs-rolecategory",
"code": "11",
"display": "Palveluntuottaja"
}
]
}
],
"who": {
"reference": "#tuottajaorg1"
}
}
],
"entity": [
{
"role": "source",
"what": {
"identifier": {
"system": "urn:oid:1.2.246.537.5.40150",
"value": "4"
},
"display": "Työterveyshuolto"
}
},
{
"role": "source",
"what": {
"identifier": {
"type": {
"coding": [
{
"system": "http://terminology.hl7.org/CodeSystem/v2-0203",
"code": "XX"
}
]
},
"system": "urn:oid:1.2.246.10",
"value": "2606155-7"
},
"display": "Sensotrend Oy"
}
}
]
}
44 changes: 0 additions & 44 deletions input/examples/example-CarePlan-mandatory.json

This file was deleted.

Loading

0 comments on commit 45197ce

Please sign in to comment.