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

แก้พ้นราชการ

Browse source
This commit is contained in:
Kittapath 2024-05-29 16:29:12 +07:00
parent b7f19d7077
commit 1828685e0e
50 changed files with 37955 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

31
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaintController.cs
View file

@ -140,7 +140,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
FirstName = p.FirstName,
LastName = p.LastName,
Position = p.Position,
PositionLevel = p.PositionLevel,
// PositionLevel = p.PositionLevel,
IsAncestorDNA = p.IsAncestorDNA,
Salary = p.Salary,
PersonId = p.PersonId,
@ -168,8 +168,11 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
posLevelId = p.posLevelId,
posLevelName = p.posLevelName,
}),//รายการข้อมูลบุคลผู้ถูกร้องเรียน
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
Organization = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
ConsideredAgency = x.ConsideredAgency,//หน่วยงานที่พิจารณา จะเปลี่ยนไปตามผู้ถูกร้องดูรายละเอียดด้านล่าง
OrganizationId = x.OrganizationId,//id หน่วยงานกรณี type เป็นหน่วยงาน
ConsideredAgencyId = x.ConsideredAgencyId,//หน่วยงานที่พิจารณา จะเปลี่ยนไปตามผู้ถูกร้องดูรายละเอียดด้านล่าง
activeId = x.activeId,
Title = x.Title,//ชื่อเรื่อง
Description = x.Description,//รายละเอียด
DateReceived = x.DateReceived,//วันที่รับเรื่อง
@ -204,8 +207,11 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
_data.Id,
_data.RespondentType,
_data.Persons,
_data.OrganizationId,
_data.Organization,
_data.ConsideredAgency,
_data.OrganizationId,
_data.ConsideredAgencyId,
_data.activeId,
_data.Title,
_data.Description,
_data.DateReceived,
@ -236,8 +242,11 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
var disciplineComplaint = new Domain.Models.Discipline.DisciplineComplaint
{
RespondentType = req.respondentType.Trim().ToUpper(),
Organization = req.organizationId,
Organization = req.organization,
ConsideredAgency = req.consideredAgency,
OrganizationId = req.organizationId,
ConsideredAgencyId = req.consideredAgencyId,
activeId = req.activeId,
Title = req.title,
Description = req.description,
DateReceived = req.dateReceived,
@ -292,7 +301,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
Salary = item.salary,
PosNo = item.posNo,
Position = item.position,
PositionLevel = item.positionLevel,
// PositionLevel = item.positionLevel,
IsAncestorDNA = true,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
@ -333,8 +342,11 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
return Error(new Exception("ไม่สามารถแก้ไขข้อมูลนี้ได้"), StatusCodes.Status500InternalServerError);
data.RespondentType = req.respondentType.Trim().ToUpper();
data.Organization = req.organizationId;
data.Organization = req.organization;
data.ConsideredAgency = req.consideredAgency;
data.OrganizationId = req.organizationId;
data.ConsideredAgencyId = req.consideredAgencyId;
data.activeId = req.activeId;
data.Title = req.title;
data.Description = req.description;
data.DateReceived = req.dateReceived;
@ -362,7 +374,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
LastName = item.lastName,
Organization = item.organization,
Position = item.position,
PositionLevel = item.positionLevel,
// PositionLevel = item.positionLevel,
IsAncestorDNA = true,
Salary = item.salary,
PersonId = item.personId,
@ -481,6 +493,9 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
RespondentType = data.RespondentType.Trim().ToUpper(),
Organization = data.Organization,
ConsideredAgency = data.ConsideredAgency,
OrganizationId = data.OrganizationId,
ConsideredAgencyId = data.ConsideredAgencyId,
activeId = data.activeId,
Title = data.Title,
Description = data.Description,
DateReceived = data.DateReceived,
@ -539,7 +554,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
Salary = item.Salary,
PosNo = item.PosNo,
Position = item.Position,
PositionLevel = item.PositionLevel,
// PositionLevel = item.PositionLevel,
IsAncestorDNA = true,
IsDisciplinary = false,
CreatedFullName = FullName ?? "System Administrator",

254
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaint_AppealController.cs
View file

@ -96,46 +96,46 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
if (org == null || org.result == null)
return Success(new { data = new List<dynamic>(), total = 0 });
id = org.result.profileId;
}
if (id == "")
return Success(new { data = new List<dynamic>(), total = 0 });
if (id == "")
return Success(new { data = new List<dynamic>(), total = 0 });
var data_search = (from x in _context.DisciplineComplaint_Appeals
where x.Title.Contains(keyword) ||
x.Description.Contains(keyword) ||
x.CaseType.Contains(keyword) ||
x.CaseNumber.Contains(keyword) ||
x.Fullname.Contains(keyword) ||
x.CitizenId.Contains(keyword)
where x.ProfileId == Guid.Parse(id)
select x).ToList();
if (status.Trim().ToUpper() != "ALL")
data_search = data_search.Where(x => x.Status == status).ToList();
if (type.Trim().ToUpper() != "ALL")
data_search = data_search.Where(x => x.Type == type).ToList();
if (year != 0)
data_search = data_search.Where(x => x.Year == year).ToList();
var data = data_search
.Select(x => new
{
Id = x.Id,
Title = x.Title,
Description = x.Description,
Status = x.Status,
Type = x.Type,
Year = x.Year,
CaseType = x.CaseType,
CaseNumber = x.CaseNumber,
Fullname = x.Fullname,
CitizenId = x.CitizenId,
ProfileId = x.ProfileId,
LastUpdatedAt = x.LastUpdatedAt,
})
.OrderByDescending(x => x.LastUpdatedAt)
.Skip((page - 1) * pageSize)
.Take(pageSize)
.ToList();
return Success(new { data, total = data_search.Count() });
var data_search = (from x in _context.DisciplineComplaint_Appeals
where x.Title.Contains(keyword) ||
x.Description.Contains(keyword) ||
x.CaseType.Contains(keyword) ||
x.CaseNumber.Contains(keyword) ||
x.Fullname.Contains(keyword) ||
x.CitizenId.Contains(keyword)
where x.ProfileId == id
select x).ToList();
if (status.Trim().ToUpper() != "ALL")
data_search = data_search.Where(x => x.Status == status).ToList();
if (type.Trim().ToUpper() != "ALL")
data_search = data_search.Where(x => x.Type == type).ToList();
if (year != 0)
data_search = data_search.Where(x => x.Year == year).ToList();
var data = data_search
.Select(x => new
{
Id = x.Id,
Title = x.Title,
Description = x.Description,
Status = x.Status,
Type = x.Type,
Year = x.Year,
CaseType = x.CaseType,
CaseNumber = x.CaseNumber,
Fullname = x.Fullname,
CitizenId = x.CitizenId,
ProfileId = x.ProfileId,
LastUpdatedAt = x.LastUpdatedAt,
})
.OrderByDescending(x => x.LastUpdatedAt)
.Skip((page - 1) * pageSize)
.Take(pageSize)
.ToList();
return Success(new { data, total = data_search.Count() });
}
}
/// <summary>
@ -224,76 +224,94 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
[HttpPost()]
public async Task<ActionResult<ResponseObject>> CreateDiscipline([FromForm] DisciplineComplaint_AppealRequest req)
{
var disciplineComplaint_Appeal = new Domain.Models.Discipline.DisciplineComplaint_Appeal
var apiUrl = $"{_configuration["API"]}org/profile/keycloak/position";
using (var client = new HttpClient())
{
Title = req.Title,
Description = req.Description,
Status = "NEW",
Type = req.Type.Trim().ToUpper(),
Year = req.Year == null ? DateTime.Now.Year : req.Year,
CaseType = req.CaseType,
CaseNumber = req.CaseNumber,
Fullname = req.Fullname,
CitizenId = req.CitizenId,
ProfileId = req.ProfileId,
Position = req.Position,
Oc = req.Oc,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
};
var disciplineComplaint_Appeal_History = new DisciplineComplaint_Appeal_History
{
DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
Status = "NEW",
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
};
// await _context.DisciplineComplaint_Appeals.AddAsync(disciplineComplaint_Appeal);
await _context.DisciplineComplaint_Appeal_Historys.AddAsync(disciplineComplaint_Appeal_History);
await _context.SaveChangesAsync();
if (Request.Form.Files != null && Request.Form.Files.Count != 0)
{
foreach (var file in Request.Form.Files)
client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token.Replace("Bearer ", ""));
var _req = new HttpRequestMessage(HttpMethod.Get, apiUrl);
var _res = await client.SendAsync(_req);
var _result = await _res.Content.ReadAsStringAsync();
var org = JsonConvert.DeserializeObject<dynamic>(_result);
if (org == null || org.result == null)
return Success(new { data = new List<dynamic>(), total = 0 });
var id = org.result.profileId;
if (id == "")
return Success(new { data = new List<dynamic>(), total = 0 });
var disciplineComplaint_Appeal = new Domain.Models.Discipline.DisciplineComplaint_Appeal
{
var fileExtension = Path.GetExtension(file.FileName);
var doc = await _documentService.UploadFileAsync(file, file.FileName);
var _doc = await _context.Documents.AsQueryable()
.FirstOrDefaultAsync(x => x.Id == doc.Id);
if (_doc != null)
Title = req.Title,
Description = req.Description,
Status = "NEW",
Type = req.Type.Trim().ToUpper(),
Year = req.Year == null ? DateTime.Now.Year : req.Year,
CaseType = req.CaseType,
CaseNumber = req.CaseNumber,
Fullname = req.Fullname,
CitizenId = req.CitizenId,
ProfileId = id,
Position = req.Position,
Oc = req.Oc,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
};
var disciplineComplaint_Appeal_History = new DisciplineComplaint_Appeal_History
{
DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
Status = "NEW",
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
};
// await _context.DisciplineComplaint_Appeals.AddAsync(disciplineComplaint_Appeal);
await _context.DisciplineComplaint_Appeal_Historys.AddAsync(disciplineComplaint_Appeal_History);
await _context.SaveChangesAsync();
if (Request.Form.Files != null && Request.Form.Files.Count != 0)
{
foreach (var file in Request.Form.Files)
{
var disciplineComplaint_Appeal_Doc = new DisciplineComplaint_Appeal_Doc
var fileExtension = Path.GetExtension(file.FileName);
var doc = await _documentService.UploadFileAsync(file, file.FileName);
var _doc = await _context.Documents.AsQueryable()
.FirstOrDefaultAsync(x => x.Id == doc.Id);
if (_doc != null)
{
DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
Document = _doc,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
};
await _context.DisciplineComplaint_Appeal_Docs.AddAsync(disciplineComplaint_Appeal_Doc);
var disciplineComplaint_Appeal_Doc = new DisciplineComplaint_Appeal_Doc
{
DisciplineComplaint_Appeal = disciplineComplaint_Appeal,
Document = _doc,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,
LastUpdateFullName = FullName ?? "System Administrator",
LastUpdateUserId = UserId ?? "",
LastUpdatedAt = DateTime.Now,
};
await _context.DisciplineComplaint_Appeal_Docs.AddAsync(disciplineComplaint_Appeal_Doc);
}
}
}
await _repositoryNoti.PushNotificationAsync(
Guid.Parse("08dbca3a-8b6a-4a4e-8b23-1f62e4f30ef6"),
$"มีคำขอยื่นอุทธรณ์/ร้องทุกข์จาก {req.Fullname}",
$"มีคำขอยื่นอุทธรณ์/ร้องทุกข์จาก {req.Fullname}",
"",
true,
true
);
await _context.SaveChangesAsync();
return Success(disciplineComplaint_Appeal.Id);
}
await _repositoryNoti.PushNotificationAsync(
Guid.Parse("08dbca3a-8b6a-4a4e-8b23-1f62e4f30ef6"),
$"มีคำขอยื่นอุทธรณ์/ร้องทุกข์จาก {req.Fullname}",
$"มีคำขอยื่นอุทธรณ์/ร้องทุกข์จาก {req.Fullname}",
"",
true,
true
);
await _context.SaveChangesAsync();
return Success(disciplineComplaint_Appeal.Id);
}
/// <summary>
@ -367,14 +385,14 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
}
}
}
await _repositoryNoti.PushNotificationAsync(
req.ProfileId,
$"เจ้าหน้าที่ได้ทำการสร้างคำร้องอุทธรณ์ร้องทุกข์",
$"เจ้าหน้าที่ได้ทำการสร้างคำร้องอุทธรณ์ร้องทุกข์",
"",
true,
true
);
// await _repositoryNoti.PushNotificationAsyncV2(
// req.ProfileId,
// $"เจ้าหน้าที่ได้ทำการสร้างคำร้องอุทธรณ์ร้องทุกข์",
// $"เจ้าหน้าที่ได้ทำการสร้างคำร้องอุทธรณ์ร้องทุกข์",
// "",
// true,
// true
// );
await _context.SaveChangesAsync();
return Success(disciplineComplaint_Appeal.Id);
}
@ -549,14 +567,14 @@ namespace BMA.EHR.DisciplineComplaint_Appeal.Service.Controllers
LastUpdatedAt = DateTime.Now,
};
await _context.DisciplineComplaint_Appeal_Historys.AddAsync(disciplineComplaint_Appeal_History);
await _repositoryNoti.PushNotificationAsync(
data.ProfileId,
$"มีการแก้ไขสถานะคำขออุทธรณ์/ร้องทุกข์จาก {data.Fullname} เป็น {StatusDisciplineComplaintAppeal(req.Status.Trim().ToUpper())}",
$"มีการแก้ไขสถานะคำขออุทธรณ์/ร้องทุกข์จาก {data.Fullname} เป็น {StatusDisciplineComplaintAppeal(req.Status.Trim().ToUpper())}",
"",
true,
true
);
// await _repositoryNoti.PushNotificationAsync(
// data.ProfileId,
// $"มีการแก้ไขสถานะคำขออุทธรณ์/ร้องทุกข์จาก {data.Fullname} เป็น {StatusDisciplineComplaintAppeal(req.Status.Trim().ToUpper())}",
// $"มีการแก้ไขสถานะคำขออุทธรณ์/ร้องทุกข์จาก {data.Fullname} เป็น {StatusDisciplineComplaintAppeal(req.Status.Trim().ToUpper())}",
// "",
// true,
// true
// );
}
data.Status = req.Status.Trim().ToUpper();
data.Type = req.Type.Trim().ToUpper();

14
BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
View file

@ -458,7 +458,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
FirstName = p.FirstName,
LastName = p.LastName,
Position = p.Position,
PositionLevel = p.PositionLevel,
// PositionLevel = p.PositionLevel,
IsAncestorDNA = p.IsAncestorDNA,
Salary = p.Salary,
PersonId = p.PersonId,
@ -492,7 +492,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
StatusDiscard = p.StatusDiscard,
// Report = p.DisciplineReport_Profiles.Count() > 0 ? true : false,
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
Organization = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
OrganizationId = x.OrganizationId,//id หน่วยงานกรณี type เป็นหน่วยงาน
DisciplinaryFaultLevelOther = x.DisciplinaryFaultLevelOther,
DisciplineDisciplinary_DocRelevants = x.DisciplineDisciplinary_DocRelevants.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
DisciplineDisciplinary_DocSummaryEvidences = x.DisciplineDisciplinary_DocSummaryEvidences.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
@ -589,6 +590,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
_data.Director,
_data.RespondentType,
_data.Persons,
_data.Organization,
_data.OrganizationId,
_data.DisciplinaryFaultLevelOther,
disciplineDisciplinary_DocRelevants,
@ -692,7 +694,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
);
}
}
data.Organization = req.organizationId;
data.Organization = req.organization;
data.OrganizationId = req.organizationId;
data.RespondentType = req.respondentType;
var hisprofile = data.DisciplineDisciplinary_ProfileComplaintInvestigates;
_context.DisciplineDisciplinary_ProfileComplaintInvestigates.RemoveRange(data.DisciplineDisciplinary_ProfileComplaintInvestigates);
@ -710,7 +713,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
LastName = item.lastName,
Organization = item.organization,
Position = item.position,
PositionLevel = item.positionLevel,
// PositionLevel = item.positionLevel,
IsAncestorDNA = isReport == null ? false : isReport.IsAncestorDNA,
Salary = item.salary,
PersonId = item.personId,
@ -1689,7 +1692,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
Salary = item.Salary,
PosNo = item.PosNo,
Position = item.Position,
PositionLevel = item.PositionLevel,
PositionLevel = item.posLevelName,
PositionType = item.posTypeName,
Title = data.Title,
OffenseDetails = data.OffenseDetails,
DisciplinaryCaseFault = data.DisciplinaryCaseFault,

