Merge branch 'work' into develop

BMA.EHR.Application/Repositories/InsigniaPeriodsRepository.cs

@@ -4983,7 +4983,7 @@ namespace BMA.EHR.Application.Repositories
                                         IsApprove = h.IsApprove,
                                         RequestDate = h.RequestDate,
                                         Status = h.Status,
-                                        RequestNote = "",
+                                        RequestNote = h.Reason,
                                         // Docs = GetDocFile(h.Profile.Id),
                                         MatchingConditions = h.MatchingConditions == null ? null : JsonConvert.DeserializeObject<List<MatchingCondition>>(h.MatchingConditions)
                                     })).ToList();

BMA.EHR.Application/Requests/InsigniaBorrowRequest.cs

@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Application.Requests
+{
+    public class InsigniaBorrowRequest
+    {
+        public DateTime BorrowDate { get; set; }
+        public Guid BorrowOrganizationId { get; set; }
+        public Guid InsigniaNoteProfileId { get; set; }
+    }
+}

BMA.EHR.Application/Requests/InsigniaManageOrganizationRequest.cs

@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Application.Requests
+{
+    public class InsigniaManageOrganizationRequest
+    {
+        public Guid OrganizationOrganizationId { get; set; }
+        public Guid insigniaManageId { get; set; }
+        public int Total { get; set; }
+    }
+}

BMA.EHR.Application/Requests/InsigniaManageOrganizationUpdateRequest.cs

@@ -0,0 +1,10 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Application.Requests
+{
+    public class InsigniaManageOrganizationUpdateRequest
+    {
+        public int Total { get; set; }
+    }
+}

BMA.EHR.Application/Requests/InsigniaManageRequest.cs

@@ -8,6 +8,6 @@ namespace BMA.EHR.Application.Requests
         public Guid Insignia { get; set; }
         public int Year { get; set; }
         public int Total { get; set; }
-        public string Type { get; set; }
+        // public string Type { get; set; }
     }
 }

BMA.EHR.Application/Requests/InsigniaRequestItem.cs

@@ -17,7 +17,7 @@
         public string Status { get; set; }
         public bool IsApprove { get; set; }
         public DateTime? RequestDate { get; set; }
-        public string RequestNote { get; set; }
+        public string? RequestNote { get; set; }
         public List<InsigniaRequestDoc>? Docs { get; set; }
 
         public List<MatchingCondition> MatchingConditions { get; set; } = new List<MatchingCondition>();

BMA.EHR.Application/Requests/InsigniaReturnRequest.cs

@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Application.Requests
+{
+    public class InsigniaReturnRequest
+    {
+        public DateTime ReturnDate { get; set; }
+        public Guid ReturnOrganizationId { get; set; }
+        public string ReturnReason { get; set; }
+    }
+}

BMA.EHR.Domain/Models/Insignias/InsigniaManage.cs

@@ -15,7 +15,6 @@ namespace BMA.EHR.Domain.Models.Insignias
         public int Year { get; set; }
         [Comment("จำนวนทั้งหมด")]
         public int Total { get; set; }
-        [Comment("ประเภทเครื่องราช")]
-        public string Type { get; set; }
+        public virtual List<InsigniaManageOrganiation> InsigniaManageOrganiations { get; set; } = new List<InsigniaManageOrganiation>();
     }
 }

BMA.EHR.Domain/Models/Insignias/InsigniaManageOrganiation.cs

@@ -0,0 +1,20 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+using BMA.EHR.Domain.Models.Base;
+using System.ComponentModel.DataAnnotations.Schema;
+using BMA.EHR.Domain.Models.Documents;
+using BMA.EHR.Domain.Models.MetaData;
+
+namespace BMA.EHR.Domain.Models.Insignias
+{
+    public class InsigniaManageOrganiation : EntityBase
+    {
+        [Comment("จำนวนทั้งหมด")]
+        public int Total { get; set; }
+        [Comment("Fk Table OrganizationOrganization")]
+        public OrganizationOrganization OrganizationOrganization { get; set; }
+        [Comment("Fk Table InsigniaManage")]
+        public InsigniaManage InsigniaManage { get; set; }
+        public virtual List<InsigniaManageProfile> InsigniaManageProfiles { get; set; } = new List<InsigniaManageProfile>();
+    }
+}

BMA.EHR.Domain/Models/Insignias/InsigniaManageProfile.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+using BMA.EHR.Domain.Models.Base;
+using System.ComponentModel.DataAnnotations.Schema;
+using BMA.EHR.Domain.Models.Documents;
+using BMA.EHR.Domain.Models.MetaData;
+
+namespace BMA.EHR.Domain.Models.Insignias
+{
+    public class InsigniaManageProfile : EntityBase
+    {
+        [Comment("สถานะการคืน")]
+        public bool Status { get; set; }
+        [Comment("ยืมวันที่")]
+        public DateTime? BorrowDate { get; set; }
+        [Comment("Fk Table OrganizationOrganization Borrow")]
+        public OrganizationOrganization? BorrowOrganization { get; set; }
+        [Comment("คืนวันที่")]
+        public DateTime? ReturnDate { get; set; }
+        [Comment("Fk Table OrganizationOrganization Return")]
+        public OrganizationOrganization? ReturnOrganization { get; set; }
+        [Comment("เหตุผลคืน")]
+        public string? ReturnReason { get; set; }
+        [Comment("Fk Table InsigniaNoteProfile")]
+        public InsigniaNoteProfile InsigniaNoteProfile { get; set; }
+        [Comment("Fk Table InsigniaManageOrganiation")]
+        public InsigniaManageOrganiation InsigniaManageOrganiation { get; set; }
+    }
+}

BMA.EHR.Domain/Models/Retirement/RetirementQuestion.cs

@@ -43,5 +43,7 @@ namespace BMA.EHR.Domain.Models.Retirement
         public string? FutureWorkReason { get; set; }
         [Comment("ความคิดเห็นและข้อเสนอแนะอื่น ๆ ")]
         public string? Suggestion { get; set; }
+        [Comment("กําหนดวันนัดหมายเพื่อทําการสัมภาษณ์การลาออก")]
+        public DateTime? AppointDate { get; set; }
     }
 }

BMA.EHR.Domain/Shared/GlobalMessages.cs

@@ -78,13 +78,19 @@
         #region " Insignia "
         public static readonly string InsigniaDupicate = "มีการยื่นรอบรอบนี้ในปีนี้ไว้อยู่แล้ว";
         public static readonly string InsigniaManageDupicate = "มีการกำหนดจัดสรรเครื่องราชย์ฯ รอบนี้ในปีนี้ไว้อยู่แล้ว";
+        public static readonly string InsigniaManageOrgDupicate = "มีการกำหนดหน่วยงานจัดสรรเครื่องราชฯ รอบนี้ในปีนี้ไว้อยู่แล้ว";
         public static readonly string InsigniaRequestNotFound = "ไม่พบข้อมูลการยื่นขอพระราชทานเครื่องราชย์ฯ ของหน่วยงานที่ระบุ!!";
         public static readonly string InsigniaRequestProfileNotFound = "ไม่พบข้อมูลการยื่นขอพระราชทานเครื่องราชย์ฯ ของบุคคลนี้!!";
         public static readonly string InsigniaRequestProfileDupicate = "มีการกำหนดจัดสรรเครื่องราชย์ฯ บุคคลนี้ไว้อยู่แล้ว";
         public static readonly string InsigniaPeriodNotFound = "ไม่พบรอบการยื่นขอพระราชทานเครื่องราชย์อิสริยาภรณ์ฯ ";
         public static readonly string InsigniaManageNotFound = "ไม่พบจัดสรรเครื่องราชย์ฯ ที่ระบุ";
+        public static readonly string InsigniaManageOrgNotFound = "ไม่พบหน่วยงานจัดสรรเครื่องราชฯ ที่ระบุ";
         public static readonly string CoinPeriodNotFound = "ไม่พบรอบการขอพระราชทานเหรียญจักรพรรดิมาลาที่ระบุ!!";
         public static readonly string OCNotFound = "ไม่พบหน่วยงานที่ระบุในระบบ";
+        public static readonly string InsigniaManageOrgLimit = "จำนวนการจัดสรรเครื่องราชฯ หน่วยงานเกินจำนวน";
+        public static readonly string InsigniaBorrowOrgLimit = "จำนวนการจัดสรรเครื่องราชฯ หน่วยงานเกินจำนวนของหน่วยงานที่ได้รับ";
+        public static readonly string InsigniaBorrowNotFound = "ไม่พบรายการยืมเครื่องราชฯ";
+        public static readonly string InsigniaNotReturn = "รายการยืมเครื่องราชนี้ได้ทำการยืมไว้แล้ว";
         #endregion
 
         #region " Retirement "

BMA.EHR.Infrastructure/Migrations/20230825025054_update table RetirementQuestion update type TimeThink int.cs

