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 2024-01-15 10:53:05 +07:00
commit 4c40a50eb3
13 changed files with 4045 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

940
BMA.EHR.Application/Repositories/Commands/CommandRepository.cs
View file

File diff suppressed because it is too large Load diff

22
BMA.EHR.Command.Service/Controllers/OrderController.cs
View file

@ -2522,6 +2522,7 @@ namespace BMA.EHR.Command.Service.Controllers
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
ComplaintId = req.complaintId,
};
var result = await _repository.AddAsync(inserted);
@ -2579,6 +2580,7 @@ namespace BMA.EHR.Command.Service.Controllers
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
order.ComplaintId = req.complaintId;
var result = await _repository.UpdateAsync(order);
return Success(result);
@ -2634,6 +2636,7 @@ namespace BMA.EHR.Command.Service.Controllers
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
ComplaintId = req.complaintId,
};
var result = await _repository.AddAsync(inserted);
@ -2691,6 +2694,7 @@ namespace BMA.EHR.Command.Service.Controllers
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
order.ComplaintId = req.complaintId;
var result = await _repository.UpdateAsync(order);
@ -3118,6 +3122,7 @@ namespace BMA.EHR.Command.Service.Controllers
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
ComplaintId = req.complaintId,
};
var result = await _repository.AddAsync(inserted);
@ -3168,6 +3173,7 @@ namespace BMA.EHR.Command.Service.Controllers
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
order.ComplaintId = req.complaintId;
var result = await _repository.UpdateAsync(order);
@ -3217,6 +3223,8 @@ namespace BMA.EHR.Command.Service.Controllers
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
ComplaintId = req.complaintId,
};
var result = await _repository.AddAsync(inserted);
@ -3267,6 +3275,7 @@ namespace BMA.EHR.Command.Service.Controllers
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
order.ComplaintId = req.complaintId;
var result = await _repository.UpdateAsync(order);
@ -3316,6 +3325,8 @@ namespace BMA.EHR.Command.Service.Controllers
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
ComplaintId = req.complaintId,
};
var result = await _repository.AddAsync(inserted);
@ -3366,6 +3377,7 @@ namespace BMA.EHR.Command.Service.Controllers
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
order.ComplaintId = req.complaintId;
var result = await _repository.UpdateAsync(order);
@ -3415,6 +3427,7 @@ namespace BMA.EHR.Command.Service.Controllers
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
ComplaintId = req.complaintId,
};
var result = await _repository.AddAsync(inserted);
@ -3465,6 +3478,7 @@ namespace BMA.EHR.Command.Service.Controllers
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
order.ComplaintId = req.complaintId;
var result = await _repository.UpdateAsync(order);
@ -3514,6 +3528,7 @@ namespace BMA.EHR.Command.Service.Controllers
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
ComplaintId = req.complaintId,
};
var result = await _repository.AddAsync(inserted);
@ -3564,6 +3579,7 @@ namespace BMA.EHR.Command.Service.Controllers
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
order.ComplaintId = req.complaintId;
var result = await _repository.UpdateAsync(order);
@ -3613,6 +3629,7 @@ namespace BMA.EHR.Command.Service.Controllers
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
ComplaintId = req.complaintId,
};
var result = await _repository.AddAsync(inserted);
@ -3663,6 +3680,7 @@ namespace BMA.EHR.Command.Service.Controllers
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
order.ComplaintId = req.complaintId;
var result = await _repository.UpdateAsync(order);
@ -3712,6 +3730,7 @@ namespace BMA.EHR.Command.Service.Controllers
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
ComplaintId = req.complaintId,
};
var result = await _repository.AddAsync(inserted);
@ -3762,6 +3781,7 @@ namespace BMA.EHR.Command.Service.Controllers
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
order.ComplaintId = req.complaintId;
var result = await _repository.UpdateAsync(order);
@ -3811,6 +3831,7 @@ namespace BMA.EHR.Command.Service.Controllers
FaultLevel = req.faultLevel,
RefRaw = req.refRaw,
Result = req.result,
ComplaintId = req.complaintId,
};
var result = await _repository.AddAsync(inserted);
@ -3861,6 +3882,7 @@ namespace BMA.EHR.Command.Service.Controllers
order.FaultLevel = req.faultLevel;
order.RefRaw = req.refRaw;
order.Result = req.result;
order.ComplaintId = req.complaintId;
var result = await _repository.UpdateAsync(order);

