สรุปผลวินัยเพิ่มstatusบุคคล

BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs

@@ -211,6 +211,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                             Salary = item.salary,
                             PersonId = item.personId,
                             PosNo = item.posNo,
+                            Status = "NEW",
                             CreatedFullName = FullName ?? "System Administrator",
                             CreatedUserId = UserId ?? "",
                             CreatedAt = DateTime.Now,
@@ -255,8 +256,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                                 Result = x.Result,//ผลการตรวจสอบ
                                 Director = x.DisciplineDisciplinary_DirectorInvestigates.Select(d => new
                                 {
-                                    Id = d.Id,
+                                    DirectorId = d.Id,
-                                    DirectorId = d.DisciplineDirector.Id,
+                                    Id = d.DisciplineDirector.Id,
                                     Prefix = d.DisciplineDirector.Prefix,
                                     FirstName = d.DisciplineDirector.FirstName,
                                     LastName = d.DisciplineDirector.LastName,
@@ -445,6 +446,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                                     PersonId = p.PersonId,
                                     PosNo = p.PosNo,
                                     Organization = p.Organization,
+                                    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 +638,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                             Salary = item.salary,
                             PersonId = item.personId,
                             PosNo = item.posNo,
+                            Status = "NEW",
                             CreatedFullName = FullName ?? "System Administrator",
                             CreatedUserId = UserId ?? "",
                             CreatedAt = DateTime.Now,
@@ -1422,8 +1425,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
         public async Task<ActionResult<ResponseObject>> PostToSuspend([FromBody] DisciplinePersonIdRequest req, Guid id)
         {
             var data = await _context.DisciplineDisciplinarys
-                        .Include(x => x.DisciplineReport_Profiles)
                         .Include(x => x.DisciplineDisciplinary_ProfileComplaintInvestigates)
+                        .ThenInclude(x => x.DisciplineReport_Profiles)
                         .Where(x => x.Id == id)
                         .FirstOrDefaultAsync();
             if (data == null)
@@ -1432,7 +1435,12 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
             var persons = data.DisciplineDisciplinary_ProfileComplaintInvestigates.Where(x => req.persons.Contains(x.Id)).ToList();
             foreach (var item in persons)
             {
-                data.DisciplineReport_Profiles.Add(
+                var personIdDupicate = data.DisciplineDisciplinary_ProfileComplaintInvestigates.Where(x => x.PersonId == item.PersonId).FirstOrDefault();
+                if (personIdDupicate == null)
+                    continue;
+                if (personIdDupicate.DisciplineReport_Profiles.Count() > 0)
+                    continue;
+                personIdDupicate.DisciplineReport_Profiles.Add(
                     new DisciplineReport_Profile
                     {
                         PersonId = item.PersonId,

BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs

@@ -250,8 +250,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
                                 Result = x.Result,//ผลการตรวจสอบ
                                 Director = x.DisciplineInvestigate_Directors.Select(d => new
                                 {
-                                    Id = d.Id,
+                                    DirectorId = d.Id,
-                                    DirectorId = d.DisciplineDirector.Id,
+                                    Id = d.DisciplineDirector.Id,
                                     Prefix = d.DisciplineDirector.Prefix,
                                     FirstName = d.DisciplineDirector.FirstName,
                                     LastName = d.DisciplineDirector.LastName,
@@ -531,6 +531,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
                         PosNo = item.PosNo,
                         Position = item.Position,
                         PositionLevel = item.PositionLevel,
+                        Status = "NEW",
                         CreatedFullName = FullName ?? "System Administrator",
                         CreatedUserId = UserId ?? "",
                         CreatedAt = DateTime.Now,

BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs

@@ -56,10 +56,9 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
         public async Task<ActionResult<ResponseObject>> GetDisciplineResult(int page = 1, int pageSize = 25, string keyword = "")
         {
             var data_search = (from x in _context.DisciplineDisciplinarys
-                               where x.Title.Contains(keyword) ||
+                               where x.Title.Contains(keyword)
-                                  //   x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) ||
+                               //   x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) ||
-                                  //   x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) ||
+                               //   x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) ||
-                                  x.Status == "DONE"
                                select x).ToList();
             var data = data_search
                             .Select(x => new
@@ -73,6 +72,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                 Status = x.Status,//สถานะหรือผลการสอบสวน
                                 CreatedAt = x.CreatedAt,//วันที่สร้างเรื่องสอบสวน
                             })
+                            .Where(x => x.Status == "DONE" || x.Status == "REPORT")
                             .OrderByDescending(x => x.CreatedAt)
                             .Skip((page - 1) * pageSize)
                             .Take(pageSize)
@@ -112,9 +112,11 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
                                     PersonId = p.PersonId,
                                     PosNo = p.PosNo,
                                     Organization = p.Organization,
+                                    Status = p.Status,
                                 }),//รายการข้อมูลบุคลผู้ถูกสืบสวน
                                 OrganizationId = x.Organization,//id หน่วยงานกรณี type เป็นหน่วยงาน
                                 ResultDescription = x.ResultDescription,//สรุปผลการพิจารณา
+                                Status = x.Status,//สถานะหรือผลการสอบสวน
                             })
                             .Where(x => x.Id == id)
                             .FirstOrDefaultAsync();

BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs

@@ -55,7 +55,9 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
         [HttpGet()]
         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)
+            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) ||
@@ -64,7 +66,7 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
                                     x.Position.Contains(keyword) ||
                                     x.PosNo.Contains(keyword) ||
                                     x.PositionLevel.Contains(keyword) ||
-                                    x.DisciplineDisciplinary.Title.Contains(keyword)
+                                    x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title.Contains(keyword)
                                select x).ToList();
             var data = data_search
                             .Select(x => new
@@ -83,10 +85,10 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
                                 DescriptionSuspend = x.DescriptionSuspend,
                                 StartDateSuspend = x.StartDateSuspend,
                                 EndDateSuspend = x.EndDateSuspend,
-                                Title = x.DisciplineDisciplinary.Title,
+                                Title = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title,
-                                OffenseDetails = x.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
+                                OffenseDetails = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
-                                DisciplinaryFaultLevel = x.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
+                                DisciplinaryFaultLevel = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
-                                DisciplinaryCaseFault = x.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
+                                DisciplinaryCaseFault = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
                             })
                             .OrderByDescending(x => x.CitizenId)
                             .Skip((page - 1) * pageSize)
@@ -123,10 +125,10 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
                                 DescriptionSuspend = x.DescriptionSuspend,
                                 StartDateSuspend = x.StartDateSuspend,
                                 EndDateSuspend = x.EndDateSuspend,
-                                Title = x.DisciplineDisciplinary.Title,
+                                Title = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.Title,
-                                OffenseDetails = x.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
+                                OffenseDetails = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
-                                DisciplinaryFaultLevel = x.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
+                                DisciplinaryFaultLevel = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
-                                DisciplinaryCaseFault = x.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
+                                DisciplinaryCaseFault = x.DisciplineDisciplinary_ProfileComplaintInvestigate.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
                             })
                             .Where(x => x.Id == id)
                             .FirstOrDefaultAsync();

BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary.cs

@@ -139,6 +139,5 @@ namespace BMA.EHR.Domain.Models.Discipline
         public virtual List<DisciplineDisciplinary_DocWitnesses> DisciplineDisciplinary_DocWitnessess { get; set; } = new List<DisciplineDisciplinary_DocWitnesses>();
         public virtual List<DisciplineDisciplinary_DocOther> DisciplineDisciplinary_DocOthers { get; set; } = new List<DisciplineDisciplinary_DocOther>();
         public virtual List<DisciplineDisciplinary_DocRelevant> DisciplineDisciplinary_DocRelevants { get; set; } = new List<DisciplineDisciplinary_DocRelevant>();
-        public virtual List<DisciplineReport_Profile> DisciplineReport_Profiles { get; set; } = new List<DisciplineReport_Profile>();
     }
 }

BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary_ProfileComplaintInvestigate.cs

@@ -35,5 +35,6 @@ namespace BMA.EHR.Domain.Models.Discipline
         public Guid? CommandTypeId { get; set; }
         [Required, Comment("Id เรื่องสอบสวน")]
         public DisciplineDisciplinary DisciplineDisciplinary { get; set; }
+        public virtual List<DisciplineReport_Profile> DisciplineReport_Profiles { get; set; } = new List<DisciplineReport_Profile>();
     }
 }

BMA.EHR.Domain/Models/Discipline/DisciplineReport_Profile.cs

@@ -39,7 +39,7 @@ namespace BMA.EHR.Domain.Models.Discipline
         public DateTime? StartDateSuspend { get; set; }
         [Comment("วันสิ้นสุดการสั่งพักราชการ/ให้ออกจากราชการไว้ก่อน")]
         public DateTime? EndDateSuspend { get; set; }
-        [Required, Comment("Id เรื่องสอบสวน")]
+        [Required, Comment("Id ผู้ถูกร้องเรียน")]
-        public DisciplineDisciplinary DisciplineDisciplinary { get; set; }
+        public DisciplineDisciplinary_ProfileComplaintInvestigate DisciplineDisciplinary_ProfileComplaintInvestigate { get; set; }
     }
 }

BMA.EHR.Infrastructure/Migrations/DisciplineDb/20231201135152_update table DisciplineDisciplinarys add DisciplineDisciplinary_ProfileComplaintInvestigates.cs

@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
+{
+    /// <inheritdoc />
+    public partial class updatetableDisciplineDisciplinarysaddDisciplineDisciplinary_ProfileComplaintInvestigates : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_DisciplineReport_Profiles_DisciplineDisciplinarys_Discipline~",
+                table: "DisciplineReport_Profiles");
+
+            migrationBuilder.RenameColumn(
+                name: "DisciplineDisciplinaryId",
+                table: "DisciplineReport_Profiles",
+                newName: "DisciplineDisciplinary_ProfileComplaintInvestigateId");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_DisciplineReport_Profiles_DisciplineDisciplinaryId",
+                table: "DisciplineReport_Profiles",
+                newName: "IX_DisciplineReport_Profiles_DisciplineDisciplinary_ProfileComp~");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_DisciplineReport_Profiles_DisciplineDisciplinary_ProfileComp~",
+                table: "DisciplineReport_Profiles",
+                column: "DisciplineDisciplinary_ProfileComplaintInvestigateId",
+                principalTable: "DisciplineDisciplinary_ProfileComplaintInvestigates",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_DisciplineReport_Profiles_DisciplineDisciplinary_ProfileComp~",
+                table: "DisciplineReport_Profiles");
+
+            migrationBuilder.RenameColumn(
+                name: "DisciplineDisciplinary_ProfileComplaintInvestigateId",
+                table: "DisciplineReport_Profiles",
+                newName: "DisciplineDisciplinaryId");
+
+            migrationBuilder.RenameIndex(
+                name: "IX_DisciplineReport_Profiles_DisciplineDisciplinary_ProfileComp~",
+                table: "DisciplineReport_Profiles",
+                newName: "IX_DisciplineReport_Profiles_DisciplineDisciplinaryId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_DisciplineReport_Profiles_DisciplineDisciplinarys_Discipline~",
+                table: "DisciplineReport_Profiles",
+                column: "DisciplineDisciplinaryId",
+                principalTable: "DisciplineDisciplinarys",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/DisciplineDb/DisciplineDbContextModelSnapshot.cs

@@ -1899,7 +1899,7 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
                         .HasColumnType("longtext")
                         .HasComment("เหตุที่ถูกสั่งพักราชการ/ออกจากราชการไว้ก่อน");
 
-                    b.Property<Guid>("DisciplineDisciplinaryId")
+                    b.Property<Guid>("DisciplineDisciplinary_ProfileComplaintInvestigateId")
                         .HasColumnType("char(36)");
 
                     b.Property<DateTime?>("EndDateSuspend")
@@ -1975,7 +1975,7 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
 
                     b.HasKey("Id");
 
-                    b.HasIndex("DisciplineDisciplinaryId");
+                    b.HasIndex("DisciplineDisciplinary_ProfileComplaintInvestigateId");
 
                     b.ToTable("DisciplineReport_Profiles");
                 });
@@ -10260,13 +10260,13 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
 
             modelBuilder.Entity("BMA.EHR.Domain.Models.Discipline.DisciplineReport_Profile", b =>
                 {
-                    b.HasOne("BMA.EHR.Domain.Models.Discipline.DisciplineDisciplinary", "DisciplineDisciplinary")
+                    b.HasOne("BMA.EHR.Domain.Models.Discipline.DisciplineDisciplinary_ProfileComplaintInvestigate", "DisciplineDisciplinary_ProfileComplaintInvestigate")
                         .WithMany("DisciplineReport_Profiles")
-                        .HasForeignKey("DisciplineDisciplinaryId")
+                        .HasForeignKey("DisciplineDisciplinary_ProfileComplaintInvestigateId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
-                    b.Navigation("DisciplineDisciplinary");
+                    b.Navigation("DisciplineDisciplinary_ProfileComplaintInvestigate");
                 });
 
             modelBuilder.Entity("BMA.EHR.Domain.Models.HR.LimitTypeLeave", b =>
@@ -11079,7 +11079,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
                     b.Navigation("DisciplineDisciplinary_DocWitnessess");
 
                     b.Navigation("DisciplineDisciplinary_ProfileComplaintInvestigates");
+                });
 
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Discipline.DisciplineDisciplinary_ProfileComplaintInvestigate", b =>
+                {
                     b.Navigation("DisciplineReport_Profiles");
                 });