@@ -0,0 +1,42 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class updatetableRetirementQuestionupdatetypeTimeThinkint : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "TimeThink",
+                table: "RetirementQuestions",
+                type: "int",
+                nullable: true,
+                comment: "สำหรับการลาออกในครั้งนี้ ท่านได้คิดทบทวนอย่างจริงจังเป็นระยะเวลานานเท่าใด",
+                oldClrType: typeof(string),
+                oldType: "longtext",
+                oldNullable: true,
+                oldComment: "สำหรับการลาออกในครั้งนี้ ท่านได้คิดทบทวนอย่างจริงจังเป็นระยะเวลานานเท่าใด")
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "TimeThink",
+                table: "RetirementQuestions",
+                type: "longtext",
+                nullable: true,
+                comment: "สำหรับการลาออกในครั้งนี้ ท่านได้คิดทบทวนอย่างจริงจังเป็นระยะเวลานานเท่าใด",
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldNullable: true,
+                oldComment: "สำหรับการลาออกในครั้งนี้ ท่านได้คิดทบทวนอย่างจริงจังเป็นระยะเวลานานเท่าใด")
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/20230825025632_update table RetirementQuestion add AppointDate.cs

@@ -0,0 +1,30 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class updatetableRetirementQuestionaddAppointDate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "AppointDate",
+                table: "RetirementQuestions",
+                type: "datetime(6)",
+                nullable: true,
+                comment: "กําหนดวันนัดหมายเพื่อทําการสัมภาษณ์การลาออก");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AppointDate",
+                table: "RetirementQuestions");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/20230825083812_ADD table InsigniaManageOrganiations.cs

@@ -0,0 +1,81 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class ADDtableInsigniaManageOrganiations : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Type",
+                table: "InsigniaManages");
+
+            migrationBuilder.CreateTable(
+                name: "InsigniaManageOrganiations",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, comment: "PrimaryKey", collation: "ascii_general_ci"),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "สร้างข้อมูลเมื่อ"),
+                    CreatedUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "แก้ไขข้อมูลล่าสุดเมื่อ"),
+                    LastUpdateUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CreatedFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdateFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Total = table.Column<int>(type: "int", nullable: false, comment: "จำนวนทั้งหมด"),
+                    OrganizationOrganizationId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    InsigniaManageId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_InsigniaManageOrganiations", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_InsigniaManageOrganiations_InsigniaManages_InsigniaManageId",
+                        column: x => x.InsigniaManageId,
+                        principalTable: "InsigniaManages",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InsigniaManageOrganiations_OrganizationOrganizations_Organiz~",
+                        column: x => x.OrganizationOrganizationId,
+                        principalTable: "OrganizationOrganizations",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InsigniaManageOrganiations_InsigniaManageId",
+                table: "InsigniaManageOrganiations",
+                column: "InsigniaManageId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InsigniaManageOrganiations_OrganizationOrganizationId",
+                table: "InsigniaManageOrganiations",
+                column: "OrganizationOrganizationId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "InsigniaManageOrganiations");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Type",
+                table: "InsigniaManages",
+                type: "longtext",
+                nullable: false,
+                comment: "ประเภทเครื่องราช")
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/20230825110348_ADD table InsigniaManageProfiles.cs

@@ -0,0 +1,95 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class ADDtableInsigniaManageProfiles : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "InsigniaManageProfiles",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, comment: "PrimaryKey", collation: "ascii_general_ci"),
+                    CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "สร้างข้อมูลเมื่อ"),
+                    CreatedUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "แก้ไขข้อมูลล่าสุดเมื่อ"),
+                    LastUpdateUserId = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: false, comment: "User Id ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CreatedFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่สร้างข้อมูล")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    LastUpdateFullName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: false, comment: "ชื่อ User ที่แก้ไขข้อมูลล่าสุด")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Status = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "สถานะการคืน"),
+                    BorrowDate = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "ยืมวันที่"),
+                    BorrowOrganizationId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    ReturnDate = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "คืนวันที่"),
+                    ReturnOrganizationId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    ReturnReason = table.Column<string>(type: "longtext", nullable: true, comment: "เหตุผลคืน")
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    InsigniaNoteProfileId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    InsigniaManageOrganiationId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_InsigniaManageProfiles", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_InsigniaManageProfiles_InsigniaManageOrganiations_InsigniaMa~",
+                        column: x => x.InsigniaManageOrganiationId,
+                        principalTable: "InsigniaManageOrganiations",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InsigniaManageProfiles_InsigniaNoteProfiles_InsigniaNoteProf~",
+                        column: x => x.InsigniaNoteProfileId,
+                        principalTable: "InsigniaNoteProfiles",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_InsigniaManageProfiles_OrganizationOrganizations_BorrowOrgan~",
+                        column: x => x.BorrowOrganizationId,
+                        principalTable: "OrganizationOrganizations",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_InsigniaManageProfiles_OrganizationOrganizations_ReturnOrgan~",
+                        column: x => x.ReturnOrganizationId,
+                        principalTable: "OrganizationOrganizations",
+                        principalColumn: "Id");
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InsigniaManageProfiles_BorrowOrganizationId",
+                table: "InsigniaManageProfiles",
+                column: "BorrowOrganizationId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InsigniaManageProfiles_InsigniaManageOrganiationId",
+                table: "InsigniaManageProfiles",
+                column: "InsigniaManageOrganiationId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InsigniaManageProfiles_InsigniaNoteProfileId",
+                table: "InsigniaManageProfiles",
+                column: "InsigniaNoteProfileId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_InsigniaManageProfiles_ReturnOrganizationId",
+                table: "InsigniaManageProfiles",
+                column: "ReturnOrganizationId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "InsigniaManageProfiles");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs

@@ -5294,11 +5294,6 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasColumnType("int")
                         .HasComment("จำนวนทั้งหมด");
 
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasColumnType("longtext")
-                        .HasComment("ประเภทเครื่องราช");
-
                     b.Property<int>("Year")
                         .HasColumnType("int")
                         .HasComment("ปี");
@@ -5310,6 +5305,160 @@ namespace BMA.EHR.Infrastructure.Migrations
                     b.ToTable("InsigniaManages");
                 });
 
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Insignias.InsigniaManageOrganiation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("InsigniaManageId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<Guid>("OrganizationOrganizationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Total")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนทั้งหมด");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("InsigniaManageId");
+
+                    b.HasIndex("OrganizationOrganizationId");
+
+                    b.ToTable("InsigniaManageOrganiations");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Insignias.InsigniaManageProfile", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)")
+                        .HasColumnOrder(0)
+                        .HasComment("PrimaryKey")
+                        .HasAnnotation("Relational:JsonPropertyName", "id");
+
+                    b.Property<DateTime?>("BorrowDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("ยืมวันที่");
+
+                    b.Property<Guid?>("BorrowOrganizationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(100)
+                        .HasComment("สร้างข้อมูลเมื่อ");
+
+                    b.Property<string>("CreatedFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(104)
+                        .HasComment("ชื่อ User ที่สร้างข้อมูล");
+
+                    b.Property<string>("CreatedUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(101)
+                        .HasComment("User Id ที่สร้างข้อมูล");
+
+                    b.Property<Guid>("InsigniaManageOrganiationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("InsigniaNoteProfileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("LastUpdateFullName")
+                        .IsRequired()
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)")
+                        .HasColumnOrder(105)
+                        .HasComment("ชื่อ User ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<string>("LastUpdateUserId")
+                        .IsRequired()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnOrder(103)
+                        .HasComment("User Id ที่แก้ไขข้อมูลล่าสุด");
+
+                    b.Property<DateTime?>("LastUpdatedAt")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnOrder(102)
+                        .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
+
+                    b.Property<DateTime?>("ReturnDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("คืนวันที่");
+
+                    b.Property<Guid?>("ReturnOrganizationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ReturnReason")
+                        .HasColumnType("longtext")
+                        .HasComment("เหตุผลคืน");
+
+                    b.Property<bool>("Status")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("สถานะการคืน");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BorrowOrganizationId");
+
+                    b.HasIndex("InsigniaManageOrganiationId");
+
+                    b.HasIndex("InsigniaNoteProfileId");
+
+                    b.HasIndex("ReturnOrganizationId");
+
+                    b.ToTable("InsigniaManageProfiles");
+                });
+
             modelBuilder.Entity("BMA.EHR.Domain.Models.Insignias.InsigniaNote", b =>
                 {
                     b.Property<Guid>("Id")
@@ -13291,6 +13440,10 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasColumnType("longtext")
                         .HasComment("อื่นๆ อะไรคือสิ่งที่ท่านเห็นว่าควรปรับปรุง");
 
+                    b.Property<DateTime?>("AppointDate")
+                        .HasColumnType("datetime(6)")
+                        .HasComment("กําหนดวันนัดหมายเพื่อทําการสัมภาษณ์การลาออก");
+
                     b.Property<DateTime>("CreatedAt")
                         .HasColumnType("datetime(6)")
                         .HasColumnOrder(100)
@@ -14157,6 +14310,56 @@ namespace BMA.EHR.Infrastructure.Migrations
                     b.Navigation("Insignia");
                 });
 
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Insignias.InsigniaManageOrganiation", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.Insignias.InsigniaManage", "InsigniaManage")
+                        .WithMany("InsigniaManageOrganiations")
+                        .HasForeignKey("InsigniaManageId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationOrganization", "OrganizationOrganization")
+                        .WithMany()
+                        .HasForeignKey("OrganizationOrganizationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("InsigniaManage");
+
+                    b.Navigation("OrganizationOrganization");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Insignias.InsigniaManageProfile", b =>
+                {
+                    b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationOrganization", "BorrowOrganization")
+                        .WithMany()
+                        .HasForeignKey("BorrowOrganizationId");
+
+                    b.HasOne("BMA.EHR.Domain.Models.Insignias.InsigniaManageOrganiation", "InsigniaManageOrganiation")
+                        .WithMany("InsigniaManageProfiles")
+                        .HasForeignKey("InsigniaManageOrganiationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BMA.EHR.Domain.Models.Insignias.InsigniaNoteProfile", "InsigniaNoteProfile")
+                        .WithMany()
+                        .HasForeignKey("InsigniaNoteProfileId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationOrganization", "ReturnOrganization")
+                        .WithMany()
+                        .HasForeignKey("ReturnOrganizationId");
+
+                    b.Navigation("BorrowOrganization");
+
+                    b.Navigation("InsigniaManageOrganiation");
+
+                    b.Navigation("InsigniaNoteProfile");
+
+                    b.Navigation("ReturnOrganization");
+                });
+
             modelBuilder.Entity("BMA.EHR.Domain.Models.Insignias.InsigniaNoteDoc", b =>
                 {
                     b.HasOne("BMA.EHR.Domain.Models.Documents.Document", "Document")
@@ -15604,6 +15807,16 @@ namespace BMA.EHR.Infrastructure.Migrations
                     b.Navigation("LimitTypeLeaves");
                 });
 
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Insignias.InsigniaManage", b =>
+                {
+                    b.Navigation("InsigniaManageOrganiations");
+                });
+
+            modelBuilder.Entity("BMA.EHR.Domain.Models.Insignias.InsigniaManageOrganiation", b =>
+                {
+                    b.Navigation("InsigniaManageProfiles");
+                });
+
             modelBuilder.Entity("BMA.EHR.Domain.Models.Insignias.InsigniaNote", b =>
                 {
                     b.Navigation("InsigniaNoteDocs");

BMA.EHR.Infrastructure/Persistence/ApplicationDBContext.cs

@@ -309,6 +309,8 @@ namespace BMA.EHR.Infrastructure.Persistence
         public DbSet<InsigniaNoteProfile> InsigniaNoteProfiles { get; set; }
         public DbSet<InsigniaNote> InsigniaNotes { get; set; }
         public DbSet<InsigniaNoteDoc> InsigniaNoteDocs { get; set; }
+        public DbSet<InsigniaManageOrganiation> InsigniaManageOrganiations { get; set; }
+        public DbSet<InsigniaManageProfile> InsigniaManageProfiles { get; set; }
 
         #endregion
 

BMA.EHR.Insignia.Service/Controllers/InsigniaManageController.cs

@@ -8,6 +8,7 @@ using BMA.EHR.Infrastructure.Persistence;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
 using Newtonsoft.Json;
 using Swashbuckle.AspNetCore.Annotations;
 
@@ -25,7 +26,6 @@ namespace BMA.EHR.Insignia.Service.Controllers
         private readonly MinIOService _documentService;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly InsigniaPeriodsRepository _repository;
-        private readonly string Royal_Type = "Royal";
 
         public InsigniaManageController(ApplicationDBContext context,
                                    MinIOService documentService,
@@ -49,18 +49,24 @@ namespace BMA.EHR.Insignia.Service.Controllers
         /// <summary>
         /// list จัดสรรเครื่องราช
         /// </summary>
-        /// <param name="type">ประเภทเครื่องราช(insignia=เครื่องราช,coin=เหรียญ)</param>
+        /// <param name="year">ปีการจัดสรร</param>
+        /// <param name="insigniaTypeId">Id ประเภทเครื่องราช</param>
         /// <returns></returns>
         /// <response code="200"></response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
-        [HttpGet("{type}")]
-        public async Task<ActionResult<ResponseObject>> GetList(string type)
+        [HttpGet("type/{year}/{insigniaTypeId:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> GetList(int year, Guid insigniaTypeId)
         {
+            var insigniaType = await _context.InsigniaTypes
+                                    .FirstOrDefaultAsync(x => x.Id == insigniaTypeId);
+            if (insigniaType == null)
+                return Error(GlobalMessages.InsigniaTypeNotFound);
             var data = await _context.InsigniaManages.AsQueryable()
-                        .Where(x => x.Type == type.Trim().ToUpper())
-                        .OrderByDescending(x => x.Year)
+                        .Where(x => x.Insignia.InsigniaType == insigniaType)
+                        .Where(x => x.Year == year)
+                        .OrderByDescending(x => x.CreatedAt)
                         .Select(p => new
                         {
                             Id = p.Id,
@@ -68,7 +74,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
                             InsigniaId = p.Insignia.Id,
                             Year = p.Year,
                             Total = p.Total,
-                            Type = p.Type,
+                            Allocate = p.InsigniaManageOrganiations.Sum(x => x.Total),
+                            Remain = p.Total - p.InsigniaManageOrganiations.Sum(x => x.Total),
                             LastUpdatedAt = p.LastUpdatedAt,
                             CreatedAt = p.CreatedAt,
                         })
@@ -79,19 +86,17 @@ namespace BMA.EHR.Insignia.Service.Controllers
         /// <summary>
         /// get รายละเอียดจัดสรรเครื่องราช
         /// </summary>
-        /// <param name="id">Id จัดสรรเครื่องราช</param>
-        /// <param name="type">ประเภทเครื่องราช(insignia=เครื่องราช,coin=เหรียญ)</param>
+        /// <param name="insigniaManageId">Id จัดสรรเครื่องราช</param>
         /// <returns></returns>
         /// <response code="200"></response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
-        [HttpGet("{type}/{id:length(36)}")]
-        public async Task<ActionResult<ResponseObject>> GetById(string type, Guid id)
+        [HttpGet("{insigniaManageId:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> GetById(Guid insigniaManageId)
         {
             var data = await _context.InsigniaManages.AsQueryable()
-                        .Where(x => x.Type == type.Trim().ToUpper())
-                        .Where(x => x.Id == id)
+                        .Where(x => x.Id == insigniaManageId)
                         .Select(p => new
                         {
                             Id = p.Id,
@@ -99,7 +104,6 @@ namespace BMA.EHR.Insignia.Service.Controllers
                             InsigniaId = p.Insignia.Id,
                             Year = p.Year,
                             Total = p.Total,
-                            Type = p.Type,
                             LastUpdatedAt = p.LastUpdatedAt,
                             CreatedAt = p.CreatedAt,
                         })
@@ -113,14 +117,13 @@ namespace BMA.EHR.Insignia.Service.Controllers
         /// <summary>
         /// สร้างจัดสรรเครื่องราช
         /// </summary>
-        /// <param name="type">ประเภทเครื่องราช(insignia=เครื่องราช,coin=เหรียญ)</param>
         /// <returns></returns>
         /// <response code="200"></response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
-        [HttpPost("{type}")]
-        public async Task<ActionResult<ResponseObject>> Post([FromForm] InsigniaManageRequest req, string type)
+        [HttpPost()]
+        public async Task<ActionResult<ResponseObject>> Post([FromForm] InsigniaManageRequest req)
         {
             var insignia = await _context.Insignias.AsQueryable()
                             .FirstOrDefaultAsync(x => x.Id == req.Insignia);
@@ -131,22 +134,21 @@ namespace BMA.EHR.Insignia.Service.Controllers
                             .Where(x => x.Insignia == insignia && x.Year == req.Year)
                             .FirstOrDefaultAsync();
             if (insigniaManage != null)
-                return Error(GlobalMessages.InsigniaManageNotFound);
+                return Error(GlobalMessages.InsigniaManageDupicate);
 
-            var period = new InsigniaManage
-            {
-                Insignia = insignia,
-                Year = req.Year,
-                Total = req.Total,
-                Type = type.Trim().ToUpper(),
-                CreatedUserId = FullName ?? "",
-                CreatedFullName = UserId ?? "System Administrator",
-                CreatedAt = DateTime.Now,
-                LastUpdateFullName = FullName ?? "System Administrator",
-                LastUpdateUserId = UserId ?? "",
-                LastUpdatedAt = DateTime.Now,
-            };
-            await _context.InsigniaManages.AddAsync(period);
+            await _context.InsigniaManages.AddAsync(
+                new InsigniaManage
+                {
+                    Insignia = insignia,
+                    Year = req.Year,
+                    Total = req.Total,
+                    CreatedUserId = FullName ?? "",
+                    CreatedFullName = UserId ?? "System Administrator",
+                    CreatedAt = DateTime.Now,
+                    LastUpdateFullName = FullName ?? "System Administrator",
+                    LastUpdateUserId = UserId ?? "",
+                    LastUpdatedAt = DateTime.Now,
+                });
             await _context.SaveChangesAsync();
 
             return Success();
@@ -155,19 +157,17 @@ namespace BMA.EHR.Insignia.Service.Controllers
         /// <summary>
         /// ลบจัดสรรเครื่องราช
         /// </summary>
-        /// <param name="id">Id จัดสรรเครื่องราช</param>
-        /// <param name="type">ประเภทเครื่องราช(insignia=เครื่องราช,coin=เหรียญ)</param>
+        /// <param name="insigniaManageId">Id จัดสรรเครื่องราช</param>
         /// <returns></returns>
         /// <response code="200"></response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
-        [HttpDelete("{type}/{id:length(36)}")]
-        public async Task<ActionResult<ResponseObject>> Delete(Guid id, string type)
+        [HttpDelete("{insigniaManageId:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> Delete(Guid insigniaManageId)
         {
             var deleted = await _context.InsigniaManages.AsQueryable()
-                        .Where(x => x.Type == type.Trim().ToUpper())
-                        .Where(x => x.Id == id)
+                        .Where(x => x.Id == insigniaManageId)
                         .FirstOrDefaultAsync();
 
             if (deleted == null)
@@ -181,15 +181,14 @@ namespace BMA.EHR.Insignia.Service.Controllers
         /// <summary>
         /// แก้ไขจัดสรรเครื่องราช
         /// </summary>
-        /// <param name="id">Id จัดสรรเครื่องราช</param>
-        /// <param name="type">ประเภทเครื่องราช(insignia=เครื่องราช,coin=เหรียญ)</param>
+        /// <param name="insigniaManageId">Id จัดสรรเครื่องราช</param>
         /// <returns></returns>
         /// <response code="200"></response>
         /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
         /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
         /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
-        [HttpPut("{type}/{id:length(36)}")]
-        public async Task<ActionResult<ResponseObject>> Put([FromForm] InsigniaManageRequest req, Guid id, string type)
+        [HttpPut("{id:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> Put([FromForm] InsigniaManageRequest req, Guid insigniaManageId)
         {
             var insignia = await _context.Insignias.AsQueryable()
                             .FirstOrDefaultAsync(x => x.Id == req.Insignia);
@@ -197,21 +196,20 @@ namespace BMA.EHR.Insignia.Service.Controllers
                 return Error(GlobalMessages.InsigniaNotFound);
 
             var insigniaManage = await _context.InsigniaManages.AsQueryable()
-                            .Where(x => x.Insignia == insignia && x.Year == req.Year && x.Id != id)
+                            .Where(x => x.Insignia == insignia && x.Year == req.Year && x.Id != insigniaManageId)
                             .FirstOrDefaultAsync();
             if (insigniaManage != null)
-                return Error(GlobalMessages.InsigniaManageNotFound);
+                return Error(GlobalMessages.InsigniaManageDupicate);
 
             var uppdated = await _context.InsigniaManages.AsQueryable()
                             .Include(x => x.Insignia)
-                            .FirstOrDefaultAsync(x => x.Id == id);
+                            .FirstOrDefaultAsync(x => x.Id == insigniaManageId);
             if (uppdated == null)
                 return Error(GlobalMessages.InsigniaManageNotFound);
 
             uppdated.Insignia = insignia;
-            uppdated.Year = req.Year;
+            // uppdated.Year = req.Year;
             uppdated.Total = req.Total;
-            uppdated.Type = type.Trim().ToUpper();
             uppdated.LastUpdateFullName = FullName ?? "System Administrator";
             uppdated.LastUpdateUserId = UserId ?? "";
             uppdated.LastUpdatedAt = DateTime.Now;
@@ -221,5 +219,347 @@ namespace BMA.EHR.Insignia.Service.Controllers
             return Success();
         }
 
+        /// <summary>
+        /// list หน่วยงานจัดสรรเครื่องราชอิสริยาภรณ์
+        /// </summary>
+        /// <param name="insigniaManageId">Id จัดสรรเครื่องราช</param>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("org/{insigniaManageId:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> GetListOrganization(Guid insigniaManageId)
+        {
+            var insigniaManage = await _context.InsigniaManages.AsQueryable()
+                        .FirstOrDefaultAsync(x => x.Id == insigniaManageId);
+            if (insigniaManage == null)
+                return Error(GlobalMessages.InsigniaManageNotFound);
+
+            var insigniaManageOrg = await _context.InsigniaManageOrganiations.AsQueryable()
+                        .Where(x => x.InsigniaManage == insigniaManage)
+                        .OrderByDescending(x => x.CreatedAt)
+                        .Select(p => new
+                        {
+                            Id = p.Id,
+                            OrganizationOrganization = p.OrganizationOrganization.Name,
+                            Total = p.Total,
+                            Allocate = p.InsigniaManageProfiles.Where(x => x.Status == false).Count(),
+                            Remain = p.Total - p.InsigniaManageProfiles.Where(x => x.Status == false).Count(),
+                            LastUpdatedAt = p.LastUpdatedAt,
+                            CreatedAt = p.CreatedAt,
+                        })
+                        .FirstOrDefaultAsync();
+            if (insigniaManageOrg == null)
+                return Error(GlobalMessages.InsigniaManageOrgNotFound);
+            return Success(insigniaManageOrg);
+        }
+
+        /// <summary>
+        /// สร้างหน่วยงานจัดสรรเครื่องราชอิสริยาภรณ์
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("org")]
+        public async Task<ActionResult<ResponseObject>> PostOrganization([FromBody] InsigniaManageOrganizationRequest req)
+        {
+            var organizationOrganization = await _context.OrganizationOrganizations.AsQueryable()
+                            .FirstOrDefaultAsync(x => x.Id == req.OrganizationOrganizationId);
+            if (organizationOrganization == null)
+                return Error(GlobalMessages.OrganizationNotFound);
+
+            var insigniaManage = await _context.InsigniaManages.AsQueryable()
+                        .Include(x => x.InsigniaManageOrganiations)
+                        .ThenInclude(x => x.OrganizationOrganization)
+                        .FirstOrDefaultAsync(x => x.Id == req.insigniaManageId);
+            if (insigniaManage == null)
+                return Error(GlobalMessages.InsigniaManageNotFound);
+            var total = insigniaManage.InsigniaManageOrganiations.Where(x => x.OrganizationOrganization != organizationOrganization).Sum(x => x.Total);
+            if (req.Total + total > insigniaManage.Total)
+                return Error(GlobalMessages.InsigniaManageOrgLimit);
+            await _context.InsigniaManageOrganiations.AddAsync(
+                new InsigniaManageOrganiation
+                {
+                    OrganizationOrganization = organizationOrganization,
+                    Total = req.Total,
+                    InsigniaManage = insigniaManage,
+                    CreatedUserId = FullName ?? "",
+                    CreatedFullName = UserId ?? "System Administrator",
+                    CreatedAt = DateTime.Now,
+                    LastUpdateFullName = FullName ?? "System Administrator",
+                    LastUpdateUserId = UserId ?? "",
+                    LastUpdatedAt = DateTime.Now,
+                });
+            await _context.SaveChangesAsync();
+
+            return Success();
+        }
+
+        /// <summary>
+        /// ลบหน่วยงานจัดสรรเครื่องราชอิสริยาภรณ์
+        /// </summary>
+        /// <param name="insigniaManageOrgId">Id หน่วยงานจัดสรรเครื่องราชอิสริยาภรณ์</param>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpDelete("org/{insigniaManageOrgId:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> DeleteOrganization(Guid insigniaManageOrgId)
+        {
+            var deleted = await _context.InsigniaManageOrganiations.AsQueryable()
+                        .FirstOrDefaultAsync(x => x.Id == insigniaManageOrgId);
+
+            if (deleted == null)
+                return Error(GlobalMessages.InsigniaManageNotFound);
+            _context.InsigniaManageOrganiations.Remove(deleted);
+            await _context.SaveChangesAsync();
+            return Success();
+        }
+
+        /// <summary>
+        /// แก้ไขหน่วยงานจัดสรรเครื่องราชอิสริยาภรณ์
+        /// </summary>
+        /// <param name="insigniaManageOrgId">Id หน่วยงานจัดสรรเครื่องราชอิสริยาภรณ์</param>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("org/{insigniaManageOrgId:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> PutOrganization([FromForm] InsigniaManageOrganizationUpdateRequest req, Guid insigniaManageOrgId)
+        {
+            var uppdated = await _context.InsigniaManageOrganiations.AsQueryable()
+                            .Include(x => x.OrganizationOrganization)
+                            .Include(x => x.InsigniaManage)
+                            .FirstOrDefaultAsync(x => x.Id == insigniaManageOrgId);
+            if (uppdated == null)
+                return Error(GlobalMessages.InsigniaManageNotFound);
+
+            var insigniaManage = await _context.InsigniaManages.AsQueryable()
+                        .Include(x => x.InsigniaManageOrganiations)
+                        .ThenInclude(x => x.OrganizationOrganization)
+                        .FirstOrDefaultAsync(x => x.Id == uppdated.InsigniaManage.Id);
+            if (insigniaManage == null)
+                return Error(GlobalMessages.InsigniaManageNotFound);
+            var total = insigniaManage.InsigniaManageOrganiations.Where(x => x.Id != insigniaManageOrgId).Sum(x => x.Total);
+            if (req.Total + total > insigniaManage.Total)
+                return Error(GlobalMessages.InsigniaManageOrgLimit);
+
+            uppdated.Total = req.Total;
+            uppdated.LastUpdateFullName = FullName ?? "System Administrator";
+            uppdated.LastUpdateUserId = UserId ?? "";
+            uppdated.LastUpdatedAt = DateTime.Now;
+
+            await _context.SaveChangesAsync();
+
+            return Success();
+        }
+
+        /// <summary>
+        /// list dashboard หน่วยงานจัดสรรเครื่องราชอิสริยาภรณ์
+        /// </summary>
+        /// <param name="insigniaManageId">Id จัดสรรเครื่องราช</param>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("org/dashboard/{insigniaManageId:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> GetListDashboardOrganization(Guid insigniaManageId)
+        {
+            var insigniaManage = await _context.InsigniaManages.AsQueryable()
+                        .Include(x => x.InsigniaManageOrganiations)
+                        .Select(p => new
+                        {
+                            Id = p.Id,
+                            Insignia = p.Insignia.Name,
+                            InsigniaId = p.Insignia.Id,
+                            Year = p.Year,
+                            Total = p.Total,
+                            Allocate = p.InsigniaManageOrganiations.Sum(x => x.Total),
+                            Remain = p.Total - p.InsigniaManageOrganiations.Sum(x => x.Total),
+                            LastUpdatedAt = p.LastUpdatedAt,
+                            CreatedAt = p.CreatedAt,
+                        })
+                        .FirstOrDefaultAsync(x => x.Id == insigniaManageId);
+            if (insigniaManage == null)
+                return Error(GlobalMessages.InsigniaManageNotFound);
+
+            return Success(insigniaManage);
+        }
+
+        /// <summary>
+        /// แก้ไขยืมเครื่องราชฯ
+        /// </summary>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPost("borrow")]
+        public async Task<ActionResult<ResponseObject>> PostBorrowInsignia([FromForm] InsigniaBorrowRequest req)
+        {
+            var organizationOrganization = await _context.OrganizationOrganizations.AsQueryable()
+                            .FirstOrDefaultAsync(x => x.Id == req.BorrowOrganizationId);
+            if (organizationOrganization == null)
+                return Error(GlobalMessages.OrganizationNotFound);
+
+            var insigniaNoteProfile = await _context.InsigniaNoteProfiles.AsQueryable()
+                            .Include(x => x.RequestInsignia)
+                            .FirstOrDefaultAsync(x => x.Id == req.InsigniaNoteProfileId);
+            if (insigniaNoteProfile == null)
+                return Error(GlobalMessages.InsigniaRequestProfileNotFound);
+
+            var insigniaManage = await _context.InsigniaManages.AsQueryable()
+                            .FirstOrDefaultAsync(x => x.Year == DateTime.Now.Year && x.Insignia == insigniaNoteProfile.RequestInsignia);
+            if (insigniaManage == null)
+                return Error(GlobalMessages.InsigniaManageNotFound);
+
+            var insigniaManageOrganiation = await _context.InsigniaManageOrganiations.AsQueryable()
+                            .Include(x => x.InsigniaManageProfiles)
+                            .FirstOrDefaultAsync(x => x.OrganizationOrganization == organizationOrganization && x.InsigniaManage == insigniaManage);
+            if (insigniaManageOrganiation == null)
+                return Error(GlobalMessages.InsigniaManageOrgNotFound);
+
+            var insigniaManageProfile = await _context.InsigniaManageProfiles.AsQueryable()
+                            .FirstOrDefaultAsync(x => x.InsigniaNoteProfile == insigniaNoteProfile && x.InsigniaManageOrganiation == insigniaManageOrganiation && x.Status == false);
+            if (insigniaManageProfile != null)
+                return Error(GlobalMessages.InsigniaNotReturn);
+
+            if (insigniaManageOrganiation.Total <= insigniaManageOrganiation.InsigniaManageProfiles.Count())
+                return Error(GlobalMessages.InsigniaBorrowOrgLimit);
+
+            await _context.InsigniaManageProfiles.AddAsync(
+                new InsigniaManageProfile
+                {
+                    Status = false,
+                    InsigniaManageOrganiation = insigniaManageOrganiation,
+                    BorrowOrganization = organizationOrganization,
+                    BorrowDate = req.BorrowDate,
+                    InsigniaNoteProfile = insigniaNoteProfile,
+                    CreatedUserId = FullName ?? "",
+                    CreatedFullName = UserId ?? "System Administrator",
+                    CreatedAt = DateTime.Now,
+                    LastUpdateFullName = FullName ?? "System Administrator",
+                    LastUpdateUserId = UserId ?? "",
+                    LastUpdatedAt = DateTime.Now,
+                });
+
+            await _context.SaveChangesAsync();
+
+            return Success();
+        }
+
+        /// <summary>
+        /// แก้ไขคืนเครื่องราชฯ
+        /// </summary>
+        /// <param name="insigniaManageProfileId">Id ยืมเครื่องราช</param>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("return/{insigniaManageProfileId:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> PutReturnInsignia([FromForm] InsigniaReturnRequest req, Guid insigniaManageProfileId)
+        {
+            var organizationOrganization = await _context.OrganizationOrganizations.AsQueryable()
+                            .FirstOrDefaultAsync(x => x.Id == req.ReturnOrganizationId);
+            if (organizationOrganization == null)
+                return Error(GlobalMessages.OrganizationNotFound);
+
+            var uppdated = await _context.InsigniaManageProfiles.AsQueryable()
+                            .FirstOrDefaultAsync(x => x.Id == insigniaManageProfileId);
+            if (uppdated == null)
+                return Error(GlobalMessages.InsigniaManageNotFound);
+
+            uppdated.Status = true;
+            uppdated.ReturnDate = req.ReturnDate;
+            uppdated.ReturnOrganization = organizationOrganization;
+            uppdated.ReturnReason = req.ReturnReason;
+            uppdated.LastUpdateFullName = FullName ?? "System Administrator";
+            uppdated.LastUpdateUserId = UserId ?? "";
+            uppdated.LastUpdatedAt = DateTime.Now;
+
+            await _context.SaveChangesAsync();
+
+            return Success();
+        }
+
+        /// <summary>
+        /// list รายการยืม/คืนเครื่องราชฯ
+        /// </summary>
+        /// <param name="year">ปียืมขอ</param>
+        /// <param name="insigniaTypeId">Id ประเภทเครื่องราช</param>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("borrow/{year}/{insigniaTypeId:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> ListBorrowReturnInsignia(int year, Guid insigniaTypeId)
+        {
+            var insigniaType = await _context.InsigniaTypes
+                                    .FirstOrDefaultAsync(x => x.Id == insigniaTypeId);
+            if (insigniaType == null)
+                return Error(GlobalMessages.InsigniaTypeNotFound);
+            var data = await _context.InsigniaManageProfiles.AsQueryable()
+                        .Where(x => x.InsigniaNoteProfile.RequestInsignia.InsigniaType == insigniaType)
+                        .Where(x => x.InsigniaManageOrganiation.InsigniaManage.Year == year)
+                        .OrderByDescending(x => x.CreatedAt)
+                        .Select(p => new
+                        {
+                            Id = p.Id,
+                            Status = p.Status,
+                            BorrowOrganization = p.BorrowOrganization == null ? null : p.BorrowOrganization.Name,
+                            BorrowOrganizationId = p.BorrowOrganization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.BorrowOrganization.Id,
+                            BorrowDate = p.BorrowDate,
+                            ReturnDate = p.ReturnDate,
+                            ReturnOrganization = p.ReturnOrganization == null ? null : p.ReturnOrganization.Name,
+                            ReturnOrganizationId = p.ReturnOrganization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.ReturnOrganization.Id,
+                            ReturnReason = p.ReturnReason,
+                            LastUpdatedAt = p.LastUpdatedAt,
+                            CreatedAt = p.CreatedAt,
+                        })
+                        .ToListAsync();
+            return Success(data);
+        }
+
+        /// <summary>
+        /// get รายการยืม/คืนเครื่องราชฯ
+        /// </summary>
+        /// <param name="insigniaManageProfileId">Id ประเภทเครื่องราช</param>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpGet("borrow/{insigniaManageProfileId:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> GetBorrowReturnInsignia(Guid insigniaManageProfileId)
+        {
+            var data = await _context.InsigniaManageProfiles.AsQueryable()
+                        .Where(x => x.Id == insigniaManageProfileId)
+                        .Select(p => new
+                        {
+                            Id = p.Id,
+                            Status = p.Status,
+                            BorrowOrganization = p.BorrowOrganization == null ? null : p.BorrowOrganization.Name,
+                            BorrowOrganizationId = p.BorrowOrganization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.BorrowOrganization.Id,
+                            BorrowDate = p.BorrowDate,
+                            ReturnDate = p.ReturnDate,
+                            ReturnOrganization = p.ReturnOrganization == null ? null : p.ReturnOrganization.Name,
+                            ReturnOrganizationId = p.ReturnOrganization == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : p.ReturnOrganization.Id,
+                            ReturnReason = p.ReturnReason,
+                            LastUpdatedAt = p.LastUpdatedAt,
+                            CreatedAt = p.CreatedAt,
+                        })
+                        .FirstOrDefaultAsync();
+            if (data == null)
+                return Error(GlobalMessages.InsigniaBorrowNotFound);
+            return Success(data);
+        }
     }
 }

BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs

@@ -3,6 +3,7 @@ using System.Security.Claims;
 using BMA.EHR.Application.Repositories;
 using BMA.EHR.Application.Requests;
 using BMA.EHR.Domain.Common;
+using BMA.EHR.Domain.Models.HR;
 using BMA.EHR.Domain.Models.Insignias;
 using BMA.EHR.Domain.Shared;
 using BMA.EHR.Infrastructure.Persistence;
@@ -125,6 +126,73 @@ namespace BMA.EHR.Insignia.Service.Controllers
             }
         }
 
+        private async Task<List<ImportReceiveRequest>> ReadExcelImportReceive(IFormFile formFile)
+        {
+            var list = new List<ImportReceiveRequest>();
+            using (var stream = new MemoryStream())
+            {
+                await formFile.CopyToAsync(stream);
+                using (var package = new ExcelPackage(stream))
+                {
+                    for (int i = 0; i < package.Workbook.Worksheets.Count(); i++)
+                    {
+                        ExcelWorksheet worksheet = package.Workbook.Worksheets[i];
+                        var rowCount = worksheet.Dimension.Rows;
+                        for (int row = 2; row <= rowCount; row++)
+                        {
+                            list.Add(new ImportReceiveRequest
+                            {
+                                Number = worksheet.Cells[row, 1].Value != null ? worksheet.Cells[row, 1].Value.ToString() : null,
+                                RequestInsignia = worksheet.Cells[row, 2].Value != null ? worksheet.Cells[row, 2].Value.ToString() : null,
+                                CitizanId = worksheet.Cells[row, 3].Value != null ? worksheet.Cells[row, 3].Value.ToString() : null,
+                                Prefix = worksheet.Cells[row, 4].Value != null ? worksheet.Cells[row, 4].Value.ToString() : null,
+                                FullName = worksheet.Cells[row, 5].Value != null ? worksheet.Cells[row, 5].Value.ToString() : null,
+                                Position = worksheet.Cells[row, 6].Value != null ? worksheet.Cells[row, 6].Value.ToString() : null,
+                                DateReceive = worksheet.Cells[row, 7].Value != null ? DateTime.Parse(worksheet.Cells[row, 7].Value.ToString()) : null,
+                                OrgSend = worksheet.Cells[row, 8].Value != null ? worksheet.Cells[row, 8].Value.ToString() : null,
+                                OrgReceive = worksheet.Cells[row, 9].Value != null ? worksheet.Cells[row, 9].Value.ToString() : null,
+                                Date = worksheet.Cells[row, 10].Value != null ? DateTime.Parse(worksheet.Cells[row, 10].Value.ToString()) : null,
+                                VolumeNo = worksheet.Cells[row, 11].Value != null ? worksheet.Cells[row, 11].Value.ToString() : null,
+                                Section = worksheet.Cells[row, 12].Value != null ? worksheet.Cells[row, 12].Value.ToString() : null,
+                                Page = worksheet.Cells[row, 13].Value != null ? worksheet.Cells[row, 13].Value.ToString() : null,
+                                No = worksheet.Cells[row, 14].Value != null ? worksheet.Cells[row, 14].Value.ToString() : null,
+                            });
+                        }
+                    }
+                }
+            }
+            return list;
+        }
+
+        private async Task<List<ImportInvoiceRequest>> ReadExcelImportInvoice(IFormFile formFile)
+        {
+            var list = new List<ImportInvoiceRequest>();
+            using (var stream = new MemoryStream())
+            {
+                await formFile.CopyToAsync(stream);
+                using (var package = new ExcelPackage(stream))
+                {
+                    for (int i = 0; i < package.Workbook.Worksheets.Count(); i++)
+                    {
+                        ExcelWorksheet worksheet = package.Workbook.Worksheets[i];
+                        var rowCount = worksheet.Dimension.Rows;
+                        for (int row = 2; row <= rowCount; row++)
+                        {
+                            list.Add(new ImportInvoiceRequest
+                            {
+                                CitizanId = worksheet.Cells[row, 1].Value != null ? worksheet.Cells[row, 1].Value.ToString() : null,
+                                Number = worksheet.Cells[row, 2].Value != null ? worksheet.Cells[row, 2].Value.ToString() : null,
+                                DatePayment = worksheet.Cells[row, 3].Value != null ? DateTime.Parse(worksheet.Cells[row, 3].Value.ToString()) : null,
+                                TypePayment = worksheet.Cells[row, 4].Value != null ? worksheet.Cells[row, 4].Value.ToString() : null,
+                                Address = worksheet.Cells[row, 5].Value != null ? worksheet.Cells[row, 5].Value.ToString() : null,
+                            });
+                        }
+                    }
+                }
+            }
+            return list;
+        }
+
         #endregion
 
         #region " ดึงเครื่องราชฯ ล่าสุดของครู (GetInsigniaLast) "
@@ -1272,6 +1340,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
             if (profile == null)
                 return Error(GlobalMessages.DataNotFound);
             var insignia = await _context.Insignias
+                                    .Include(x => x.InsigniaType)
                                     .FirstOrDefaultAsync(x => x.Id == req.InsigniaId);
             if (insignia == null)
                 return Error(GlobalMessages.InsigniaNotFound);
@@ -1313,7 +1382,29 @@ namespace BMA.EHR.Insignia.Service.Controllers
                     LastUpdateUserId = UserId ?? "",
                     LastUpdatedAt = DateTime.Now,
                 });
-                //////////////บันทึกลงทะเบียน
+                await _context.ProfileInsignias.AddAsync(new ProfileInsignia
+                {
+                    Year = insigniaNote.Year,
+                    No = req.No,
+                    Issue = req.VolumeNo,
+                    VolumeNo = req.VolumeNo,
+                    // Volume = req.Volume,
+                    Section = req.Section,
+                    Page = req.Page,
+                    DateAnnounce = req.DateReceive,
+                    ReceiveDate = req.Date,
+                    InsigniaType = insignia.InsigniaType == null ? null : insignia.InsigniaType.Name,
+                    Insignia = insignia,
+                    // RefCommandNo = req.RefCommandNo,
+                    // RefCommandDate = req.RefCommandDate,
+                    Profile = profile,
+                    CreatedUserId = FullName ?? "",
+                    CreatedFullName = UserId ?? "System Administrator",
+                    CreatedAt = DateTime.Now,
+                    LastUpdateFullName = FullName ?? "System Administrator",
+                    LastUpdateUserId = UserId ?? "",
+                    LastUpdatedAt = DateTime.Now,
+                });
             }
             else
             {
@@ -1434,6 +1525,9 @@ namespace BMA.EHR.Insignia.Service.Controllers
                                     .ThenInclude(x => x.Profile)
                                     .Include(x => x.InsigniaNoteProfiles)
                                     .ThenInclude(x => x.RequestInsignia)
+                                    .ThenInclude(x => x.InsigniaType)
+                                    .Include(x => x.InsigniaNoteProfiles)
+                                    .ThenInclude(x => x.Profile)
                                     .FirstOrDefaultAsync(x => x.Id == insigniaNoteId);
             if (insigniaNote == null)
                 return Error(GlobalMessages.InsigniaRequestNotFound);
@@ -1461,7 +1555,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
                     var _insignia = await _context.Insignias.FirstOrDefaultAsync(x => x.Name == item.RequestInsignia);
                     if (_insignia == null)
                         continue;
-                    await _context.InsigniaNoteProfiles.AddAsync(new InsigniaNoteProfile
+                    profile = new InsigniaNoteProfile
                     {
                         RequestDate = DateTime.Now,
                         Salary = _profile.Salaries.Count() == 0 ? null : _profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
@@ -1480,7 +1574,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
                         LastUpdateFullName = FullName ?? "System Administrator",
                         LastUpdateUserId = UserId ?? "",
                         LastUpdatedAt = DateTime.Now,
-                    });
+                    };
+                    await _context.InsigniaNoteProfiles.AddAsync(profile);
                 }
                 else
                 {
@@ -1497,7 +1592,29 @@ namespace BMA.EHR.Insignia.Service.Controllers
                     profile.LastUpdateUserId = UserId ?? "";
                     profile.LastUpdatedAt = DateTime.Now;
                 }
-                //////////////บันทึกลงทะเบียน
+                await _context.ProfileInsignias.AddAsync(new ProfileInsignia
+                {
+                    Year = insigniaNote.Year,
+                    No = profile.No,
+                    Issue = profile.VolumeNo,
+                    VolumeNo = profile.VolumeNo,
+                    // Volume = profile.Volume,
+                    Section = profile.Section,
+                    Page = profile.Page,
+                    DateAnnounce = profile.DateReceive,
+                    ReceiveDate = profile.Date,
+                    InsigniaType = profile.RequestInsignia.InsigniaType == null ? null : profile.RequestInsignia.InsigniaType.Name,
+                    Insignia = profile.RequestInsignia,
+                    // RefCommandNo = req.RefCommandNo,
+                    // RefCommandDate = req.RefCommandDate,
+                    Profile = profile.Profile,
+                    CreatedUserId = FullName ?? "",
+                    CreatedFullName = UserId ?? "System Administrator",
+                    CreatedAt = DateTime.Now,
+                    LastUpdateFullName = FullName ?? "System Administrator",
+                    LastUpdateUserId = UserId ?? "",
+                    LastUpdatedAt = DateTime.Now,
+                });
             }
             await _context.SaveChangesAsync();
             return Success();
@@ -1551,71 +1668,223 @@ namespace BMA.EHR.Insignia.Service.Controllers
             return Success();
         }
 
-        private async Task<List<ImportReceiveRequest>> ReadExcelImportReceive(IFormFile formFile)
+        /// <summary>
+        /// preview บันทึกผลการได้รับเครื่องราชฯ
+        /// </summary>
+        /// <param name="insigniaNoteId">Id รอบบันทึกผลเครื่องราช</param>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("preview/receice/{insigniaNoteId:length(36)}"), DisableRequestSizeLimit]
+        public async Task<ActionResult<ResponseObject>> PreviewReceiceProfile([FromForm] ImportFileRequest req, Guid insigniaNoteId)
         {
-            var list = new List<ImportReceiveRequest>();
-            using (var stream = new MemoryStream())
+            var insigniaNote = await _context.InsigniaNotes
+                                    .Include(x => x.InsigniaNoteProfiles)
+                                    .ThenInclude(x => x.Profile)
+                                    .Include(x => x.InsigniaNoteProfiles)
+                                    .ThenInclude(x => x.RequestInsignia)
+                                    .ThenInclude(x => x.InsigniaType)
+                                    .Include(x => x.InsigniaNoteProfiles)
+                                    .ThenInclude(x => x.Profile)
+                                    .ThenInclude(x => x.Prefix)
+                                    .Include(x => x.InsigniaNoteProfiles)
+                                    .ThenInclude(x => x.Profile)
+                                    .ThenInclude(x => x.Position)
+                                    .FirstOrDefaultAsync(x => x.Id == insigniaNoteId);
+            if (insigniaNote == null)
+                return Error(GlobalMessages.InsigniaRequestNotFound);
+
+            if (Request.Form.Files == null || Request.Form.Files.Count == 0)
             {
-                await formFile.CopyToAsync(stream);
-                using (var package = new ExcelPackage(stream))
-                {
-                    for (int i = 0; i < package.Workbook.Worksheets.Count(); i++)
-                    {
-                        ExcelWorksheet worksheet = package.Workbook.Worksheets[i];
-                        var rowCount = worksheet.Dimension.Rows;
-                        for (int row = 2; row <= rowCount; row++)
-                        {
-                            list.Add(new ImportReceiveRequest
-                            {
-                                Number = worksheet.Cells[row, 1].Value != null ? worksheet.Cells[row, 1].Value.ToString() : null,
-                                RequestInsignia = worksheet.Cells[row, 2].Value != null ? worksheet.Cells[row, 2].Value.ToString() : null,
-                                CitizanId = worksheet.Cells[row, 3].Value != null ? worksheet.Cells[row, 3].Value.ToString() : null,
-                                Prefix = worksheet.Cells[row, 4].Value != null ? worksheet.Cells[row, 4].Value.ToString() : null,
-                                FullName = worksheet.Cells[row, 5].Value != null ? worksheet.Cells[row, 5].Value.ToString() : null,
-                                Position = worksheet.Cells[row, 6].Value != null ? worksheet.Cells[row, 6].Value.ToString() : null,
-                                DateReceive = worksheet.Cells[row, 7].Value != null ? DateTime.Parse(worksheet.Cells[row, 7].Value.ToString()) : null,
-                                OrgSend = worksheet.Cells[row, 8].Value != null ? worksheet.Cells[row, 8].Value.ToString() : null,
-                                OrgReceive = worksheet.Cells[row, 9].Value != null ? worksheet.Cells[row, 9].Value.ToString() : null,
-                                Date = worksheet.Cells[row, 10].Value != null ? DateTime.Parse(worksheet.Cells[row, 10].Value.ToString()) : null,
-                                VolumeNo = worksheet.Cells[row, 11].Value != null ? worksheet.Cells[row, 11].Value.ToString() : null,
-                                Section = worksheet.Cells[row, 12].Value != null ? worksheet.Cells[row, 12].Value.ToString() : null,
-                                Page = worksheet.Cells[row, 13].Value != null ? worksheet.Cells[row, 13].Value.ToString() : null,
-                                No = worksheet.Cells[row, 14].Value != null ? worksheet.Cells[row, 14].Value.ToString() : null,
-                            });
-                        }
-                    }
-                }
+                return Error(GlobalMessages.NoFileToUpload);
             }
-            return list;
+            var file = Request.Form.Files[0];
+            if (!Path.GetExtension(file.FileName).Equals(".xlsx", StringComparison.OrdinalIgnoreCase))
+            {
+                return Error("นามสกุลไฟล์ต้องเป็น .xlsx!");
+            }
+            var items = await ReadExcelImportReceive(file);
+            var _insigniaNoteProfiles = new List<dynamic>();
+            foreach (var item in items)
+            {
+                var profile = insigniaNote.InsigniaNoteProfiles.FirstOrDefault(x => x.Profile.CitizenId == item.CitizanId);
+                if (profile == null)
+                {
+                    var _profile = await _context.Profiles
+                                        .Include(x => x.Salaries)
+                                        .FirstOrDefaultAsync(x => x.CitizenId == item.CitizanId);
+                    if (_profile == null)
+                        continue;
+                    var _insignia = await _context.Insignias.FirstOrDefaultAsync(x => x.Name == item.RequestInsignia);
+                    if (_insignia == null)
+                        continue;
+                    profile = new InsigniaNoteProfile
+                    {
+                        RequestDate = DateTime.Now,
+                        Salary = _profile.Salaries.Count() == 0 ? null : _profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount,
+                        IsApprove = true,
+                        Status = "DONE",
+                        Number = item.Number,
+                        RequestInsignia = _insignia,
+                        DateReceive = item.DateReceive,
+                        Date = item.Date,
+                        VolumeNo = item.VolumeNo,
+                        Section = item.Section,
+                        Page = item.Page,
+                        No = item.No,
+                        Profile = _profile,
+                        InsigniaNote = insigniaNote,
+                        LastUpdateFullName = FullName ?? "System Administrator",
+                        LastUpdateUserId = UserId ?? "",
+                        LastUpdatedAt = DateTime.Now,
+                    };
+                }
+                else
+                {
+                    profile.Status = "DONE";
+                    profile.Number = item.Number;
+                    profile.RequestInsignia = await _context.Insignias.FirstOrDefaultAsync(x => x.Name == item.RequestInsignia) == null ? profile.RequestInsignia : await _context.Insignias.FirstOrDefaultAsync(x => x.Name == item.RequestInsignia);
+                    profile.DateReceive = item.DateReceive;
+                    profile.Date = item.Date;
+                    profile.VolumeNo = item.VolumeNo;
+                    profile.Section = item.Section;
+                    profile.Page = item.Page;
+                    profile.No = item.No;
+                    profile.LastUpdateFullName = FullName ?? "System Administrator";
+                    profile.LastUpdateUserId = UserId ?? "";
+                    profile.LastUpdatedAt = DateTime.Now;
+                }
+                _insigniaNoteProfiles.Add(
+                    new
+                    {
+                        profile.Id,
+                        Prefix = profile.Profile.Prefix == null ? null : profile.Profile.Prefix.Name,
+                        Position = profile.Profile.Position == null ? null : profile.Profile.Position.Name,
+                        profile.Profile.CitizenId,
+                        profile.Profile.ProfileType,
+                        FullName = $"{profile.Profile.FirstName} {profile.Profile.LastName}",
+                        RequestInsignia = profile.RequestInsignia == null ? null : profile.RequestInsignia.Name,
+                        RequestInsigniaId = profile.RequestInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : profile.RequestInsignia.Id,
+                        RequestInsigniaShortName = profile.RequestInsignia == null ? null : profile.RequestInsignia.ShortName,
+                        profile.DateReceive,
+                        profile.OrganizationOrganizationSend,
+                        profile.OrganizationOrganizationReceive,
+                        profile.Status,
+                        profile.Issue,
+                        profile.Date,
+                        profile.VolumeNo,
+                        profile.Section,
+                        profile.Page,
+                        profile.No,
+                        profile.DatePayment,
+                        profile.TypePayment,
+                        profile.Address,
+                        profile.Number,
+                        profile.Salary,
+                    }
+                );
+            }
+            return Success(_insigniaNoteProfiles);
         }
 
-        private async Task<List<ImportInvoiceRequest>> ReadExcelImportInvoice(IFormFile formFile)
+        /// <summary>
+        /// preview บันทึกผลใบกำกับเครื่องราชฯ
+        /// </summary>
+        /// <param name="insigniaNoteId">Id รอบบันทึกผลเครื่องราช</param>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("preview/invoice/{insigniaNoteId:length(36)}"), DisableRequestSizeLimit]
+        public async Task<ActionResult<ResponseObject>> PreviewInvoiceProfile([FromForm] ImportFileRequest req, Guid insigniaNoteId)
         {
-            var list = new List<ImportInvoiceRequest>();
-            using (var stream = new MemoryStream())
+            var insigniaNote = await _context.InsigniaNotes
+                                    .Include(x => x.InsigniaNoteProfiles)
+                                    .ThenInclude(x => x.Profile)
+                                    .Include(x => x.InsigniaNoteProfiles)
+                                    .ThenInclude(x => x.RequestInsignia)
+                                    .ThenInclude(x => x.InsigniaType)
+                                    .Include(x => x.InsigniaNoteProfiles)
+                                    .ThenInclude(x => x.Profile)
+                                    .ThenInclude(x => x.Prefix)
+                                    .Include(x => x.InsigniaNoteProfiles)
+                                    .ThenInclude(x => x.Profile)
+                                    .ThenInclude(x => x.Position)
+                                    .FirstOrDefaultAsync(x => x.Id == insigniaNoteId);
+            if (insigniaNote == null)
+                return Error(GlobalMessages.InsigniaRequestNotFound);
+
+            if (Request.Form.Files == null || Request.Form.Files.Count == 0)
             {
-                await formFile.CopyToAsync(stream);
-                using (var package = new ExcelPackage(stream))
-                {
-                    for (int i = 0; i < package.Workbook.Worksheets.Count(); i++)
-                    {
-                        ExcelWorksheet worksheet = package.Workbook.Worksheets[i];
-                        var rowCount = worksheet.Dimension.Rows;
-                        for (int row = 2; row <= rowCount; row++)
-                        {
-                            list.Add(new ImportInvoiceRequest
-                            {
-                                CitizanId = worksheet.Cells[row, 1].Value != null ? worksheet.Cells[row, 1].Value.ToString() : null,
-                                Number = worksheet.Cells[row, 2].Value != null ? worksheet.Cells[row, 2].Value.ToString() : null,
-                                DatePayment = worksheet.Cells[row, 3].Value != null ? DateTime.Parse(worksheet.Cells[row, 3].Value.ToString()) : null,
-                                TypePayment = worksheet.Cells[row, 4].Value != null ? worksheet.Cells[row, 4].Value.ToString() : null,
-                                Address = worksheet.Cells[row, 5].Value != null ? worksheet.Cells[row, 5].Value.ToString() : null,
-                            });
-                        }
-                    }
-                }
+                return Error(GlobalMessages.NoFileToUpload);
             }
-            return list;
+            var file = Request.Form.Files[0];
+            if (!Path.GetExtension(file.FileName).Equals(".xlsx", StringComparison.OrdinalIgnoreCase))
+            {
+                return Error("นามสกุลไฟล์ต้องเป็น .xlsx!");
+            }
+            var items = await ReadExcelImportInvoice(file);
+            foreach (var item in items)
+            {
+                var profile = insigniaNote.InsigniaNoteProfiles.FirstOrDefault(x => x.Profile.CitizenId == item.CitizanId);
+                if (profile == null)
+                    continue;
+                profile.Number = item.Number;
+                profile.DatePayment = item.DatePayment;
+                profile.TypePayment = item.TypePayment;
+                profile.Address = item.Address;
+                profile.LastUpdateFullName = FullName ?? "System Administrator";
+                profile.LastUpdateUserId = UserId ?? "";
+                profile.LastUpdatedAt = DateTime.Now;
+            }
+            var _insigniaNoteProfiles = new List<dynamic>();
+            foreach (var item in items)
+            {
+                var profile = insigniaNote.InsigniaNoteProfiles.FirstOrDefault(x => x.Profile.CitizenId == item.CitizanId);
+                if (profile == null)
+                    continue;
+                profile.Status = "DONE";
+                profile.Number = item.Number;
+                profile.DatePayment = item.DatePayment;
+                profile.TypePayment = item.TypePayment;
+                profile.Address = item.Address;
+                profile.LastUpdateFullName = FullName ?? "System Administrator";
+                profile.LastUpdateUserId = UserId ?? "";
+                profile.LastUpdatedAt = DateTime.Now;
+                _insigniaNoteProfiles.Add(
+                    new
+                    {
+                        profile.Id,
+                        Prefix = profile.Profile.Prefix == null ? null : profile.Profile.Prefix.Name,
+                        Position = profile.Profile.Position == null ? null : profile.Profile.Position.Name,
+                        profile.Profile.CitizenId,
+                        profile.Profile.ProfileType,
+                        FullName = $"{profile.Profile.FirstName} {profile.Profile.LastName}",
+                        RequestInsignia = profile.RequestInsignia == null ? null : profile.RequestInsignia.Name,
+                        RequestInsigniaId = profile.RequestInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : profile.RequestInsignia.Id,
+                        RequestInsigniaShortName = profile.RequestInsignia == null ? null : profile.RequestInsignia.ShortName,
+                        profile.DateReceive,
+                        profile.OrganizationOrganizationSend,
+                        profile.OrganizationOrganizationReceive,
+                        profile.Status,
+                        profile.Issue,
+                        profile.Date,
+                        profile.VolumeNo,
+                        profile.Section,
+                        profile.Page,
+                        profile.No,
+                        profile.DatePayment,
+                        profile.TypePayment,
+                        profile.Address,
+                        profile.Number,
+                        profile.Salary,
+                    }
+                );
+            }
+            return Success(_insigniaNoteProfiles);
         }
 
     }

BMA.EHR.Retirement.Service/Controllers/RetirementDeceasedController.cs

@@ -1,6 +1,7 @@
 using BMA.EHR.Application.Repositories;
 using BMA.EHR.Domain.Common;
 using BMA.EHR.Domain.Extensions;
+using BMA.EHR.Domain.Models.HR;
 using BMA.EHR.Domain.Models.MetaData;
 using BMA.EHR.Domain.Models.Retirement;
 using BMA.EHR.Domain.Shared;
@@ -247,6 +248,22 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 if (_doc != null)
                     retirementDeceased.Document = _doc;
             }
+            await _context.ProfileSalaries.AddAsync(new ProfileSalary
+            {
+                Date = req.Date,
+                SalaryRef = req.Number,
+                CommandNo = "-",
+                SalaryClass = "-",
+                PosNoEmployee = "-",
+                CommandTypeName = "-",
+                Profile = profile,
+                CreatedUserId = FullName ?? "",
+                CreatedFullName = UserId ?? "System Administrator",
+                CreatedAt = DateTime.Now,
+                LastUpdateFullName = FullName ?? "System Administrator",
+                LastUpdateUserId = UserId ?? "",
+                LastUpdatedAt = DateTime.Now,
+            });
             await _context.SaveChangesAsync();
 
             return Success();

BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs

@@ -560,6 +560,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                             FutureWork = p.FutureWork,
                             FutureWorkReason = p.FutureWorkReason,
                             Suggestion = p.Suggestion,
+                            AppointDate = p.AppointDate,
                             LastUpdatedAt = p.LastUpdatedAt,
                             CreatedAt = p.CreatedAt,
                         })
@@ -591,6 +592,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                 data.FutureWork,
                 data.FutureWorkReason,
                 data.Suggestion,
+                data.AppointDate,
                 data.LastUpdatedAt,
                 data.CreatedAt,
             };
@@ -717,5 +719,32 @@ namespace BMA.EHR.Retirement.Service.Controllers
 
             return Success();
         }
+
+        /// <summary>
+        /// แก้ไขกําหนดวันนัดหมายเพื่อทําการสัมภาษณ์การลาออก
+        /// </summary>
+        /// <param name="id">Id กําหนดวันนัดหมายเพื่อทําการสัมภาษณ์การลาออก</param>
+        /// <returns></returns>
+        /// <response code="200"></response>
+        /// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
+        /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
+        /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
+        [HttpPut("questionnaire/appoint/{id:length(36)}")]
+        public async Task<ActionResult<ResponseObject>> UpdateAppointQuestion([FromBody] RetirementQuestionAppointRequest req, Guid id)
+        {
+            var uppdated = await _context.RetirementQuestions.AsQueryable()
+                            .FirstOrDefaultAsync(x => x.Id == id);
+            if (uppdated == null)
+                return Error(GlobalMessages.RetirementQuestionNotFound);
+
+            uppdated.AppointDate = req.AppointDate;
+            uppdated.LastUpdateFullName = FullName ?? "System Administrator";
+            uppdated.LastUpdateUserId = UserId ?? "";
+            uppdated.LastUpdatedAt = DateTime.Now;
+
+            await _context.SaveChangesAsync();
+
+            return Success();
+        }
     }
 }

BMA.EHR.Retirement.Service/Requests/RetirementQuestionAppointRequest.cs

@@ -0,0 +1,10 @@
+using BMA.EHR.Domain.Models.MetaData;
+using Microsoft.EntityFrameworkCore;
+
+namespace BMA.EHR.Retirement.Service.Requests
+{
+    public class RetirementQuestionAppointRequest
+    {
+        public DateTime AppointDate { get; set; }
+    }
+}