1
BMA.EHR.Command.Service/Requests/CreateCommandGroup11Request.cs
View file

@ -34,5 +34,6 @@
public string faultLevel { get; set; }
public string refRaw { get; set; }
public string result { get; set; }
public Guid? complaintId { get; set; }
}
}

1
BMA.EHR.Command.Service/Requests/CreateCommandGroup13Request.cs
View file

@ -15,5 +15,6 @@
public int orderYear { get; set; }
public string signatoryBy { get; set; } = string.Empty;
public string signatoryPosition { get; set; } = string.Empty;
public Guid? complaintId { get; set; }
}
}

28
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaintController.cs
View file

@ -87,6 +87,34 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
return Success(new { data, total = data_search.Count() });
}
/// <summary>
/// list รายการวินัยเรื่องร้องเรียนในหน้าออกคำสั่ง
/// </summary>
/// <returns></returns>
/// <response code="200"></response>
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("report")]
public async Task<ActionResult<ResponseObject>> GetDisciplineComplaintReport()
{
var data = await _context.DisciplineComplaints
.Where(x => x.Status.Contains("SEND_INVESTIGATE"))
.Select(x => new
{
Id = x.Id,//id ข้อมูลเรื่องร้องเรียน
Title = x.Title,//ชื่อเรื่อง
IsComplaint = true,
IsInvestigate = x.DisciplineInvestigates.FirstOrDefault() == null ? false : true,
IsDisciplinary = x.DisciplineInvestigates.FirstOrDefault() == null || x.DisciplineInvestigates.FirstOrDefault().DisciplineDisciplinarys.FirstOrDefault() == null ? false : true,
IsResult = x.DisciplineInvestigates.FirstOrDefault() == null || x.DisciplineInvestigates.FirstOrDefault().DisciplineDisciplinarys.FirstOrDefault() == null || (x.DisciplineInvestigates.FirstOrDefault().DisciplineDisciplinarys.FirstOrDefault().Status != "DONE" && x.DisciplineInvestigates.FirstOrDefault().DisciplineDisciplinarys.FirstOrDefault().Status != "REPORT") ? false : true,
DateConsideration = x.DateConsideration,//วันที่กำหนดพิจารณา
})
.OrderByDescending(x => x.DateConsideration)
.ToListAsync();
return Success(data);
}
/// <summary>
/// get รายการวินัยเรื่องร้องเรียน
/// </summary>

1
BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
View file

@ -1626,6 +1626,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
OffenseDetails = data.OffenseDetails,
DisciplinaryCaseFault = data.DisciplinaryCaseFault,
DisciplinaryFaultLevel = data.DisciplinaryFaultLevel,
DisciplineDisciplinary = data,
Status = "PENDING",
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",

21
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -327,11 +327,12 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("report/up")]
public async Task<ActionResult<ResponseObject>> GetPersonReportUp()
[HttpGet("report/up/{id:guid}")]
public async Task<ActionResult<ResponseObject>> GetPersonReportUp(Guid id)
{
var data = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => x.Status == "REPORT")
.Where(x => x.DisciplineDisciplinary.DisciplineInvestigate.DisciplineComplaint.Id == id)
.Select(x => new
{
PersonId = x.PersonId,
@ -350,11 +351,12 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("report/down")]
public async Task<ActionResult<ResponseObject>> GetPersonReportDown()
[HttpGet("report/down/{id:guid}")]
public async Task<ActionResult<ResponseObject>> GetPersonReportDown(Guid id)
{
var data = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => x.StatusDiscard == "REPORT")
.Where(x => x.DisciplineDisciplinary.DisciplineInvestigate.DisciplineComplaint.Id == id)
.Select(x => new
{
PersonId = x.PersonId,
@ -373,11 +375,12 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("report/reject")]
public async Task<ActionResult<ResponseObject>> GetPersonReportReject()
[HttpGet("report/reject/{id:guid}")]
public async Task<ActionResult<ResponseObject>> GetPersonReportReject(Guid id)
{
var data1 = await _context.DisciplineInvestigate_ProfileComplaints
.Where(x => x.IsReport == "REPORT")
.Where(x => x.DisciplineInvestigate.DisciplineComplaint.Id == id)
.Select(x => new
{
PersonId = x.PersonId,
@ -386,6 +389,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
.ToListAsync();
var data2 = await _context.DisciplineDisciplinary_ProfileComplaintInvestigates
.Where(x => x.IsReport == "REPORT")
.Where(x => x.DisciplineDisciplinary.DisciplineInvestigate.DisciplineComplaint.Id == id)
.Select(x => new
{
PersonId = x.PersonId,
@ -408,11 +412,12 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("report/stop")]
public async Task<ActionResult<ResponseObject>> GetPersonReportStop()
[HttpGet("report/stop/{id:guid}")]
public async Task<ActionResult<ResponseObject>> GetPersonReportStop(Guid id)
{
var data = await _context.DisciplineReport_Profiles
.Where(x => x.Status == "REPORT")
.Where(x => x.DisciplineDisciplinary.DisciplineInvestigate.DisciplineComplaint.Id == id)
.Select(x => new
{
PersonId = x.PersonId,

16
BMA.EHR.Discipline.Service/Controllers/DisciplineSuspendController.cs
View file

@ -83,10 +83,10 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
DescriptionSuspend = x.DescriptionSuspend,
StartDateSuspend = x.StartDateSuspend,
EndDateSuspend = x.EndDateSuspend,
Title = x.Title,
OffenseDetails = x.OffenseDetails,//ลักษณะความผิด
DisciplinaryFaultLevel = x.DisciplinaryFaultLevel,//ระดับโทษความผิด
DisciplinaryCaseFault = x.DisciplinaryCaseFault,//กรณีความผิด
Title = x.DisciplineDisciplinary.Title,
OffenseDetails = x.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
DisciplinaryFaultLevel = x.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
DisciplinaryCaseFault = x.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
})
.OrderByDescending(x => x.CitizenId)
.Skip((page - 1) * pageSize)
@ -124,10 +124,10 @@ namespace BMA.EHR.DisciplineSuspend.Service.Controllers
DescriptionSuspend = x.DescriptionSuspend,
StartDateSuspend = x.StartDateSuspend,
EndDateSuspend = x.EndDateSuspend,
Title = x.Title,
OffenseDetails = x.OffenseDetails,//ลักษณะความผิด
DisciplinaryFaultLevel = x.DisciplinaryFaultLevel,//ระดับโทษความผิด
DisciplinaryCaseFault = x.DisciplinaryCaseFault,//กรณีความผิด
Title = x.DisciplineDisciplinary.Title,
OffenseDetails = x.DisciplineDisciplinary.OffenseDetails,//ลักษณะความผิด
DisciplinaryFaultLevel = x.DisciplineDisciplinary.DisciplinaryFaultLevel,//ระดับโทษความผิด
DisciplinaryCaseFault = x.DisciplineDisciplinary.DisciplinaryCaseFault,//กรณีความผิด
})
.Where(x => x.Id == id)
.FirstOrDefaultAsync();

3
BMA.EHR.Domain/Models/Commands/Core/Command.cs
View file

@ -214,6 +214,9 @@ namespace BMA.EHR.Domain.Models.Commands.Core
[Comment("อ้างอิงมาตราตามกฏหมาย")]
public string? RefRaw { get; set; }
[Comment("Id เรื่องร้องเรียน")]
public Guid? ComplaintId { get; set; }
#endregion
public virtual List<CommandDocument> Documents { get; set; } = new();

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

@ -48,6 +48,8 @@ namespace BMA.EHR.Domain.Models.Discipline
public string? DisciplinaryFaultLevel { get; set; }
[Comment("กรณีความผิด")]
public string? DisciplinaryCaseFault { get; set; }
[Required, Comment("Id เรื่องสอบสวน")]
public DisciplineDisciplinary DisciplineDisciplinary { get; set; }
// [Required, Comment("Id ผู้ถูกร้องเรียน")]
// public DisciplineDisciplinary_ProfileComplaintInvestigate? DisciplineDisciplinary_ProfileComplaintInvestigate { get; set; }
}

3000
BMA.EHR.Infrastructure/Migrations/DisciplineDb/20240115030653_update table DisciplineDisciplinary_DirectorInvestigates datestart nullable3.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

52
BMA.EHR.Infrastructure/Migrations/DisciplineDb/20240115030653_update table DisciplineDisciplinary_DirectorInvestigates datestart nullable3.cs Normal file
View file

@ -0,0 +1,52 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
{
/// <inheritdoc />
public partial class updatetableDisciplineDisciplinary_DirectorInvestigatesdatestartnullable3 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "DisciplineDisciplinaryId",
table: "DisciplineReport_Profiles",
type: "char(36)",
nullable: false,
defaultValue: new Guid("00000000-0000-0000-0000-000000000000"),
collation: "ascii_general_ci");
migrationBuilder.CreateIndex(
name: "IX_DisciplineReport_Profiles_DisciplineDisciplinaryId",
table: "DisciplineReport_Profiles",
column: "DisciplineDisciplinaryId");
migrationBuilder.AddForeignKey(
name: "FK_DisciplineReport_Profiles_DisciplineDisciplinarys_Discipline~",
table: "DisciplineReport_Profiles",
column: "DisciplineDisciplinaryId",
principalTable: "DisciplineDisciplinarys",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_DisciplineReport_Profiles_DisciplineDisciplinarys_Discipline~",
table: "DisciplineReport_Profiles");
migrationBuilder.DropIndex(
name: "IX_DisciplineReport_Profiles_DisciplineDisciplinaryId",
table: "DisciplineReport_Profiles");
migrationBuilder.DropColumn(
name: "DisciplineDisciplinaryId",
table: "DisciplineReport_Profiles");
}
}
}

16
BMA.EHR.Infrastructure/Migrations/DisciplineDb/DisciplineDbContextModelSnapshot.cs
View file

@ -2399,6 +2399,9 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
.HasColumnType("longtext")
.HasComment("ระดับโทษความผิด กรณีไม่ร้ายแรง: ภาคทัณฑ์, ตัดเงินเดือน, ลดขั้นเงินเดือน | กรณีร้ายแรง: ปลดออก, ไล่ออก");
b.Property<Guid>("DisciplineDisciplinaryId")
.HasColumnType("char(36)");
b.Property<DateTime?>("EndDateSuspend")
.HasColumnType("datetime(6)")
.HasComment("วันสิ้นสุดการสั่งพักราชการ/ให้ออกจากราชการไว้ก่อน");
@ -2480,6 +2483,8 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
b.HasKey("Id");
b.HasIndex("DisciplineDisciplinaryId");
b.ToTable("DisciplineReport_Profiles");
});
@ -2909,6 +2914,17 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
b.Navigation("DisciplineInvestigate");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Discipline.DisciplineReport_Profile", b =>
{
b.HasOne("BMA.EHR.Domain.Models.Discipline.DisciplineDisciplinary", "DisciplineDisciplinary")
.WithMany()
.HasForeignKey("DisciplineDisciplinaryId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("DisciplineDisciplinary");
});
modelBuilder.Entity("BMA.EHR.Domain.Models.Discipline.DisciplineComplaint", b =>
{
b.Navigation("DisciplineComplaint_Docs");