Merge branch 'HealthIntersections:master' into makelinuxinstallscript

costateixeira · May 20, 2024 · 5fcd8e2 · 5fcd8e2
2 parents 221a529 + 5d40319
commit 5fcd8e2
Show file tree

Hide file tree

Showing 15 changed files with 279 additions and 138 deletions.
diff --git a/build/windows-release.bat b/build/windows-release.bat
@@ -126,12 +126,16 @@ cd ..
 :: =========================================================================================
 :: now time to do the github release
 
-echo ## GitHub Release ##
+echo ## GitHub Push##
 git commit -a -m "Release Version %1"
 git push 
 
+echo ## GitHub Release ##
+
 install\tools\gh release create v%1 "install\build\fhirserver-win64-%1.exe#Windows Server Installer" "install\build\fhirserver-win64-%1.zip#Windows Server Installer Zip" "install\build\fhirtoolkit-win64-%1.exe#Windows Toolkit Installer" -F release-notes.md
 
+echo ## GitHub Release Done ##
+
 rename release-notes.md release-notes-old.md
 
 utilities\codescan\codescan.exe -next-version %1

diff --git a/install/install-tk.iss b/install/install-tk.iss
@@ -3,11 +3,11 @@
 ; AppID can never be changed as subsequent installations require the same installation ID each time
 AppID=FHIRToolkit
 AppName=Health Intersections FHIR Toolkit
-AppVerName=FHIRToolkit v3.6.3
+AppVerName=FHIRToolkit v3.4.6
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirtoolkit-win64-3.6.3
+OutputBaseFilename=fhirtoolkit-win64-3.4.6
 Compression=lzma2/ultra64
 
 ; 64 bit
@@ -32,11 +32,11 @@ UninstallFilesDir={app}\uninstall
 ; win2000+ add/remove programs support
 AppPublisher=Health Intersections P/L
 AppPublisherURL=http://www.healthintersections.com.au
-AppVersion=3.6.3
+AppVersion=3.4.6
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2020+
-VersionInfoVersion=3.6.3.0
+VersionInfoVersion=3.4.6.0
 
 ; dialog support
 LicenseFile=..\license

diff --git a/install/install.iss b/install/install.iss
@@ -3,11 +3,11 @@
 ; AppID can never be changed as subsequent installations require the same installation ID each time
 AppID=FHIRServer
 AppName=Health Intersections FHIR Server
-AppVerName=FHIRServer v3.6.3
+AppVerName=FHIRServer v3.4.6
 
 ; compilation control
 OutputDir=..\install\build
-OutputBaseFilename=fhirserver-win64-3.6.3
+OutputBaseFilename=fhirserver-win64-3.4.6
 Compression=lzma2/ultra64
 
 ; 64 bit
@@ -34,11 +34,11 @@ UninstallFilesDir={app}\uninstall
 ; win2000+ add/remove programs support
 AppPublisher=Health Intersections P/L
 AppPublisherURL=http://www.healthintersections.com.au
-AppVersion=3.6.3
+AppVersion=3.4.6
 AppSupportURL=https://github.com/grahamegrieve/fhirserver
 AppUpdatesURL=https://github.com/grahamegrieve/fhirserver
 AppCopyright=Copyright (c) Health Intersections Pty Ltd 2011+
-VersionInfoVersion=3.6.3.0
+VersionInfoVersion=3.4.6.0
 
 ; dialog support
 LicenseFile=..\license

diff --git a/library/fhir/fhir_tx.pas b/library/fhir/fhir_tx.pas
@@ -510,7 +510,7 @@ procedure TFHIRCodeSystemInformationProvider.lookupCode(coding: TFHIRCodingW; pr
     if (props = nil) or (length(props) = 0) then
       result := def
     else
-      result := StringArrayExistsInsensitive(props, name);
+      result := StringArrayExistsInsensitive(props, name) or StringArrayExistsInsensitive(props, '*') ;
   end;
 begin
   params := TFHIRTxOperationParams.Create;
@@ -538,6 +538,11 @@ procedure TFHIRCodeSystemInformationProvider.lookupCode(coding: TFHIRCodingW; pr
           p := resp.addProp('inactive');
           p.value := FFactory.makeBoolean(provider.IsInactive(ctxt));
         end;
+        if hasProp('definition', true) and (provider.Definition(ctxt) <> '') then
+        begin
+          p := resp.addProp('definition');
+          p.value := FFactory.makeString(provider.Definition(ctxt));
+        end;
         resp.code := coding.code;
         resp.display := provider.Display(ctxt, FlangList);
         provider.extendLookup(FFactory, ctxt, FlangList, props, resp);

diff --git a/library/ftx/fhir_codesystem_service.pas b/library/ftx/fhir_codesystem_service.pas
@@ -1181,7 +1181,7 @@ function hasProp(props : TArray<String>; name : String; def : boolean) : boolean
   if (props = nil) or (length(props) = 0) then
     result := def
   else
-    result := StringArrayExistsSensitive(props, name);
+    result := StringArrayExistsSensitive(props, name) or StringArrayExistsSensitive(props, '*');
 end;
 
 procedure TFhirCodeSystemProvider.extendLookup(factory : TFHIRFactory; ctxt: TCodeSystemProviderContext; langList : THTTPLanguageList; props: TArray<String>; resp: TFHIRLookupOpResponseW);

diff --git a/library/ftx/fhir_valuesets.pas b/library/ftx/fhir_valuesets.pas
@@ -1534,17 +1534,14 @@ function TValueSetChecker.check(issuePath : String; code: TFhirCodeableConceptW;
                 dc := list.displayCount(FParams.languages, true);
                 severity := dispWarning;
                 if dc = 0 then
-                begin
                   severity := isWarning;
+
+                if dc = 1 then
                   m := FI18n.translate(baseMsg+'_one', FParams.languages,
-                    ['', c.systemUri, c.code, list.present(FParams.languages, false), c.display, FParams.langSummary])
-                end
-                else if dc = 1 then
-                  m := FI18n.translate(baseMsg+'_one', FParams.languages,
-                    ['', c.systemUri, c.code, list.present(FParams.languages, true), c.display, FParams.langSummary])
+                    ['', c.systemUri, c.code, list.present(FParams.languages, dc > 0), c.display, FParams.langSummary])
                 else
                   m := FI18n.translate(baseMsg+'_other', FParams.languages,
-                    [inttostr(dc), c.systemUri, c.code, list.present(FParams.languages, true), c.display, FParams.langSummary]);
+                    [inttostr(dc), c.systemUri, c.code, list.present(FParams.languages, dc > 0), c.display, FParams.langSummary]);
                 msg(m);
                 op.addIssue(severity, itInvalid, addToPath(path, 'display'), m, oicDisplay);
               end;