พ้นราชการเพิ่มรายละเอียดรอบ
This commit is contained in:
parent
ca945ebad6
commit
f878ef239e
1 changed files with 3 additions and 3 deletions
|
|
@ -416,7 +416,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
posNoEmployee = x.Profile.PosNoEmployee,
|
||||
})
|
||||
.ToListAsync();
|
||||
return Success(new { retire.Id, retire.CreatedAt, retire.Year, retire.Round, retire.Type, profile = profile_new });
|
||||
return Success(new { retire.Id, retire.CreatedAt, retire.Year, retire.Round, retire.Type, retire.TypeReport, profile = profile_new });
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -446,7 +446,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
var responseTask = client.GetAsync(url);
|
||||
var results = responseTask.Result;
|
||||
// Console.WriteLine(results.Content.ReadAsStringAsync().Result);
|
||||
return Success(new { Json = true, profile = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ProfileJsonRequest>>(results.Content.ReadAsStringAsync().Result) });
|
||||
return Success(new { Json = true, profileHistorys.Id, profileHistorys.CreatedAt, profileHistorys.Year, profileHistorys.Round, profileHistorys.Type, profileHistorys.TypeReport, profile = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ProfileJsonRequest>>(results.Content.ReadAsStringAsync().Result) });
|
||||
}
|
||||
}
|
||||
var profile_new = await _context.RetirementProfiles
|
||||
|
|
@ -474,7 +474,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
|||
})
|
||||
.ToListAsync();
|
||||
|
||||
return Success(new { Json = false, profile = profile_new });
|
||||
return Success(new { Json = false, retire.Id, retire.CreatedAt, retire.Year, retire.Round, retire.Type, retire.TypeReport, profile = profile_new });
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue