From 2112f5a644db214773eacaa343c9599cafa40ddc Mon Sep 17 00:00:00 2001 From: Alexandra Date: Thu, 16 Oct 2025 09:51:08 +0200 Subject: [PATCH] LwlPrueflisteRO - Erweiterung um Monatsunterschrift Klient --- Report/ReportObjects/LwlPrueflisteRO.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Report/ReportObjects/LwlPrueflisteRO.cs b/Report/ReportObjects/LwlPrueflisteRO.cs index 5925e9976..b57339a9d 100644 --- a/Report/ReportObjects/LwlPrueflisteRO.cs +++ b/Report/ReportObjects/LwlPrueflisteRO.cs @@ -57,7 +57,8 @@ sr.ServiceDescriptionOid, (select name from ServiceDescription sd where sd.Oid = sr.ServiceDescriptionOid), (select distinct zeitstempel from signature sig where sig.ServiceRecordOid = sr.Oid AND sig.IsActive = 1 order by zeitstempel desc limit 1), (select emp2p.Abbreviation from employee emp2 join `person` emp2p on emp2p.`Oid` = emp2.`PersonOid` where emp2.`Oid` = sr.EmployeeOid), -(select cs.InsTs from confirmationreceiptsignature2servicerecord cs2s join confirmationreceiptsignature cs where cs.Oid = cs2s.ConfirmationReceiptSignatureOid and cs.IsActive = 1 and cs2s.ServiceRecordOid = sr.oid LIMIT 1) +(select cs.InsTs from confirmationreceiptsignature2servicerecord cs2s join confirmationreceiptsignature cs where cs.Oid = cs2s.ConfirmationReceiptSignatureOid and cs.IsActive = 1 and cs.EmployeeOid Is not null and cs2s.ServiceRecordOid = sr.oid LIMIT 1), +(select cs.InsTs from confirmationreceiptsignature2servicerecord cs2s join confirmationreceiptsignature cs where cs.Oid = cs2s.ConfirmationReceiptSignatureOid and cs.IsActive = 1 and cs.CustomerOid = c.Oid and cs2s.ServiceRecordOid = sr.oid LIMIT 1) FROM servicerecord sr JOIN costbearer2supportconcept c2s on c2s.oid = sr.CostBearer2SupportConceptOid JOIN supportconcept sc on sc.Oid = c2s.SupportConceptOid @@ -115,6 +116,10 @@ order by p.lastname, p.Firstname, sr.startdate { e.CustomerSignatureDate = dt1; } + else if (sqlRow[21] != null && DateTime.TryParse(sqlRow[21].ToString(), out var dtb)) + { + e.CustomerSignatureDate = dtb; + } e.EmployeeAbbr = (String)sqlRow[19]; if (sqlRow[20] != null && DateTime.TryParse(sqlRow[20].ToString(), out var dt2))