diff --git a/src/Shentun.Peis.Application.Contracts/PacsBusiness/GetPatientRegisterPacsCheckInputDto.cs b/src/Shentun.Peis.Application.Contracts/PacsBusiness/GetPatientRegisterPacsCheckInputDto.cs
index d5f32b7..6bdbad3 100644
--- a/src/Shentun.Peis.Application.Contracts/PacsBusiness/GetPatientRegisterPacsCheckInputDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PacsBusiness/GetPatientRegisterPacsCheckInputDto.cs
@@ -25,6 +25,11 @@ namespace Shentun.Peis.PacsBusiness
public string EndDate { get; set; }
+ ///
+ /// 检查类型 0-普通检查 1-检验 2-特检 3-放射
+ ///
+ public char? CheckTypeFlag { get; set; }
+
public int MaxResultCount { get; set; } = 1000;
public int SkipCount { get; set; } = 0;
diff --git a/src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs b/src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs
index be3c6f5..74872b7 100644
--- a/src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs
+++ b/src/Shentun.Peis.Application/PacsBusiness/PacsBusinessAppService.cs
@@ -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("AdminId");
@@ -576,6 +584,8 @@ namespace Shentun.Peis.PacsBusiness
RegisterCheckId = s.Key.RegisterCheckId
}).ToList();
+
+
return entListDto;
}