From 1bc38af29eeb3ff801eb2bb0136b19060ee533da Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Thu, 6 Feb 2025 13:53:52 +0100
Subject: [PATCH] 
 ClaudiaHeizmannHeilpaedagogik/QuittierungsbelegIfsEingangsdiagnostik.cs -
 Summierung bestimmter Leistungen

---
 .../QuittierungsbelegIfsEingangsdiagnostik.cs | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/ReportImp/ClaudiaHeizmannHeilpaedagogik/QuittierungsbelegIfsEingangsdiagnostik.cs b/ReportImp/ClaudiaHeizmannHeilpaedagogik/QuittierungsbelegIfsEingangsdiagnostik.cs
index 7f71d1de0..834fd1baf 100644
--- a/ReportImp/ClaudiaHeizmannHeilpaedagogik/QuittierungsbelegIfsEingangsdiagnostik.cs
+++ b/ReportImp/ClaudiaHeizmannHeilpaedagogik/QuittierungsbelegIfsEingangsdiagnostik.cs
@@ -28,36 +28,39 @@ namespace ClaudiaHeizmannHeilpaedagogik
             SetzeBewilligung(pRO);
             pRO.CustomerStreet = pRO.CustomerLastName.Substring(0, 2) + pRO.CustomerFirstName.Substring(0, 2);
             decimal sum = 0;
+            decimal sumEF = 0;
+            decimal sumZV = 0;
             foreach (var sd in pRO.Services)
             {
                 ServicesOverviewRO.CreateSignatureString(sd);
                 sd.ServiceCategoryAbbr = "HE";
                 sd.EmployeeFirstName = "A";
+                var be = (decimal)Math.Round(sd.Minutes * 4 / 3 / 60, 1, MidpointRounding.AwayFromZero);
+                sd.Notice2 = be.ToString("n2");
+                sum += be;
+
                 if (sd.ServiceCategory.Contains("Eltern"))
                 {
                     sd.ServiceCategoryAbbr = "EF";
                     sd.StartDateString = String.Format("{0:MMMM}", sd.StartDate);
                     sd.EmployeeFirstName = "B";
+                    sumEF += be;
                 }
                 if (sd.ServiceCategory.Contains("Kooperation"))
                 {
                     sd.StartDateString = String.Format("{0:MMMM}", sd.StartDate);
                     sd.ServiceCategoryAbbr = "ZV";
                     sd.EmployeeFirstName = "C";
+                    sumZV += be;
                 }
-
-                var be = (decimal)Math.Round(sd.Minutes * 4 / 3 / 60, 1, MidpointRounding.AwayFromZero);
-                sd.Notice2 = be.ToString("n2");
-                sum += be;
             }
-            // Zusammenfassen der ZV und EF zu je einem Item - Rundung am Ende
+            // Zusammenfassen der ZV und EF zu je einem Item
             if (pRO.Services.Where(s => s.ServiceCategoryAbbr == "ZV").ToList().Count() > 1)
             {
                 var zvServices = pRO.Services.Where(s => s.ServiceCategoryAbbr == "ZV").First();
                 var zvMinuten = pRO.Services.Where(s => s.ServiceCategoryAbbr == "ZV").Sum(s => s.Minutes);
                 zvServices.Minutes = zvMinuten;
-                var be = (decimal)Math.Round(zvServices.Minutes * 4 / 3 / 60, 1, MidpointRounding.AwayFromZero);
-                zvServices.Notice2 = be.ToString("n2");
+                zvServices.Notice2 = sumZV.ToString("n2");
                 pRO.Services = pRO.Services.Where(s => s.ServiceCategoryAbbr != "ZV").ToList();
                 pRO.Services.Add(zvServices);
             }
@@ -66,8 +69,7 @@ namespace ClaudiaHeizmannHeilpaedagogik
                 var efMinuten = pRO.Services.Where(s => s.ServiceCategoryAbbr == "EF").Sum(s => s.Minutes);
                 var efServices = pRO.Services.Where(s => s.ServiceCategoryAbbr == "EF").First();
                 efServices.Minutes = efMinuten;
-                var be = (decimal)Math.Round(efServices.Minutes * 4 / 3 / 60, 1, MidpointRounding.AwayFromZero);
-                efServices.Notice2 = be.ToString("n2");
+                efServices.Notice2 = sumEF.ToString("n2");
                 pRO.Services = pRO.Services.Where(s => s.ServiceCategoryAbbr != "EF").ToList();
                 pRO.Services.Add(efServices);
             }