แก้สืบสอบ status เพิ่มdefult

BMA.EHR.Discipline.Service/Controllers/DisciplineComplaintController.cs

@@ -382,7 +382,9 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
                 ComplaintFrom = data.ComplaintFrom,
                 Appellant = data.Appellant,
                 ResultComplaint = data.Result,
+
                 InvestigationStatusResult = "NOT_SPECIFIED",
+                InvestigationExtendStatus = false,
                 Status = "NEW",
                 CreatedFullName = FullName ?? "System Administrator",
                 CreatedUserId = UserId ?? "",

BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs

@@ -249,6 +249,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                                 InvestigationDescription = x.InvestigationDescription,
                                 InvestigationStatusResult = x.InvestigationStatusResult,
                                 InvestigationCauseText = x.InvestigationCauseText,
+                                InvestigationExtendStatus = x.InvestigationExtendStatus,
+                                InvestigationDaysExtend = x.InvestigationDaysExtend,
                                 Status = x.Status,//สถานะเรื่องสืบสวน
                                 Result = x.Result,//ผลการตรวจสอบ
                                 Director = x.DisciplineDisciplinary_DirectorInvestigates.Select(d => new
@@ -307,6 +309,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                 _data.InvestigationDescription,
                 _data.InvestigationStatusResult,
                 _data.InvestigationCauseText,
+                _data.InvestigationExtendStatus,
+                _data.InvestigationDaysExtend,
                 _data.Status,
                 _data.Result,
                 _data.Director,
@@ -344,6 +348,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
             data.InvestigationDescription = req.investigationDescription;
             data.InvestigationStatusResult = req.investigationStatusResult.Trim().ToUpper();
             data.InvestigationCauseText = req.investigationCauseText.Trim().ToUpper();
+            data.InvestigationExtendStatus = req.investigationExtendStatus;
+            data.InvestigationDaysExtend = req.investigationDaysExtend;
             data.Result = req.result;
             data.LastUpdateFullName = FullName ?? "System Administrator";
             data.LastUpdateUserId = UserId ?? "";
@@ -403,6 +409,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                                 DisciplinaryDateStart = x.DisciplinaryDateStart,
                                 DisciplinaryDateEnd = x.DisciplinaryDateEnd,
                                 DaysExtend = x.DisciplinaryDaysExtend,
+                                ExtendStatus = x.DisciplinaryExtendStatus,
                                 DisciplinaryDateInvestigation = x.DisciplinaryDateInvestigation,
                                 DisciplinaryDateResult = x.DisciplinaryDateResult,
                                 DisciplinaryStatusResult = x.DisciplinaryStatusResult,
@@ -523,6 +530,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                 _data.DisciplinaryDateStart,
                 _data.DisciplinaryDateEnd,
                 _data.DaysExtend,
+                _data.ExtendStatus,
                 _data.DisciplinaryDateInvestigation,
                 _data.DisciplinaryDateResult,
                 _data.DisciplinaryStatusResult,
@@ -577,6 +585,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
             data.DisciplinaryDateStart = req.DisciplinaryDateStart;
             data.DisciplinaryDateEnd = req.DisciplinaryDateEnd;
             data.DisciplinaryDaysExtend = req.DaysExtend;
+            data.DisciplinaryExtendStatus = req.ExtendStatus;
             data.DisciplinaryDateInvestigation = req.DisciplinaryDateInvestigation;
             data.DisciplinaryDateResult = req.DisciplinaryDateResult;
             data.DisciplinaryStatusResult = req.DisciplinaryStatusResult;
@@ -659,7 +668,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
                 return Error(new Exception(GlobalMessages.DataNotFound), (int)StatusCodes.Status404NotFound);
             if (data.Status.Trim().ToUpper() != "NEW")
                 return Error(new Exception("ไม่สามารถยุติเรื่องได้"), (int)StatusCodes.Status500InternalServerError);
-            if (data.InvestigationStatusResult == null || data.InvestigationStatusResult.Trim().ToUpper() != "NO_CAUSE")
+            if (data.DisciplinaryStatusResult == null || data.DisciplinaryStatusResult.Trim().ToUpper() != "NO_CAUSE")
                 return Error(new Exception("ไม่สามารถยุติเรื่องได้"), (int)StatusCodes.Status500InternalServerError);
             data.Status = "STOP";
 

BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs

@@ -244,6 +244,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
                                 InvestigationDescription = x.InvestigationDescription,
                                 InvestigationStatusResult = x.InvestigationStatusResult,
                                 InvestigationCauseText = x.InvestigationCauseText,
+                                InvestigationExtendStatus = x.InvestigationExtendStatus,
+                                InvestigationDaysExtend = x.InvestigationDaysExtend,
                                 Status = x.Status,//สถานะเรื่องสืบสวน
                                 Result = x.Result,//ผลการตรวจสอบ
                                 Director = x.DisciplineInvestigate_Directors.Select(d => new
@@ -318,6 +320,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
                 _data.InvestigationDescription,
                 _data.InvestigationStatusResult,
                 _data.InvestigationCauseText,
+                _data.InvestigationExtendStatus,
+                _data.InvestigationDaysExtend,
                 _data.Status,
                 _data.Result,
                 _data.Director,
@@ -342,6 +346,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
         public async Task<ActionResult<ResponseObject>> UpdateDisciplineInvestigate([FromBody] DisciplineInvestigateRequest req, Guid id)
         {
             var data = await _context.DisciplineInvestigates
+                                .Include(x => x.DisciplineInvestigate_ProfileComplaints)
                                 .Include(x => x.DisciplineInvestigate_Directors)
                                 .ThenInclude(x => x.DisciplineDirector)
                                 .Where(x => x.Id == id)
@@ -358,6 +363,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
             data.InvestigationDescription = req.investigationDescription;
             data.InvestigationStatusResult = req.investigationStatusResult.Trim().ToUpper();
             data.InvestigationCauseText = req.investigationCauseText;
+            data.InvestigationExtendStatus = req.investigationExtendStatus;
+            data.InvestigationDaysExtend = req.investigationDaysExtend;
             data.Result = req.result;
             data.LastUpdateFullName = FullName ?? "System Administrator";
             data.LastUpdateUserId = UserId ?? "";
@@ -496,7 +503,10 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
                 InvestigationDescription = data.InvestigationDescription,
                 InvestigationStatusResult = data.InvestigationStatusResult,
                 InvestigationCauseText = data.InvestigationCauseText,
+                InvestigationExtendStatus = data.InvestigationExtendStatus,
+                InvestigationDaysExtend = data.InvestigationDaysExtend,
 
+                DisciplinaryExtendStatus = false,
                 Status = "NEW",
                 CreatedFullName = FullName ?? "System Administrator",
                 CreatedUserId = UserId ?? "",

BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs

@@ -57,8 +57,8 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
         {
             var data_search = (from x in _context.DisciplineDisciplinarys
                                where x.Title.Contains(keyword) ||
-                                  x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) ||
+                                  //   x.DisciplinaryFaultLevel == null ? false : x.DisciplinaryFaultLevel.Contains(keyword) ||
-                                  x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) ||
+                                  //   x.DisciplinaryCaseFault == null ? false : x.DisciplinaryCaseFault.Contains(keyword) ||
                                   x.Status == "DONE"
                                select x).ToList();
             var data = data_search

BMA.EHR.Discipline.Service/Requests/DisciplineDisciplinaryInvestigateRequest.cs

@@ -11,6 +11,8 @@ namespace BMA.EHR.Discipline.Service.Requests
         public string investigationDescription { get; set; }
         public string investigationStatusResult { get; set; }
         public string? investigationCauseText { get; set; }
+        public bool investigationExtendStatus { get; set; } = false;
+        public int? investigationDaysExtend { get; set; }
         public string? result { get; set; }
         public Guid[] directors { get; set; }
 

BMA.EHR.Discipline.Service/Requests/DisciplineDisciplinaryRequest.cs

@@ -17,6 +17,7 @@ namespace BMA.EHR.Discipline.Service.Requests
         public DateTime DisciplinaryDateStart { get; set; }
         public DateTime DisciplinaryDateEnd { get; set; }
         public int? DaysExtend { get; set; }
+        public bool ExtendStatus { get; set; } = false;
         public DateTime? DisciplinaryDateInvestigation { get; set; }
         public DateTime DisciplinaryDateResult { get; set; }
         public string? DisciplinaryStatusResult { get; set; }

BMA.EHR.Discipline.Service/Requests/DisciplineInvestigateRequest.cs

@@ -11,6 +11,8 @@ namespace BMA.EHR.Discipline.Service.Requests
         public string investigationDescription { get; set; }
         public string investigationStatusResult { get; set; }
         public string? investigationCauseText { get; set; }
+        public bool investigationExtendStatus { get; set; } = false;
+        public int? investigationDaysExtend { get; set; }
         public string? result { get; set; }
         public Guid[] directors { get; set; }
         public DisciplineInvestigateComplaintProfileRequest[] persons { get; set; }// กรณีบุคคลใส่ id คน มาใน array แต่ถ้าเป็น type อื่นจะ null

BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary.cs

@@ -78,6 +78,12 @@ namespace BMA.EHR.Domain.Models.Discipline
         [Comment("กรณีมีมูลต้องเลือกว่า 'ร้ายแรง' หรือ 'ไม่ร้ายแรง'")]
         public string? InvestigationCauseText { get; set; }
 
+        [Comment("ขยายเวลา")]
+        public bool InvestigationExtendStatus { get; set; } = false;
+
+        [Comment("จำนวนวันที่ต้องการขยาย")]
+        public int? InvestigationDaysExtend { get; set; }
+
 
         [Comment("พยานและบันทึกถ้อยคำพยาน")]
         public string? DisciplinaryWitnesses { get; set; }
@@ -103,6 +109,8 @@ namespace BMA.EHR.Domain.Models.Discipline
         public DateTime? DisciplinaryDateEnd { get; set; }
         [Comment("จำนวนวันที่ขยาย")]
         public int? DisciplinaryDaysExtend { get; set; }
+        [Comment("ขยายเวลา")]
+        public bool DisciplinaryExtendStatus { get; set; } = false;
         [Comment("วันที่มีคำสั่งให้สอบสวน")]
         public DateTime? DisciplinaryDateInvestigation { get; set; }
         [Comment("วันที่รายงานผลการสอบสวน")]

BMA.EHR.Domain/Models/Discipline/DisciplineInvestigate.cs

@@ -74,6 +74,12 @@ namespace BMA.EHR.Domain.Models.Discipline
 
         [Comment("กรณีมีมูลต้องเลือกว่า 'ร้ายแรง' หรือ 'ไม่ร้ายแรง'")]
         public string? InvestigationCauseText { get; set; }
+
+        [Comment("ขยายเวลา")]
+        public bool InvestigationExtendStatus { get; set; } = false;
+
+        [Comment("จำนวนวันที่ต้องการขยาย")]
+        public int? InvestigationDaysExtend { 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>();

BMA.EHR.Infrastructure/Migrations/DisciplineDb/20231130074915_update table DisciplineDisciplinarys add InvestigationDaysExtend.cs

@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
+{
+    /// <inheritdoc />
+    public partial class updatetableDisciplineDisciplinarysaddInvestigationDaysExtend : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "InvestigationDaysExtend",
+                table: "DisciplineInvestigates",
+                type: "int",
+                nullable: true,
+                comment: "จำนวนวันที่ต้องการขยาย");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "InvestigationExtendStatus",
+                table: "DisciplineInvestigates",
+                type: "tinyint(1)",
+                nullable: true,
+                comment: "ขยายเวลา");
+
+            migrationBuilder.AddColumn<int>(
+                name: "InvestigationDaysExtend",
+                table: "DisciplineDisciplinarys",
+                type: "int",
+                nullable: true,
+                comment: "จำนวนวันที่ต้องการขยาย");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "InvestigationExtendStatus",
+                table: "DisciplineDisciplinarys",
+                type: "tinyint(1)",
+                nullable: true,
+                comment: "ขยายเวลา");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "InvestigationDaysExtend",
+                table: "DisciplineInvestigates");
+
+            migrationBuilder.DropColumn(
+                name: "InvestigationExtendStatus",
+                table: "DisciplineInvestigates");
+
+            migrationBuilder.DropColumn(
+                name: "InvestigationDaysExtend",
+                table: "DisciplineDisciplinarys");
+
+            migrationBuilder.DropColumn(
+                name: "InvestigationExtendStatus",
+                table: "DisciplineDisciplinarys");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/DisciplineDb/20231130103836_update table DisciplineDisciplinarys add DisciplineDaysExtend.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
+{
+    /// <inheritdoc />
+    public partial class updatetableDisciplineDisciplinarysaddDisciplineDaysExtend : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "DisciplinaryExtendStatus",
+                table: "DisciplineDisciplinarys",
+                type: "tinyint(1)",
+                nullable: true,
+                comment: "ขยายเวลา");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DisciplinaryExtendStatus",
+                table: "DisciplineDisciplinarys");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/DisciplineDb/20231201023452_update table DisciplineDisciplinarys DisciplinaryDaysExtend not null.cs

