checkpoint report #852 (1)
This commit is contained in:
parent
164dc819ab
commit
68346f8096
1 changed files with 11 additions and 6 deletions
|
|
@ -157,17 +157,22 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
||||||
colLeft = start;
|
colLeft = start;
|
||||||
colRight = start + 25;
|
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
|
mergeList.Add(new
|
||||||
{
|
{
|
||||||
row = mergeList.Count + 1,
|
row = mergeList.Count + 1,
|
||||||
ColLeft = colLeft.ToString().ToThaiNumber(),
|
ColLeft = colLeft.ToString().ToThaiNumber(),
|
||||||
NameLeft = string.IsNullOrEmpty(left.ElementAt(i).GetType().GetProperty("FullName").GetValue(left.ElementAt(i))?.ToString())
|
NameLeft = left.ElementAt(i).GetType().GetProperty("FullName").GetValue(left.ElementAt(i)),
|
||||||
? null
|
|
||||||
: left.ElementAt(i).GetType().GetProperty("FullName").GetValue(left.ElementAt(i)),
|
|
||||||
ColRight = colRight.ToString().ToThaiNumber(),
|
ColRight = colRight.ToString().ToThaiNumber(),
|
||||||
NameRight = string.IsNullOrEmpty(right.ElementAt(i).GetType().GetProperty("FullName").GetValue(right.ElementAt(i))?.ToString())
|
NameRight = right.ElementAt(i).GetType().GetProperty("FullName").GetValue(right.ElementAt(i)),
|
||||||
? null
|
|
||||||
: right.ElementAt(i).GetType().GetProperty("FullName").GetValue(right.ElementAt(i)),
|
|
||||||
InsigniaInitial = left.ElementAt(i).GetType().GetProperty("InsigniaInitial").GetValue(left.ElementAt(i)),
|
InsigniaInitial = left.ElementAt(i).GetType().GetProperty("InsigniaInitial").GetValue(left.ElementAt(i)),
|
||||||
InsigniaName = left.ElementAt(i).GetType().GetProperty("InsigniaName").GetValue(left.ElementAt(i)),
|
InsigniaName = left.ElementAt(i).GetType().GetProperty("InsigniaName").GetValue(left.ElementAt(i)),
|
||||||
Range = range.ToThaiNumber(),
|
Range = range.ToThaiNumber(),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue