From 4654330ef7105f2e43b2aa2ee2e13def9ee6a760 Mon Sep 17 00:00:00 2001 From: Bright Date: Mon, 23 Sep 2024 12:58:40 +0700 Subject: [PATCH] fix report kk1/kp7 : add field imgUrl --- Controllers/ProfileReportController.cs | 8 ++++++-- Responses/kk1Responses.cs | 1 + Responses/kp7ShortRequest.cs | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Controllers/ProfileReportController.cs b/Controllers/ProfileReportController.cs index 10660d0..ad8686c 100644 --- a/Controllers/ProfileReportController.cs +++ b/Controllers/ProfileReportController.cs @@ -134,7 +134,8 @@ namespace BMA.EHR.Report.Service.Controllers Date = "-", Degree = "-", }, - } + }, + Url = data.result.ImgUrl != null ? data.result.ImgUrl : "-", } }; @@ -242,7 +243,8 @@ namespace BMA.EHR.Report.Service.Controllers Date = "-", Degree = "-", }, - } + }, + Url = data.result.ImgUrl != null ? data.result.ImgUrl : "-", } }; return Success(result); @@ -330,6 +332,7 @@ namespace BMA.EHR.Report.Service.Controllers CurrentDistrict = data.Result.Profile.Count > 0 ? data.Result.Profile[0].CurrentDistrict : "-", CurrentProvince = data.Result.Profile.Count > 0 ? data.Result.Profile[0].CurrentProvince : "-", Telephone = data.Result.Profile.Count > 0 ? data.Result.Profile[0].Telephone : "-", + Url = data.Result.Profile.Count > 0 ? data.Result.Profile[0].ImgUrl : "-", Insignias = data.Result.Insignia, Leaves = data.Result.Leave, Certs = data.Result.Cert, @@ -614,6 +617,7 @@ namespace BMA.EHR.Report.Service.Controllers CurrentDistrict = data.Result.Profile.Count > 0 ? data.Result.Profile[0].CurrentDistrict : "-", CurrentProvince = data.Result.Profile.Count > 0 ? data.Result.Profile[0].CurrentProvince : "-", Telephone = data.Result.Profile.Count > 0 ? data.Result.Profile[0].Telephone : "-", + Url = data.Result.Profile.Count > 0 ? data.Result.Profile[0].ImgUrl : "-", Insignias = data.Result.Insignia, Leaves = data.Result.Leave, Certs = data.Result.Cert, diff --git a/Responses/kk1Responses.cs b/Responses/kk1Responses.cs index b241c6c..c40a0fe 100644 --- a/Responses/kk1Responses.cs +++ b/Responses/kk1Responses.cs @@ -59,6 +59,7 @@ namespace BMA.EHR.Report.Service.Responses public string? CurrentSubDistrict { get; set; } public string? CurrentDistrict { get; set; } public string? CurrentProvince { get; set; } + public string? ImgUrl { get; set; } } public class Insignia diff --git a/Responses/kp7ShortRequest.cs b/Responses/kp7ShortRequest.cs index 578f53c..83b1505 100644 --- a/Responses/kp7ShortRequest.cs +++ b/Responses/kp7ShortRequest.cs @@ -21,6 +21,7 @@ namespace BMA.EHR.Report.Service.Responses public string? SalaryDate { get; set; } public string? PositionName { get; set; } public string? OcFullPath { get; set; } + public string? ImgUrl { get; set; } } public class Educations