Merge pull request #7 from SKYWARE-Group/dev (v0.0.5)

v0.0.5

AkitaModel/AkitaModel.csproj

@@ -15,7 +15,7 @@
     <RepositoryType>git</RepositoryType>
     <PackageTags>iLab;Akita;Model;API</PackageTags>
     <SignAssembly>False</SignAssembly>
-    <Version>0.0.4</Version>
+    <Version>0.0.5</Version>
     <RootNamespace>Skyware.Lis.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <AssemblyName>Skyware.Lis.$(MSBuildProjectName)</AssemblyName>

AkitaModel/Courier/Dialect.cs

@@ -0,0 +1,36 @@
+namespace Skyware.Lis.AkitaModel.Courier;
+
+// Ignore Spelling: hl ngh
+
+/// <summary>
+/// HL7 syntax dialect.
+/// </summary>
+public class Dialect
+{
+
+    /// <summary>
+    /// Identifier in the Courier system, e.g. "ngh-2020".
+    /// </summary>
+    public string Id { get; set; }
+
+    /// <summary>
+    /// Friendly name, e.g. "North General Hospital 2020".
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Base HL7 version, e.g. "2.5.1".
+    /// </summary>
+    public string Hl7Version { get; set; }
+
+    /// <summary>
+    /// Description and further details.
+    /// </summary>
+    public string Description { get; set; }
+
+    /// <summary>
+    /// True if this dialect is default one for Courier system.
+    /// </summary>
+    public bool IsDefault { get; set; } = false;
+
+}

AkitaModel/Test.cs

@@ -81,6 +81,11 @@ public class Test
     /// </summary>
     public FlagType FlagType { get; set; }
 
+    /// <summary>
+    /// If false, test should be considered as "internal use only" and shouldn't be reported to third parties. 
+    /// </summary>
+    public bool? ShowInResults { get; set; } = true;
+
     /// <summary>
     /// Maximum allowed flag level.
     /// </summary>

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);

AkitaModelDemo/Services/IAkitaApi.cs

@@ -16,10 +16,10 @@ public interface IAkitaApi
     Task<IEnumerable<Species>> GetAllSpecies();
 
     [Get(Constants.URL_CORE_PUBLIC_TESTS)]
-    Task<IEnumerable<Test>> GetAllTests();
+    Task<IEnumerable<Test>> GetAllTests([Query] bool? loadRanges = null, [Query] bool? loadSampleType = null, [Query] bool? loadFlagType = null);
 
     [Get(Constants.URL_CORE_PUBLIC_SINGLE_TEST)]
-    Task<Test> GetSingleTest(int id);
+    Task<Test> GetSingleTest(int id, [Query] bool? loadRanges = null, [Query] bool? loadSampleType = null, [Query] bool? loadFlagType = null);
 
     [Get(Constants.URL_CORE_PUBLIC_SAMPLE_TYPES)]
     Task<IEnumerable<SampleType>> GetAllSampleTypes();