修改导表

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

@@ -227,7 +227,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string SubjectCode { get; set; } = String.Empty;
 
         [DictionaryTranslateAttribute("Subject_Visit_Status")]
-        public SubjectStatus SubjectStatus { get; set; } 
+        public SubjectStatus SubjectStatus { get; set; }
 
         public String TrialSiteCode { get; set; } = String.Empty;
 
@@ -1159,7 +1159,7 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public List<CommonQuesionInfo> QuestionAnswerList { get; set; }
 
-        public bool IsSubjectHaveReadingPeriod { get; set; }
+        public List<decimal> SubjectCriterionReadingPeriodVisitNumList { get; set; }
 
         public String TrialSiteCode { get; set; } = String.Empty;
         public string SubjectCode { get; set; } = String.Empty;

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

@@ -257,9 +257,12 @@ namespace IRaCIS.Core.Application.Service
                 false)))
                .ForMember(o => o.JudgeNote, t => t.MapFrom(u => u.ReadingCategory==ReadingCategory.Judge? u.JudgeResultRemark : u.JudgeVisitTask.JudgeResultRemark))
                .ForMember(o => o.VisitNote, t => t.MapFrom(u => u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.AdjustReason).FirstOrDefault()!.Answer))
-                .ForMember(o => o.IsSubjectHaveReadingPeriod, t => t.MapFrom(u => arbitrationRule == ArbitrationRule.Reading ?
-                u.Subject.ReadModuleList.Any(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading) : false))
+                //.ForMember(o => o.IsSubjectHaveReadingPeriod, t => t.MapFrom(u => arbitrationRule == ArbitrationRule.Reading ?
+                //u.Subject.ReadModuleList.Any(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading) : false))
+                
 
+                .ForMember(o => o.SubjectCriterionReadingPeriodVisitNumList, t => t.MapFrom(u => 
+                u.Subject.ReadModuleList.Where(t=>t.TrialReadingCriterionId == trialReadingCriterionId && t.ReadingSetType == ReadingSetType.ImageReading).Select(c=>c.SubjectVisit.VisitNum)))
                .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
                .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
                .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))