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 2025-04-21 17:20:17 +07:00
commit cd54079a47
31 changed files with 27955 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BMA.EHR.Domain/Models/Discipline/DisciplineComplaint.cs
View file

@ -58,6 +58,9 @@ namespace BMA.EHR.Domain.Models.Discipline
[Comment("version หน่วยงาน")]
public string? activeId { get; set; }
[Comment("RootDnaId")]
public Guid? RootDnaId { get; set; }
public virtual List<DisciplineComplaint_Profile> DisciplineComplaint_Profiles { get; set; } = new List<DisciplineComplaint_Profile>();
public virtual List<DisciplineComplaint_Doc> DisciplineComplaint_Docs { get; set; } = new List<DisciplineComplaint_Doc>();
public virtual List<DisciplineInvestigate> DisciplineInvestigates { get; set; } = new List<DisciplineInvestigate>();

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

@ -146,6 +146,9 @@ namespace BMA.EHR.Domain.Models.Discipline
[Comment("ระดับโทษความผิดกรณีอื่นๆ")]
public string? DisciplinaryFaultLevelOther { get; set; }
[Comment("RootDnaId")]
public Guid? RootDnaId { 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>();

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

@ -100,6 +100,10 @@ namespace BMA.EHR.Domain.Models.Discipline
[Comment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")]
public string? profileType { get; set; }
[Comment("ฐานความผิดรายบุคคลหมายเหตุ")]
public string? Remark { get; set; }
[Comment("ฐานความผิดรายบุคคล")]
public string? Offense { get; set; }
[Required, Comment("Id เรื่องสอบสวน")]
public DisciplineDisciplinary DisciplineDisciplinary { get; set; }

3
BMA.EHR.Domain/Models/Discipline/DisciplineInvestigate.cs
View file

@ -89,6 +89,9 @@ namespace BMA.EHR.Domain.Models.Discipline
[Comment("จำนวนวันที่ต้องการขยาย")]
public int? InvestigationDaysExtend { get; set; }
[Comment("RootDnaId")]
public Guid? RootDnaId { get; set; }
public DisciplineComplaint DisciplineComplaint { get; set; }
public virtual List<DisciplineInvestigate_ProfileComplaint> DisciplineInvestigate_ProfileComplaints { get; set; } = new List<DisciplineInvestigate_ProfileComplaint>();
public virtual List<DisciplineInvestigate_DocComplaint> DisciplineInvestigate_DocComplaints { get; set; } = new List<DisciplineInvestigate_DocComplaint>();

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

@ -81,6 +81,10 @@ namespace BMA.EHR.Domain.Models.Discipline
public double? Salary { get; set; }
[Comment("ส่งไปยุติเรื่อง")]
public string? IsReport { get; set; } = "NEW";
[Comment("หมายเหตุยุติเรื่อง")]
public string? RemarkReject { get; set; }
[Comment("อ้างอิงรหัสเอกสาร")]
public Document? DocumentReject { get; set; }
[Comment("ส่งไปสอบสวน")]
public bool? IsDisciplinary { get; set; } = false;
[Comment("รายการเก่า")]