@@ -0,0 +1,84 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
+{
+    /// <inheritdoc />
+    public partial class updatetableDisciplineDisciplinarysDisciplinaryDaysExtendnotnull : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<bool>(
+                name: "InvestigationExtendStatus",
+                table: "DisciplineInvestigates",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false,
+                comment: "ขยายเวลา",
+                oldClrType: typeof(bool),
+                oldType: "tinyint(1)",
+                oldNullable: true,
+                oldComment: "ขยายเวลา");
+
+            migrationBuilder.AlterColumn<bool>(
+                name: "InvestigationExtendStatus",
+                table: "DisciplineDisciplinarys",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false,
+                comment: "ขยายเวลา",
+                oldClrType: typeof(bool),
+                oldType: "tinyint(1)",
+                oldNullable: true,
+                oldComment: "ขยายเวลา");
+
+            migrationBuilder.AlterColumn<bool>(
+                name: "DisciplinaryExtendStatus",
+                table: "DisciplineDisciplinarys",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false,
+                comment: "ขยายเวลา",
+                oldClrType: typeof(bool),
+                oldType: "tinyint(1)",
+                oldNullable: true,
+                oldComment: "ขยายเวลา");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<bool>(
+                name: "InvestigationExtendStatus",
+                table: "DisciplineInvestigates",
+                type: "tinyint(1)",
+                nullable: true,
+                comment: "ขยายเวลา",
+                oldClrType: typeof(bool),
+                oldType: "tinyint(1)",
+                oldComment: "ขยายเวลา");
+
+            migrationBuilder.AlterColumn<bool>(
+                name: "InvestigationExtendStatus",
+                table: "DisciplineDisciplinarys",
+                type: "tinyint(1)",
+                nullable: true,
+                comment: "ขยายเวลา",
+                oldClrType: typeof(bool),
+                oldType: "tinyint(1)",
+                oldComment: "ขยายเวลา");
+
+            migrationBuilder.AlterColumn<bool>(
+                name: "DisciplinaryExtendStatus",
+                table: "DisciplineDisciplinarys",
+                type: "tinyint(1)",
+                nullable: true,
+                comment: "ขยายเวลา",
+                oldClrType: typeof(bool),
+                oldType: "tinyint(1)",
+                oldComment: "ขยายเวลา");
+        }
+    }
+}

BMA.EHR.Infrastructure/Migrations/DisciplineDb/DisciplineDbContextModelSnapshot.cs

@@ -533,6 +533,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
                         .HasColumnType("int")
                         .HasComment("จำนวนวันที่ขยาย");
 
+                    b.Property<bool>("DisciplinaryExtendStatus")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("ขยายเวลา");
+
                     b.Property<string>("DisciplinaryFaultLevel")
                         .HasColumnType("longtext")
                         .HasComment("ระดับโทษความผิด กรณีไม่ร้ายแรง: ภาคทัณฑ์, ตัดเงินเดือน, ลดขั้นเงินเดือน | กรณีร้ายแรง: ปลดออก, ไล่ออก");
@@ -580,6 +584,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
                         .HasColumnType("datetime(6)")
                         .HasComment("วันที่เริ่มการสืบสวน");
 
+                    b.Property<int?>("InvestigationDaysExtend")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนวันที่ต้องการขยาย");
+
                     b.Property<string>("InvestigationDescription")
                         .HasColumnType("longtext")
                         .HasComment("รายละเอียดเกี่ยวกับการสืบสวน");
@@ -592,6 +600,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
                         .HasColumnType("longtext")
                         .HasComment("ลักษณะการสืบสวนกรณีเลือกอื่นๆ");
 
+                    b.Property<bool>("InvestigationExtendStatus")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("ขยายเวลา");
+
                     b.Property<string>("InvestigationStatusResult")
                         .HasColumnType("longtext")
                         .HasComment("สถานะหรือผลการสืบสวน (NOT_SPECIFIED คือ ยังไม่ระบุ, HAVE_CAUSE คือ มีมูล, NO_CAUSE คือ ไม่มีมูล");
@@ -1409,6 +1421,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
                         .HasColumnType("datetime(6)")
                         .HasComment("วันที่เริ่มการสืบสวน");
 
+                    b.Property<int?>("InvestigationDaysExtend")
+                        .HasColumnType("int")
+                        .HasComment("จำนวนวันที่ต้องการขยาย");
+
                     b.Property<string>("InvestigationDescription")
                         .HasColumnType("longtext")
                         .HasComment("รายละเอียดเกี่ยวกับการสืบสวน");
@@ -1421,6 +1437,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
                         .HasColumnType("longtext")
                         .HasComment("ลักษณะการสืบสวนกรณีเลือกอื่นๆ");
 
+                    b.Property<bool>("InvestigationExtendStatus")
+                        .HasColumnType("tinyint(1)")
+                        .HasComment("ขยายเวลา");
+
                     b.Property<string>("InvestigationStatusResult")
                         .HasColumnType("longtext")
                         .HasComment("สถานะหรือผลการสืบสวน (not_specified คือ ยังไม่ระบุ, have_cause คือ มีมูล, no_cause คือ ไม่มีมูล");