fix merge

Author: grahamegrieve

library/ftx/fhir_codesystem_service.pas

@@ -1522,7 +1522,7 @@ procedure TFhirCodeSystemProvider.iterateCodes(opContext : TTxOperationContext;
 
 procedure TFhirCodeSystemProvider.iterateConceptsByProperty(src : TFhirCodeSystemConceptListW; pp: TFhirCodeSystemPropertyW; values: TStringArray; list: TFhirCodeSystemProviderFilterContext; include : boolean);
 var
-  c, cc : TFhirCodeSystemConceptW;
+  c : TFhirCodeSystemConceptW;
   css : TFhirCodeSystemW;
   cp : TFhirCodeSystemConceptPropertyW;
   ok, val : boolean;
@@ -1532,7 +1532,7 @@ procedure TFhirCodeSystemProvider.iterateConceptsByProperty(src : TFhirCodeSyste
   begin
     ok := not include;
     val := false;
-    for cp in cc.properties.forEnum do
+    for cp in c.properties.forEnum do
     begin
       if (ok <> include) and (cp.code = pp.code) then
       begin
@@ -1555,10 +1555,10 @@ procedure TFhirCodeSystemProvider.iterateConceptsByProperty(src : TFhirCodeSyste
       end;
     end;
     if ok then
-      list.Add(c.Link, 0);
+      list.Add(c.Link, 0); 
+    if (c.hasConcepts) then
+      iterateConceptsByProperty(c.conceptList, pp, values, list, include);
   end;
-  if (c.hasConcepts) then
-    iterateConceptsByProperty(c.conceptList, pp, values, list, include);
 end;
 
 procedure TFhirCodeSystemProvider.iterateConceptsByPropertyRegex(src: TFhirCodeSystemConceptListW; pp: TFhirCodeSystemPropertyW; regex: TRegularExpression; list: TFhirCodeSystemProviderFilterContext; include: boolean);

release-notes.md

@@ -1,7 +1,7 @@
-## Change Notes for {ver}:
+## Change Notes for 3.7.10:
 
-* 
+* Fix access violation
 
 ## Conformance Notes:
 
-* 
+* tx.fhir.org passed 310 HL7 terminology service tests (mode 'tx.fhir.org', tests v1.7.7-SNAPSHOT, runner v6.5.14)