From 53eae9b51f20fc57191a687a910576f4defb42d7 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 28 Apr 2023 10:14:17 +1000 Subject: [PATCH] fix error messages --- .../org/hl7/fhir/r5/terminologies/ValueSetCheckerSimple.java | 4 ++-- org.hl7.fhir.utilities/src/main/resources/Messages.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetCheckerSimple.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetCheckerSimple.java index 0fb3b91dd..73272baab 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetCheckerSimple.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetCheckerSimple.java @@ -208,10 +208,10 @@ public class ValueSetCheckerSimple extends ValueSetWorker implements ValueSetChe Coding foundCoding = null; if (valueset != null && options.getValueSetMode() != ValueSetMode.NO_MEMBERSHIP_CHECK) { Boolean result = false; - CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(",", " and "); + CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder(", "); for (Coding c : code.getCoding()) { - b.append(c.toString()); + b.append(c.getSystem()+(c.hasVersion() ? "|"+c.getVersion() : "")+"#"+c.getCode()); Boolean ok = codeInValueSet(c.getSystem(), c.getVersion(), c.getCode(), info); if (ok == null && result == false) { result = null; diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages.properties b/org.hl7.fhir.utilities/src/main/resources/Messages.properties index 09ca19c0d..3f8b8e3dd 100644 --- a/org.hl7.fhir.utilities/src/main/resources/Messages.properties +++ b/org.hl7.fhir.utilities/src/main/resources/Messages.properties @@ -468,7 +468,7 @@ 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 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} is not 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}'' +None_of_the_provided_codes_are_in_the_value_set_other = None of the provided codes [{2}] are in the value set ''{1}'' Coding_has_no_system__cannot_validate = Coding has no system - cannot validate Unable_to_handle_system__concept_filter_with_op__ = Unable to handle system {0} concept filter with op = {1} Unable_to_handle_system__filter_with_property__ = Unable to handle system {0} filter with property = {1}, op = {2}