Merge pull request #1690 from hapifhir/2024-07-gg-tho-ns-fix

2024 07 gg tho ns fix
This commit is contained in:
Grahame Grieve 2024-07-17 12:45:35 +08:00 committed by GitHub
commit fc517e3ec5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 2 deletions

View File

@ -1,7 +1,12 @@
## Validator Changes ## Validator Changes
* no changes * work around THO 6.0.0 problem (hack, to be reversed later)
* Improve MeasureReport validation for checking subject count
* Fix for R2B Resource.id cardinality problem
* Fix for validator using wrong property for list determination when parsing json
## Other code changes ## Other code changes
* no changes * no changes

View File

@ -347,6 +347,8 @@ public class NamingSystem extends MetadataResource {
} }
public String toCode(NamingSystemIdentifierType code) { public String toCode(NamingSystemIdentifierType code) {
if (code == NamingSystemIdentifierType.NULL)
return null;
if (code == NamingSystemIdentifierType.OID) if (code == NamingSystemIdentifierType.OID)
return "oid"; return "oid";
if (code == NamingSystemIdentifierType.UUID) if (code == NamingSystemIdentifierType.UUID)

View File

@ -312,6 +312,8 @@ public class NamingSystem extends MetadataResource {
throw new FHIRException("Unknown NamingSystemType code '"+codeString+"'"); throw new FHIRException("Unknown NamingSystemType code '"+codeString+"'");
} }
public String toCode(NamingSystemType code) { public String toCode(NamingSystemType code) {
if (code == NamingSystemType.NULL)
return null;
if (code == NamingSystemType.CODESYSTEM) if (code == NamingSystemType.CODESYSTEM)
return "codesystem"; return "codesystem";
if (code == NamingSystemType.IDENTIFIER) if (code == NamingSystemType.IDENTIFIER)