diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs index 50826596..2a13bffe 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs @@ -1527,6 +1527,7 @@ 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) @@ -1538,6 +1539,29 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers var personIdDupicate = data.DisciplineDisciplinary_ProfileComplaintInvestigates.Where(x => x.PersonId == item.PersonId && x.Status == "REPORT" && x.StatusDiscard == "NEW").FirstOrDefault(); if (personIdDupicate == null) continue; + if (personIdDupicate.DisciplineReport_Profiles.Count() > 0) + continue; + personIdDupicate.DisciplineReport_Profiles.Add( + new DisciplineReport_Profile + { + PersonId = item.PersonId, + CitizenId = item.CitizenId, + Prefix = item.Prefix, + FirstName = item.FirstName, + LastName = item.LastName, + Organization = item.Organization, + Salary = item.Salary, + PosNo = item.PosNo, + Position = item.Position, + PositionLevel = item.PositionLevel, + Status = "PENDING", + CreatedFullName = FullName ?? "System Administrator", + CreatedUserId = UserId ?? "", + CreatedAt = DateTime.Now, + LastUpdateFullName = FullName ?? "System Administrator", + LastUpdateUserId = UserId ?? "", + LastUpdatedAt = DateTime.Now, + }); item.CommandTypeDiscardId = commandTypeId; item.StatusDiscard = "REPORT"; item.LastUpdateFullName = FullName ?? "System Administrator"; diff --git a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs index 1dc62ba0..c66891d1 100644 --- a/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs +++ b/BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs @@ -113,6 +113,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers PosNo = p.PosNo, Organization = p.Organization, Status = p.Status, + StatusDiscard = p.StatusDiscard, }),//รายการข้อมูลบุคลผู้ถูกสืบสวน OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน ResultDescription = x.ResultDescription,//สรุปผลการพิจารณา