Merge pull request #229 from Saxos-Simone/master

Fix Boolean (BL) XML-specific data type representation
HealthIntersections · Jan 31, 2024 · bbd0e5c · bbd0e5c
2 parents 45c7b89 + d1b172d
commit bbd0e5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/library/cda/cda_base.pas b/library/cda/cda_base.pas
@@ -734,7 +734,7 @@ constructor Tv3PropertyDefinition.CreateBoolean(oOwner: Tv3Base; bIsStructural :
  FCollectionState := rmpctNone;
  FIsStructural := bIsStructural;
  if bHasValue Then
- FValueString := BoolToStr(bValue);
+ FValueString := BoolToStr(bValue, true).ToLower;
 end;
 
 

diff --git a/library/cda/cda_writer.pas b/library/cda/cda_writer.pas
@@ -301,7 +301,7 @@ procedure TCDAWriter.WriteCDA(oXml: TXmlBuilder; oDoc: TcdaClinicalDocument);
 
 Procedure TCDAWriter.WriteANYAttributes(Const sPath: string; oXml : TXmlBuilder; oDT : Tv3ANY);
 Begin
- Attribute(sPath, oXml, 'nullFLavor', writeNullFlavor(sPath, oDt.NullFlavor), true);
+ Attribute(sPath, oXml, 'nullFlavor', writeNullFlavor(sPath, oDt.NullFlavor), true);
  // ignore updateMode and flavorId for now
 End;
 
@@ -316,7 +316,7 @@ procedure TCDAWriter.WriteCDA(oXml: TXmlBuilder; oDoc: TcdaClinicalDocument);
  WriteComments(oXml, oDT);
  WriteANYAttributes(sPath, oXml, oDT);
  if oDT.HasValue Then
- Attribute(sPath, oXml, 'value', BoolToStr(oDT.value), true);
+ Attribute(sPath, oXml, 'value', BoolToStr(oDT.value, true).ToLower, true);
  oDT.sourcelocation := oXml.Tag(sName);
 End;
 
@@ -349,7 +349,7 @@ procedure TCDAWriter.WriteCDA(oXml: TXmlBuilder; oDoc: TcdaClinicalDocument);
  Attribute(sPath, oXml, 'extension', oDT.extension, true);
  Attribute(sPath, oXml, 'assigningAuthorityName', oDT.identifierName, true);
  if oDT.hasDisplayable Then
- Attribute(sPath, oXml, 'displayable', BoolToStr(oDT.displayable), true);
+ Attribute(sPath, oXml, 'displayable', BoolToStr(oDT.displayable, true).ToLower, true);
  Attribute(sPath, oXml, 'scope', CODES_Tv3IdentifierScope[oDT.scope], true);
  Attribute(sPath, oXml, 'reliability', CODES_Tv3IdentifierReliability[oDT.reliability], true);
  oDT.sourcelocation := oXml.Tag(sName);