Compare commits
No commits in common. "e0aa9fb1d9dca13891159639cc8033bf35192b2f" and "d9fc5e3646360ee2422d5aeed3098cc909f5a223" have entirely different histories.
e0aa9fb1d9
...
d9fc5e3646
|
|
@ -1031,8 +1031,6 @@ namespace IRaCIS.Application.Contracts
|
|||
|
||||
public DateTime? LatestStudyTime { get; set; }
|
||||
public string? Modalities { get; set; }
|
||||
|
||||
public string? PatientInfo { get; set; }
|
||||
}
|
||||
public class VisitPatientStudyFilterView
|
||||
{
|
||||
|
|
@ -1050,11 +1048,6 @@ namespace IRaCIS.Application.Contracts
|
|||
public string CalledAE { get; set; } = string.Empty;
|
||||
|
||||
public string CallingAE { get; set; } = string.Empty;
|
||||
|
||||
public string PatientIdStr { get; set; } = string.Empty;
|
||||
public string PatientName { get; set; } = string.Empty;
|
||||
public string PatientAge { get; set; } = string.Empty;
|
||||
public string PatientSex { get; set; } = string.Empty;
|
||||
}
|
||||
|
||||
public class PatientStudySimpleView: VisitPatientStudyFilterView
|
||||
|
|
|
|||
|
|
@ -224,13 +224,6 @@ namespace IRaCIS.Application.Services
|
|||
return list;
|
||||
}
|
||||
|
||||
public async Task<List<string>> GetDicomModalityList(Guid trialId)
|
||||
{
|
||||
var list = await _scpStudyRepository.Where(t => t.TrialId == trialId).SelectMany(t => t.SeriesList).Select(t=>t.Modality).Distinct().ToListAsync();
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 影像访视上传 检查列表
|
||||
/// </summary>
|
||||
|
|
@ -250,7 +243,6 @@ namespace IRaCIS.Application.Services
|
|||
.WhereIf(inQuery.EarliestStudyTime != null, t => t.StudyTime >= inQuery.EarliestStudyTime)
|
||||
.WhereIf(inQuery.LatestStudyTime != null, t => t.StudyTime <= inQuery.LatestStudyTime)
|
||||
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.Modalities), t => t.Modalities.Contains(inQuery.Modalities))
|
||||
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.PatientInfo), t => t.PatientIdStr.Contains(inQuery.PatientInfo) || t.PatientName.Contains(inQuery.PatientInfo) || t.PatientSex.Contains(inQuery.PatientInfo))
|
||||
select new VisitPatientStudyFilterView()
|
||||
{
|
||||
Description = scpStudy.Description,
|
||||
|
|
@ -262,11 +254,6 @@ namespace IRaCIS.Application.Services
|
|||
SCPStudyId = scpStudy.Id,
|
||||
SeriesCount = scpStudy.SeriesCount,
|
||||
StudyTime = scpStudy.StudyTime,
|
||||
|
||||
PatientAge = scpStudy.PatientAge,
|
||||
PatientIdStr = scpStudy.PatientIdStr,
|
||||
PatientName = scpStudy.PatientName,
|
||||
PatientSex = scpStudy.PatientSex,
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue