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

Merge branch 'develop'

Browse source
This commit is contained in:
kittapath 2024-12-27 00:41:26 +07:00
commit 5d1f3755f7
28 changed files with 4817 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

10
BMA.EHR.Application/Responses/Profiles/GetProfileByKeycloakIdDto.cs
View file

@ -94,7 +94,7 @@ namespace BMA.EHR.Application.Responses.Profiles
public Guid? LastUpdateUserId { get; set; }
public string? CreatedFullName { get; set; }
public string? LastUpdateFullName { get; set; }
public string PosNo { get; set; } = string.Empty;
public string? PosNo { get; set; } = string.Empty;
public double? Amount { get; set; }
@ -102,15 +102,15 @@ namespace BMA.EHR.Application.Responses.Profiles
public double? MouthSalaryAmount { get; set; }
public int Order { get; set; }
public int? Order { get; set; }
public DateTime? Date { get; set; }
public string PositionLevel { get; set; } = string.Empty;
public string? PositionLevel { get; set; } = string.Empty;
public string PositionType { get; set; } = string.Empty;
public string? PositionType { get; set; } = string.Empty;
public string Position { get; set; } = string.Empty;
public string? Position { get; set; } = string.Empty;
}

16
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -1039,13 +1039,15 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new {
fullName = _null,
positionname = r.RemarkHorizontal,
positionno = _null,
organizationname = _null,
salary = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new {
fullName = _null,
positionname = r.RemarkHorizontal,
positionno = _null,
organizationname = _null,
salary = _null,
});
}
}
return Success(result);
}

3
BMA.EHR.Domain/Models/Discipline/DisciplineComplaint_Appeal.cs
View file

@ -45,6 +45,9 @@ namespace BMA.EHR.Domain.Models.Discipline
[Comment("สังกัดผู้อุทธรณ์/ร้องทุกข์")]
public string? Oc { get; set; }
[Comment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")]
public string? profileType { get; set; }
public virtual List<DisciplineComplaint_Appeal_Doc> DisciplineComplaint_Appeal_Docs { get; set; } = new List<DisciplineComplaint_Appeal_Doc>();
public virtual List<DisciplineComplaint_Appeal_History> DisciplineComplaint_Appeal_Historys { get; set; } = new List<DisciplineComplaint_Appeal_History>();
}

3379
BMA.EHR.Infrastructure/Migrations/DisciplineDb/20241226172314_update table disciplinecom add profiletype.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

30
BMA.EHR.Infrastructure/Migrations/DisciplineDb/20241226172314_update table disciplinecom add profiletype.cs Normal file
View file

@ -0,0 +1,30 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
{
/// <inheritdoc />
public partial class updatetabledisciplinecomaddprofiletype : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "profileType",
table: "DisciplineComplaint_Appeals",
type: "longtext",
nullable: true,
comment: "สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "profileType",
table: "DisciplineComplaint_Appeals");
}
}
}

4
BMA.EHR.Infrastructure/Migrations/DisciplineDb/DisciplineDbContextModelSnapshot.cs
View file

@ -241,6 +241,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
.HasColumnType("int")
.HasComment("ปีงบประมาณ");
b.Property<string>("profileType")
.HasColumnType("longtext")
.HasComment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)");
b.HasKey("Id");
b.ToTable("DisciplineComplaint_Appeals");

3
BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs
View file

@ -411,6 +411,9 @@ namespace BMA.EHR.Insignia.Service.Controllers
if (organization == null)
continue;
// TODO - Comment This
//if (organization.Id.ToString() != "e93c0ed3-7b80-42aa-8626-8abf0042f618") continue;
var result = await _repository.GetInsigniaRequest(insigniaPeriodId, organization.Id);
if (result != null)
{

14
BMA.EHR.Insignia/appsettings.json
View file

@ -14,14 +14,16 @@
"AllowedHosts": "*",
"ConnectionStrings": {
//"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
//"DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
//"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
//"DefaultConnection": "server=hrms.chin.in.th;user=root;password=adminVM123;port=53636;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
//"DefaultConnection": "server=hrms.chin.in.th;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=53636;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
//"ExamConnection": "server=hrms.chin.in.th;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=53636;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
//"LeaveConnection": "server=hrms.chin.in.th;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=53636;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
//"DisciplineConnection": "server=hrms.chin.in.th;user=root;password=ey2qVVyyqGYw8CyA7h8X72559r2Ad84K;port=53636;database=hrms_discipline;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
},
"Jwt": {
//"Key": "j7C9RO_p4nRtuwCH4z9Db_A_6We42tkD_p4lZtDrezc",
//"Issuer": "https://hrms-id.chin.in.th/realms/hrms"
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
"Issuer": "https://id.frappet.synology.me/realms/bma-ehr"
},

97
BMA.EHR.MetaData.Service/Controllers/MainController.cs Normal file
View file

@ -0,0 +1,97 @@
using BMA.EHR.Domain.Common;
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.MetaData.Service.Request;
using BMA.EHR.MetaData.Service.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
namespace BMA.EHR.MetaData.Service.Controllers
{
[Route("api/v{version:apiVersion}/metadata/main")]
[ApiVersion("1.0")]
[ApiController]
[Produces("application/json")]
[Authorize]
[SwaggerTag("จัดการข้อมูลตำแหน่ง เพื่อนำไปใช้งานในระบบ")]
public class MainController : BaseController
{
#region " Fields "
private readonly BloodGroupService _bloodGroupService;
private readonly EducationLevelService _educationLevelService;
private readonly GenderService _genderService;
private readonly ProvinceService _provinceService;
private readonly PrefixService _prefixService;
private readonly RelationshipService _relationshipService;
private readonly ReligionService _religionService;
#endregion
#region " Constructor and Destructor "
public MainController(
BloodGroupService bloodGroupService,
ProvinceService provinceService,
EducationLevelService educationLevelService,
GenderService genderService,
PrefixService prefixService,
RelationshipService relationshipService,
ReligionService religionService)
{
_bloodGroupService = bloodGroupService;
_provinceService = provinceService;
_educationLevelService = educationLevelService;
_genderService = genderService;
_prefixService = prefixService;
_relationshipService = relationshipService;
_religionService = religionService;
}
#endregion
#region " Methods "
/// <summary>
/// อ่านข้อมูล ข้อมูลเกี่ยวกับบุคคล
/// </summary>
/// <returns></returns>
/// <response code="200">อ่านข้อมูล ข้อมูลเกี่ยวกับบุคคล สำเร็จ</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("person")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status500InternalServerError)]
public async Task<ActionResult<ResponseObject>> GetsMainPersonAsync()
{
try
{
var bloodGroups = await _bloodGroupService.GetsAsync(showAll: false);
var provinces = await _provinceService.GetsAsync(showAll: false);
var educationLevels = await _educationLevelService.GetsAsync(showAll: false);
var genders = await _genderService.GetsAsync(showAll: false);
var prefixs = await _prefixService.GetsAsync(showAll: false);
var relationships = await _relationshipService.GetsAsync(showAll: false);
var religions = await _religionService.GetsAsync(showAll: false);
return Success(new
{
bloodGroups,
provinces,
educationLevels,
genders,
prefixs,
relationships,
religions,
});
}
catch (Exception ex)
{
return Error(ex);
}
}
#endregion
}
}

8
BMA.EHR.MetaData.Service/Program.cs
View file

@ -89,6 +89,14 @@ var builder = WebApplication.CreateBuilder(args);
builder.Services.AddTransient<PositionPathService>();
builder.Services.AddTransient<PositionPathSideService>();
builder.Services.AddTransient<PositionTypeService>();
builder.Services.AddTransient<BloodGroupService>();
builder.Services.AddTransient<EducationLevelService>();
builder.Services.AddTransient<GenderService>();
builder.Services.AddTransient<ProvinceService>();
builder.Services.AddTransient<PrefixService>();
builder.Services.AddTransient<RelationshipService>();
builder.Services.AddTransient<ReligionService>();
builder.Services.AddControllers(options =>
{
options.SuppressAsyncSuffixInActionNames = false;

92
BMA.EHR.MetaData.Service/Services/BloodGroupService.cs Normal file
View file

@ -0,0 +1,92 @@
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Infrastructure.Persistence;
using Microsoft.EntityFrameworkCore;
using System.Security.Claims;
namespace BMA.EHR.MetaData.Service.Services
{
public class BloodGroupService
{
#region " Fields "
private readonly ApplicationDBContext _context;
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly ILogger<BloodGroupService> _logger;
#endregion
#region " Constructor and Destructor "
public BloodGroupService(ApplicationDBContext context,
IHttpContextAccessor httpContextAccessor,
ILogger<BloodGroupService> logger)
{
_context = context;
_httpContextAccessor = httpContextAccessor;
_logger = logger;
}
#endregion
#region " Properties "
private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
#endregion
#region " Methods "
public async Task<IEnumerable<BloodGroup>> GetsAsync(bool showAll = true)
{
if (showAll)
return await _context.BloodGroups.AsQueryable()
.OrderBy(d => d.Name)
.ToListAsync();
else
return await _context.BloodGroups.AsQueryable()
.Where(p => p.IsActive)
.OrderBy(d => d.Name)
.ToListAsync();
}
public async Task<BloodGroup?> GetByIdAsync(Guid id)
{
return await _context.BloodGroups.FirstOrDefaultAsync(x => x.Id == id);
}
public async Task UpdateAsync(Guid id, BloodGroup updated)
{
var existData = await _context.BloodGroups.FirstOrDefaultAsync(x => x.Id == id);
if (existData != null)
{
if (existData.Name != updated.Name || existData.IsActive != updated.IsActive)
{
existData.Name = updated.Name;
existData.IsActive = updated.IsActive;
existData.LastUpdatedAt = DateTime.Now;
existData.LastUpdateUserId = UserId ?? "";
existData.LastUpdateFullName = FullName ?? "";
}
await _context.SaveChangesAsync();
}
}
public async Task CreateAsync(BloodGroup inserted)
{
inserted.CreatedUserId = UserId ?? "";
inserted.CreatedFullName = FullName ?? "System Administrator";
inserted.CreatedAt = DateTime.Now;
inserted.LastUpdatedAt = DateTime.Now;
inserted.LastUpdateFullName = FullName ?? "System Administrator";
inserted.LastUpdateUserId = UserId ?? "";
await _context.BloodGroups.AddAsync(inserted);
await _context.SaveChangesAsync();
}
#endregion
}
}

90
BMA.EHR.MetaData.Service/Services/EducationLevelService.cs Normal file
View file

@ -0,0 +1,90 @@
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Infrastructure.Persistence;
using Microsoft.EntityFrameworkCore;
using System.Security.Claims;
namespace BMA.EHR.MetaData.Service.Services
{
public class EducationLevelService
{
#region " Fields "
private readonly ApplicationDBContext _context;
private readonly IHttpContextAccessor _httpContextAccessor;
#endregion
#region " Constructor and Destructor "
public EducationLevelService(ApplicationDBContext context,
IHttpContextAccessor httpContextAccessor)
{
_context = context;
_httpContextAccessor = httpContextAccessor;
}
#endregion
#region " Properties "
private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
#endregion
#region " Methods "
public async Task<IEnumerable<EducationLevel>> GetsAsync(bool showAll = true)
{
if (showAll)
return await _context.EducationLevels.AsQueryable()
.OrderBy(d => d.Name)
.ToListAsync();
else
return await _context.EducationLevels.AsQueryable()
.Where(p => p.IsActive)
.OrderBy(d => d.Name)
.ToListAsync();
}
public async Task<EducationLevel?> GetByIdAsync(Guid id)
{
return await _context.EducationLevels.FirstOrDefaultAsync(x => x.Id == id);
}
public async Task UpdateAsync(Guid id, EducationLevel updated)
{
var existData = await _context.EducationLevels.FirstOrDefaultAsync(x => x.Id == id);
if (existData != null)
{
if (existData.Name != updated.Name || existData.IsActive != updated.IsActive)
{
existData.Name = updated.Name;
existData.IsActive = updated.IsActive;
existData.LastUpdatedAt = DateTime.Now;
existData.LastUpdateUserId = UserId ?? "";
existData.LastUpdateFullName = FullName ?? "";
}
await _context.SaveChangesAsync();
}
}
public async Task CreateAsync(EducationLevel inserted)
{
inserted.CreatedUserId = UserId ?? "";
inserted.CreatedFullName = FullName ?? "System Administrator";
inserted.CreatedAt = DateTime.Now;
inserted.LastUpdatedAt = DateTime.Now;
inserted.LastUpdateFullName = FullName ?? "System Administrator";
inserted.LastUpdateUserId = UserId ?? "";
await _context.EducationLevels.AddAsync(inserted);
await _context.SaveChangesAsync();
}
#endregion
}
}

90
BMA.EHR.MetaData.Service/Services/GenderService.cs Normal file
View file

@ -0,0 +1,90 @@
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Infrastructure.Persistence;
using Microsoft.EntityFrameworkCore;
using System.Security.Claims;
namespace BMA.EHR.MetaData.Service.Services
{
public class GenderService
{
#region " Fields "
private readonly ApplicationDBContext _context;
private readonly IHttpContextAccessor _httpContextAccessor;
#endregion
#region " Constructor and Destructor "
public GenderService(ApplicationDBContext context,
IHttpContextAccessor httpContextAccessor)
{
_context = context;
_httpContextAccessor = httpContextAccessor;
}
#endregion
#region " Properties "
private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
#endregion
#region " Methods "
public async Task<IEnumerable<Gender>> GetsAsync(bool showAll = true)
{
if (showAll)
return await _context.Genders.AsQueryable()
.OrderBy(d => d.Name)
.ToListAsync();
else
return await _context.Genders.AsQueryable()
.Where(p => p.IsActive)
.OrderBy(d => d.Name)
.ToListAsync();
}
public async Task<Gender?> GetByIdAsync(Guid id)
{
return await _context.Genders.FirstOrDefaultAsync(x => x.Id == id);
}
public async Task UpdateAsync(Guid id, Gender updated)
{
var existData = await _context.Genders.FirstOrDefaultAsync(x => x.Id == id);
if (existData != null)
{
if (existData.Name != updated.Name || existData.IsActive != updated.IsActive)
{
existData.Name = updated.Name;
existData.IsActive = updated.IsActive;
existData.LastUpdatedAt = DateTime.Now;
existData.LastUpdateUserId = UserId ?? "";
existData.LastUpdateFullName = FullName ?? "";
}
await _context.SaveChangesAsync();
}
}
public async Task CreateAsync(Gender inserted)
{
inserted.CreatedUserId = UserId ?? "";
inserted.CreatedFullName = FullName ?? "System Administrator";
inserted.CreatedAt = DateTime.Now;
inserted.LastUpdatedAt = DateTime.Now;
inserted.LastUpdateFullName = FullName ?? "System Administrator";
inserted.LastUpdateUserId = UserId ?? "";
await _context.Genders.AddAsync(inserted);
await _context.SaveChangesAsync();
}
#endregion
}
}

90
BMA.EHR.MetaData.Service/Services/PrefixService.cs Normal file
View file

@ -0,0 +1,90 @@
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Infrastructure.Persistence;
using Microsoft.EntityFrameworkCore;
using System.Security.Claims;
namespace BMA.EHR.MetaData.Service.Services
{
public class PrefixService
{
#region " Fields "
private readonly ApplicationDBContext _context;
private readonly IHttpContextAccessor _httpContextAccessor;
#endregion
#region " Constructor and Destructor "
public PrefixService(ApplicationDBContext context,
IHttpContextAccessor httpContextAccessor)
{
_context = context;
_httpContextAccessor = httpContextAccessor;
}
#endregion
#region " Properties "
private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
#endregion
#region " Methods "
public async Task<IEnumerable<Prefix>> GetsAsync(bool showAll = true)
{
if (showAll)
return await _context.Prefixes.AsQueryable()
.OrderBy(d => d.Name)
.ToListAsync();
else
return await _context.Prefixes.AsQueryable()
.Where(p => p.IsActive)
.OrderBy(d => d.Name)
.ToListAsync();
}
public async Task<Prefix?> GetByIdAsync(Guid id)
{
return await _context.Prefixes.FirstOrDefaultAsync(x => x.Id == id);
}
public async Task UpdateAsync(Guid id, Prefix updated)
{
var existData = await _context.Prefixes.FirstOrDefaultAsync(x => x.Id == id);
if (existData != null)
{
if (existData.Name != updated.Name || existData.IsActive != updated.IsActive)
{
existData.Name = updated.Name;
existData.IsActive = updated.IsActive;
existData.LastUpdateUserId = UserId ?? "";
existData.LastUpdateFullName = FullName ?? "";
existData.LastUpdatedAt = DateTime.Now;
}
await _context.SaveChangesAsync();
}
}
public async Task CreateAsync(Prefix inserted)
{
inserted.CreatedUserId = UserId ?? "";
inserted.CreatedFullName = FullName ?? "System Administrator";
inserted.CreatedAt = DateTime.Now;
inserted.LastUpdatedAt = DateTime.Now;
inserted.LastUpdateFullName = FullName ?? "System Administrator";
inserted.LastUpdateUserId = UserId ?? "";
await _context.Prefixes.AddAsync(inserted);
await _context.SaveChangesAsync();
}
#endregion
}
}

93
BMA.EHR.MetaData.Service/Services/ProvinceService.cs Normal file
View file

@ -0,0 +1,93 @@
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Infrastructure.Persistence;
using Microsoft.EntityFrameworkCore;
using System.Security.Claims;
namespace BMA.EHR.MetaData.Service.Services
{
public class ProvinceService
{
#region " Fields "
private readonly ApplicationDBContext _context;
private readonly IHttpContextAccessor _httpContextAccessor;
#endregion
#region " Constructor and Destructor "
public ProvinceService(ApplicationDBContext context,
IHttpContextAccessor httpContextAccessor)
{
_context = context;
_httpContextAccessor = httpContextAccessor;
}
#endregion
#region " Properties "
private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
#endregion
#region " Methods "
public async Task<IEnumerable<Province>> GetsAsync(bool showAll = true)
{
if (showAll)
return await _context.Provinces.AsQueryable()
.OrderBy(d => d.Name)
.ToListAsync();
else
return await _context.Provinces.AsQueryable()
.Where(p => p.IsActive)
.OrderBy(d => d.Name)
.ToListAsync();
}
public async Task<Province?> GetByIdAsync(Guid id)
{
return await _context.Provinces
.AsQueryable()
.Include(x => x.Districts)
.FirstOrDefaultAsync(x => x.Id == id);
}
public async Task UpdateAsync(Guid id, Province updated)
{
var existData = await _context.Provinces.FirstOrDefaultAsync(x => x.Id == id);
if (existData != null)
{
if (existData.Name != updated.Name || existData.IsActive != updated.IsActive)
{
existData.Name = updated.Name;
existData.IsActive = updated.IsActive;
existData.LastUpdatedAt = DateTime.Now;
existData.LastUpdateUserId = UserId ?? "";
existData.LastUpdateFullName = FullName ?? "";
}
await _context.SaveChangesAsync();
}
}
public async Task CreateAsync(Province inserted)
{
inserted.CreatedUserId = UserId ?? "";
inserted.CreatedFullName = FullName ?? "System Administrator";
inserted.CreatedAt = DateTime.Now;
inserted.LastUpdatedAt = DateTime.Now;
inserted.LastUpdateFullName = FullName ?? "System Administrator";
inserted.LastUpdateUserId = UserId ?? "";
await _context.Provinces.AddAsync(inserted);
await _context.SaveChangesAsync();
}
#endregion
}
}

89
BMA.EHR.MetaData.Service/Services/RelationshipService.cs Normal file
View file

@ -0,0 +1,89 @@
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Infrastructure.Persistence;
using Microsoft.EntityFrameworkCore;
using System.Security.Claims;
namespace BMA.EHR.MetaData.Service.Services;
public class RelationshipService
{
#region " Fields "
private readonly ApplicationDBContext _context;
private readonly IHttpContextAccessor _httpContextAccessor;
#endregion
#region " Constructor and Destructor "
public RelationshipService(ApplicationDBContext context,
IHttpContextAccessor httpContextAccessor)
{
_context = context;
_httpContextAccessor = httpContextAccessor;
}
#endregion
#region " Properties "
private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
#endregion
#region " Methods "
public async Task<IEnumerable<Relationship>> GetsAsync(bool showAll = true)
{
if (showAll)
return await _context.Relationships.AsQueryable()
.OrderBy(d => d.Name)
.ToListAsync();
else
return await _context.Relationships.AsQueryable()
.Where(p => p.IsActive)
.OrderBy(d => d.Name)
.ToListAsync();
}
public async Task<Relationship?> GetByIdAsync(Guid id)
{
return await _context.Relationships.FirstOrDefaultAsync(x => x.Id == id);
}
public async Task UpdateAsync(Guid id, Relationship updated)
{
var existData = await _context.Relationships.FirstOrDefaultAsync(x => x.Id == id);
if (existData != null)
{
if (existData.Name != updated.Name || existData.IsActive != updated.IsActive)
{
existData.Name = updated.Name;
existData.IsActive = updated.IsActive;
existData.LastUpdateUserId = UserId ?? "";
existData.LastUpdateFullName = FullName ?? "";
existData.LastUpdatedAt = DateTime.Now;
}
await _context.SaveChangesAsync();
}
}
public async Task CreateAsync(Relationship inserted)
{
inserted.CreatedUserId = UserId ?? "";
inserted.CreatedFullName = FullName ?? "System Administrator";
inserted.CreatedAt = DateTime.Now;
inserted.LastUpdatedAt = DateTime.Now;
inserted.LastUpdateFullName = FullName ?? "System Administrator";
inserted.LastUpdateUserId = UserId ?? "";
await _context.Relationships.AddAsync(inserted);
await _context.SaveChangesAsync();
}
#endregion
}

90
BMA.EHR.MetaData.Service/Services/ReligionService.cs Normal file
View file

@ -0,0 +1,90 @@
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Infrastructure.Persistence;
using Microsoft.EntityFrameworkCore;
using System.Security.Claims;
namespace BMA.EHR.MetaData.Service.Services
{
public class ReligionService
{
#region " Fields "
private readonly ApplicationDBContext _context;
private readonly IHttpContextAccessor _httpContextAccessor;
#endregion
#region " Constructor and Destructor "
public ReligionService(ApplicationDBContext context,
IHttpContextAccessor httpContextAccessor)
{
_context = context;
_httpContextAccessor = httpContextAccessor;
}
#endregion
#region " Properties "
private string? UserId => _httpContextAccessor?.HttpContext?.User?.FindFirst(ClaimTypes.NameIdentifier)?.Value;
private string? FullName => _httpContextAccessor?.HttpContext?.User?.FindFirst("name")?.Value;
#endregion
#region " Methods "
public async Task<IEnumerable<Religion>> GetsAsync(bool showAll = true)
{
if (showAll)
return await _context.Religions.AsQueryable()
.OrderBy(d => d.Name)
.ToListAsync();
else
return await _context.Religions.AsQueryable()
.Where(p => p.IsActive)
.OrderBy(d => d.Name)
.ToListAsync();
}
public async Task<Religion?> GetByIdAsync(Guid id)
{
return await _context.Religions.FirstOrDefaultAsync(x => x.Id == id);
}
public async Task UpdateAsync(Guid id, Religion updated)
{
var existData = await _context.Religions.FirstOrDefaultAsync(x => x.Id == id);
if (existData != null)
{
if (existData.Name != updated.Name || existData.IsActive != updated.IsActive)
{
existData.Name = updated.Name;
existData.IsActive = updated.IsActive;
existData.LastUpdateUserId = UserId ?? "";
existData.LastUpdateFullName = FullName ?? "";
existData.LastUpdatedAt = DateTime.Now;
}
await _context.SaveChangesAsync();
}
}
public async Task CreateAsync(Religion inserted)
{
inserted.CreatedUserId = UserId ?? "";
inserted.CreatedFullName = FullName ?? "System Administrator";
inserted.CreatedAt = DateTime.Now;
inserted.LastUpdatedAt = DateTime.Now;
inserted.LastUpdateFullName = FullName ?? "System Administrator";
inserted.LastUpdateUserId = UserId ?? "";
await _context.Religions.AddAsync(inserted);
await _context.SaveChangesAsync();
}
#endregion
}
}

194
BMA.EHR.Placement.Service/Controllers/PlacementAppointmentController.cs
View file

@ -844,27 +844,29 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -1054,27 +1056,29 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -1261,21 +1265,23 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOrganization = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOrganization = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -1464,21 +1470,23 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionNumber = _null,
NewSalary = _null,
ReportingDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionNumber = _null,
NewSalary = _null,
ReportingDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -1678,26 +1686,28 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

225
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -727,7 +727,7 @@ namespace BMA.EHR.Placement.Service.Controllers
.FirstOrDefaultAsync(x => x.Id == req.PersonalId);
if (person == null)
return Error(GlobalMessages.DataNotFound, 404);
bool? _nullBool = null;
person.OrganizationPosition = null;
person.PositionNumber = null;
person.PositionPath = null;
@ -762,7 +762,7 @@ namespace BMA.EHR.Placement.Service.Controllers
person.child4ShortName = null;
person.orgRevisionId = null;
person.posMasterNo = null;
person.positionName = null;
//person.positionName = null;
person.positionField = null;
person.posTypeId = null;
person.posTypeName = null;
@ -772,7 +772,7 @@ namespace BMA.EHR.Placement.Service.Controllers
person.nodeId = null;
person.posmasterId = null;
person.positionId = null;
person.Draft = false;
person.Draft = _nullBool;
person.typeCommand = null;
await _context.SaveChangesAsync();
@ -1623,27 +1623,30 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
PositionName = _null,
ExamNumber = _null,
PlacementName = _null,
Oc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
OcCandidate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
PositionName = _null,
ExamNumber = _null,
PlacementName = _null,
Oc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
OcCandidate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -1927,26 +1930,28 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
PositionName = _null,
ExamNumber = _null,
PlacementName = _null,
Oc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
PositionName = _null,
ExamNumber = _null,
PlacementName = _null,
Oc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
OccupationPosition = _null,
PositionCandidate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -2250,28 +2255,30 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
OldPosition = _null,
NewOc = _null,
NewPosition = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
OldPosition = _null,
NewOc = _null,
NewPosition = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -2476,28 +2483,30 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPosition = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPosition = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPosition = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
NewOc = _null,
NewPosition = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -2693,26 +2702,28 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

26
BMA.EHR.Placement.Service/Controllers/PlacementOfficerController.cs
View file

@ -628,18 +628,20 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
PositionName = _null,
Organization = _null,
StartDate = _null,
EndDate = _null,
Reason = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
PositionName = _null,
Organization = _null,
StartDate = _null,
EndDate = _null,
Reason = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

47
BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs
View file

@ -342,7 +342,7 @@ namespace BMA.EHR.Placement.Service.Controllers
data.PositionTypeOld,
data.PositionLevelOld,
data.PositionNumberOld,
organizationPositionOld = data.OrganizationPositionOld == "/" || data.OrganizationPositionOld == null ? null: data.OrganizationPositionOld,
organizationPositionOld = data.OrganizationPositionOld == "/" || data.OrganizationPositionOld == null ? null : data.OrganizationPositionOld,
data.IsActive,
data.rootOld,
@ -489,7 +489,7 @@ namespace BMA.EHR.Placement.Service.Controllers
placementReceive.posLevelNameOld = org.result.posLevelName;
// placementReceive.EducationOld = profile.Educations.Count() == 0 ? null : $"{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Degree}-{profile.Educations.OrderByDescending(x => x.FinishDate).FirstOrDefault().Field}";
// placementReceive.AmountOld = profile.Salaries.Count() == 0 ? null : profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount;
placementReceive.AmountOld = org.result.Amount;
placementReceive.PositionOld = org.result.position;
placementReceive.PositionLevelOld = org.result.posLevelName;
@ -974,26 +974,29 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOrg = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldSalary = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOrg = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldSalary = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -1035,7 +1038,7 @@ namespace BMA.EHR.Placement.Service.Controllers
email = (String?)null,
phone = (String?)null,
keycloak = string.Empty,
isProbation = true,
isProbation = false,
isLeave = false,
dateRetire = (DateTime?)null,
dateAppoint = r.commandAffectDate,

34
BMA.EHR.Placement.Service/Controllers/PlacementTransferController.cs
View file

@ -838,22 +838,24 @@ namespace BMA.EHR.Placement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
ReceiveOrganizationName = _null,
ActiveDate = _null,
CommandExcecuteDate = _null,
Reason = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
OldOc = _null,
PositionType = _null,
PositionLevel = _null,
PositionNumber = _null,
Salary = _null,
ReceiveOrganizationName = _null,
ActiveDate = _null,
CommandExcecuteDate = _null,
Reason = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

1
BMA.EHR.Placement.Service/Requests/OrgRequest.cs
View file

@ -42,6 +42,7 @@ namespace BMA.EHR.Placement.Service.Requests
public string? posLevelName { get; set; }
public double? salary { get; set; }
public string? education { get; set; }
public double? Amount { get; set; }
}
}

44
BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
View file

@ -1280,5 +1280,49 @@ namespace BMA.EHR.Retirement.Service.Controllers
await _context.SaveChangesAsync();
return Success(true);
}
/// <summary>
/// report1
/// </summary>
/// <returns></returns>
/// <response code="200"></response>
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("report1")]
public async Task<ActionResult<ResponseObject>> report1(string? nodeId = null, int? node = 0, DateOnly? startDate = null, DateOnly? startEnd = null)
{
var data = new
{
template = "retirement01",
reportName = "xlsx-report",
data = ""
};
return Success(data);
}
/// <summary>
/// report2
/// </summary>
/// <returns></returns>
/// <response code="200"></response>
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("report2")]
public async Task<ActionResult<ResponseObject>> report2(string? nodeId = null, int? node = 0, DateOnly? startDate = null, DateOnly? startEnd = null)
{
var data = new
{
template = "retirement02",
reportName = "xlsx-report",
data = ""
};
return Success(data);
}
}
}

90
BMA.EHR.Retirement.Service/Controllers/RetirementOtherController.cs
View file

@ -721,27 +721,29 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -925,28 +927,30 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
MilitaryDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "") {
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
Education = _null,
OldOc = _null,
OldPositionType = _null,
OldPositionLevel = _null,
OldPositionNumber = _null,
OldSalary = _null,
LeaveDate = _null,
MilitaryDate = _null,
NewOc = _null,
NewPositionType = _null,
NewPositionLevel = _null,
NewPositionNumber = _null,
NewSalary = _null,
AppointDate = _null,
CommandExcecuteDate = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

68
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -946,7 +946,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResign.posTypeNameOld = org.result.posTypeName;
retirementResign.posLevelOldId = org.result.posLevelId;
retirementResign.posLevelNameOld = org.result.posLevelName;
retirementResign.AmountOld = org.result.salary;
retirementResign.PositionOld = org.result.position;
retirementResign.PositionLevelOld = org.result.posLevelName;
retirementResign.PositionTypeOld = org.result.posTypeName;
@ -2394,22 +2394,25 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -2575,22 +2578,25 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}

68
BMA.EHR.Retirement.Service/Controllers/RetirementResignEmployeeController.cs
View file

@ -889,7 +889,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
retirementResignEmployee.posTypeNameOld = org.result.posTypeName;
retirementResignEmployee.posLevelOldId = org.result.posLevelId;
retirementResignEmployee.posLevelNameOld = org.result.posLevelName;
retirementResignEmployee.AmountOld = org.result.salary;
retirementResignEmployee.PositionOld = org.result.position;
retirementResignEmployee.PositionLevelOld = org.result.posLevelName;
retirementResignEmployee.PositionTypeOld = org.result.posTypeName;
@ -2337,22 +2337,25 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}
@ -2518,22 +2521,25 @@ namespace BMA.EHR.Retirement.Service.Controllers
{
result.Add(r);
string? _null = null;
result.Add(new
if (r.RemarkHorizontal != null && r.RemarkHorizontal != "")
{
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
result.Add(new
{
No = _null,
FullName = r.RemarkHorizontal,
CitizenId = _null,
PositionName = _null,
Organization = _null,
PositionLevel = _null,
PositionType = _null,
PositionNumber = _null,
ActiveDate = _null,
Salary = _null,
Remark = _null,
RemarkHorizontal = _null,
RemarkVertical = _null,
});
}
}
return Success(result);
}