diff --git a/_updatePublisher.bat b/_updatePublisher.bat index 67aebf5834..10fee38155 100644 --- a/_updatePublisher.bat +++ b/_updatePublisher.bat @@ -8,6 +8,8 @@ SET input_cache_path=%CD%\input-cache\ SET skipPrompts=false SET scriptdlroot=https://raw.githubusercontent.com/HL7/ig-publisher-scripts/main +SET build_bat_url=%scriptdlroot%/_build.bat +SET build_sh_url=%scriptdlroot%/_build.sh SET update_bat_url=%scriptdlroot%/_updatePublisher.bat SET gen_bat_url=%scriptdlroot%/_genonce.bat SET gencont_bat_url=%scriptdlroot%/_gencontinuous.bat @@ -20,7 +22,7 @@ IF "%~1"=="/f" SET skipPrompts=y ECHO. ECHO Checking internet connection... -PING tx.fhir.org -4 -n 1 -w 1000 | FINDSTR TTL && GOTO isonline +PING tx.fhir.org -4 -n 1 -w 4000 | FINDSTR TTL && GOTO isonline ECHO We're offline, nothing to do... GOTO end @@ -69,6 +71,7 @@ IF DEFINED FORCE ( IF "%skipPrompts%"=="y" ( SET create=Y ) ELSE ( + ECHO Will place publisher jar here: %input_cache_path%%publisher_jar% SET /p create="Ok? (Y/N) " ) IF /I "%create%"=="Y" ( @@ -211,6 +214,16 @@ goto end start copy /y "_updatePublisher.new.bat" "_updatePublisher.bat" ^&^& del "_updatePublisher.new.bat" ^&^& exit +:dl_script_7 +ECHO Updating _build.bat +call POWERSHELL -command if ('System.Net.WebClient' -as [type]) {(new-object System.Net.WebClient).DownloadFile(\"%build_bat_url%\",\"_build.new.bat\") } else { Invoke-WebRequest -Uri "%update_bat_url%" -Outfile "_build.new.bat" } +if %ERRORLEVEL% == 0 goto upd_script_6 +echo "Errors encountered during download: %errorlevel%" +goto end +:upd_script_6 +start copy /y "_build.new.bat" "_build.bat" ^&^& del "_build.new.bat" ^&^& exit + + :end diff --git a/_updatePublisher.sh b/_updatePublisher.sh index 0f9ecbed9c..6a97fe0bdb 100755 --- a/_updatePublisher.sh +++ b/_updatePublisher.sh @@ -12,6 +12,8 @@ gencont_bat_url=$scriptdlroot/_gencontinuous.bat gencont_sh_url=$scriptdlroot/_gencontinuous.sh gen_sh_url=$scriptdlroot/_genonce.sh update_sh_url=$scriptdlroot/_updatePublisher.sh +build_sh_url=$scriptdlroot/_build.sh +build_bat_url=$scriptdlroot/_build.bat skipPrompts=false FORCE=false @@ -103,6 +105,16 @@ if [[ $skipPrompts != true ]]; then if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then echo "Downloading most recent scripts " + curl -L $build_bat_url -o /tmp/_build.new + cp /tmp/_build.new _build.bat + rm /tmp/_build.new + + + curl -L $build_sh_url -o /tmp/_build.new + cp /tmp/_build.new _build.sh + chmod +x _build.sh + rm /tmp/_build.new + curl -L $update_bat_url -o /tmp/_updatePublisher.new cp /tmp/_updatePublisher.new _updatePublisher.bat rm /tmp/_updatePublisher.new @@ -129,4 +141,4 @@ if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then cp /tmp/_updatePublisher.new _updatePublisher.sh chmod +x _updatePublisher.sh rm /tmp/_updatePublisher.new -fi +fi \ No newline at end of file diff --git a/input/fsh/aliases.fsh b/input/fsh/aliases.fsh index 2382f135fe..75c3587f7e 100644 --- a/input/fsh/aliases.fsh +++ b/input/fsh/aliases.fsh @@ -100,3 +100,6 @@ Alias: $fr-core-schedule-unavailability-reason = https://hl7.fr/ig/fhir/core/Val // SD Alias: $fr-core-observation-level-of-exertion = https://hl7.fr/ig/fhir/core/StructureDefinition/fr-core-observation-level-of-exertion // A corriger + + +Alias: $patient-multiple-birth-r5 = http://hl7.org/fhir/5.0/StructureDefinition/extension-Patient.multipleBirth[x] \ No newline at end of file diff --git a/input/fsh/extensions/FRCorePatientMultipleBirthExtension.fsh b/input/fsh/extensions/FRCorePatientMultipleBirthExtension.fsh deleted file mode 100644 index d0a28bf188..0000000000 --- a/input/fsh/extensions/FRCorePatientMultipleBirthExtension.fsh +++ /dev/null @@ -1,10 +0,0 @@ -Extension: FRCorePatientMultipleBirthExtension -Id: fr-core-patient-multiple-birth-r5 -Title: "Rang Gémellaire" -Description: "Extension créée pour exprimer le rang gémellaire, notamment utile dans le cadre des attestations de droits à l'assurance maladie. Cette extension implemente l'élément PatientMultipleBirth de R5 https://www.hl7.org/fhir/patient-definitions.html#Patient.multipleBirth_x." -* ^context.type = #element -* ^context.expression = "Patient" -* ^url = "http://hl7.org/fhir/5.0/StructureDefinition/extension-Patient.multipleBirth" - -* value[x] only integer -* value[x] ^short = "Indicates the actual birth order (integer)." \ No newline at end of file diff --git a/input/fsh/profiles/FRCorePatientProfile.fsh b/input/fsh/profiles/FRCorePatientProfile.fsh index 26552a900d..a6f102a82a 100644 --- a/input/fsh/profiles/FRCorePatientProfile.fsh +++ b/input/fsh/profiles/FRCorePatientProfile.fsh @@ -22,7 +22,11 @@ Description: """Profile of the Patient resource for France. This profile specifi FRCorePatientDeathPlaceExtension named deathPlace 0..1 and FRCorePatientBirthDateUpdateIndicatorExtension named birthDateUpdateIndicator 0..1 and $patient-birthPlace named birthPlace 0..1 and - FRCorePatientMultipleBirthExtension named multipleBirth 0..1 + $patient-multiple-birth-r5 named multipleBirth-r5 0..1 + +* extension[multipleBirth-r5] + * value[x] only integer + * ^short = "Whether patient is part of a multiple birth" * extension[birthPlace].valueAddress only FRCoreAddressProfile diff --git a/sushi-config.yaml b/sushi-config.yaml index 44f85a6253..6b22e82bcf 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -20,6 +20,7 @@ jurisdiction: urn:iso:std:iso:3166#FR "France" dependencies: ans.fr.terminologies: latest + hl7.fhir.extensions.r5: 4.0.1 #La liste des paramètres ainsi que leur explication est disponible ici : https://build.fhir.org/ig/FHIR/fhir-tools-ig/CodeSystem-ig-parameters.html parameters: