From cfa675ac3269ca61f86f06bc3fbe32167447a2e3 Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 17 Dec 2024 18:10:55 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A5=E0=B8=94=E0=B9=8C=20(Issue=20#874)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/Discipline/DisciplineComplaint_Profile.cs | 4 ++++ .../DisciplineDisciplinary_ProfileComplaintInvestigate.cs | 2 +- .../Discipline/DisciplineInvestigate_ProfileComplaint.cs | 4 ++++ BMA.EHR.Domain/Models/Discipline/DisciplineReport_Profile.cs | 4 ++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/BMA.EHR.Domain/Models/Discipline/DisciplineComplaint_Profile.cs b/BMA.EHR.Domain/Models/Discipline/DisciplineComplaint_Profile.cs index f1adde47..02f00cc4 100644 --- a/BMA.EHR.Domain/Models/Discipline/DisciplineComplaint_Profile.cs +++ b/BMA.EHR.Domain/Models/Discipline/DisciplineComplaint_Profile.cs @@ -71,6 +71,10 @@ namespace BMA.EHR.Domain.Models.Discipline public double? Salary { get; set; } [Comment("รายการเก่า")] public bool? IsAncestorDNA { get; set; } = false; + + [Comment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")] + public string? profileType { get; set; } + [Required, Comment("Id เรื่องร้องเรียน")] public DisciplineComplaint DisciplineComplaint { get; set; } } diff --git a/BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary_ProfileComplaintInvestigate.cs b/BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary_ProfileComplaintInvestigate.cs index a25b2760..0c70e22d 100644 --- a/BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary_ProfileComplaintInvestigate.cs +++ b/BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary_ProfileComplaintInvestigate.cs @@ -84,7 +84,7 @@ namespace BMA.EHR.Domain.Models.Discipline [Comment("รายการเก่า")] public bool? IsAncestorDNA { get; set; } = false; - [Comment("ประเภทผู้ถูกร้องเรียน (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")] + [Comment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")] public string? profileType { get; set; } [Required, Comment("Id เรื่องสอบสวน")] diff --git a/BMA.EHR.Domain/Models/Discipline/DisciplineInvestigate_ProfileComplaint.cs b/BMA.EHR.Domain/Models/Discipline/DisciplineInvestigate_ProfileComplaint.cs index 8e05cf58..b12defbd 100644 --- a/BMA.EHR.Domain/Models/Discipline/DisciplineInvestigate_ProfileComplaint.cs +++ b/BMA.EHR.Domain/Models/Discipline/DisciplineInvestigate_ProfileComplaint.cs @@ -75,6 +75,10 @@ namespace BMA.EHR.Domain.Models.Discipline public bool? IsDisciplinary { get; set; } = false; [Comment("รายการเก่า")] public bool? IsAncestorDNA { get; set; } = false; + + [Comment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")] + public string? profileType { get; set; } + [Required, Comment("Id เรื่องสืบสวน")] public DisciplineInvestigate DisciplineInvestigate { get; set; } } diff --git a/BMA.EHR.Domain/Models/Discipline/DisciplineReport_Profile.cs b/BMA.EHR.Domain/Models/Discipline/DisciplineReport_Profile.cs index 5fcda981..f1c44696 100644 --- a/BMA.EHR.Domain/Models/Discipline/DisciplineReport_Profile.cs +++ b/BMA.EHR.Domain/Models/Discipline/DisciplineReport_Profile.cs @@ -90,6 +90,10 @@ namespace BMA.EHR.Domain.Models.Discipline public string? DisciplinaryFaultLevel { get; set; } [Comment("กรณีความผิด")] public string? DisciplinaryCaseFault { get; set; } + + [Comment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")] + public string? profileType { get; set; } + [Required, Comment("Id เรื่องสอบสวน")] public DisciplineDisciplinary DisciplineDisciplinary { get; set; } // [Required, Comment("Id ผู้ถูกร้องเรียน")]