diff --git a/Dakota/Models/Daten/DatenelementDecimal.cs b/Dakota/Models/Daten/DatenelementDecimal.cs index c85d7ff93..096f500b1 100644 --- a/Dakota/Models/Daten/DatenelementDecimal.cs +++ b/Dakota/Models/Daten/DatenelementDecimal.cs @@ -12,17 +12,23 @@ namespace Dakota.Models.Daten public void SetValue(Decimal input) { - var dec = input.ToString("#.00").Replace(".", ","); - var tester = Math.Abs(input).ToString("#.00").Replace(".", ""); - - if (tester.Length < MinStellen || tester.Length > MaxStellen) + string dec; + if (input != default(decimal)) { - throw new NotImplementedException("Error Code: 3483091097895"); + dec = input.ToString("#.00").Replace(".", ","); + var tester = Math.Abs(input).ToString("#.00").Replace(".", ""); + + if (tester.Length < MinStellen || tester.Length > MaxStellen) + { + throw new NotImplementedException("Error Code: 3483091097895"); + } } else { - _Value = dec; + dec = null; } + + _Value = dec; } } } diff --git a/Dakota/Models/Daten/DatenelementFiller.cs b/Dakota/Models/Daten/DatenelementFiller.cs index 66df15a7f..25b894cb8 100644 --- a/Dakota/Models/Daten/DatenelementFiller.cs +++ b/Dakota/Models/Daten/DatenelementFiller.cs @@ -23,14 +23,16 @@ namespace Dakota.Models.Daten Title = title; } - public void SetValue(int value) + public new void SetValue(int value) { if (value.ToString().Length > FillLength) throw new ArgumentOutOfRangeException("length", $"the length of {value} is bigger than len {FillLength}"); Value = value; - SetValue(value.ToString("D" + FillLength.ToString())); + var temp = value.ToString("D" + FillLength.ToString()); + + SetValue(temp); } } } diff --git a/Dakota/Models/Infos/InfoCreator.cs b/Dakota/Models/Infos/InfoCreator.cs index 73ce8fcb5..c961d09bf 100644 --- a/Dakota/Models/Infos/InfoCreator.cs +++ b/Dakota/Models/Infos/InfoCreator.cs @@ -29,9 +29,9 @@ namespace Dakota.Models.Infos NachrichtenRefenrenz = 0; } - internal string GetNextRefNumber() + internal int GetNextRefNumber() { - return NachrichtenRefenrenz++.ToString(); + return ++NachrichtenRefenrenz; } internal InfoFile GetDakotaInfoFile() diff --git a/Dakota/Models/Infos/InfoNachricht.cs b/Dakota/Models/Infos/InfoNachricht.cs index e4658386b..21f46d46f 100644 --- a/Dakota/Models/Infos/InfoNachricht.cs +++ b/Dakota/Models/Infos/InfoNachricht.cs @@ -8,7 +8,7 @@ namespace Dakota.Models.Infos { public class InfoNachricht { - public string Nachrichtenreferenznummer { get; set; } + public int Nachrichtenreferenznummer { get; set; } public string NachrichtenTypKennung { get; set; } public string NachrichtenVersionsnummer { get; set; } public string NachrichtenFreigabeNrTages { get; set; } diff --git a/Dakota/Models/Segmente/SLGA/SegmentSLGAFKT.cs b/Dakota/Models/Segmente/SLGA/SegmentSLGAFKT.cs index 46536175f..f8c7b23b3 100644 --- a/Dakota/Models/Segmente/SLGA/SegmentSLGAFKT.cs +++ b/Dakota/Models/Segmente/SLGA/SegmentSLGAFKT.cs @@ -63,6 +63,6 @@ namespace Dakota.Models.Segmente.SLGA public override string GetHead() => "FKT"; public override List GetBody() - => new List() { Verarbeitungskennzeichen, Sammelrechnung }; + => new List() { Verarbeitungskennzeichen, Sammelrechnung, IKLeistungserbringers, IKKostenträger, IKKrankenkasseKVKarte, IKAbsender }; } } diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs index a22e2df2c..17468515e 100644 --- a/Service/ServiceImplementations/OperationsServiceImp.cs +++ b/Service/ServiceImplementations/OperationsServiceImp.cs @@ -7725,6 +7725,11 @@ namespace BeWo.Service.ServiceImplementations var code = DakotaFileCreator.GenerateDakotaFilesByMonth(year, month); + var path = @"C:\Projects\out"; + + File.WriteAllText(path, code.FirstOrDefault()); + + //var baseoid = long.Parse((string)param); //var accounting = new AccountingServiceImp();