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:
Kittapath 2023-12-19 21:41:35 +07:00
commit d5a78f2d0f
2299 changed files with 166412 additions and 150676 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Domain/Extensions/DateTimeExtension.cs
View file

@ -18,7 +18,7 @@ namespace BMA.EHR.Domain.Extensions
{
throw new ArgumentException("End Date must greater than start date.");
}
return (int)(endDate.Date - startDate.Date).TotalDays;
return (int)(endDate.Date - startDate.Date).TotalDays + 1;
}
public static double DiffYear(this DateTime currentDate)

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

@ -126,11 +126,20 @@ namespace BMA.EHR.Domain.Models.Discipline
[Comment("สรุปผลการพิจารณา")]
public string? ResultDescription { get; set; }
[Comment("หน่วยงาย/ส่วนราชการ")]
public string? ResultOc { get; set; }
[Comment("ประเภทวินัย")]
public string? ResultDisciplineType { get; set; }
[Comment("ประเภทของเรื่อง")]
public string? ResultTitleType { get; set; }
[Comment("ปีงบประมาณ")]
public int? ResultYear { get; set; }
public DisciplineInvestigate DisciplineInvestigate { get; set; }
public virtual List<DisciplineDisciplinary_ProfileComplaintInvestigate> DisciplineDisciplinary_ProfileComplaintInvestigates { get; set; } = new List<DisciplineDisciplinary_ProfileComplaintInvestigate>();
public virtual List<DisciplineDisciplinary_DocComplaintInvestigate> DisciplineDisciplinary_DocComplaintInvestigates { get; set; } = new List<DisciplineDisciplinary_DocComplaintInvestigate>();
public virtual List<DisciplineDisciplinary_DocInvestigate> DisciplineDisciplinary_DocInvestigates { get; set; } = new List<DisciplineDisciplinary_DocInvestigate>();
public virtual List<DisciplineDisciplinary_DocResult> DisciplineDisciplinary_DocResults { get; set; } = new List<DisciplineDisciplinary_DocResult>();
public virtual List<DisciplineDisciplinary_DocInvestigateRelevant> DisciplineDisciplinary_DocInvestigateRelevants { get; set; } = new List<DisciplineDisciplinary_DocInvestigateRelevant>();
public virtual List<DisciplineDisciplinary_DirectorInvestigate> DisciplineDisciplinary_DirectorInvestigates { get; set; } = new List<DisciplineDisciplinary_DirectorInvestigate>();

16
BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary_DocResult.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_DocResult : EntityBase
{
[Required, Comment("อ้างอิงรหัสเอกสาร")]
public Document Document { get; set; }
[Required, Comment("อ้างอิงเรื่องสอบสวน")]
public DisciplineDisciplinary DisciplineDisciplinary { get; set; }
}
}

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

@ -33,6 +33,8 @@ namespace BMA.EHR.Domain.Models.Discipline
public string? Status { get; set; }
[Comment("ประเภทออกคำสั่ง")]
public Guid? CommandTypeId { get; set; }
[Comment("ส่งไปยุติเรื่อง")]
public bool IsReport { get; set; } = false;
[Required, Comment("Id เรื่องสอบสวน")]
public DisciplineDisciplinary DisciplineDisciplinary { get; set; }
public virtual List<DisciplineReport_Profile> DisciplineReport_Profiles { get; set; } = new List<DisciplineReport_Profile>();

2
BMA.EHR.Domain/Models/Discipline/DisciplineInvestigate_ProfileComplaint.cs
View file

@ -29,6 +29,8 @@ namespace BMA.EHR.Domain.Models.Discipline
public string? PositionLevel { get; set; }
[Comment("เงินเดือน")]
public double? Salary { get; set; }
[Comment("ส่งไปยุติเรื่อง")]
public bool IsReport { get; set; } = false;
[Required, Comment("Id เรื่องสืบสวน")]
public DisciplineInvestigate DisciplineInvestigate { get; set; }
}