Skip to content

Commit

Permalink
Merge pull request #9 from fhir-fi/2-patient-resurssin-kehitys
Browse files Browse the repository at this point in the history
Changes according to the issue. Edunvalvoja issue still unresolved.
  • Loading branch information
Marvasuo authored Dec 2, 2022
2 parents a02e250 + 30f6ee8 commit a4636fc
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 15 deletions.
2 changes: 2 additions & 0 deletions _gencontinuous.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@ECHO OFF
CALL ./_genonce.bat -watch
2 changes: 2 additions & 0 deletions _gencontinuous.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
./_genonce.sh -watch
2 changes: 2 additions & 0 deletions _genonce.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ fi

echo "$txoption"

export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8

publisher=$input_cache_path/$publisher_jar
if test -f "$publisher"; then
java -jar $publisher -ig . $txoption $*
Expand Down
35 changes: 20 additions & 15 deletions input/fsh/patient.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,27 @@ Profile: FinnishCorePatient
Parent: Patient
Description: "A finnish core profile of the Patient resource."
* id 1..1
* identifier 1..1
* system = #urn:oid:1.2.246.21
* name 1..* MS
* gender 1..1
* birthDate 1..1
* address 0..1
* active 0..0
* maritalStatus 0..0
* multipleBirth[x] 0..0
* photo 0..0
* contact 0..0
* managingOrganization 0..0
* link 0..0
* text 0..0
* language 0..0

* meta.security ^slicing.discriminator.type = #value
* meta.security ^slicing.discriminator.path = "system"
* meta.security ^slicing.rules = #openAtEnd
* meta.security ^slicing.description = "Information about non-disclosure (turvakielto) SHALL be handled in meta.security."
* meta.security ^slicing.ordered = false

* meta.security contains non-disclosure 0..1
* meta.security[non-disclosure].system = "http://terminology.hl7.org/CodeSystem/v3-Confidentiality"

* identifier ^slicing.discriminator.type = #value
* identifier ^slicing.discriminator.path = "system"
* identifier ^slicing.rules = #openAtEnd
* identifier ^slicing.description = "When using the Finnish personal identifier, identifier.system SHALL be #urn:oid:1.2.246.21."
* identifier ^slicing.ordered = false

* identifier contains SSN 0..1
* identifier[SSN].system = #urn:oid:1.2.246.21

* extension contains MunicipalityCode named municipality 0..1
* extension contains interpreterRequired named interpreterRequired 0..1

Extension: MunicipalityCode
Id: municipality-code
Expand Down

0 comments on commit a4636fc

Please sign in to comment.