Merge branch 'develop' into working

BMA.EHR.Domain/Models/Placement/PlacementReceive.cs

@@ -64,6 +64,10 @@ namespace BMA.EHR.Domain.Models.Placement
         public string? profileId { get; set; }
         [Comment("คำนำหน้า")]
         public string? prefix { get; set; }
+
+        [Comment("ยศ")]
+        public string? rank { get; set; }
+
         [Comment("ชื่อ")]
         public string? firstName { get; set; }
         [Comment("นามสกุล")]

BMA.EHR.Infrastructure/Migrations/20260512073417_update_PlacementReceives_add_rank.cs

@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class update_PlacementReceives_add_rank : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "rank",
+                table: "PlacementReceives",
+                type: "longtext",
+                nullable: true,
+                comment: "ยศ")
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "rank",
+                table: "PlacementReceives");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs

@@ -13693,6 +13693,10 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasColumnType("longtext")
                         .HasComment("profile Id");
 
+                    b.Property<string>("rank")
+                        .HasColumnType("longtext")
+                        .HasComment("ยศ");
+
                     b.Property<string>("root")
                         .HasColumnType("longtext")
                         .HasComment("ชื่อหน่วยงาน root");

BMA.EHR.Placement.Service/Controllers/PlacementReceiveController.cs

@@ -129,6 +129,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                             {
                                 p.Id,
                                 p.prefix,
+                                p.rank,
                                 p.firstName,
                                 p.lastName,
                                 p.citizenId,
@@ -280,6 +281,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                             // ProfileId = p.Profile.Id,
                             p.citizenId,
                             p.prefix,
+                            p.rank,
                             p.firstName,
                             p.lastName,
                             p.DateOfBirth,
@@ -377,6 +379,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 // data.ProfileId,
                 data.citizenId,
                 data.prefix,
+                data.rank,
                 data.firstName,
                 data.lastName,
                 data.DateOfBirth,
@@ -484,6 +487,7 @@ namespace BMA.EHR.Placement.Service.Controllers
                 // Profile = profile,
                 citizenId = req.citizenId,
                 prefix = req.prefix,
+                rank = req.rank,
                 firstName = req.firstName,
                 lastName = req.lastName,
                 DateOfBirth = req.BirthDate,
@@ -852,6 +856,7 @@ namespace BMA.EHR.Placement.Service.Controllers
             uppdated.Gender = req.Gender;
             uppdated.citizenId = req.citizenId;
             uppdated.prefix = req.prefix;
+            uppdated.rank = req.rank;
             uppdated.firstName = req.firstName;
             uppdated.lastName = req.lastName;
             uppdated.DateOfBirth = req.DateOfBirth;

BMA.EHR.Placement.Service/Requests/PlacementReceiveEditRequest.cs

@@ -6,7 +6,8 @@ namespace BMA.EHR.Placement.Service.Requests
     public class PlacementReceiveEditRequest
     {
         public string citizenId { get; set; }
-        public string prefix { get; set; }
+        public string? prefix { get; set; }
+        public string? rank { get; set; }
         public string firstName { get; set; }
         public string lastName { get; set; }
         public DateTime DateOfBirth { get; set; }

BMA.EHR.Placement.Service/Requests/PlacementReceiveRequest.cs

@@ -6,7 +6,9 @@ namespace BMA.EHR.Placement.Service.Requests
     public class PlacementReceiveRequest
     {
         public string citizenId { get; set; }
-        public string prefix { get; set; }
+
+        public string? prefix { get; set; }
+        public string? rank { get; set; }
         public string firstName { get; set; }
         public string lastName { get; set; }
         public DateTime BirthDate { get; set; }