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

Merge branch 'develop' into working

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-11-30 08:59:54 +07:00
commit dd4a409855
23 changed files with 45812 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

23
BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary.cs
View file

@ -97,6 +97,27 @@ namespace BMA.EHR.Domain.Models.Discipline
public DateTime? DisciplinaryDateEvident { get; set; }
[Comment("วันที่รับทราบข้อกล่าวหา")]
public DateTime? DisciplinaryDateAllegation { get; set; }
[Comment("วันที่เริ่มการสอบสวน")]
public DateTime? DisciplinaryDateStart { get; set; }
[Comment("วันที่สิ้นสุดการสอบสวน")]
public DateTime? DisciplinaryDateEnd { get; set; }
[Comment("จำนวนวันที่ขยาย")]
public int? DisciplinaryDaysExtend { get; set; }
[Comment("วันที่มีคำสั่งให้สอบสวน")]
public DateTime? DisciplinaryDateInvestigation { get; set; }
[Comment("วันที่รายงานผลการสอบสวน")]
public DateTime? DisciplinaryDateResult { get; set; }
[Comment("ผลการสอบสวน ผล")]
public string? DisciplinaryStatusResult { get; set; }
[Comment("ผลการสอบสวน กรณีมีมูล")]
public string? DisciplinaryCauseText { get; set; }
[Comment("ผลการสอบสวน เหตุผล")]
public string? DisciplinaryResult { get; set; }
[Comment("สรุปผลการพิจารณา")]
public string? ResultDescription { get; set; }
public DisciplineInvestigate DisciplineInvestigate { get; set; }
public virtual List<DisciplineDisciplinary_ProfileComplaintInvestigate> DisciplineDisciplinary_ProfileComplaintInvestigates { get; set; } = new List<DisciplineDisciplinary_ProfileComplaintInvestigate>();
@ -109,5 +130,7 @@ namespace BMA.EHR.Domain.Models.Discipline
public virtual List<DisciplineDisciplinary_DocRecordAccuser> DisciplineDisciplinary_DocRecordAccusers { get; set; } = new List<DisciplineDisciplinary_DocRecordAccuser>();
public virtual List<DisciplineDisciplinary_DocWitnesses> DisciplineDisciplinary_DocWitnessess { get; set; } = new List<DisciplineDisciplinary_DocWitnesses>();
public virtual List<DisciplineDisciplinary_DocOther> DisciplineDisciplinary_DocOthers { get; set; } = new List<DisciplineDisciplinary_DocOther>();
public virtual List<DisciplineDisciplinary_DocRelevant> DisciplineDisciplinary_DocRelevants { get; set; } = new List<DisciplineDisciplinary_DocRelevant>();
public virtual List<DisciplineReport_Profile> DisciplineReport_Profiles { get; set; } = new List<DisciplineReport_Profile>();
}
}

16
BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary_DocRelevant.cs Normal file
View file

@ -0,0 +1,16 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.Organizations;
using Microsoft.EntityFrameworkCore;
namespace BMA.EHR.Domain.Models.Discipline
{
public class DisciplineDisciplinary_DocRelevant : EntityBase
{
[Required, Comment("อ้างอิงรหัสเอกสาร")]
public Document Document { get; set; }
[Required, Comment("อ้างอิงเรื่องสอบสวน")]
public DisciplineDisciplinary DisciplineDisciplinary { get; set; }
}
}

4
BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary_ProfileComplaintInvestigate.cs
View file

@ -29,6 +29,10 @@ namespace BMA.EHR.Domain.Models.Discipline
public string? PositionLevel { get; set; }
[Comment("เงินเดือน")]
public double? Salary { get; set; }
[Comment("สถานะออกคำสั่ง")]
public string? Status { get; set; }
[Comment("ประเภทออกคำสั่ง")]
public Guid? CommandTypeId { get; set; }
[Required, Comment("Id เรื่องสอบสวน")]
public DisciplineDisciplinary DisciplineDisciplinary { get; set; }
}

45
BMA.EHR.Domain/Models/Discipline/DisciplineReport_Profile.cs Normal file
View file

@ -0,0 +1,45 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.MetaData;
using BMA.EHR.Domain.Models.Organizations;
using Microsoft.EntityFrameworkCore;
namespace BMA.EHR.Domain.Models.Discipline
{
public class DisciplineReport_Profile : EntityBase
{
[Comment("id อ้างอิง profile")]
public Guid? PersonId { get; set; }
[MaxLength(13), Comment("รหัสบัตรประชาชน")]
public string? CitizenId { get; set; }
[Comment("คำนำหน้า")]
public string? Prefix { get; set; }
[Required, MaxLength(100), Comment("ชื่อ")]
public string? FirstName { get; set; }
[Required, MaxLength(100), Comment("นามสกุล")]
public string? LastName { get; set; }
[Comment("สังกัด")]
public string? Organization { get; set; }
[Comment("ตำแหน่ง")]
public string? Position { get; set; }
[Comment("เลขที่ตำแหน่ง")]
public string? PosNo { get; set; }
[Comment("ระดับ")]
public string? PositionLevel { get; set; }
[Comment("เงินเดือน")]
public double? Salary { get; set; }
[Comment("สถานะออกคำสั่ง")]
public string? Status { get; set; }
[Comment("ประเภทออกคำสั่ง")]
public Guid? CommandTypeId { get; set; }
[Comment("เหตุที่ถูกสั่งพักราชการ/ออกจากราชการไว้ก่อน")]
public string? DescriptionSuspend { get; set; }
[Comment("วันที่สั่งพักราชการ/ให้ออกจากราชการไว้ก่อน")]
public DateTime? StartDateSuspend { get; set; }
[Comment("วันสิ้นสุดการสั่งพักราชการ/ให้ออกจากราชการไว้ก่อน")]
public DateTime? EndDateSuspend { get; set; }
[Required, Comment("Id เรื่องสอบสวน")]
public DisciplineDisciplinary DisciplineDisciplinary { get; set; }
}
}