Merge branch 'develop' into working

BMA.EHR.Domain/Models/Organizations/OrganizationEntity.cs

@@ -34,11 +34,11 @@ namespace BMA.EHR.Domain.Models.Organizations
         [Column(Order = 9), Comment("ParentId")]
         public OrganizationEntity? Parent { get; set; }
 
-        // [Column(Order = 10), Comment("OrganizationAgencyId")]
+        [Column(Order = 10), Comment("OrganizationAgencyId")]
-        // public OrganizationAgency? OrganizationAgency { get; set; }
+        public OrganizationAgency? OrganizationAgency { get; set; }
 
-        // [Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
+        [Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
-        // public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; }
+        public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; }
 
         [Column(Order = 12), Comment("OrganizationOrder")]
         public int? OrganizationOrder { get; set; }

BMA.EHR.Infrastructure/Migrations/20230807061916_update table org add orgagency.cs

@@ -0,0 +1,81 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class updatetableorgaddorgagency : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "OrganizationAgencyId",
+                table: "Organizations",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "OrganizationGovernmentAgencyId",
+                table: "Organizations",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Organizations_OrganizationAgencyId",
+                table: "Organizations",
+                column: "OrganizationAgencyId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Organizations_OrganizationGovernmentAgencyId",
+                table: "Organizations",
+                column: "OrganizationGovernmentAgencyId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Organizations_OrganizationAgencys_OrganizationAgencyId",
+                table: "Organizations",
+                column: "OrganizationAgencyId",
+                principalTable: "OrganizationAgencys",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Organizations_OrganizationGovernmentAgencys_OrganizationGove~",
+                table: "Organizations",
+                column: "OrganizationGovernmentAgencyId",
+                principalTable: "OrganizationGovernmentAgencys",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Organizations_OrganizationAgencys_OrganizationAgencyId",
+                table: "Organizations");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Organizations_OrganizationGovernmentAgencys_OrganizationGove~",
+                table: "Organizations");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Organizations_OrganizationAgencyId",
+                table: "Organizations");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Organizations_OrganizationGovernmentAgencyId",
+                table: "Organizations");
+
+            migrationBuilder.DropColumn(
+                name: "OrganizationAgencyId",
+                table: "Organizations");
+
+            migrationBuilder.DropColumn(
+                name: "OrganizationGovernmentAgencyId",
+                table: "Organizations");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs

@@ -8655,9 +8655,15 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .HasColumnOrder(102)
                         .HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
 
+                    b.Property<Guid?>("OrganizationAgencyId")
+                        .HasColumnType("char(36)");
+
                     b.Property<Guid?>("OrganizationFaxId")
                         .HasColumnType("char(36)");
 
+                    b.Property<Guid?>("OrganizationGovernmentAgencyId")
+                        .HasColumnType("char(36)");
+
                     b.Property<Guid?>("OrganizationLevelId")
                         .HasColumnType("char(36)");
 
@@ -8699,8 +8705,12 @@ namespace BMA.EHR.Infrastructure.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("OrganizationAgencyId");
+
                     b.HasIndex("OrganizationFaxId");
 
+                    b.HasIndex("OrganizationGovernmentAgencyId");
+
                     b.HasIndex("OrganizationLevelId");
 
                     b.HasIndex("OrganizationOrganizationId");
@@ -11920,10 +11930,18 @@ namespace BMA.EHR.Infrastructure.Migrations
 
             modelBuilder.Entity("BMA.EHR.Domain.Models.Organizations.OrganizationEntity", b =>
                 {
+                    b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationAgency", "OrganizationAgency")
+                        .WithMany()
+                        .HasForeignKey("OrganizationAgencyId");
+
                     b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationFax", "OrganizationFax")
                         .WithMany()
                         .HasForeignKey("OrganizationFaxId");
 
+                    b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationGovernmentAgency", "OrganizationGovernmentAgency")
+                        .WithMany()
+                        .HasForeignKey("OrganizationGovernmentAgencyId");
+
                     b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationLevel", "OrganizationLevel")
                         .WithMany()
                         .HasForeignKey("OrganizationLevelId");
@@ -11956,8 +11974,12 @@ namespace BMA.EHR.Infrastructure.Migrations
                         .WithMany("Organizations")
                         .HasForeignKey("ParentId");
 
+                    b.Navigation("OrganizationAgency");
+
                     b.Navigation("OrganizationFax");
 
+                    b.Navigation("OrganizationGovernmentAgency");
+
                     b.Navigation("OrganizationLevel");
 
                     b.Navigation("OrganizationOrganization");

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

@@ -164,6 +164,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                                         Year = x.Year,
                                         Round = x.Round,
                                         Total = x.Total,
+                                        TypeReport = x.TypeReport,
                                         Json = true,
                                     })
                                     .ToListAsync();
@@ -182,6 +183,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
                         Year = retire.Year,
                         Round = retire.Round,
                         Total = retire.RetirementProfiles.Count(),
+                        TypeReport = retire.TypeReport,
                         Json = false,
                     });
                 }