15
BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
View file

@ -286,7 +286,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
FirstName = p.FirstName,
LastName = p.LastName,
Position = p.Position,
PositionLevel = p.PositionLevel,
// PositionLevel = p.PositionLevel,
IsAncestorDNA = p.IsAncestorDNA,
Salary = p.Salary,
PersonId = p.PersonId,
@ -317,7 +317,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
IsSend = p.IsReport,
IsDisciplinary = p.IsDisciplinary,
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
Organization = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
OrganizationId = x.OrganizationId,//id หน่วยงานกรณี type เป็นหน่วยงาน
DisciplineInvestigateDocs = x.DisciplineInvestigate_Docs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
DisciplineInvestigateRelevantDocs = x.DisciplineInvestigateRelevant_Docs.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
})
@ -368,6 +369,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
_data.Director,
_data.RespondentType,
_data.Persons,
_data.Organization,
_data.OrganizationId,
disciplineInvestigateDocs,
disciplineInvestigateRelevantDocs,
@ -457,7 +459,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
);
}
}
data.Organization = req.organizationId;
data.Organization = req.organization;
data.OrganizationId = req.organizationId;
data.RespondentType = req.respondentType;
var hisprofile = data.DisciplineInvestigate_ProfileComplaints;
_context.DisciplineInvestigate_ProfileComplaints.RemoveRange(data.DisciplineInvestigate_ProfileComplaints);
@ -475,7 +478,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
LastName = item.lastName,
Organization = item.organization,
Position = item.position,
PositionLevel = item.positionLevel,
// PositionLevel = item.positionLevel,
IsAncestorDNA = isReport == null ? false : isReport.IsAncestorDNA,
Salary = item.salary,
PersonId = item.personId,
@ -578,6 +581,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
RespondentType = data.RespondentType.Trim().ToUpper(),
Organization = data.Organization,
ConsideredAgency = data.ConsideredAgency,
OrganizationId = data.OrganizationId,
ConsideredAgencyId = data.ConsideredAgencyId,
Title = data.Title,
Description = data.Description,
DateReceived = data.DateReceived,
@ -646,7 +651,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
Salary = item.Salary,
PosNo = item.PosNo,
Position = item.Position,
PositionLevel = item.PositionLevel,
// PositionLevel = item.PositionLevel,
IsAncestorDNA = true,
Status = "NEW",
StatusDiscard = "NEW",

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

