diff --git a/AkitaModel/AkitaModel.csproj b/AkitaModel/AkitaModel.csproj index 9114e54..a2c8e9f 100644 --- a/AkitaModel/AkitaModel.csproj +++ b/AkitaModel/AkitaModel.csproj @@ -15,7 +15,7 @@ git iLab;Akita;Model;API False - 0.0.4 + 0.0.5 Skyware.Lis.$(MSBuildProjectName.Replace(" ", "_")) MIT Skyware.Lis.$(MSBuildProjectName) diff --git a/AkitaModel/Courier/Dialect.cs b/AkitaModel/Courier/Dialect.cs new file mode 100644 index 0000000..214dfad --- /dev/null +++ b/AkitaModel/Courier/Dialect.cs @@ -0,0 +1,36 @@ +namespace Skyware.Lis.AkitaModel.Courier; + +// Ignore Spelling: hl ngh + +/// +/// HL7 syntax dialect. +/// +public class Dialect +{ + + /// + /// Identifier in the Courier system, e.g. "ngh-2020". + /// + public string Id { get; set; } + + /// + /// Friendly name, e.g. "North General Hospital 2020". + /// + public string Name { get; set; } + + /// + /// Base HL7 version, e.g. "2.5.1". + /// + public string Hl7Version { get; set; } + + /// + /// Description and further details. + /// + public string Description { get; set; } + + /// + /// True if this dialect is default one for Courier system. + /// + public bool IsDefault { get; set; } = false; + +} diff --git a/AkitaModel/Test.cs b/AkitaModel/Test.cs index 23ce05f..377bef2 100644 --- a/AkitaModel/Test.cs +++ b/AkitaModel/Test.cs @@ -81,6 +81,11 @@ public class Test /// public FlagType FlagType { get; set; } + /// + /// If false, test should be considered as "internal use only" and shouldn't be reported to third parties. + /// + public bool? ShowInResults { get; set; } = true; + /// /// Maximum allowed flag level. /// diff --git a/AkitaModelDemo/Program.cs b/AkitaModelDemo/Program.cs index 135e26f..f8f4841 100644 --- a/AkitaModelDemo/Program.cs +++ b/AkitaModelDemo/Program.cs @@ -26,7 +26,7 @@ await Core.RunSales(akitaService, settings); // BgNhis -await BgNhis.Run(akitaService, settings); +//await BgNhis.Run(akitaService, settings); // Robin await Robin.Run(akitaService, settings); diff --git a/AkitaModelDemo/Services/IAkitaApi.cs b/AkitaModelDemo/Services/IAkitaApi.cs index 95bba29..2e05c4a 100644 --- a/AkitaModelDemo/Services/IAkitaApi.cs +++ b/AkitaModelDemo/Services/IAkitaApi.cs @@ -16,10 +16,10 @@ public interface IAkitaApi Task> GetAllSpecies(); [Get(Constants.URL_CORE_PUBLIC_TESTS)] - Task> GetAllTests(); + Task> GetAllTests([Query] bool? loadRanges = null, [Query] bool? loadSampleType = null, [Query] bool? loadFlagType = null); [Get(Constants.URL_CORE_PUBLIC_SINGLE_TEST)] - Task GetSingleTest(int id); + Task GetSingleTest(int id, [Query] bool? loadRanges = null, [Query] bool? loadSampleType = null, [Query] bool? loadFlagType = null); [Get(Constants.URL_CORE_PUBLIC_SAMPLE_TYPES)] Task> GetAllSampleTypes();