diff --git a/Controllers/RecruitController.cs b/Controllers/RecruitController.cs index 3f43ff7..32d064c 100644 --- a/Controllers/RecruitController.cs +++ b/Controllers/RecruitController.cs @@ -2067,7 +2067,7 @@ namespace BMA.EHR.Recruit.Service.Controllers // --------------------------- dynamic header = null; int _count = await _context.Recruits.Where(x => x.RecruitImport.Id == id).CountAsync(); - if (data.Count > 0) + if (_count > 0) { header = await _context.RecruitScores .Include(x => x.ScoreImport) @@ -2692,12 +2692,12 @@ namespace BMA.EHR.Recruit.Service.Controllers { var examInfo = new ExamInfo { - PositionName = reader["Position_name"].ToString(), - PositionLevel = reader["position_level"].ToString(), - PositionType = reader["position_type"].ToString(), - Gender = reader["Gender"].ToString(), - Age = DateTimeExtension.CalculateAge(Convert.ToDateTime(reader["Dateofbirth"]), 0, 0), - Degree = reader["Degree"].ToString(), + PositionName = reader["Position_name"]?.ToString() ?? "", + PositionLevel = reader["position_level"]?.ToString() ?? "", + PositionType = reader["position_type"]?.ToString() ?? "", + Gender = reader["Gender"]?.ToString() ?? "", + Age = reader["Dateofbirth"] != DBNull.Value ? DateTimeExtension.CalculateAge(Convert.ToDateTime(reader["Dateofbirth"]), 0, 0) : 0, + Degree = reader["Degree"]?.ToString() ?? "", }; header.Add(examInfo); @@ -2788,13 +2788,13 @@ namespace BMA.EHR.Recruit.Service.Controllers { var examInfo = new ExamInfo { - PositionName = reader["Position_name"].ToString(), - PositionLevel = reader["position_level"].ToString(), - PositionType = reader["position_type"].ToString(), - Gender = reader["Gender"].ToString(), - Age = DateTimeExtension.CalculateAge(Convert.ToDateTime(reader["Dateofbirth"]), 0, 0), - Degree = reader["Degree"].ToString(), - Result = reader["Result"].ToString() + PositionName = reader["Position_name"]?.ToString() ?? "", + PositionLevel = reader["position_level"]?.ToString() ?? "", + PositionType = reader["position_type"]?.ToString() ?? "", + Gender = reader["Gender"]?.ToString() ?? "", + Age = reader["Dateofbirth"] != DBNull.Value ? DateTimeExtension.CalculateAge(Convert.ToDateTime(reader["Dateofbirth"]), 0, 0) : 0, + Degree = reader["Degree"]?.ToString() ?? "", + Result = reader["Result"]?.ToString() ?? "" }; header.Add(examInfo);