@ -128,7 +128,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
FirstName = p.FirstName,
LastName = p.LastName,
Position = p.Position,
PositionLevel = p.PositionLevel,
// PositionLevel = p.PositionLevel,
IsAncestorDNA = p.IsAncestorDNA,
Salary = p.Salary,
PersonId = p.PersonId,
@ -157,7 +157,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
Status = p.Status,
StatusDiscard = p.StatusDiscard,
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
Organization = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
OrganizationId = x.OrganizationId,//id หน่วยงานกรณี type เป็นหน่วยงาน
ResultDescription = x.ResultDescription,//สรุปผลการพิจารณา
ResultOc = x.ResultOc,//
ResultDisciplineType = x.ResultDisciplineType,//
@ -188,6 +189,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
_data.IdComplaint,
_data.RespondentType,
_data.Persons,
_data.Organization,
_data.OrganizationId,
_data.ResultDescription,
_data.ResultOc,

6
BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
View file

@ -63,7 +63,8 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
(x.Organization == null ? false : x.Organization.Contains(keyword)) ||
(x.Position == null ? false : x.Position.Contains(keyword)) ||
(x.PosNo == null ? false : x.PosNo.Contains(keyword)) ||
(x.PositionLevel == null ? false : x.PositionLevel.Contains(keyword)) ||
(x.posTypeName == null ? false : x.posTypeName.Contains(keyword)) ||
(x.posLevelName == null ? false : x.posLevelName.Contains(keyword)) ||
(x.Title == null ? false : x.Title.Contains(keyword))
select x).ToList();
var data = data_search
@ -100,6 +101,7 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
Position = x.Position,
PosNo = x.PosNo,
PositionLevel = x.PositionLevel,
PositionType = x.PositionType,
Salary = x.Salary,
Status = x.Status,
DescriptionSuspend = x.DescriptionSuspend,
@ -161,6 +163,7 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
Position = x.Position,
PosNo = x.PosNo,
PositionLevel = x.PositionLevel,
PositionType = x.PositionType,
Salary = x.Salary,
Status = x.Status,
DescriptionSuspend = x.DescriptionSuspend,
@ -198,6 +201,7 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
data.Position = req.Position;
data.PosNo = req.PosNo;
data.PositionLevel = req.PositionLevel;
data.PositionType = req.PositionType;
data.Salary = req.Salary;
data.DescriptionSuspend = req.DescriptionSuspend;
data.StartDateSuspend = req.StartDateSuspend;

