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

fix report command

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-12-22 15:53:33 +07:00
parent e8a288b4b2
commit 3617193ec4
2 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
View file

@ -1008,17 +1008,17 @@ namespace BMA.EHR.Application.Repositories.Commands
CitizenId = r.CitizenId, CitizenId = r.CitizenId,
FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name, PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name,
Organization = p.OrganizationPositionOld, Organization = p.OrganizationPositionOld ?? "",
PositionLevel = p.PositionLevelOld, PositionLevel = p.PositionLevelOld ?? "",
PositionType = p.PositionTypeOld, PositionType = p.PositionTypeOld ?? "",
PositionNumber = p.PositionNumberOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(),
Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(),
//Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(),
Fault = r.Command.Fault.ToThaiNumber(), Fault = r.Command.Fault == null ? "" : r.Command.Fault.ToThaiNumber(),
GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(), GuiltyBasis = r.Command.GuiltyBasis == null ? "" : r.Command.GuiltyBasis.ToThaiNumber(),
ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), ConclusionFireNo = r.Command.ConclusionFireNo == null ? "" : r.Command!.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber() ConclusionFireResolution = r.Command.ConclusionFireResolution == null ? "" : r.Command.ConclusionFireResolution.ToThaiNumber()
}) })
.ToList(); .ToList();

26
BMA.EHR.Report.Service/Properties/launchSettings.json
View file

@ -1,5 +1,15 @@
{ {
"profiles": { "profiles": {
"dotnet": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"dotnetRunMessages": true,
"applicationUrl": "https://localhost:7164;http://localhost:5156"
},
"http": { "http": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": true,
@ -46,13 +56,13 @@
"useSSL": true "useSSL": true
} }
}, },
"$schema": "https://json.schemastore.org/launchsettings.json", "$schema": "https://json.schemastore.org/launchsettings.json",
"iisSettings": { "iisSettings": {
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:23132", "applicationUrl": "http://localhost:23132",
"sslPort": 44337 "sslPort": 44337
}
} }
}
} }