Merge branch 'master' of https://github.com/HealthIntersections/fhirs…

…erver

.github/workflows/linux-docker-build.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - lastbuilt
 #  pull_request:
 jobs:
   Build-Docker-Image:
@@ -74,15 +73,15 @@ jobs:
           -v ~/test-settings.ini:/work/fhirserver/exec/64/test-settings.ini \
           fhirserver -tests
 
-    - name: Tag and push Docker image
-      run: |
-        # Extract the FHIR server version from the library/version.inc file
-        FHIR_VERSION=$(grep -oP "FHIR_CODE_FULL_VERSION = '\K[^']+" library/version.inc)
-
-        # Tag the Docker image with the extracted version and "latest"
-        docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:$FHIR_VERSION
-        docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:latest
-
-        # Push both tagged images to Docker Hub
-        docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:$FHIR_VERSION
-        docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:latest
+#    - name: Tag and push Docker image
+#      run: |
+#        # Extract the FHIR server version from the library/version.inc file
+#        FHIR_VERSION=$(grep -oP "FHIR_CODE_FULL_VERSION = '\K[^']+" library/version.inc)
+#
+#        # Tag the Docker image with the extracted version and "latest"
+#        docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:$FHIR_VERSION
+#        docker tag fhirserver ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:latest
+#
+#        # Push both tagged images to Docker Hub
+#        docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:$FHIR_VERSION
+#        docker push ${{ secrets.DOCKERHUB_USERNAME }}/fhirserver:latest

exec/pack/Messages.properties

@@ -140,7 +140,7 @@ Resource_RES_ID_Malformed_Length = Invalid Resource id: Too long ({0} chars)
 Resource_RES_ID_Malformed_Chars = Invalid Resource id: Invalid Characters (''{0}'')
 Resource_RES_ID_Missing = Resource requires an id, but none is present
 Resource_RES_ID_Prohibited = Resource has an id, but none is allowed
-Terminology_PassThrough_TX_Message = {0} for ''{1}#{2}''
+Terminology_PassThrough_TX_Message = {0} (for ''{1}#{2}'')
 Terminology_TX_Binding_CantCheck = Binding by URI reference cannot be checked
 Terminology_TX_Binding_Missing = Binding for CodeableConcept {0} missing 
 Terminology_TX_Binding_Missing2 = Binding for Coding {0} missing
@@ -222,6 +222,7 @@ Type_Specific_Checks_DT_Primitive_NotEmpty = value cannot be empty
 Type_Specific_Checks_DT_Primitive_Regex = Element value ''{0}'' does not meet regex ''{1}''
 TYPE_SPECIFIC_CHECKS_DT_PRIMITIVE_REGEX_EXCEPTION = Exception evaluating regex ''{0}'' on type {1}: {2}
 Type_Specific_Checks_DT_Primitive_Regex_Type = Element value ''{0}'' does not meet {1} regex ''{2}''
+TYPE_SPECIFIC_CHECKS_DT_PRIMITIVE_REGEX_TYPE_ALT = Neither the element value ''{0}'' or the formatted value ''{1}'' meet {2} regex ''{3}''
 Type_Specific_Checks_DT_Primitive_ValueExt = Primitive types must have a value or must have child extensions
 Type_Specific_Checks_DT_Primitive_WS = Primitive types should not only be whitespace
 Type_Specific_Checks_DT_String_Length = value is longer than permitted maximum length of 1 MB (1048576 bytes)
@@ -243,6 +244,7 @@ Validation_VAL_Profile_Maximum_one = {3}: max allowed = {7}, but found {0} (from
 Validation_VAL_Profile_Maximum_other = {3}: max allowed = {7}, but found {0} (from {1})
 Validation_VAL_Profile_Minimum_one = {3}: minimum required = {7}, but only found {0} (from {1})
 Validation_VAL_Profile_Minimum_other = {3}: minimum required = {7}, but only found {0} (from {1})
+VALIDATION_VAL_PROFILE_MINIMUM_MAGIC = {0}: magic LOINC code {1} required, but not found (from {2}). Note that other Observation codes are allowed in addition to this required magic code
 Validation_VAL_Profile_NoCheckMax_one = {3}: Found {0} match, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})
 Validation_VAL_Profile_NoCheckMax_other = {3}: Found {0} matches, but unable to check max allowed ({2}) due to lack of slicing validation (from {1})
 Validation_VAL_Profile_NoCheckMin_one = {3}: Found {0} match, but unable to check minimum required ({2}) due to lack of slicing validation (from {1})
