คำสั่งวินัย
This commit is contained in:
Kittapath
parent
f644654384
commit
1747891818
15 changed files with 6826 additions and 83 deletions
|
|
@ -462,7 +462,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
IsSuspend = p.IsSuspend,
|
||||
Status = p.Status,
|
||||
StatusDiscard = p.StatusDiscard,
|
||||
Report = p.DisciplineReport_Profiles.Count() > 0 ? true : false,
|
||||
// Report = p.DisciplineReport_Profiles.Count() > 0 ? true : false,
|
||||
}),//รายการข้อมูลบุคลผู้ถูกสืบสวน
|
||||
OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
|
||||
DisciplineDisciplinary_DocRelevants = x.DisciplineDisciplinary_DocRelevants.Where(d => d.Document != null).Select(d => new { d.Document.Id, d.Document.FileName }),
|
||||
|
|
@ -636,6 +636,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
LastUpdatedAt = DateTime.Now,
|
||||
});
|
||||
}
|
||||
var hisDirector = data.DisciplineDisciplinary_DirectorInvestigates;
|
||||
_context.DisciplineDisciplinary_DirectorInvestigates.RemoveRange(data.DisciplineDisciplinary_DirectorInvestigates);
|
||||
foreach (var item in req.directors)
|
||||
{
|
||||
|
|
@ -643,10 +644,12 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
.FirstOrDefaultAsync(x => x.Id == item);
|
||||
if (director != null)
|
||||
{
|
||||
var isDirector = hisDirector.Where(x => x.DisciplineDirector.Id == director.Id).FirstOrDefault();
|
||||
data.DisciplineDisciplinary_DirectorInvestigates.Add(
|
||||
new DisciplineDisciplinary_DirectorInvestigate
|
||||
{
|
||||
DisciplineDirector = director,
|
||||
Duty = isDirector == null ? "" : isDirector.Duty,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
|
|
@ -666,31 +669,31 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
foreach (var item in req.persons)
|
||||
{
|
||||
var isReport = hisprofile.Where(x => x.PersonId == item.personId).FirstOrDefault();
|
||||
data.DisciplineDisciplinary_ProfileComplaintInvestigates.Add(
|
||||
new DisciplineDisciplinary_ProfileComplaintInvestigate
|
||||
{
|
||||
CitizenId = item.idcard,
|
||||
Prefix = item.prefix,
|
||||
FirstName = item.firstName,
|
||||
LastName = item.lastName,
|
||||
Organization = item.organization,
|
||||
Position = item.position,
|
||||
PositionLevel = item.positionLevel,
|
||||
Salary = item.salary,
|
||||
PersonId = item.personId,
|
||||
PosNo = item.posNo,
|
||||
Status = isReport == null ? "NEW" : isReport.Status,
|
||||
StatusDiscard = isReport == null ? "NEW" : isReport.StatusDiscard,
|
||||
IsReport = isReport == null ? "NEW" : isReport.IsReport,
|
||||
IsSuspend = isReport == null ? "NEW" : isReport.IsSuspend,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
LastUpdateFullName = FullName ?? "System Administrator",
|
||||
LastUpdateUserId = UserId ?? "",
|
||||
LastUpdatedAt = DateTime.Now,
|
||||
}
|
||||
);
|
||||
|
||||
var disciplineDisciplinary_ProfileComplaintInvestigate = new DisciplineDisciplinary_ProfileComplaintInvestigate
|
||||
{
|
||||
CitizenId = item.idcard,
|
||||
Prefix = item.prefix,
|
||||
FirstName = item.firstName,
|
||||
LastName = item.lastName,
|
||||
Organization = item.organization,
|
||||
Position = item.position,
|
||||
PositionLevel = item.positionLevel,
|
||||
Salary = item.salary,
|
||||
PersonId = item.personId,
|
||||
PosNo = item.posNo,
|
||||
Status = isReport == null ? "NEW" : isReport.Status,
|
||||
StatusDiscard = isReport == null ? "NEW" : isReport.StatusDiscard,
|
||||
IsReport = isReport == null ? "NEW" : isReport.IsReport,
|
||||
IsSuspend = isReport == null ? "NEW" : isReport.IsSuspend,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
LastUpdateFullName = FullName ?? "System Administrator",
|
||||
LastUpdateUserId = UserId ?? "",
|
||||
LastUpdatedAt = DateTime.Now,
|
||||
};
|
||||
data.DisciplineDisciplinary_ProfileComplaintInvestigates.Add(disciplineDisciplinary_ProfileComplaintInvestigate);
|
||||
}
|
||||
}
|
||||
await _context.SaveChangesAsync();
|
||||
|
|
@ -1470,7 +1473,6 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
{
|
||||
var data = await _context.DisciplineDisciplinarys
|
||||
.Include(x => x.DisciplineDisciplinary_ProfileComplaintInvestigates)
|
||||
.ThenInclude(x => x.DisciplineReport_Profiles)
|
||||
.Where(x => x.Id == id)
|
||||
.FirstOrDefaultAsync();
|
||||
if (data == null)
|
||||
|
|
@ -1529,7 +1531,6 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
{
|
||||
var data = await _context.DisciplineDisciplinarys
|
||||
.Include(x => x.DisciplineDisciplinary_ProfileComplaintInvestigates)
|
||||
.ThenInclude(x => x.DisciplineReport_Profiles)
|
||||
.Where(x => x.Id == id)
|
||||
.FirstOrDefaultAsync();
|
||||
if (data == null)
|
||||
|
|
@ -1588,7 +1589,6 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
{
|
||||
var data = await _context.DisciplineDisciplinarys
|
||||
.Include(x => x.DisciplineDisciplinary_ProfileComplaintInvestigates)
|
||||
.ThenInclude(x => x.DisciplineReport_Profiles)
|
||||
.Where(x => x.Id == id)
|
||||
.FirstOrDefaultAsync();
|
||||
if (data == null)
|
||||
|
|
@ -1600,9 +1600,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
var personIdDupicate = data.DisciplineDisciplinary_ProfileComplaintInvestigates.Where(x => x.PersonId == item.PersonId && x.Status == "NEW").FirstOrDefault();
|
||||
if (personIdDupicate == null)
|
||||
continue;
|
||||
if (personIdDupicate.DisciplineReport_Profiles.Count() > 0)
|
||||
continue;
|
||||
personIdDupicate.DisciplineReport_Profiles.Add(
|
||||
await _context.DisciplineReport_Profiles.AddAsync(
|
||||
new DisciplineReport_Profile
|
||||
{
|
||||
PersonId = item.PersonId,
|
||||
|
|
@ -1615,6 +1613,10 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
|
|||
PosNo = item.PosNo,
|
||||
Position = item.Position,
|
||||
PositionLevel = item.PositionLevel,
|
||||
Title = data.Title,
|
||||
OffenseDetails = data.OffenseDetails,
|
||||
DisciplinaryCaseFault = data.DisciplinaryCaseFault,
|
||||
DisciplinaryFaultLevel = data.DisciplinaryFaultLevel,
|
||||
Status = "PENDING",
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
|
|
|
|||
|
|
@ -405,6 +405,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
|
|||
LastUpdatedAt = DateTime.Now,
|
||||
});
|
||||
}
|
||||
var hisDirector = data.DisciplineInvestigate_Directors;
|
||||
_context.DisciplineInvestigate_Directors.RemoveRange(data.DisciplineInvestigate_Directors);
|
||||
foreach (var item in req.directors)
|
||||
{
|
||||
|
|
@ -412,10 +413,12 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
|
|||
.FirstOrDefaultAsync(x => x.Id == item);
|
||||
if (director != null)
|
||||
{
|
||||
var isDirector = hisDirector.Where(x => x.DisciplineDirector.Id == director.Id).FirstOrDefault();
|
||||
data.DisciplineInvestigate_Directors.Add(
|
||||
new DisciplineInvestigate_Director
|
||||
{
|
||||
DisciplineDirector = director,
|
||||
Duty = isDirector == null ? "" : isDirector.Duty,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
CreatedAt = DateTime.Now,
|
||||
|
|
|
|||
|
|
@ -56,8 +56,6 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
|
|||
public async Task<ActionResult<ResponseObject>> GetDisciplineSuspend(int page = 1, int pageSize = 25, string keyword = "")
|
||||
{
|
||||
var data_search = (from x in _context.DisciplineReport_Profiles
|
||||
.Include(x => x.DisciplineDisciplinary_ProfileComplaintInvestigate)
|
||||
.ThenInclude(x => x.DisciplineDisciplinary)
|
||||
where x.CitizenId.Contains(keyword) ||
|
||||
x.Prefix.Contains(keyword) ||
|
||||
x.FirstName.Contains(keyword) ||
|
||||
|
|
@ -66,7 +64,7 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
|
|||
x.Position.Contains(keyword) ||
|
||||
x.PosNo.Contains(keyword) ||
|
||||
x.PositionLevel.Contains(keyword) ||
|
||||
x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title.Contains(keyword)
|
||||
x.Title.Contains(keyword)
|
||||
select x).ToList();
|
||||
var data = data_search
|
||||
.Select(x => new
|
||||
|
|
@ -85,10 +83,10 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
|
|||
DescriptionSuspend = x.DescriptionSuspend,
|
||||
StartDateSuspend = x.StartDateSuspend,
|
||||
EndDateSuspend = x.EndDateSuspend,
|
||||
Title = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title,
|
||||
OffenseDetails = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
|
||||
DisciplinaryFaultLevel = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
|
||||
DisciplinaryCaseFault = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
|
||||
Title = x.Title,
|
||||
OffenseDetails = x.OffenseDetails,//ลักษณะความผิด
|
||||
DisciplinaryFaultLevel = x.DisciplinaryFaultLevel,//ระดับโทษความผิด
|
||||
DisciplinaryCaseFault = x.DisciplinaryCaseFault,//กรณีความผิด
|
||||
})
|
||||
.OrderByDescending(x => x.CitizenId)
|
||||
.Skip((page - 1) * pageSize)
|
||||
|
|
@ -126,10 +124,10 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
|
|||
DescriptionSuspend = x.DescriptionSuspend,
|
||||
StartDateSuspend = x.StartDateSuspend,
|
||||
EndDateSuspend = x.EndDateSuspend,
|
||||
Title = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title,
|
||||
OffenseDetails = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
|
||||
DisciplinaryFaultLevel = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
|
||||
DisciplinaryCaseFault = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
|
||||
Title = x.Title,
|
||||
OffenseDetails = x.OffenseDetails,//ลักษณะความผิด
|
||||
DisciplinaryFaultLevel = x.DisciplinaryFaultLevel,//ระดับโทษความผิด
|
||||
DisciplinaryCaseFault = x.DisciplinaryCaseFault,//กรณีความผิด
|
||||
})
|
||||
.Where(x => x.Id == id)
|
||||
.FirstOrDefaultAsync();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue