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-23 09:41:20 +07:00
commit c031311429
10 changed files with 3163 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10313,7 +10313,7 @@ namespace BMA.EHR.Application.Repositories.Commands
.Where(x => x.Receivers.Where(x => x.RefPlacementProfileId == id).FirstOrDefault() != null)
.Select(x => new
{
CommandSubject = x.CommandSubject,
CommandSubject = $"{x.CommandNo}/{Int32.Parse(x.CommandYear) + 543} {x.CommandSubject}",
CreatedAt = x.CreatedAt,
LastUpdatedAt = x.LastUpdatedAt,
})

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

@ -631,7 +631,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
data.DisciplineDisciplinaryExtends.Add(
new DisciplineDisciplinaryExtend
{
Name = sumExtend > 0 ? "ขยายครั้งที่" + sumExtend : "วันที่สอบสวน",
Name = sumExtend > 0 ? "ขยายครั้งที่ " + sumExtend : "วันที่สอบสวน",
Num = sumExtend,
DaysExtend = data.DisciplinaryDaysExtend,
DateStart = sumExtend > 0 && data.DisciplinaryDateEnd != null ? data.DisciplinaryDateEnd.Value.AddDays(data.DisciplinaryDaysExtend == null ? 0 : -(double)data.DisciplinaryDaysExtend + 1) : data.DisciplinaryDateStart,
@ -657,8 +657,8 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
new DisciplineDisciplinary_DirectorInvestigate
{
DisciplineDirector = director,
Duty = isDirector == null ? "" : isDirector.Duty,
CommandNo = isDirector == null ? "" : isDirector.CommandNo,
Duty = isDirector == null ? null : isDirector.Duty,
CommandNo = isDirector == null ? null : isDirector.CommandNo,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,

6
BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
View file

@ -396,7 +396,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
data.DisciplineInvestigateExtends.Add(
new DisciplineInvestigateExtend
{
Name = sumExtend > 0 ? "ขยายครั้งที่" + sumExtend : "วันที่สืบสวน",
Name = sumExtend > 0 ? "ขยายครั้งที่ " + sumExtend : "วันที่สืบสวน",
Num = sumExtend,
DaysExtend = data.InvestigationDaysExtend,
DateStart = sumExtend > 0 && data.InvestigationDateEnd != null ? data.InvestigationDateEnd.Value.AddDays(data.InvestigationDaysExtend == null ? 0 : -(double)data.InvestigationDaysExtend + 1) : data.InvestigationDateStart,
@ -422,8 +422,8 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
new DisciplineInvestigate_Director
{
DisciplineDirector = director,
Duty = isDirector == null ? "" : isDirector.Duty,
CommandNo = isDirector == null ? "" : isDirector.CommandNo,
Duty = isDirector == null ? null : isDirector.Duty,
CommandNo = isDirector == null ? null : isDirector.CommandNo,
CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now,

8
BMA.EHR.Discipline.Service/appsettings.json
View file

@ -14,10 +14,10 @@
"AllowedHosts": "*",
"ConnectionStrings": {
//"DefaultConnection": "User Id=sys;Password=P@ssw0rd;DBA Privilege=SYSDBA;Data Source=localhost:1521/ORCLCDB",
"DefaultConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"ExamConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"LeaveConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"DisciplineConnection": "server=192.168.1.9;user=root;password=adminVM123;port=3306;database=bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
"DefaultConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"ExamConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_exam_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"LeaveConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_leave_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
"DisciplineConnection": "server=192.168.1.80;user=root;password=adminVM123;port=3306;database=bma_ehr_discipline_demo;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
},
"Jwt": {
"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",

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

@ -13,8 +13,8 @@ namespace BMA.EHR.Domain.Models.Discipline
[Required, Comment("อ้างอิงเรื่องสอบสวน")]
public DisciplineDisciplinary DisciplineDisciplinary { get; set; }
[Comment("หน้าที่")]
public string Duty { get; set; } = string.Empty;
public string? Duty { get; set; } = string.Empty;
[Comment("เลขที่คำสั่ง")]
public string CommandNo { get; set; } = string.Empty;
public string? CommandNo { get; set; } = string.Empty;
}
}

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

@ -13,8 +13,8 @@ namespace BMA.EHR.Domain.Models.Discipline
[Required, Comment("อ้างอิงเรื่องสืบสวน")]
public DisciplineInvestigate DisciplineInvestigate { get; set; }
[Comment("หน้าที่")]
public string Duty { get; set; } = string.Empty;
public string? Duty { get; set; } = string.Empty;
[Comment("เลขที่คำสั่ง")]
public string CommandNo { get; set; } = string.Empty;
public string? CommandNo { get; set; } = string.Empty;
}
}

2998
BMA.EHR.Infrastructure/Migrations/DisciplineDb/20240122085818_update table DisciplineDirectors commandno nullable.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

146
BMA.EHR.Infrastructure/Migrations/DisciplineDb/20240122085818_update table DisciplineDirectors commandno nullable.cs Normal file
View file

@ -0,0 +1,146 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
{
/// <inheritdoc />
public partial class updatetableDisciplineDirectorscommandnonullable : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "Duty",
table: "DisciplineInvestigate_Directors",
type: "longtext",
nullable: true,
comment: "หน้าที่",
oldClrType: typeof(string),
oldType: "longtext",
oldComment: "หน้าที่")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "CommandNo",
table: "DisciplineInvestigate_Directors",
type: "longtext",
nullable: true,
comment: "เลขที่คำสั่ง",
oldClrType: typeof(string),
oldType: "longtext",
oldComment: "เลขที่คำสั่ง")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "Duty",
table: "DisciplineDisciplinary_DirectorInvestigates",
type: "longtext",
nullable: true,
comment: "หน้าที่",
oldClrType: typeof(string),
oldType: "longtext",
oldComment: "หน้าที่")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.AlterColumn<string>(
name: "CommandNo",
table: "DisciplineDisciplinary_DirectorInvestigates",
type: "longtext",
nullable: true,
comment: "เลขที่คำสั่ง",
oldClrType: typeof(string),
oldType: "longtext",
oldComment: "เลขที่คำสั่ง")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.UpdateData(
table: "DisciplineInvestigate_Directors",
keyColumn: "Duty",
keyValue: null,
column: "Duty",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Duty",
table: "DisciplineInvestigate_Directors",
type: "longtext",
nullable: false,
comment: "หน้าที่",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "หน้าที่")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "DisciplineInvestigate_Directors",
keyColumn: "CommandNo",
keyValue: null,
column: "CommandNo",
value: "");
migrationBuilder.AlterColumn<string>(
name: "CommandNo",
table: "DisciplineInvestigate_Directors",
type: "longtext",
nullable: false,
comment: "เลขที่คำสั่ง",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "เลขที่คำสั่ง")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "DisciplineDisciplinary_DirectorInvestigates",
keyColumn: "Duty",
keyValue: null,
column: "Duty",
value: "");
migrationBuilder.AlterColumn<string>(
name: "Duty",
table: "DisciplineDisciplinary_DirectorInvestigates",
type: "longtext",
nullable: false,
comment: "หน้าที่",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "หน้าที่")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
migrationBuilder.UpdateData(
table: "DisciplineDisciplinary_DirectorInvestigates",
keyColumn: "CommandNo",
keyValue: null,
column: "CommandNo",
value: "");
migrationBuilder.AlterColumn<string>(
name: "CommandNo",
table: "DisciplineDisciplinary_DirectorInvestigates",
type: "longtext",
nullable: false,
comment: "เลขที่คำสั่ง",
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true,
oldComment: "เลขที่คำสั่ง")
.Annotation("MySql:CharSet", "utf8mb4")
.OldAnnotation("MySql:CharSet", "utf8mb4");
}
}
}

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

@ -1005,7 +1005,6 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
.HasAnnotation("Relational:JsonPropertyName", "id");
b.Property<string>("CommandNo")
.IsRequired()
.HasColumnType("longtext")
.HasComment("เลขที่คำสั่ง");
@ -1035,7 +1034,6 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
.HasColumnType("char(36)");
b.Property<string>("Duty")
.IsRequired()
.HasColumnType("longtext")
.HasComment("หน้าที่");
@ -2056,7 +2054,6 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
.HasAnnotation("Relational:JsonPropertyName", "id");
b.Property<string>("CommandNo")
.IsRequired()
.HasColumnType("longtext")
.HasComment("เลขที่คำสั่ง");
@ -2086,7 +2083,6 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
.HasColumnType("char(36)");
b.Property<string>("Duty")
.IsRequired()
.HasColumnType("longtext")
.HasComment("หน้าที่");

8
BMA.EHR.Report.Service/Controllers/CommandReportController.cs
View file

@ -2077,7 +2077,7 @@ namespace BMA.EHR.Report.Service.Controllers
ConclusionFireNo = raw_data.ConclusionFireNo == null ? "" : raw_data.ConclusionFireNo.ToThaiNumber(),
ConclusionFireDate = raw_data.ConclusionFireDate == null ? "" : raw_data.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(),
ConclusionFireResolution = raw_data.ConclusionFireResolution,
ConclusionFireResolution = raw_data.ConclusionFireResolution == null ? "" : raw_data.ConclusionFireResolution.ToThaiNumber(),
};
return command;
@ -2513,10 +2513,10 @@ namespace BMA.EHR.Report.Service.Controllers
ReceiveOrganizationName = raw_data.ReceiveOrganizationName,
Title = $"{raw_data.CommandSubject}",
CaseFault = raw_data.CaseFault,
FaultLevel = raw_data.FaultLevel,
CaseFault = raw_data.CaseFault == null ? "" : raw_data.CaseFault.ToThaiNumber(),
FaultLevel = raw_data.FaultLevel == null ? "" : raw_data.FaultLevel.ToThaiNumber(),
RefRaw = raw_data.RefRaw == null ? "" : raw_data.RefRaw.ToThaiNumber(),
Result = raw_data.Result,
Result = raw_data.Result == null ? "" : raw_data.Result.ToThaiNumber(),
Fullname = raw_data_profile == null ? "" : raw_data_profile.FullName,
Positionname = raw_data_profile == null ? "" : raw_data_profile.Positionname,