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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

Browse source
This commit is contained in:
Kittapath 2024-07-07 10:25:41 +07:00
commit 0b6ba817f6
58 changed files with 26024 additions and 6121 deletions
Download patch file Download diff file Expand all files Collapse all files

11
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

@ -9158,11 +9158,14 @@ namespace BMA.EHR.Application.Repositories.Commands
var raw = JsonConvert.DeserializeObject<dynamic>(apiResult.Result);
if (raw != null)
{
ret.Add(new KeyValueItemResponse
if(raw.result!.rootId != null && raw.result!.root != null)
{
Id = raw.result!.rootId ?? null,
Name = raw.result!.root ?? null,
});
ret.Add(new KeyValueItemResponse
{
Id = raw.result!.rootId ?? null,
Name = raw.result!.root ?? null,
});
}
}
}
// var rootOcId = await GetRootOcIdAsync(UserOrganizationId);

8132
BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs
View file

File diff suppressed because it is too large Load diff

38
BMA.EHR.Application/Requests/InsigniaResultSet.cs
View file

@ -6,28 +6,46 @@ namespace BMA.EHR.Application.Requests
{
public Guid ProfileId { get; set; }
public string Prefix { get; set; }
public string CitizenId { get; set; } = String.Empty;
public string FullName { get; set; }
public string Prefix { get; set; } = String.Empty;
public string FirstName { get; set; } = String.Empty;
public string LastName { get; set; } = String.Empty;
public DateTime? BirthDate { get; set; }
public DateTime? DateAppoint { get; set; }
public string? ProfileType { get; set; }
public string? PosTypeName { get; set; }
public string? PosLevelName { get; set; }
public string Position { get; set; }
public string FullName { get; set; } = String.Empty;
public string Rank { get; set; }
public string Position { get; set; } = String.Empty;
public string GovAge { get; set; }
public string Rank { get; set; } = String.Empty;
public string GovAge { get; set; } = String.Empty;
public double? Salary { get; set; }
public double? PositionSalary { get; set; }
public string LastInsignia { get; set; }
public string LastInsignia { get; set; } = String.Empty;
public Guid? LastInsigniaId { get; set; }
//public Guid PosNo { get; set; }
public string PosNo { get; set; }
public string PosNo { get; set; } = String.Empty;
public InsigniaItem RequestInsignia { get; set; }
public InsigniaItem RequestInsignia { get; set; } = new();
public string Gender { get; set; }
public string Gender { get; set; } = String.Empty;
public int Seq { get; set; }
@ -40,4 +58,4 @@ namespace BMA.EHR.Application.Requests
public string Result { get; set; } = "";
}
}
}