@@ -473,8 +475,9 @@ Display_Name_for__should_be_one_of__instead_of_one = Wrong Display Name ''{4}''
 Display_Name_for__should_be_one_of__instead_of_other = Wrong Display Name ''{4}'' for {1}#{2} - should be one of {0} choices: {3} (for the language(s) ''{5}'')
 Display_Name_WS_for__should_be_one_of__instead_of_one = Wrong whitespace in Display Name ''{4}'' for {1}#{2} - should be {3} (for the language(s) ''{5}'') 
 Display_Name_WS_for__should_be_one_of__instead_of_other = Wrong whitespace in Display Name ''{4}'' for {1}#{2} - should be one of {0} choices: {3} (for the language(s) ''{5}'')
-Unknown_Code__in_ = Unknown Code ''{0}'' in the system ''{1}''
-UNKNOWN_CODE__IN_FRAGMENT = Unknown Code ''{0}'' in the system ''{1}'' - note that the code system is labeled as a fragment, so the code may be valid in some other fragment
+Unknown_Code_in = Unknown code ''{0}'' in the CodeSystem ''{1}''
+Unknown_Code_in_Version = Unknown code ''{0}'' in the CodeSystem ''{1}'' version ''{2}''
+UNKNOWN_CODE_IN_FRAGMENT = Unknown Code ''{0}'' in the system ''{1}'' version ''{2}'' - note that the code system is labeled as a fragment, so the code may be valid in some other fragment
 Code_found_in_expansion_however_ = Code found in expansion, however: {0}
 None_of_the_provided_codes_are_in_the_value_set_one = The provided code {2} was not found in the value set ''{1}''
 None_of_the_provided_codes_are_in_the_value_set_other = None of the provided codes [{2}] are in the value set ''{1}''
@@ -568,6 +571,7 @@ SEARCHPARAMETER_NOTFOUND = Unable to find the base Search Parameter {0} so can''
 SEARCHPARAMETER_BASE_WRONG = The resource type {1} is not listed as a base in the SearchParameter this is derived from ({0})
 SEARCHPARAMETER_TYPE_WRONG = The type {1} is different to the type {0} in the derivedFrom SearchParameter
 SEARCHPARAMETER_EXP_WRONG = The expression ''{2}'' is not compatible with the expression ''{1}'' in the derivedFrom SearchParameter {0}, and this likely indicates that the derivation relationship is not valid
+SEARCHPARAMETER_MISSING_COMPONENTS = When the SearchParameter has a type of 'composite', then the SearchParameter must define two or more components  
 VALUESET_NO_SYSTEM_WARNING = No System specified, so Concepts and Filters can't be checked
 VALUESET_INCLUDE_INVALID_CONCEPT_CODE = The code ''{1}'' is not valid in the system {0}
 VALUESET_INCLUDE_INVALID_CONCEPT_CODE_VER = The code ''{2}'' is not valid in the system {0} version {1}
@@ -690,7 +694,7 @@ FHIRPATH_CONTINUOUS_ONLY= Error evaluating FHIRPath expression: The function {0}
 FHIRPATH_FOCUS_one =
 FHIRPATH_FOCUS_other = Error evaluating FHIRPath expression: focus for {0} can only have one value, but has {0} values
 REFERENCE_REF_SUSPICIOUS = The syntax of the reference ''{0}'' looks incorrect, and it should be checked
-XHTML_XHTML_ELEMENT_ILLEGAL_IN_PARA = Invalid element name inside in a paragraph in the XHTML (''{0}'')
+XHTML_XHTML_ELEMENT_ILLEGAL_IN_PARA = Invalid element name inside a paragraph in the XHTML (''{0}'')
 UNSUPPORTED_IDENTIFIER_PATTERN_PROPERTY_NOT_SUPPORTED_FOR_DISCRIMINATOR_FOR_SLICE = Unsupported property {3} on type {2} for pattern for discriminator ({0}) for slice {1}
 UNSUPPORTED_IDENTIFIER_PATTERN_NO_PROPERTY_NOT_SUPPORTED_FOR_DISCRIMINATOR_FOR_SLICE = Unsupported: no properties with values found on type {2} for pattern for discriminator ({0}) for slice {1}
 SD_NESTED_MUST_SUPPORT_DIFF = The element {0} has types/profiles/targets that are marked as must support, but the element itself is not marked as must-support. The inner must-supports will be ignored unless the element inherits must-support = true
@@ -932,6 +936,7 @@ NO_VALID_DISPLAY_FOUND_other = No valid Display Names found for {1}#{2} in the l
 SD_NO_CONTEXT_WHEN_NOT_EXTENSION = The type is {0} so an extension context should not be specified
 SD_NO_CONTEXT_INV_WHEN_NOT_EXTENSION = The type is {0} so an extension context invariants should not be specified
 SD_CONTEXT_SHOULD_NOT_BE_ELEMENT = Review the extension type for {1}: extensions should not have a context of {0} unless it''s really intended that they can be used anywhere
+SD_CONTEXT_SHOULD_NOT_BE_FHIRPATH = Review the extension type for {1}: the context of {0} appears to be a simple element, so the context type should be 'element' not 'fhirpath'
 ED_PATH_WRONG_TYPE_MATCH = The path must be ''{0}'' not ''{1}'' when the type list is not constrained
 ATTEMPT_TO_CHANGE_SLICING = The element at {0} defines the slicing {1} but then an element in the slicing {2} tries to redefine the slicing to {3}
 REPEAT_SLICING_IGNORED = The element at {0} defines the slicing but then an element in the slicing {2} repeats it, which is ignored
@@ -1012,16 +1017,16 @@ FHIRPATH_AS_IMPOSSIBLE = The type specified in as() is {1} which is not a possib
 ED_SEARCH_EXPRESSION_ERROR = Error in search expression ''{0}'': {1}
 SD_EXTENSION_URL_MISMATCH = The fixed value for the extension URL is {1} which doesn''t match the canonical URL {0}
 SD_EXTENSION_URL_MISSING = The value of Extension.url is not fixed to the extension URL {0}
-MSG_DEPRECATED = Reference to deprecated item {0} 
-MSG_WITHDRAWN = Reference to withdrawn item {0}
-MSG_RETIRED = Reference to retired item {0} 
-MSG_EXPERIMENTAL = Reference to experimental item {0}
-MSG_DRAFT = Reference to draft item {0}
-MSG_DEPRECATED_SRC = Reference to deprecated item {0} from {1}
-MSG_WITHDRAWN_SRC = Reference to withdrawn item {0} from {1}
-MSG_RETIRED_SRC = Reference to retired item {0} from {1}
-MSG_EXPERIMENTAL_SRC = Reference to experimental item {0} from {1}
-MSG_DRAFT_SRC = Reference to draft item {0} from {1}
+MSG_DEPRECATED = Reference to deprecated {2} {0} 
+MSG_WITHDRAWN = Reference to withdrawn {2} {0}
+MSG_RETIRED = Reference to retired {2} {0} 
+MSG_EXPERIMENTAL = Reference to experimental {2} {0}
+MSG_DRAFT = Reference to draft {2} {0}
+MSG_DEPRECATED_SRC = Reference to deprecated {2} {0} from {1}
+MSG_WITHDRAWN_SRC = Reference to withdrawn {2} {0} from {1}
+MSG_RETIRED_SRC = Reference to retired {2} {0} from {1}
+MSG_EXPERIMENTAL_SRC = Reference to experimental {2} {0} from {1}
+MSG_DRAFT_SRC = Reference to draft {2} {0} from {1}
 STATUS_CODE_WARNING = The code is valid but is {0}
 STATUS_CODE_HINT = The code is {0}
 STATUS_CODE_WARNING_CODE = The code ''{1}'' is valid but is {0}
