问题修改

IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs

@@ -59,6 +59,7 @@ namespace IRaCIS.Core.Application.Service
                 ;
 
             CreateMap<DicomStudy, QAStudyInfoDTO>()
+                .ForMember(o => o.IsCompleteClinicalData, t =>  t.MapFrom(u => !u.ReadingClinicalDataList.Any(x=>x.ReadingClinicalDataPDFList.Count()==0)))
 				.ForMember(o => o.UploadedTime, t => t.MapFrom(u => u.CreateTime))
                 .ForMember(o => o.Uploader, t => t.MapFrom(u => u.Uploader.LastName + " / " + u.Uploader.FirstName))
                 .ForMember(o => o.StudyId, t => t.MapFrom(u => u.Id))

IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs

@@ -387,6 +387,9 @@ namespace IRaCIS.Core.Application.Contracts.DTO
         public string ModalityForEdit { get; set; } = string.Empty;
 
         public bool IsHaveUploadFailed { get; set; }
+
+        public bool IsCompleteClinicalData { get; set; }
+
 	}
 
     public class QASeriesInfoDto

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -123,6 +123,9 @@ namespace IRaCIS.Core.Application.Contracts
         public bool IsEnrollementQualificationConfirm { get; set; }
         public bool IsPDProgressView { get; set; }
 
+        public bool IsHaveStudyClinicalData { get; set; }
+
+
 
 		public string OutEnrollmentVisitName { get; set; } = String.Empty;
 

IRaCIS.Core.Application/Service/QC/QCListService.cs

@@ -16,6 +16,7 @@ namespace IRaCIS.Core.Application.Image.QA
     {
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
         private readonly IRepository<Trial> _trialRepository;
+		private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
 		private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSet;
         private readonly IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository;
         private readonly IRepository<TrialQCQuestion> _trialQCQuestionRepository;
@@ -26,6 +27,7 @@ namespace IRaCIS.Core.Application.Image.QA
         public QCListService(
               IRepository<SubjectVisit> subjectVisitRepository,
               IRepository<Trial> trialRepository,
+				IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
 			  IRepository<ClinicalDataTrialSet> clinicalDataTrialSet,
               IRepository<TrialQCQuestionAnswer> trialQCQuestionAnswerRepository,
               IRepository<TrialQCQuestion> trialQCQuestionRepository,
@@ -39,6 +41,7 @@ namespace IRaCIS.Core.Application.Image.QA
             this._trialQCQuestionRepository = trialQCQuestionRepository;
             this._consistencyCheckFileRepository = consistencyCheckFileRepository;
             _trialRepository = trialRepository;
+			this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
 			this._clinicalDataTrialSet = clinicalDataTrialSet;
         }
 
@@ -760,11 +763,16 @@ namespace IRaCIS.Core.Application.Image.QA
         [HttpGet("{subjectVisitId:guid}")]
         public async Task<(List<QAStudyInfoDTO>,object)> GetSubjectVisitUploadedStudyList(Guid subjectVisitId)
         {
+
+            var visit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).FirstNotNullAsync();
             var list= await _repository.Where<DicomStudy>(s => s.SubjectVisitId == subjectVisitId).IgnoreQueryFilters().ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider).OrderBy(t=>t.StudyCode).ToListAsync();
 
 
             var config = await _repository.Where<SubjectVisit>(t => t.Id == subjectVisitId).Select(t=>t.Trial).ProjectTo<TrialSubjectAndSVConfig>(_mapper.ConfigurationProvider).FirstOrDefaultAsync().IfNullThrowException();
 
+            config.IsHaveStudyClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(x => x.IsConfirm && x.TrialId == visit.TrialId && x.ClinicalDataLevel == ClinicalLevel.Study);
+
+
 			return (list, config);
         }
 

IRaCIS.Core.Application/Triggers/SubjectVisitTrigger.cs

@@ -71,8 +71,8 @@ namespace IRaCIS.Core.Application.Triggers
 
                 // 检查类型  ModalityForEdit
                 // 检查模态  Modalities
-                var modalityForEdit = context.Entity.ModalityForEdit;
+                var modalities = context.Entity.Modalities;
-                if (modalityForEdit.Contains("PT") && modalityForEdit.Contains("CT"))
+                if (modalities.Contains("PT") && modalities.Contains("CT"))
                 {
 					await _iClinicalAnswerService.AddStudyClinical(new Service.Reading.Dto.AddStudyClinicalInDto()
 					{

IRaCIS.Core.Domain/Image/DicomStudy.cs

@@ -88,6 +88,10 @@ namespace IRaCIS.Core.Domain.Models
         [ForeignKey("CreateUserId")]
         public User Uploader { get; set; }
 
+		[JsonIgnore]
+
+		public List<ReadingClinicalData> ReadingClinicalDataList { get; set; }
+
 
 
 		//软删除

IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalData.cs

@@ -77,7 +77,9 @@ namespace IRaCIS.Core.Domain.Models
 
 		public ClinicalDataTrialSet ClinicalDataTrialSet { get; set; }
 
+		[JsonIgnore]
 
+		public DicomStudy? DicomStudy { get; set; }
 
 		[JsonIgnore]
         [ForeignKey("TrialId")]

IRaCIS.Core.Infra.EFCore/EntityConfigration/StudyConfigration.cs

@@ -24,6 +24,13 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
         .HasForeignKey(s => new { s.TrialId, s.SiteId })
         .HasPrincipalKey(c => new { c.TrialId, c.SiteId });
 
+
+			builder
+            .HasMany(s => s.ReadingClinicalDataList)
+            .WithOne(c => c.DicomStudy)
+            .HasForeignKey(s => new { s.StudyId })
+            .HasPrincipalKey(c => new { c.Id });
+
 		}
     }
 }