hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

แก้ไขข้อมมูลบุคคลบรรจุ

Browse source
This commit is contained in:
Kittapath 2023-07-05 16:22:44 +07:00
parent 0c56512f54
commit 258a95a0e2
19 changed files with 11975 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

13
BMA.EHR.Domain/Models/Organizations/AvailablePositionLevelEntity.cs
View file

@ -1,4 +1,5 @@
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.MetaData;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@ -8,17 +9,13 @@ namespace BMA.EHR.Domain.Models.Organizations
public class AvailablePositionLevelEntity : EntityBase
{
[ForeignKey("PositionMasterId")]
public PositionMasterEntity? PositionMaster_PositionMasterId { get; set; }
// [ForeignKey("PositionMasterId")]
// public PositionMasterEntity? PositionMaster_PositionMasterId { get; set; }
[Column(Order = 2), Comment("PositionMasterId")]
public Guid? PositionMasterId { get; set; }
public PositionMasterEntity? PositionMaster { get; set; }
[Column(Order = 3), Comment("PositionLevelId")]
public Guid? PositionLevelId { get; set; }
public PositionLevel? PositionLevel { get; set; }
}
}

53
BMA.EHR.Domain/Models/Organizations/OrganizationEntity.cs
View file

@ -2,65 +2,44 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.MetaData;
namespace BMA.EHR.Domain.Models.Organizations
{
public class OrganizationEntity : EntityBase
{
//[ForeignKey("OrganizationOrganizationId")]
//public OrganizationOrganization? OrganizationOrganization_OrganizationOrganizationId { get; set; }
[Column(Order = 2), Comment("OrganizationOrganizationId")]
public Guid? OrganizationOrganizationId { get; set; }
//[ForeignKey("OrganizationShortNameId")]
//public OrganizationShortName? OrganizationShortName_OrganizationShortNameId { get; set; }
public OrganizationOrganization? OrganizationOrganization { get; set; }
[Column(Order = 3), Comment("OrganizationShortNameId")]
public Guid? OrganizationShortNameId { get; set; }
//[ForeignKey("OrganizationTypeId")]
//public OrganizationType? OrganizationType_OrganizationTypeId { get; set; }
public OrganizationShortName? OrganizationShortName { get; set; }
[Column(Order = 4), Comment("OrganizationTypeId")]
public Guid? OrganizationTypeId { get; set; }
//[ForeignKey("OrganizationLevelId")]
//public OrganizationLevel? OrganizationLevel_OrganizationLevelId { get; set; }
public OrganizationType? OrganizationType { get; set; }
[Column(Order = 5), Comment("OrganizationLevelId")]
public Guid? OrganizationLevelId { get; set; }
//[ForeignKey("OrganizationTelExternalId")]
//public OrganizationTelExternal? OrganizationTelExternal_OrganizationTelExternalId { get; set; }
public OrganizationLevel? OrganizationLevel { get; set; }
[Column(Order = 6), Comment("OrganizationTelExternalId")]
public Guid? OrganizationTelExternalId { get; set; }
//[ForeignKey("OrganizationTelInternalId")]
//public OrganizationTelInternal? OrganizationTelInternal_OrganizationTelInternalId { get; set; }
public OrganizationTelExternal? OrganizationTelExternal { get; set; }
[Column(Order = 7), Comment("OrganizationTelInternalId")]
public Guid? OrganizationTelInternalId { get; set; }
//[ForeignKey("OrganizationFaxId")]
//public OrganizationFax? OrganizationFax_OrganizationFaxId { get; set; }
public OrganizationTelInternal? OrganizationTelInternal { get; set; }
[Column(Order = 8), Comment("OrganizationFaxId")]
public Guid? OrganizationFaxId { get; set; }
public OrganizationFax? OrganizationFax { get; set; }
[ForeignKey("ParentId")]
public OrganizationEntity? Organization_ParentId { get; set; }
// [ForeignKey("ParentId")]
// public OrganizationEntity? Organization_ParentId { get; set; }
[Column(Order = 9), Comment("ParentId")]
public Guid? ParentId { get; set; }
public OrganizationEntity? Parent { get; set; }
[Column(Order = 10), Comment("OrganizationAgencyId")]
public Guid? OrganizationAgencyId { get; set; }
// [Column(Order = 10), Comment("OrganizationAgencyId")]
// public OrganizationAgency? OrganizationAgency { get; set; }
[Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
public Guid? OrganizationGovernmentAgencyId { get; set; }
// [Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
// public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; }
[Column(Order = 12), Comment("OrganizationOrder")]
public int? OrganizationOrder { get; set; }
@ -80,7 +59,7 @@ namespace BMA.EHR.Domain.Models.Organizations
[Column(Order = 17), Comment("กอง")]
public string? Pile { get; set; }
public Guid? OrganizationStatusId { get; set; }
public OrganizationStatus? OrganizationStatus { get; set; }
public List<OrganizationEntity> Organizations { get; } = new();

14
BMA.EHR.Domain/Models/Organizations/OrganizationPositionEntity.cs
View file

@ -8,11 +8,11 @@ namespace BMA.EHR.Domain.Models.Organizations
public class OrganizationPositionEntity : EntityBase
{
[ForeignKey("PositionMasterId")]
public PositionMasterEntity? PositionMaster_PositionMasterId { get; set; }
// [ForeignKey("PositionMasterId")]
// public PositionMasterEntity? PositionMaster_PositionMasterId { get; set; }
[Column(Order = 2), Comment("Position Master")]
public Guid? PositionMasterId { get; set; }
public PositionMasterEntity? PositionMaster { get; set; }
[Column(Order = 3), Comment("Is Director")]
public bool? IsDirector { get; set; }
@ -20,14 +20,14 @@ namespace BMA.EHR.Domain.Models.Organizations
[Column(Order = 4), Comment("positionUserNote")]
public string? PositionUserNote { get; set; }
[ForeignKey("OrganizationId")]
public OrganizationEntity? Organization_OrganizationId { get; set; }
// [ForeignKey("OrganizationId")]
// public OrganizationEntity? Organization_OrganizationId { get; set; }
[Column(Order = 5), Comment("OrganizationId")]
public Guid? OrganizationId { get; set; }
public OrganizationEntity? Organization { get; set; }
[Column(Order = 6), Comment("PositionNumberId")]
public Guid? PositionNumberId { get; set; }
public PositionNumberEntity? PositionNumber { get; set; }
}
}

40
BMA.EHR.Domain/Models/Organizations/PositionMasterEntity.cs
View file

@ -2,63 +2,39 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.MetaData;
namespace BMA.EHR.Domain.Models.Organizations
{
public class PositionMasterEntity : EntityBase
{
//[ForeignKey("PositionId")]
//public Position? Position_PositionId { get; set; }
[Column(Order = 2), Comment("PositionId")]
public Guid? PositionId { get; set; }
//[ForeignKey("PositionPathId")]
//public PositionPath? PositionPath_PositionPathId { get; set; }
[Column(Order = 3), Comment("PositionPathId")]
public Guid? PositionPathId { get; set; }
//[ForeignKey("PositionTypeId")]
//public PositionType? PositionType_PositionTypeId { get; set; }
public PositionPath? PositionPath { get; set; }
[Column(Order = 4), Comment("PositionTypeId")]
public Guid? PositionTypeId { get; set; }
//[ForeignKey("PositionExecutiveId")]
//public PositionExecutive? PositionExecutive_PositionExecutiveId { get; set; }
public PositionType? PositionType { get; set; }
[Column(Order = 5), Comment("PositionExecutiveId")]
public Guid? PositionExecutiveId { get; set; }
//[ForeignKey("ExcutiveSideId")]
//public PositionExecutiveSide? PositionExecutiveSide_ExcutiveSideId { get; set; }
public PositionExecutive? PositionExecutive { get; set; }
[Column(Order = 6), Comment("PositionExecutiveSideId")]
public Guid? PositionExecutiveSideId { get; set; }
//[ForeignKey("PathSideId")]
//public PositionPathSide? PositionPathSide_PathSideId { get; set; }
public PositionExecutiveSide? PositionExecutiveSide { get; set; }
[Column(Order = 7), Comment("PositionPathSideId")]
public Guid? PositionPathSideId { get; set; }
public PositionPathSide? PositionPathSide { get; set; }
[Column(Order = 8), Comment("PositionLineId")]
public Guid? PositionLineId { get; set; }
//[Column(Order = 9), Comment("PositionLevelId")]
//public Guid? PositionLevelId { get; set; }
public PositionLine? PositionLine { get; set; }
[Column(Order = 10), Comment("PositionStatusId")]
public Guid? PositionStatusId { get; set; }
public PositionStatus? PositionStatus { get; set; }
[Column(Order = 11), Comment("PositionCondition")]
public string? PositionCondition { get; set; }
[Column(Order = 12), Comment("PositionStatus")]
public Guid? PositionStatus { get; set; }
[Column(Order = 13), Comment("PositionMasterUserNote")]
public string? PositionMasterUserNote { get; set; }

10
BMA.EHR.Domain/Models/Organizations/PositionNumberEntity.cs
View file

@ -2,6 +2,7 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.MetaData;
namespace BMA.EHR.Domain.Models.Organizations
{
@ -11,14 +12,7 @@ namespace BMA.EHR.Domain.Models.Organizations
[MaxLength(300), Column(Order = 2), Comment("ชื่อ")]
public string? Name { get; set; }
//[ForeignKey("OrganizationShortNameId")]
//public OrganizationShortName? OrganizationShortName_OrganizationShortNameId { get; set; }
[Column(Order = 3), Comment("Shortname")]
public Guid? OrganizationShortNameId { get; set; }
public OrganizationShortName? OrganizationShortName { get; set; }
}
}

7
BMA.EHR.Domain/Models/Organizations/ProfilePosition.cs
View file

@ -1,4 +1,5 @@
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.HR;
namespace BMA.EHR.Domain.Models.Organizations
{
@ -7,10 +8,8 @@ namespace BMA.EHR.Domain.Models.Organizations
/// </summary>
public class ProfilePosition : EntityBase
{
public OrganizationPositionEntity OrganizationPosition { get; set; }
public OrganizationPositionEntity? OrganizationPosition { get; set; }
public Guid OrganizationPositionId { get; set; }
public Guid? ProfileId { get; set; }
public Profile? Profile { get; set; }
}
}

6
BMA.EHR.Domain/Models/Placement/PlacementProfile.cs
View file

@ -56,12 +56,18 @@ namespace BMA.EHR.Domain.Models.Placement
[MaxLength(40), Comment("สัญชาติ")]
public string? Nationality { get; set; }
[MaxLength(40), Comment("เชื้อชาติ")]
public string? Race { get; set; }
[MaxLength(40), Comment("วันเกิด")]
public DateTime? DateOfBirth { get; set; }
[Comment("Id สถานภาพ")]
public Relationship? Relationship { get; set; }
[Comment("Id กลุ่มเลือด")]
public BloodGroup? BloodGroup { get; set; }
[Comment("Id ศาสนา")]
public Religion? Religion { get; set; }
[MaxLength(200), Comment("อีเมล")]
public string? Email { get; set; }

8
BMA.EHR.Domain/Shared/GlobalMessages.cs
View file

@ -29,6 +29,14 @@
public static readonly string HolidayOfYearNotCopy = "ไม่สามารถคัดลอกวันหยุดย้อนหลังได้";
public static readonly string DestinationHolidayIsExist = "ข้อมูลวันหยุดในปีที่ระบุมีอยู่แล้ว";
public static readonly string ProvinceNotFound = "ไม่พบข้อมูลจังหวัด";
public static readonly string DistrictNotFound = "ไม่พบข้อมูลเขต";
public static readonly string SubDistrictNotFound = "ไม่พบข้อมูลแขวง";
public static readonly string PrefixNotFound = "ไม่พบข้อมูลคำนำหน้า";
public static readonly string GenderNotFound = "ไม่พบข้อมูลเพศ";
public static readonly string RelationshipNotFound = "ไม่พบข้อมูลความสัมพันธ์";
public static readonly string BloodGroupNotFound = "ไม่พบข้อมูลกลุ่มเลือก";
public static readonly string ReligionNotFound = "ไม่พบข้อมูลศาสนา";
#endregion

10312
BMA.EHR.Infrastructure/Migrations/20230705060909_Update table Org link table.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

1029
BMA.EHR.Infrastructure/Migrations/20230705060909_Update table Org link table.cs Normal file
View file

File diff suppressed because it is too large Load diff

279
BMA.EHR.Infrastructure/Migrations/ApplicationDBContextModelSnapshot.cs
View file

@ -7371,17 +7371,15 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
b.Property<Guid?>("PositionLevelId")
.HasColumnType("char(36)")
.HasColumnOrder(3)
.HasComment("PositionLevelId");
.HasColumnType("char(36)");
b.Property<Guid?>("PositionMasterId")
.HasColumnType("char(36)")
.HasColumnOrder(2)
.HasComment("PositionMasterId");
.HasColumnType("char(36)");
b.HasKey("Id");
b.HasIndex("PositionLevelId");
b.HasIndex("PositionMasterId");
b.ToTable("AvailablePositionLevels");
@ -7449,25 +7447,11 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnOrder(102)
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
b.Property<Guid?>("OrganizationAgencyId")
.HasColumnType("char(36)")
.HasColumnOrder(10)
.HasComment("OrganizationAgencyId");
b.Property<Guid?>("OrganizationFaxId")
.HasColumnType("char(36)")
.HasColumnOrder(8)
.HasComment("OrganizationFaxId");
b.Property<Guid?>("OrganizationGovernmentAgencyId")
.HasColumnType("char(36)")
.HasColumnOrder(11)
.HasComment("OrganizationGovernmentAgencyId");
.HasColumnType("char(36)");
b.Property<Guid?>("OrganizationLevelId")
.HasColumnType("char(36)")
.HasColumnOrder(5)
.HasComment("OrganizationLevelId");
.HasColumnType("char(36)");
b.Property<int?>("OrganizationOrder")
.HasColumnType("int")
@ -7475,32 +7459,22 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasComment("OrganizationOrder");
b.Property<Guid?>("OrganizationOrganizationId")
.HasColumnType("char(36)")
.HasColumnOrder(2)
.HasComment("OrganizationOrganizationId");
.HasColumnType("char(36)");
b.Property<Guid?>("OrganizationShortNameId")
.HasColumnType("char(36)")
.HasColumnOrder(3)
.HasComment("OrganizationShortNameId");
.HasColumnType("char(36)");
b.Property<Guid?>("OrganizationStatusId")
.HasColumnType("char(36)");
b.Property<Guid?>("OrganizationTelExternalId")
.HasColumnType("char(36)")
.HasColumnOrder(6)
.HasComment("OrganizationTelExternalId");
.HasColumnType("char(36)");
b.Property<Guid?>("OrganizationTelInternalId")
.HasColumnType("char(36)")
.HasColumnOrder(7)
.HasComment("OrganizationTelInternalId");
.HasColumnType("char(36)");
b.Property<Guid?>("OrganizationTypeId")
.HasColumnType("char(36)")
.HasColumnOrder(4)
.HasComment("OrganizationTypeId");
.HasColumnType("char(36)");
b.Property<string>("OrganizationUserNote")
.HasColumnType("longtext")
@ -7508,9 +7482,7 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasComment("OrganizationUserNote");
b.Property<Guid?>("ParentId")
.HasColumnType("char(36)")
.HasColumnOrder(9)
.HasComment("ParentId");
.HasColumnType("char(36)");
b.Property<string>("Pile")
.HasColumnType("longtext")
@ -7519,6 +7491,22 @@ namespace BMA.EHR.Infrastructure.Migrations
b.HasKey("Id");
b.HasIndex("OrganizationFaxId");
b.HasIndex("OrganizationLevelId");
b.HasIndex("OrganizationOrganizationId");
b.HasIndex("OrganizationShortNameId");
b.HasIndex("OrganizationStatusId");
b.HasIndex("OrganizationTelExternalId");
b.HasIndex("OrganizationTelInternalId");
b.HasIndex("OrganizationTypeId");
b.HasIndex("ParentId");
b.ToTable("Organizations");
@ -7577,19 +7565,13 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
b.Property<Guid?>("OrganizationId")
.HasColumnType("char(36)")
.HasColumnOrder(5)
.HasComment("OrganizationId");
.HasColumnType("char(36)");
b.Property<Guid?>("PositionMasterId")
.HasColumnType("char(36)")
.HasColumnOrder(2)
.HasComment("Position Master");
.HasColumnType("char(36)");
b.Property<Guid?>("PositionNumberId")
.HasColumnType("char(36)")
.HasColumnOrder(6)
.HasComment("PositionNumberId");
.HasColumnType("char(36)");
b.Property<string>("PositionUserNote")
.HasColumnType("longtext")
@ -7602,6 +7584,8 @@ namespace BMA.EHR.Infrastructure.Migrations
b.HasIndex("PositionMasterId");
b.HasIndex("PositionNumberId");
b.ToTable("OrganizationPositions");
});
@ -7727,14 +7711,10 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasComment("PositionCondition");
b.Property<Guid?>("PositionExecutiveId")
.HasColumnType("char(36)")
.HasColumnOrder(5)
.HasComment("PositionExecutiveId");
.HasColumnType("char(36)");
b.Property<Guid?>("PositionExecutiveSideId")
.HasColumnType("char(36)")
.HasColumnOrder(6)
.HasComment("PositionExecutiveSideId");
.HasColumnType("char(36)");
b.Property<string>("PositionExecutiveSideObject")
.HasColumnType("longtext");
@ -7745,9 +7725,7 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasComment("PositionId");
b.Property<Guid?>("PositionLineId")
.HasColumnType("char(36)")
.HasColumnOrder(8)
.HasComment("PositionLineId");
.HasColumnType("char(36)");
b.Property<string>("PositionMasterUserNote")
.HasColumnType("longtext")
@ -7755,32 +7733,19 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasComment("PositionMasterUserNote");
b.Property<Guid?>("PositionPathId")
.HasColumnType("char(36)")
.HasColumnOrder(3)
.HasComment("PositionPathId");
.HasColumnType("char(36)");
b.Property<Guid?>("PositionPathSideId")
.HasColumnType("char(36)")
.HasColumnOrder(7)
.HasComment("PositionPathSideId");
.HasColumnType("char(36)");
b.Property<string>("PositionPathSideObject")
.HasColumnType("longtext");
b.Property<Guid?>("PositionStatus")
.HasColumnType("char(36)")
.HasColumnOrder(12)
.HasComment("PositionStatus");
b.Property<Guid?>("PositionStatusId")
.HasColumnType("char(36)")
.HasColumnOrder(10)
.HasComment("PositionStatusId");
.HasColumnType("char(36)");
b.Property<Guid?>("PositionTypeId")
.HasColumnType("char(36)")
.HasColumnOrder(4)
.HasComment("PositionTypeId");
.HasColumnType("char(36)");
b.Property<string>("Qualification")
.HasColumnType("longtext")
@ -7789,6 +7754,20 @@ namespace BMA.EHR.Infrastructure.Migrations
b.HasKey("Id");
b.HasIndex("PositionExecutiveId");
b.HasIndex("PositionExecutiveSideId");
b.HasIndex("PositionLineId");
b.HasIndex("PositionPathId");
b.HasIndex("PositionPathSideId");
b.HasIndex("PositionStatusId");
b.HasIndex("PositionTypeId");
b.ToTable("PositionMasters");
});
@ -7974,12 +7953,12 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasComment("ชื่อ");
b.Property<Guid?>("OrganizationShortNameId")
.HasColumnType("char(36)")
.HasColumnOrder(3)
.HasComment("Shortname");
.HasColumnType("char(36)");
b.HasKey("Id");
b.HasIndex("OrganizationShortNameId");
b.ToTable("PositionNumbers");
});
@ -8030,7 +8009,7 @@ namespace BMA.EHR.Infrastructure.Migrations
.HasColumnOrder(102)
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
b.Property<Guid>("OrganizationPositionId")
b.Property<Guid?>("OrganizationPositionId")
.HasColumnType("char(36)");
b.Property<Guid?>("ProfileId")
@ -8040,6 +8019,8 @@ namespace BMA.EHR.Infrastructure.Migrations
b.HasIndex("OrganizationPositionId");
b.HasIndex("ProfileId");
b.ToTable("ProfilePositions");
});
@ -9786,35 +9767,140 @@ namespace BMA.EHR.Infrastructure.Migrations
modelBuilder.Entity("BMA.EHR.Domain.Models.Organizations.AvailablePositionLevelEntity", b =>
{
b.HasOne("BMA.EHR.Domain.Models.Organizations.PositionMasterEntity", "PositionMaster_PositionMasterId")
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionLevel", "PositionLevel")
.WithMany()
.HasForeignKey("PositionLevelId");
b.HasOne("BMA.EHR.Domain.Models.Organizations.PositionMasterEntity", "PositionMaster")
.WithMany()
.HasForeignKey("PositionMasterId");
b.Navigation("PositionMaster_PositionMasterId");
b.Navigation("PositionLevel");
b.Navigation("PositionMaster");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Organizations.OrganizationEntity", b =>
{
b.HasOne("BMA.EHR.Domain.Models.Organizations.OrganizationEntity", "Organization_ParentId")
b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationFax", "OrganizationFax")
.WithMany()
.HasForeignKey("OrganizationFaxId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationLevel", "OrganizationLevel")
.WithMany()
.HasForeignKey("OrganizationLevelId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationOrganization", "OrganizationOrganization")
.WithMany()
.HasForeignKey("OrganizationOrganizationId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationShortName", "OrganizationShortName")
.WithMany()
.HasForeignKey("OrganizationShortNameId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationStatus", "OrganizationStatus")
.WithMany()
.HasForeignKey("OrganizationStatusId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationTelExternal", "OrganizationTelExternal")
.WithMany()
.HasForeignKey("OrganizationTelExternalId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationTelInternal", "OrganizationTelInternal")
.WithMany()
.HasForeignKey("OrganizationTelInternalId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationType", "OrganizationType")
.WithMany()
.HasForeignKey("OrganizationTypeId");
b.HasOne("BMA.EHR.Domain.Models.Organizations.OrganizationEntity", "Parent")
.WithMany("Organizations")
.HasForeignKey("ParentId");
b.Navigation("Organization_ParentId");
b.Navigation("OrganizationFax");
b.Navigation("OrganizationLevel");
b.Navigation("OrganizationOrganization");
b.Navigation("OrganizationShortName");
b.Navigation("OrganizationStatus");
b.Navigation("OrganizationTelExternal");
b.Navigation("OrganizationTelInternal");
b.Navigation("OrganizationType");
b.Navigation("Parent");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Organizations.OrganizationPositionEntity", b =>
{
b.HasOne("BMA.EHR.Domain.Models.Organizations.OrganizationEntity", "Organization_OrganizationId")
b.HasOne("BMA.EHR.Domain.Models.Organizations.OrganizationEntity", "Organization")
.WithMany()
.HasForeignKey("OrganizationId");
b.HasOne("BMA.EHR.Domain.Models.Organizations.PositionMasterEntity", "PositionMaster_PositionMasterId")
b.HasOne("BMA.EHR.Domain.Models.Organizations.PositionMasterEntity", "PositionMaster")
.WithMany()
.HasForeignKey("PositionMasterId");
b.Navigation("Organization_OrganizationId");
b.HasOne("BMA.EHR.Domain.Models.Organizations.PositionNumberEntity", "PositionNumber")
.WithMany()
.HasForeignKey("PositionNumberId");
b.Navigation("PositionMaster_PositionMasterId");
b.Navigation("Organization");
b.Navigation("PositionMaster");
b.Navigation("PositionNumber");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Organizations.PositionMasterEntity", b =>
{
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionExecutive", "PositionExecutive")
.WithMany()
.HasForeignKey("PositionExecutiveId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionExecutiveSide", "PositionExecutiveSide")
.WithMany()
.HasForeignKey("PositionExecutiveSideId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionLine", "PositionLine")
.WithMany()
.HasForeignKey("PositionLineId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionPath", "PositionPath")
.WithMany()
.HasForeignKey("PositionPathId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionPathSide", "PositionPathSide")
.WithMany()
.HasForeignKey("PositionPathSideId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionStatus", "PositionStatus")
.WithMany()
.HasForeignKey("PositionStatusId");
b.HasOne("BMA.EHR.Domain.Models.MetaData.PositionType", "PositionType")
.WithMany()
.HasForeignKey("PositionTypeId");
b.Navigation("PositionExecutive");
b.Navigation("PositionExecutiveSide");
b.Navigation("PositionLine");
b.Navigation("PositionPath");
b.Navigation("PositionPathSide");
b.Navigation("PositionStatus");
b.Navigation("PositionType");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Organizations.PositionMasterHistoryEntity", b =>
@ -9826,15 +9912,28 @@ namespace BMA.EHR.Infrastructure.Migrations
b.Navigation("PositionMasterEntity");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Organizations.PositionNumberEntity", b =>
{
b.HasOne("BMA.EHR.Domain.Models.MetaData.OrganizationShortName", "OrganizationShortName")
.WithMany()
.HasForeignKey("OrganizationShortNameId");
b.Navigation("OrganizationShortName");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Organizations.ProfilePosition", b =>
{
b.HasOne("BMA.EHR.Domain.Models.Organizations.OrganizationPositionEntity", "OrganizationPosition")
.WithMany()
.HasForeignKey("OrganizationPositionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
.HasForeignKey("OrganizationPositionId");
b.HasOne("BMA.EHR.Domain.Models.HR.Profile", "Profile")
.WithMany()
.HasForeignKey("ProfileId");
b.Navigation("OrganizationPosition");
b.Navigation("Profile");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Organizations.Report2.Report2History", b =>

61
BMA.EHR.MetaData.Service/appsettings.json
View file

@ -1,29 +1,36 @@
{
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Information",
"System": "Warning"
"Serilog": {
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Information",
"System": "Warning"
}
}
}
},
"ElasticConfiguration": {
"Uri": "http://localhost:9200"
},
"AllowedHosts": "*",
"ConnectionStrings": {
//"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
"DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
},
"Jwt": {
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
"Issuer": "https://identity.frappet.com/realms/bma-ehr"
},
"EPPlus": {
"ExcelPackage": {
"LicenseContext": "NonCommercial"
}
},
"Protocol": "HTTPS"
}
},
"ElasticConfiguration": {
"Uri": "http://localhost:9200"
},
"AllowedHosts": "*",
"ConnectionStrings": {
//"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
"DefaultConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
},
"Jwt": {
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
"Issuer": "https://identity.frappet.com/realms/bma-ehr"
},
"EPPlus": {
"ExcelPackage": {
"LicenseContext": "NonCommercial"
}
},
"MinIO": {
"Endpoint": "https://s3.frappet.com/",
"AccessKey": "frappet",
"SecretKey": "P@ssw0rd",
"BucketName": "bma-recruit"
},
"Protocol": "HTTPS"
}

268
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -96,8 +96,8 @@ namespace BMA.EHR.Placement.Service.Controllers
FullName = x.Prefix == null ? null : x.Prefix.Name + $"{x.Firstname} {x.Lastname}",
IdCard = x.CitizenId,
ProfilePhoto = x.Id,
OrganizationName = x.OrganizationPosition == null ? null : x.OrganizationPosition.OrganizationId,////
OrganizationShortName = x.OrganizationPosition == null ? null : x.OrganizationPosition.OrganizationId,////
OrganizationName = x.OrganizationPosition == null ? null : (x.OrganizationPosition.Organization == null ? null : (x.OrganizationPosition.Organization.OrganizationOrganization == null ? null : x.OrganizationPosition.Organization.OrganizationOrganization.Name)),////
OrganizationShortName = x.OrganizationPosition == null ? null : (x.OrganizationPosition.Organization == null ? null : (x.OrganizationPosition.Organization.OrganizationShortName == null ? null : x.OrganizationPosition.Organization.OrganizationShortName.Name)),////
PositionNumber = x.PositionNumber == null ? null : x.PositionNumber.Name,
PositionPath = x.PositionPath == null ? null : x.PositionPath.Name,
ReportingDate = x.ReportingDate,
@ -287,51 +287,285 @@ namespace BMA.EHR.Placement.Service.Controllers
if (save_posNo == null)
return Error(GlobalMessages.PositionPosNoNotFound, 404);
person.PositionNumber = save_posNo;
var save_orgPosition = await _context.OrganizationPositions.FirstOrDefaultAsync(x => x.PositionNumber == save_posNo);
if (save_orgPosition == null)
return Error(GlobalMessages.PositionPosNoNotFound, 404);
person.OrganizationPosition = save_orgPosition;
}
if (req.PositionId != null)
{
var save_position = await _context.PositionPaths.FindAsync(req.PositionId);
if (save_position == null)
var save = await _context.PositionPaths.FindAsync(req.PositionId);
if (save == null)
return Error(GlobalMessages.PositionPathNotFound, 404);
person.PositionPath = save_position;
person.PositionPath = save;
}
if (req.PositionLevelId != null)
{
var save_positionLevel = await _context.PositionLevels.FindAsync(req.PositionLevelId);
if (save_positionLevel == null)
var save = await _context.PositionLevels.FindAsync(req.PositionLevelId);
if (save == null)
return Error(GlobalMessages.PositionLevelNotFound, 404);
person.PositionLevel = save_positionLevel;
person.PositionLevel = save;
}
if (req.PositionLineId != null)
{
var save_positionLine = await _context.PositionLines.FindAsync(req.PositionLineId);
if (save_positionLine == null)
var save = await _context.PositionLines.FindAsync(req.PositionLineId);
if (save == null)
return Error(GlobalMessages.PositionLineNotFound, 404);
person.PositionLine = save_positionLine;
person.PositionLine = save;
}
if (req.PositionPathSideId != null)
{
var save_positionPathSide = await _context.PositionPathSides.FindAsync(req.PositionPathSideId);
if (save_positionPathSide == null)
var save = await _context.PositionPathSides.FindAsync(req.PositionPathSideId);
if (save == null)
return Error(GlobalMessages.PositionPathSideNotFound, 404);
person.PositionPathSide = save_positionPathSide;
person.PositionPathSide = save;
}
if (req.PositionTypeId != null)
{
var save_positionType = await _context.PositionTypes.FindAsync(req.PositionTypeId);
if (save_positionType == null)
var save = await _context.PositionTypes.FindAsync(req.PositionTypeId);
if (save == null)
return Error(GlobalMessages.PositionTypeNotFound, 404);
person.PositionType = save_positionType;
person.PositionType = save;
}
person.Amount = req.SalaryAmount;
person.MouthSalaryAmount = req.MouthSalaryAmount;
person.PositionSalaryAmount = req.PositionSalaryAmount;
person.RecruitDate = req.ContainDate;
person.LastUpdateFullName = FullName ?? "System Administrator";
person.LastUpdateUserId = UserId ?? "";
person.LastUpdatedAt = DateTime.Now;
_context.SaveChanges();
return Success();
}
[HttpGet("information/{personalId:length(36)}")]
public async Task<ActionResult<ResponseObject>> UpdateInformation([FromBody] PersonInformationRequest req, Guid personalId)
{
var person = await _context.PlacementProfiles.FindAsync(personalId);
if (person == null)
return Error(GlobalMessages.DataNotFound, 404);
if (req.PrefixId != null)
{
var save = await _context.Prefixes
.AsQueryable()
.FirstOrDefaultAsync(x => x.Id == req.PrefixId);
if (save == null)
return Error(GlobalMessages.PrefixNotFound, 404);
person.Prefix = save;
}
if (req.GenderId != null)
{
var save = await _context.Genders
.AsQueryable()
.FirstOrDefaultAsync(x => x.Id == req.GenderId);
if (save == null)
return Error(GlobalMessages.GenderNotFound, 404);
person.Gender = save;
}
if (req.RelationshipId != null)
{
var save = await _context.Relationships
.AsQueryable()
.FirstOrDefaultAsync(x => x.Id == req.RelationshipId);
if (save == null)
return Error(GlobalMessages.RelationshipNotFound, 404);
person.Relationship = save;
}
if (req.BloodGroupId != null)
{
var save = await _context.BloodGroups
.AsQueryable()
.FirstOrDefaultAsync(x => x.Id == req.BloodGroupId);
if (save == null)
return Error(GlobalMessages.BloodGroupNotFound, 404);
person.BloodGroup = save;
}
if (req.ReligionId != null)
{
var save = await _context.Religions
.AsQueryable()
.FirstOrDefaultAsync(x => x.Id == req.ReligionId);
if (save == null)
return Error(GlobalMessages.ReligionNotFound, 404);
person.Religion = save;
}
person.CitizenId = req.CitizenId;
person.Firstname = req.FirstName;
person.Lastname = req.LastName;
person.Nationality = req.Nationality;
person.Race = req.Race;
person.DateOfBirth = req.BirthDate;
person.Telephone = req.TelephoneNumber;
person.LastUpdateFullName = FullName ?? "System Administrator";
person.LastUpdateUserId = UserId ?? "";
person.LastUpdatedAt = DateTime.Now;
_context.SaveChanges();
return Success();
}
[HttpGet("address/{personalId:length(36)}")]
public async Task<ActionResult<ResponseObject>> UpdateAddress([FromBody] PersonAddressRequest req, Guid personalId)
{
var person = await _context.PlacementProfiles.FindAsync(personalId);
if (person == null)
return Error(GlobalMessages.DataNotFound, 404);
if (req.RegistrationSubDistrictId != null)
{
var save = await _context.SubDistricts.FindAsync(req.RegistrationSubDistrictId);
if (save == null)
return Error(GlobalMessages.SubDistrictNotFound, 404);
person.RegistSubDistrict = save;
person.RegistZipCode = save.ZipCode;
}
if (req.RegistrationDistrictId != null)
{
var save = await _context.Districts.FindAsync(req.RegistrationDistrictId);
if (save == null)
return Error(GlobalMessages.DistrictNotFound, 404);
person.RegistDistrict = save;
}
if (req.RegistrationProvinceId != null)
{
var save = await _context.Provinces.FindAsync(req.RegistrationProvinceId);
if (save == null)
return Error(GlobalMessages.ProvinceNotFound, 404);
person.RegistProvince = save;
}
if (req.CurrentSubDistrictId != null)
{
var save = await _context.SubDistricts.FindAsync(req.CurrentSubDistrictId);
if (save == null)
return Error(GlobalMessages.SubDistrictNotFound, 404);
person.CurrentSubDistrict = save;
person.CurrentZipCode = save.ZipCode;
}
if (req.CurrentDistrictId != null)
{
var save = await _context.Districts.FindAsync(req.CurrentDistrictId);
if (save == null)
return Error(GlobalMessages.DistrictNotFound, 404);
person.CurrentDistrict = save;
}
if (req.CurrentProvinceId != null)
{
var save = await _context.Provinces.FindAsync(req.CurrentProvinceId);
if (save == null)
return Error(GlobalMessages.ProvinceNotFound, 404);
person.CurrentProvince = save;
}
person.RegistSame = req.RegistrationSame;
person.LastUpdateFullName = FullName ?? "System Administrator";
person.LastUpdateUserId = UserId ?? "";
person.LastUpdatedAt = DateTime.Now;
_context.SaveChanges();
return Success();
}
[HttpGet("family/{personalId:length(36)}")]
public async Task<ActionResult<ResponseObject>> UpdateFamily([FromBody] PersonFamilyRequest req, Guid personalId)
{
var person = await _context.PlacementProfiles.FindAsync(personalId);
if (person == null)
return Error(GlobalMessages.DataNotFound, 404);
if (req.Couple == true && req.CouplePrefixId != null)
{
var save_prefix = await _context.Prefixes
.AsQueryable()
.FirstOrDefaultAsync(x => x.Id == req.CouplePrefixId);
if (save_prefix == null)
return Error(GlobalMessages.PrefixNotFound, 404);
person.MarryPrefix = save_prefix;
}
if (req.FatherPrefixId != null)
{
var save_prefix = await _context.Prefixes
.AsQueryable()
.FirstOrDefaultAsync(x => x.Id == req.FatherPrefixId);
if (save_prefix == null)
return Error(GlobalMessages.PrefixNotFound, 404);
person.FatherPrefix = save_prefix;
}
if (req.MotherPrefixId != null)
{
var save_prefix = await _context.Prefixes
.AsQueryable()
.FirstOrDefaultAsync(x => x.Id == req.MotherPrefixId);
if (save_prefix == null)
return Error(GlobalMessages.PrefixNotFound, 404);
person.MotherPrefix = save_prefix;
}
person.Marry = req.Couple;
person.MarryFirstName = req.CoupleFirstName;
person.MarryLastName = req.CoupleLastName;
// person.MarryLastNameOld = req.CoupleLastNameOld;
person.MarryOccupation = req.CoupleCareer;
// person.MarryCitizenId = req.CoupleCitizenId;
// person.MarryLive = req.CoupleLive;
person.FatherFirstName = req.FatherFirstName;
person.FatherLastName = req.FatherLastName;
person.FatherOccupation = req.FatherCareer;
// person.FatherCitizenId = req.FatherCitizenId;
// person.FatherLive = req.FatherLive;
person.MotherFirstName = req.MotherFirstName;
person.MotherLastName = req.MotherLastName;
person.MotherOccupation = req.MotherCareer;
// person.MotherCitizenId = req.MotherCitizenId;
// person.MotherLive = req.MotherLive;
person.LastUpdateFullName = FullName ?? "System Administrator";
person.LastUpdateUserId = UserId ?? "";
person.LastUpdatedAt = DateTime.Now;
_context.SaveChanges();
return Success();
}
[HttpGet("certificate/{personalId:length(36)}")]
public async Task<ActionResult<ResponseObject>> UpdateCertificate([FromBody] PersonCertificateRequest req, Guid personalId)
{
var person = await _context.PlacementProfiles.FindAsync(personalId);
if (person == null)
return Error(GlobalMessages.DataNotFound, 404);
person.LastUpdateFullName = FullName ?? "System Administrator";
person.LastUpdateUserId = UserId ?? "";
person.LastUpdatedAt = DateTime.Now;
_context.SaveChanges();
return Success();
}
[HttpGet("education/{personalId:length(36)}")]
public async Task<ActionResult<ResponseObject>> UpdateEducation([FromBody] PersonEducationRequest req, Guid personalId)
{
var person = await _context.PlacementProfiles.FindAsync(personalId);
if (person == null)
return Error(GlobalMessages.DataNotFound, 404);
person.LastUpdateFullName = FullName ?? "System Administrator";
person.LastUpdateUserId = UserId ?? "";
person.LastUpdatedAt = DateTime.Now;
_context.SaveChanges();
return Success();

20
BMA.EHR.Placement.Service/Requests/PersonAddressRequest.cs Normal file
View file

@ -0,0 +1,20 @@
using BMA.EHR.Domain.Models.MetaData;
using Microsoft.EntityFrameworkCore;
namespace BMA.EHR.Placement.Service.Requests
{
public class PersonAddressRequest
{
public bool? RegistrationSame { get; set; }
public string? RegistrationAddress { get; set; }
public Guid? RegistrationSubDistrictId { get; set; }
public Guid? RegistrationDistrictId { get; set; }
public Guid? RegistrationProvinceId { get; set; }
public string? RegistrationZipCode { get; set; }
public string? CurrentAddress { get; set; }
public Guid? CurrentSubDistrictId { get; set; }
public Guid? CurrentDistrictId { get; set; }
public Guid? CurrentProvinceId { get; set; }
public string? CurrentZipCode { get; set; }
}
}

11
BMA.EHR.Placement.Service/Requests/PersonCertificateRequest.cs Normal file
View file

@ -0,0 +1,11 @@
using BMA.EHR.Domain.Models.MetaData;
using Microsoft.EntityFrameworkCore;
namespace BMA.EHR.Placement.Service.Requests
{
public class PersonCertificateRequest
{
public string Name { get; set; }
public bool Value { get; set; }
}
}

11
BMA.EHR.Placement.Service/Requests/PersonEducationRequest.cs Normal file
View file

@ -0,0 +1,11 @@
using BMA.EHR.Domain.Models.MetaData;
using Microsoft.EntityFrameworkCore;
namespace BMA.EHR.Placement.Service.Requests
{
public class PersonEducationRequest
{
public string Name { get; set; }
public bool Value { get; set; }
}
}

41
BMA.EHR.Placement.Service/Requests/PersonFamilyRequest.cs Normal file
View file

@ -0,0 +1,41 @@
using BMA.EHR.Domain.Models.MetaData;
using Microsoft.EntityFrameworkCore;
namespace BMA.EHR.Placement.Service.Requests
{
public class PersonFamilyRequest
{
public bool? Couple { get; set; }
public Guid? CouplePrefixId { get; set; }
public string? CoupleFirstName { get; set; }
public string? CoupleLastName { get; set; }
public string? CoupleLastNameOld { get; set; }
public string? CoupleCareer { get; set; }
public string? CoupleCitizenId { get; set; }
public bool CoupleLive { get; set; }
public Guid? FatherPrefixId { get; set; }
public string? FatherFirstName { get; set; }
public string? FatherLastName { get; set; }
public string? FatherCareer { get; set; }
public string? FatherCitizenId { get; set; }
public bool FatherLive { get; set; }
public Guid? MotherPrefixId { get; set; }
public string? MotherFirstName { get; set; }
public string? MotherLastName { get; set; }
public string? MotherCareer { get; set; }
public string? MotherCitizenId { get; set; }
public bool MotherLive { get; set; }
public virtual List<ProfileChildrenRequest> Childrens { get; set; } = new List<ProfileChildrenRequest>();
}
public class ProfileChildrenRequest
{
public Guid? ChildrenPrefixId { get; set; }
public string? ChildrenFirstName { get; set; }
public string? ChildrenLastName { get; set; }
public string? ChildrenCareer { get; set; }
public string? ChildrenCitizenId { get; set; }
public string ChildrenLive { get; set; }
}
}

21
BMA.EHR.Placement.Service/Requests/PersonInformationRequest.cs Normal file
View file

@ -0,0 +1,21 @@
using BMA.EHR.Domain.Models.MetaData;
using Microsoft.EntityFrameworkCore;
namespace BMA.EHR.Placement.Service.Requests
{
public class PersonInformationRequest
{
public string? CitizenId { get; set; }
public Guid? PrefixId { get; set; }
public string? FirstName { get; set; }
public string? LastName { get; set; }
public Guid? GenderId { get; set; }
public string? Nationality { get; set; }
public string? Race { get; set; }
public Guid? ReligionId { get; set; }
public DateTime? BirthDate { get; set; }
public Guid? BloodGroupId { get; set; }
public Guid? RelationshipId { get; set; }
public string? TelephoneNumber { get; set; }
}
}

2
BMA.EHR.Placement.Service/appsettings.json
View file

@ -14,7 +14,7 @@
"AllowedHosts": "*",
"ConnectionStrings": {
//"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
"DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
"DefaultConnection": "server=127.0.0.1;user=root;password=P@ssw0rd;port=3308;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
},
"Jwt": {
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",