From f21031d182e0dfda3404f0ab0f202fc405ffb748 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Wed, 19 Apr 2023 15:33:56 +0200
Subject: [PATCH] DomizielAnsbach Zuverdienst

---
 .../Invoicing/ZVInvoiceCreation.cs            |  3 +-
 ReportImp/DomizielAnsbach/ZVBerichtBezirk.cs  | 58 ++++++++++++++++---
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/ReportImp/DomizielAnsbach/Invoicing/ZVInvoiceCreation.cs b/ReportImp/DomizielAnsbach/Invoicing/ZVInvoiceCreation.cs
index 7c232d01d..06c682b2a 100644
--- a/ReportImp/DomizielAnsbach/Invoicing/ZVInvoiceCreation.cs
+++ b/ReportImp/DomizielAnsbach/Invoicing/ZVInvoiceCreation.cs
@@ -466,8 +466,7 @@ namespace DomizielAnsbach.Invoicing
             foreach (var at in customer.AbsenceTimes)
             {
                 if (at.AbsenceReason.BillableMinutes.HasValue && at.AbsenceReason.Description.Contains("ZV") 
-                    && (at.AbsenceReason.Description.Contains("Krank") || at.AbsenceReason.Description.Contains("entschuldigt") 
-                    || at.AbsenceReason.Description.Contains("unentschuldigt")))
+                    && at.AbsenceReason.Description.Contains("Krank") && at.AbsenceReason.Description.Contains("AU"))
                 {
                     if (at.Start.HasValue && at.End.HasValue && at.Start.Value >= scStart && at.Start.Value < start)
                     {
diff --git a/ReportImp/DomizielAnsbach/ZVBerichtBezirk.cs b/ReportImp/DomizielAnsbach/ZVBerichtBezirk.cs
index f4b36c5f8..92af40bea 100644
--- a/ReportImp/DomizielAnsbach/ZVBerichtBezirk.cs
+++ b/ReportImp/DomizielAnsbach/ZVBerichtBezirk.cs
@@ -197,19 +197,59 @@ namespace DomizielAnsbach
 
         private string GetKrankheiten(Customer c)
         {
-            string diagnosen = null;
-            if (c.Diagnosis2CustomerList.Count > 0)
+            string krankheiten = "";
+            foreach (var vv in c.VarFieldValueList)
             {
-                foreach (var d in c.Diagnosis2CustomerList)
+                var varFieldValue = Utils.XMLDeserializeFromString(vv.SerializedValue, Type.GetType(vv.TypeName));
+                if (varFieldValue != null && vv.IsActive == ActivationTypeId.Active)
                 {
-                    if (diagnosen != null)
-                        diagnosen += ", ";
-                    diagnosen += ICD10DAO.GetDiagnosisForCode(d.ICD10DiagnosisCode);
+                    if (vv.VarFieldDefOid.Value == 29)
+                    {
+                        if (varFieldValue.ToString() == "True")
+                        {
+                            if (krankheiten != null)
+                            {
+                                krankheiten += ", ";
+                            }   
+                            krankheiten += "psychisch";
+                        }
+                    }
+                    if (vv.VarFieldDefOid.Value == 30)
+                    {
+                        if (varFieldValue.ToString() == "True")
+                        {
+                            if (krankheiten != null)
+                            {
+                                krankheiten += ", ";
+                            }
+                            krankheiten += "suchtkrank";
+                        }
+                    }
+                    if (vv.VarFieldDefOid.Value == 31)
+                    {
+                        if (varFieldValue.ToString() == "True")
+                        {
+                            if (krankheiten != null)
+                            {
+                                krankheiten += ", ";
+                            }
+                            krankheiten += "körperbehindert";
+                        }
+                    }
+                    if (vv.VarFieldDefOid.Value == 32)
+                    {
+                        if (varFieldValue.ToString() == "True")
+                        {
+                            if (krankheiten != null)
+                            {
+                                krankheiten += ", ";
+                            }
+                            krankheiten += "geistigbehindert";
+                        }
+                    }
                 }
-                return diagnosen;
             }
-            else
-                return "";
+            return krankheiten;
         }
     }
 }