hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

fixing field
Some checks failed
release-dev / release-dev (push) Has been cancelled
Details

Browse source
This commit is contained in:
Warunee Tamkoo 2025-01-30 11:33:00 +07:00
parent 339de6132e
commit a0cc5b62ff
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BMA.EHR.Application/Repositories/Reports/ProbationReportRepository.cs
View file

@ -949,8 +949,8 @@ namespace BMA.EHR.Application.Repositories.Reports
ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.result.chairman.Position) ? string.Empty : evaluate_assign.result.chairman.Position,
ChairmanDate = string.IsNullOrEmpty(evaluate_assign.result.evaluate.chairman_dated.ToString()) ? "-" : evaluate_assign.result.evaluate?.chairman_dated?.ToThaiFullDate().ToString().ToThaiNumber(),
CommanderName = string.IsNullOrEmpty(evaluate_assign.result.commander.name) ? string.Empty : evaluate_assign.result.commander.name,
CommanderPosition = string.IsNullOrEmpty(evaluate_assign.result.commander.Position) ? string.Empty : evaluate_assign.result.commander.Position,
CommanderDate = string.IsNullOrEmpty(evaluate_assign.result.evaluate.director1_dated.ToString()) ? "-" : evaluate_assign.result.evaluate?.director1_dated?.ToThaiFullDate().ToString().ToThaiNumber(),
CommanderPosition = string.IsNullOrEmpty(evaluate_assign.result.commander.position) ? string.Empty : evaluate_assign.result.commander.position,
CommanderDate = string.IsNullOrEmpty(evaluate_assign.result.commander.dated.ToString()) ? "-" : evaluate_assign.result.commander.dated?.ToThaiFullDate().ToString().ToThaiNumber(),
Name = evaluate_assign.result.experimentee.name,
RoundNo = no.ToString().ToThaiNumber(),
DateStart = evaluate_assign.result.assign.date_start != string.Empty ? dateStart_ : "-",

20
BMA.EHR.Application/Responses/EvaluateResultAssignResponse.cs
View file

@ -19,15 +19,19 @@ namespace BMA.EHR.Application.Responses
public class Commander
{
public string personal_id { get; set; }
// public string personal_id { get; set; }
public string name { get; set; }
public string PositionId { get; set; }
public string PositionLevelId { get; set; }
public string PositionLineId { get; set; }
public string Position { get; set; }
public string Department { get; set; }
public string OrganizationOrganization { get; set; }
public string Oc { get; set; }
// public string PositionId { get; set; }
// public string PositionLevelId { get; set; }
// public string PositionLineId { get; set; }
public string position { get; set; }
// public string Department { get; set; }
// public string OrganizationOrganization { get; set; }
// public string Oc { get; set; }
public DateTime? dated { get; set; }
public string posLevel { get; set; }
public string posType { get; set; }
}
public class Chairman