9
BMA.EHR.Discipline.Service/Requests/DisciplineComplaintRequest.cs
View file

@ -6,8 +6,11 @@ namespace BMA.EHR.Discipline.Service.Requests
{
public string respondentType { get; set; }// *ผู้ถูกร้องเรียน (PERSON คือ บุคคล, ORGANIZATION คือ หน่วยงาน, BANGKOK คือ กรุงเทพมหานคร)
public DisciplineComplaintProfileRequest[] persons { get; set; }// กรณีบุคคลใส่ id คน มาใน array แต่ถ้าเป็น type อื่นจะ null
public Guid? organizationId { get; set; }// กรณีหน่วยงานใส่ id ของหน่วยงาน
public Guid consideredAgency { get; set; }// *หน่วยงานที่พิจารณา จะเปลี่ยนไปตามผู้ถูกร้องดูรายละเอียดด้านล่าง
public string? organization { get; set; }// กรณีหน่วยงานใส่ id ของหน่วยงาน
public string? consideredAgency { get; set; }// *หน่วยงานที่พิจารณา จะเปลี่ยนไปตามผู้ถูกร้องดูรายละเอียดด้านล่าง
public string? organizationId { get; set; }// กรณีหน่วยงานใส่ id ของหน่วยงาน
public string? consideredAgencyId { get; set; }// *หน่วยงานที่พิจารณา จะเปลี่ยนไปตามผู้ถูกร้องดูรายละเอียดด้านล่าง
public string? activeId { get; set; }
public string title { get; set; }// *เรื่องที่ร้องเรียน
public string? description { get; set; }// *รายละเอียดของเรื่องร้องเรียน
public DateTime? dateReceived { get; set; }// *วันที่รับเรื่อง เป็นวันที่ถือเป็นจุดเริ่มต้นของวินัยนั้น ๆ
@ -29,7 +32,7 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? lastName { get; set; }
public string? organization { get; set; }
public string? position { get; set; }
public string? positionLevel { get; set; }
// public string? positionLevel { get; set; }
public string? posNo { get; set; }
public double? salary { get; set; }

2
BMA.EHR.Discipline.Service/Requests/DisciplineComplaint_AppealRequest.cs
View file

@ -10,7 +10,7 @@ namespace BMA.EHR.Discipline.Service.Requests
public int? Year { get; set; }
public string? CaseType { get; set; } = string.Empty;
public string? CaseNumber { get; set; } = string.Empty;
public Guid ProfileId { get; set; }
public string ProfileId { get; set; }
public string? CitizenId { get; set; }
public string? Fullname { get; set; }
public string? Position { get; set; }

2
BMA.EHR.Discipline.Service/Requests/DisciplineDisciplinaryComplaintRequest.cs
View file

@ -18,7 +18,7 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? lastName { get; set; }
public string? organization { get; set; }
public string? position { get; set; }
public string? positionLevel { get; set; }
// public string? positionLevel { get; set; }
public string? posNo { get; set; }
public double? salary { get; set; }

3
BMA.EHR.Discipline.Service/Requests/DisciplineDisciplinaryRequest.cs
View file

@ -28,7 +28,8 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? Result { get; set; }
public Guid[] directors { get; set; }
public DisciplineDisciplinaryInvestigateComplaintProfileRequest[] persons { get; set; }// กรณีบุคคลใส่ id คน มาใน array แต่ถ้าเป็น type อื่นจะ null
public Guid? organizationId { get; set; }// กรณีหน่วยงานใส่ id ของหน่วยงาน
public string? organization { get; set; }// กรณีหน่วยงานใส่ id ของหน่วยงาน
public string? organizationId { get; set; }// กรณีหน่วยงานใส่ id ของหน่วยงาน
public string respondentType { get; set; }// *ผู้ถูกร้องเรียน (PERSON คือ บุคคล, ORGANIZATION คือ หน่วยงาน, BANGKOK คือ กรุงเทพมหานคร)
}

2
BMA.EHR.Discipline.Service/Requests/DisciplineInvestigateComplaintRequest.cs
View file

@ -18,7 +18,7 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? lastName { get; set; }
public string? organization { get; set; }
public string? position { get; set; }
public string? positionLevel { get; set; }
// public string? positionLevel { get; set; }
public string? posNo { get; set; }
public double? salary { get; set; }

3
BMA.EHR.Discipline.Service/Requests/DisciplineInvestigateRequest.cs
View file

@ -16,7 +16,8 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? result { get; set; }
public Guid[] directors { get; set; }
public DisciplineInvestigateComplaintProfileRequest[] persons { get; set; }// กรณีบุคคลใส่ id คน มาใน array แต่ถ้าเป็น type อื่นจะ null
public Guid? organizationId { get; set; }// กรณีหน่วยงานใส่ id ของหน่วยงาน
public string? organization { get; set; }// กรณีหน่วยงานใส่ id ของหน่วยงาน
public string? organizationId { get; set; }// กรณีหน่วยงานใส่ id ของหน่วยงาน
public string respondentType { get; set; }// *ผู้ถูกร้องเรียน (PERSON คือ บุคคล, ORGANIZATION คือ หน่วยงาน, BANGKOK คือ กรุงเทพมหานคร)
}

1
BMA.EHR.Discipline.Service/Requests/DisciplineSuspendRequest.cs
View file

@ -8,6 +8,7 @@ namespace BMA.EHR.Discipline.Service.Requests
public string? Position { get; set; }
public string? PosNo { get; set; }
public string? PositionLevel { get; set; }
public string? PositionType { get; set; }
public double? Salary { get; set; }
public string? DescriptionSuspend { get; set; }
public DateTime? StartDateSuspend { get; set; }