diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
index 8c7eec7c7..4a3627320 100644
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
@@ -1425,7 +1425,7 @@ namespace IRaCIS.Core.Application.Service
var taskState = exsitPDF ? TaskState.NotEffect : TaskState.Effect;
- var clinicalDataList = _readingClinicalDataRepository.Where(t => t.SubjectId == subjectId).Include(t => t.ReadingClinicalDataPDFList).Include(t=>t.ClinicalDataTrialSet).ToList();
+ var clinicalDataList = _readingClinicalDataRepository.Where(t => t.SubjectId == subjectId&&t.ClinicalDataTrialSet.ClinicalUploadType == ClinicalUploadType.PDF).Include(t => t.ReadingClinicalDataPDFList).Include(t=>t.ClinicalDataTrialSet).ToList();
foreach (var clinicalData in clinicalDataList)
{
diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index 1ac7b3b8d..5d89812c9 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -1071,7 +1071,56 @@ namespace IRaCIS.Application.Services
}
#endregion
-
+
+
+ #region 一致性分析
+ ///
+ /// 获取阅片临床数据列表
+ ///
+ ///
+ ///
+ [HttpPost]
+ public async Task<(List, object)> GetConsistencyAnalysisReadingClinicalDataList(GetReadingClinicalDataListIndto inDto)
+ {
+
+
+
+
+ var isBaseLine = await _subjectVisitRepository.AnyAsync(x => x.Id == inDto.ReadingId && x.IsBaseLine);
+
+
+ var result = await this.GetClinicalDataList(new GetReadingOrTaskClinicalDataListInDto()
+ {
+ ClinicalDataTrialSetId = inDto.ClinicalDataTrialSetId,
+ GetClinicalType = inDto.GetClinicalType,
+ SubjectId = inDto.SubjectId,
+ TrialId = inDto.TrialId,
+ SelectIsSign = false,
+ ReadingId = inDto.ReadingId,
+ TrialReadingCriterionId = inDto.TrialReadingCriterionId,
+ });
+ var readingIds = result.Select(x => x.ReadingId).ToList();
+
+ var previousHistoryList = await _previousHistoryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
+ var previousOtherList = await _previousOtherRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
+ var previousSurgeryList = await _previousSurgeryRepository.Where(x => readingIds.Contains(x.SubjectVisitId)).ProjectTo(_mapper.ConfigurationProvider).ToListAsync();
+ foreach (var item in result)
+ {
+ item.ClinicalTableData = new ClinicalDataTable()
+ {
+ PreviousHistoryList = previousHistoryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
+ PreviousOtherList = previousOtherList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
+ PreviousSurgeryList = previousSurgeryList.Where(x => x.ClinicalDataTrialSetId == item.ClinicalDataTrialSetId).ToList(),
+ };
+
+ }
+
+ return (result, new
+ {
+ IsCanAddClinicalData = false,
+ });
+ }
+ #endregion
#region 阅片临床数据PDF