Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

BMA.EHR.Application/Requests/InsigniaResultSet.cs

@@ -68,6 +68,14 @@ namespace BMA.EHR.Application.Requests
         public string? Child4 { get; set; }
 
         public List<MatchingCondition> MatchingConditions { get; set; } = new List<MatchingCondition>();
+
+        public bool? MarkDiscipline { get; set; } = false;
+
+        public bool? MarkLeave { get; set; } = false;
+
+        public bool? MarkRate { get; set; } = false;
+
+        public bool? MarkInsignia { get; set; } = false;
     }
 
     public class MatchingCondition

BMA.EHR.Application/Responses/Profiles/GetProfileByRootIdDto.cs

@@ -65,5 +65,13 @@ namespace BMA.EHR.Application.Responses.Profiles
         public string? Child4 { get; set; }
 
         public string? ProfileType { get; set; }
+
+        public bool? MarkDiscipline { get; set; } = false;
+
+        public bool? MarkLeave { get; set; } = false;
+
+        public bool? MarkRate { get; set; } = false;
+
+        public bool? MarkInsignia { get; set; } = false;
     }
 }

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

@@ -87,5 +87,7 @@ namespace BMA.EHR.Domain.Models.Insignias
         public Guid? Child4Id { get; set; }
         public Guid? Child4DnaId { get; set; }
         public string? Child4 { get; set; }
+
+        public bool? MarkInsignia { get; set; } = false;
     }
 }

BMA.EHR.Infrastructure/Migrations/20250515023219_Add MarkInsignia Field.cs

@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddMarkInsigniaField : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "MarkInsignia",
+                table: "InsigniaRequestProfiles",
+                type: "tinyint(1)",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "MarkInsignia",
+                table: "InsigniaRequestProfiles");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs

@@ -6674,6 +6674,9 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasColumnType("tinyint(1)")
                         .HasComment("แจ้งเตือน มีโทษทางวินัย");
 
+                    b.Property<bool?>("MarkInsignia")
+                        .HasColumnType("tinyint(1)");
+
                     b.Property<bool?>("MarkLeave")
                         .HasColumnType("tinyint(1)")
                         .HasComment("แจ้งเตือน ไม่ได้เลื่อนเงินเดือน/ไม่ได้เลื่อนขั้น เนื่องจากลาเกิน");

BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs

@@ -265,7 +265,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
                              requestDoc = "", //irp.DocumentStatus,
                              requestNote = "", // irp.Note,
                              requestSalary = irp.Salary,
-                             matchingConditions = JsonConvert.DeserializeObject<List<MatchingCondition>>(irp.MatchingConditions)
+                             matchingConditions = JsonConvert.DeserializeObject<List<MatchingCondition>>(irp.MatchingConditions),
+                             irp.MarkRate,
+                             irp.MarkLeave,
+                             irp.MarkInsignia,
+                             irp.MarkDiscipline
                          })
                          .OrderBy(x => x.citizenId)
                          .ToList();