@@ -1056,6 +1061,7 @@ BUNDLE_BUNDLE_ENTRY_MULTIPLE_PROFILES_NO_MATCH_REASON =  The {1} resource did no
 VALIDATION_HL7_WG_NEEDED = When HL7 is publishing a resource, the owning committee must be stated using the {0} extension
 VALIDATION_HL7_WG_UNKNOWN = The nominated WG ''{0}'' is unknown
 VALIDATION_HL7_PUBLISHER_MISMATCH = The nominated WG ''{0}'' means that the publisher should be ''{1}'' but ''{2}'' was found
+VALIDATION_HL7_PUBLISHER_MISMATCH2 = The nominated WG ''{0}'' means that the publisher should be either ''{1}''or ''{2}'' but ''{3}'' was found
 VALIDATION_HL7_WG_URL = The nominated WG ''{0}'' means that the contact url should be ''{1}'' but it was not found
 VALIDATION_HL7_PUBLISHER_MISSING = When HL7 is publishing a resource, the publisher must be provided, and for WG ''{0}'' it should be ''{1}''
 TYPE_SPECIFIC_CHECKS_DT_QTY_UCUM_ANNOTATIONS_NO_UNIT = UCUM Codes that contain human readable annotations like {0} can be misleading (e.g. they are ignored when comparing units). Best Practice is not to depend on annotations in the UCUM code, so this usage should be checked, and the Quantity.unit SHOULD contain the annotation 
@@ -1075,7 +1081,7 @@ CDA_UNKNOWN_TEMPLATE = The CDA Template {0} is not known
 CDA_UNKNOWN_TEMPLATE_EXT = The CDA Template {0} / {1} is not known
 UNABLE_TO_DETERMINE_TYPE_CONTEXT_INV = The types could not be determined from the extension context, so the invariant can't be validated (types = {0})
 ED_CONTEXT_INVARIANT_EXPRESSION_ERROR = Error in constraint ''{0}'': {1}
-VALIDATION_VAL_PROFILE_SIGNPOST_OBS = Validate Observation against {1} profile because the {2} code {3} was found
+VALIDATION_VAL_PROFILE_SIGNPOST_OBS = Validate Observation against the {1} profile ({0}) which is required by the FHIR specification because the {2} code {3} was found
 FHIRPATH_INVALID_TYPE = The type {0} is not valid
 FHIRPATH_AS_COLLECTION = Attempt to use ''as()'' on more than one item (''{0}'', ''{1}'')
 FHIRPATH_ARITHMETIC_QTY = Error in date arithmetic: attempt to add a definite quantity duration time unit {0}
@@ -1087,3 +1093,8 @@ BUNDLE_ENTRY_URL_MATCHES_TYPE_ID = The fullUrl ''{0}'' looks like a RESTful serv
 BUNDLE_ENTRY_URL_ABSOLUTE = The fullUrl must be an absolute URL (not ''{0}'')
 FHIRPATH_COLLECTION_STATUS_PARAMETER = Parameter {1} is inherently a collection, and so the expression ''{0}'' may fail, create an error, or return false if there is more than one item in the parameter value ({2})
 FHIRPATH_COLLECTION_STATUS_CONTEXT = The context is inherently a collection, and so the expression ''{0}'' may fail, create an error, or return false if there is more than one item in the context ({2})
+BUNDLE_BUNDLE_ENTRY_NOTFOUND_FRAGMENT = Can''t find ''{0}'' in the bundle ({1})
+BUNDLE_BUNDLE_ENTRY_FOUND_MULTIPLE_FRAGMENT = Found {0} matches for fragment {2} in resource ''{1}'' in the bundle ({3})
+XHTML_IDREF_NOT_FOUND = The target of the HTML idref attribute ''{0}'' was not found in the resource
+XHTML_IDREF_NOT_MULTIPLE_MATCHES = Multiple matching targets for the HTML idref attribute ''{0}'' were found in the resource
+TX_GENERAL_CC_ERROR_MESSAGE = No valid coding was found for the value set ''{0}''

exec/pack/Messages_de.properties

@@ -419,7 +419,8 @@ Error_parsing_=Fehler beim Parsen {0}:{1}
 Unable_to_connect_to_terminology_server_Use_parameter_tx_na_tun_run_without_using_terminology_services_to_validate_LOINC_SNOMED_ICDX_etc_Error__=Keine Verbindung zum Terminologieserver m\u00f6glich. Verwenden Sie den Parameter ''-tx n/a'' um ohne Verwendung von Terminologiediensten zu laufen welche LOINC, SNOMED, ICD-X usw. zu validieren. Fehler = {0}
 Display_Name_for__should_be_one_of__instead_of_one=Der Displayname f\u00fcr {1}#{2} sollte einer von ''{3}'' anstelle von ''{4}'' sein.
 Display_Name_for__should_be_one_of__instead_of_other=Der Displayname f\u00fcr {1}#{2} sollte einer von ''{3}'' anstelle von ''{4}'' sein.
-Unknown_Code__in_=Unbekannter Code {0} in {1}
+Unknown_Code_in=Unbekannter Code {0} in {1}
+Unknown_Code_in_Version=Unbekannter Code {0} in {1} Version {2}
 Code_found_in_expansion_however_=Code in der Erweiterung gefunden, jedoch: {0}
 None_of_the_provided_codes_are_in_the_value_set_=Keiner der bereitgestellten Codes ist im ValueSet {0}
 Coding_has_no_system__cannot_validate=Kodierung hat kein System - kann nicht validiert werden

exec/pack/Messages_es.properties

@@ -469,8 +469,9 @@ Unable_to_connect_to_terminology_server_Use_parameter_tx_na_tun_run_without_usin
 Display_Name_for__should_be_one_of__instead_of_one = El nombre de display para {1}#{2} debe ser ''{3}'', no ''{4}''
 Display_Name_for__should_be_one_of__instead_of_many = El nombre de display para {1}#{2} debe ser uno de estas opciones {0} de ''{3}'', no ''{4}''
 Display_Name_for__should_be_one_of__instead_of_other = El nombre de display para {1}#{2} debe ser uno de estas opciones {0} de ''{3}'', no ''{4}''
-Unknown_Code__in_ = Código desconocido {0} en {1}
-UNKNOWN_CODE__IN_FRAGMENT = Código desconocido {0} en {1} - note que el sistema de codificación está etiquetado como fragmento, así que el código puede ser válido mas allá del fragmento
+Unknown_Code_in = Código desconocido {0} en {1}
+Unknown_Code_in_Version = Código desconocido {0} en {1} versión {2} 
+UNKNOWN_CODE_IN_FRAGMENT = Código desconocido {0} en {1} - note que el sistema de codificación está etiquetado como fragmento, así que el código puede ser válido mas allá del fragmento
 Code_found_in_expansion_however_ = El código se encontró en la expansión, sin embargo: {0}
 None_of_the_provided_codes_are_in_the_value_set_one =
 None_of_the_provided_codes_are_in_the_value_set_many = Ninguno de los códigos provistos está en el conjunto de valores {0}

exec/pack/Messages_ja.properties

@@ -464,8 +464,9 @@ Error_parsing_  = {0} の解析エラー: {1}
 Unable_to_connect_to_terminology_server_Use_parameter_tx_na_tun_run_without_using_terminology_services_to_validate_LOINC_SNOMED_ICDX_etc_Error__  = 用語サーバー ({1}) に接続できません。LOINC、SNOMED、ICD-Xなどを検証するための用語サービスを使用せずに実行するには、パラメータ ''-tx n/a'' を使用してください。エラー = {0}
 Display_Name_for__should_be_one_of__instead_of_one  = {1}#{2} の誤ったdisplay ''{4}'' - {3} であるべきです (言語 ''{5}'' のため)
 Display_Name_for__should_be_one_of__instead_of_other  = {1}#{2} の誤ったdisplay ''{4}'' - {0} の選択肢のうちの一つであるべきです: {3} (言語 ''{5}'' のため)
-Unknown_Code__in_  = system''{1}''で未知のコード''{0}''
-UNKNOWN_CODE__IN_FRAGMENT  = system''{1}''で未知のコード''{0}'' - CodeSystemは断片としてラベル付けされているため、そのコードは他の断片では有効である可能性があります
+Unknown_Code_in  = system''{1}''で未知のコード''{0}''
+Unknown_Code_in_Version  = system''{1}''で未知のコード''{0}''
+UNKNOWN_CODE_IN_FRAGMENT  = system''{1}''で未知のコード''{0}'' - CodeSystemは断片としてラベル付けされているため、そのコードは他の断片では有効である可能性があります
 Code_found_in_expansion_however_  = 拡張中にコードが見つかりました。しかしながら: {0}
 None_of_the_provided_codes_are_in_the_value_set_one  = 提供されたcode {2} は、ValueSet ''{1}''にありません
 None_of_the_provided_codes_are_in_the_value_set_other  = 提供されたcode [{2}] のうちどれも、ValueSet ''{1}''に含まれていません

exec/pack/Messages_nl.properties

@@ -464,8 +464,9 @@ Error_parsing_ = Fout bij verwerken {0}:{1}
 Unable_to_connect_to_terminology_server_Use_parameter_tx_na_tun_run_without_using_terminology_services_to_validate_LOINC_SNOMED_ICDX_etc_Error__ = Kan niet verbinden met terminologieserver. Gebruik parameter ''-tx n/a'' om te starten zonder terminologieservices voor validatie van LOINC, SNOMED, ICD-X etc. Fout = {0}
 Display_Name_for__should_be_one_of__instead_of_one = Verkeerde weergavenaam ''{4}'' voor {1}#{2} - moet zijn ''{3}'' (voor taal/talen ''{5}'')
 Display_Name_for__should_be_one_of__instead_of_other = Verkeerde weergavenaam ''{4}'' voor {1}#{2} - moet een zijn van {0} keuzes: ''{3}'' voor de taal/talen ''{5}''
-Unknown_Code__in_ = Onbekende code {0} in {1}
-UNKNOWN_CODE__IN_FRAGMENT = Onbekende code {0} in {1} - merk op dat het codesysteem is gemarkeerd als fragment, waardoor mogelijk geldig is in een ander fragment
+Unknown_Code_in = Onbekende code {0} in {1}
+Unknown_Code_in_Version = Onbekende code {0} in {1} versie {2}
+UNKNOWN_CODE_IN_FRAGMENT = Onbekende code {0} in {1} - merk op dat het codesysteem is gemarkeerd als fragment, waardoor mogelijk geldig is in een ander fragment
 Code_found_in_expansion_however_ = Code gevonden in expansion, echter: {0}
 None_of_the_provided_codes_are_in_the_value_set_one = De opgegeven code {2} staat niet in de waardelijst ''{1}''
 None_of_the_provided_codes_are_in_the_value_set_other = Geen van de opgegeven codes {2} staan niet in de waardelijst ''{1}''