diff --git a/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs b/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs index 7e34893c..29db1981 100644 --- a/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs +++ b/BMA.EHR.Insignia/Controllers/InsigniaReportController.cs @@ -157,17 +157,22 @@ namespace BMA.EHR.Insignia.Service.Controllers colLeft = start; colRight = start + 25; } + // ดึงข้อมูล NameLeft และ NameRight + var nameLeft = left.ElementAt(i).GetType().GetProperty("FullName").GetValue(left.ElementAt(i)); + var nameRight = right.ElementAt(i).GetType().GetProperty("FullName").GetValue(right.ElementAt(i)); + + // ถ้าไม่มีทั้ง NameLeft และ NameRight ให้ข้ามไป + if (string.IsNullOrEmpty((string)nameLeft) && string.IsNullOrEmpty((string)nameRight)) + { + continue; // ข้ามการทำงานของลูปในรอบนี้ + } mergeList.Add(new { row = mergeList.Count + 1, ColLeft = colLeft.ToString().ToThaiNumber(), - NameLeft = string.IsNullOrEmpty(left.ElementAt(i).GetType().GetProperty("FullName").GetValue(left.ElementAt(i))?.ToString()) - ? null - : left.ElementAt(i).GetType().GetProperty("FullName").GetValue(left.ElementAt(i)), + NameLeft = left.ElementAt(i).GetType().GetProperty("FullName").GetValue(left.ElementAt(i)), ColRight = colRight.ToString().ToThaiNumber(), - NameRight = string.IsNullOrEmpty(right.ElementAt(i).GetType().GetProperty("FullName").GetValue(right.ElementAt(i))?.ToString()) - ? null - : right.ElementAt(i).GetType().GetProperty("FullName").GetValue(right.ElementAt(i)), + NameRight = right.ElementAt(i).GetType().GetProperty("FullName").GetValue(right.ElementAt(i)), InsigniaInitial = left.ElementAt(i).GetType().GetProperty("InsigniaInitial").GetValue(left.ElementAt(i)), InsigniaName = left.ElementAt(i).GetType().GetProperty("InsigniaName").GetValue(left.ElementAt(i)), Range = range.ToThaiNumber(),