|
|
|
@ -37,8 +37,6 @@ namespace Shentun.Peis.OccupationalDiseases |
|
|
|
private readonly CacheService _cacheService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private readonly IRepository<Patient, Guid> _patientRepository; |
|
|
|
private readonly IRepository<RegisterCheck, Guid> _registerCheckRepository; |
|
|
|
private readonly IRepository<IdentityUser, Guid> _identityUserRepository; |
|
|
|
@ -50,7 +48,7 @@ namespace Shentun.Peis.OccupationalDiseases |
|
|
|
private readonly IRepository<ResultStatus> _resultStatusRepository; |
|
|
|
private readonly IRepository<RegisterCheckSummary, Guid> _registerCheckSummaryRepository; |
|
|
|
private readonly IRepository<Asbitem, Guid> _asbitemRepository; |
|
|
|
|
|
|
|
private readonly IRepository<RegisterCheckPicture, Guid> _registerCheckPictureRepository; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -74,7 +72,8 @@ namespace Shentun.Peis.OccupationalDiseases |
|
|
|
IRepository<RegisterCheckSummary, Guid> registerCheckSummaryRepository, |
|
|
|
IRepository<Asbitem, Guid> asbitemRepository, |
|
|
|
IRepository<PatientOccupationalMedicalHistory, Guid> patientOccupationalMedicalHistoryRepository, |
|
|
|
IRepository<PatientPastMedicalHistory, Guid> patientPastMedicalHistoryRepository) |
|
|
|
IRepository<PatientPastMedicalHistory, Guid> patientPastMedicalHistoryRepository, |
|
|
|
IRepository<RegisterCheckPicture, Guid> registerCheckPictureRepository) |
|
|
|
{ |
|
|
|
_patientOccupationalDiseaseRepository = patientOccupationalDiseaseRepository; |
|
|
|
_patientOccupationalHistoryRepository = patientOccupationalHistoryRepository; |
|
|
|
@ -95,6 +94,7 @@ namespace Shentun.Peis.OccupationalDiseases |
|
|
|
_asbitemRepository = asbitemRepository; |
|
|
|
_patientOccupationalMedicalHistoryRepository = patientOccupationalMedicalHistoryRepository; |
|
|
|
_patientPastMedicalHistoryRepository = patientPastMedicalHistoryRepository; |
|
|
|
_registerCheckPictureRepository = registerCheckPictureRepository; |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
@ -657,7 +657,36 @@ namespace Shentun.Peis.OccupationalDiseases |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 获取检查项目图片
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="input"></param>
|
|
|
|
/// <returns></returns>
|
|
|
|
[HttpPost("api/app/OccupationalDisease/GetRegisterCheckPictureByPatientRegisterId")] |
|
|
|
public async Task<List<RegisterCheckPictureByPatientRegisterIdDto>> GetRegisterCheckPictureByPatientRegisterIdAsync(PatientRegisterIdInputDto input) |
|
|
|
{ |
|
|
|
var query = (from patientRegister in await _patientRegisterRepository.GetQueryableAsync() |
|
|
|
join registerCheck in (await _registerCheckRepository.GetQueryableAsync()).Include(x => x.RegisterCheckAsbitems).ThenInclude(x => x.Asbitem).AsQueryable() |
|
|
|
on patientRegister.Id equals registerCheck.PatientRegisterId |
|
|
|
join registerCheckPicture in await _registerCheckPictureRepository.GetQueryableAsync() |
|
|
|
on registerCheck.Id equals registerCheckPicture.RegisterCheckId |
|
|
|
where patientRegister.Id == input.PatientRegisterId |
|
|
|
select new |
|
|
|
{ |
|
|
|
RegisterCheckId = registerCheck.Id, |
|
|
|
RegisterCheckAsbitemName = string.Join(',', registerCheck.RegisterCheckAsbitems.Select(s => s.Asbitem.DisplayName)), |
|
|
|
registerCheckPicture |
|
|
|
}).ToList(); |
|
|
|
|
|
|
|
var entList = query.GroupBy(g => g.RegisterCheckId).Select(s => new RegisterCheckPictureByPatientRegisterIdDto |
|
|
|
{ |
|
|
|
RegisterCheckAsbitemName = s.FirstOrDefault().RegisterCheckAsbitemName, |
|
|
|
CheckPictureUrls = s.Where(m => !string.IsNullOrWhiteSpace(m.registerCheckPicture.PictureFilename)) |
|
|
|
.Select(ss => ss.registerCheckPicture.PictureFilename).ToList() |
|
|
|
}).ToList(); |
|
|
|
|
|
|
|
return entList; |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |