|
|
|
@ -344,6 +344,7 @@ namespace Shentun.Peis.PacsBusiness |
|
|
|
join registerCheck in await _registerCheckRepository.GetQueryableAsync() on patientRegister.Id equals registerCheck.PatientRegisterId |
|
|
|
join registerCheckAsbitem in await _registerCheckAsbitemRepository.GetQueryableAsync() on registerCheck.Id equals registerCheckAsbitem.RegisterCheckId |
|
|
|
join asbitem in await _asbitemRepository.GetQueryableAsync() on registerCheckAsbitem.AsbitemId equals asbitem.Id |
|
|
|
join itemType in await _itemTypeRepository.GetQueryableAsync() on asbitem.ItemTypeId equals itemType.Id |
|
|
|
where registerCheck.IsPacsCheck == 'Y' |
|
|
|
orderby registerCheck.PacsCheckDate descending |
|
|
|
select new |
|
|
|
@ -354,7 +355,8 @@ namespace Shentun.Peis.PacsBusiness |
|
|
|
asbitemId = registerCheckAsbitem.AsbitemId, |
|
|
|
pacsCheckDate = registerCheck.PacsCheckDate, |
|
|
|
pacsUploadDate = registerCheck.PacsUploadDate, |
|
|
|
registerCheckId = registerCheck.Id |
|
|
|
registerCheckId = registerCheck.Id, |
|
|
|
checkTypeFlag = itemType.CheckTypeFlag |
|
|
|
}; |
|
|
|
|
|
|
|
if (!string.IsNullOrWhiteSpace(input.PatientName)) |
|
|
|
@ -384,6 +386,12 @@ namespace Shentun.Peis.PacsBusiness |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (input.CheckTypeFlag != null) |
|
|
|
{ |
|
|
|
query = query.Where(m => m.checkTypeFlag == input.CheckTypeFlag); |
|
|
|
} |
|
|
|
|
|
|
|
#region 增加项目类别权限
|
|
|
|
|
|
|
|
string AdminId = _configuration.GetValue<string>("AdminId"); |
|
|
|
@ -576,6 +584,8 @@ namespace Shentun.Peis.PacsBusiness |
|
|
|
RegisterCheckId = s.Key.RegisterCheckId |
|
|
|
}).ToList(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return entListDto; |
|
|
|
} |
|
|
|
|
|
|
|
|