导表修改

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

@@ -201,15 +201,15 @@ namespace IRaCIS.Core.Application.Contracts
     {
         //关闭 未关闭
         [DictionaryTranslateAttribute("CheckIsClosedEnum")]
-        public ChallengeStateEnum CheckIsClosedEnum { get; set; }
+        public ChallengeStateEnum ChallengeState { get; set; }
 
         //强行要分为两个字段  有无质疑
         [DictionaryTranslateAttribute("YesOrNo")]
-        public bool IsChallengeClosed => (int)CheckIsClosedEnum > 0;
+        public bool IsHaveChallenge => (int)ChallengeState > 0;
 
         //临床数据收集
 
-        public string ClinicalDataCollect => $"{DicomStudyCount},{NoneDicomStudyCount}{(IsBaseLine? (ClinicalInformationTransmissionEnum>0 &&IsHaveClinicalData ? "w/" : "w/o") :"" )}";
+        public string ClinicalDataCollect => $"{DicomStudyCount},{NoneDicomStudyCount}{(IsBaseLine? (ClinicalInformationTransmissionEnum>0 && IsHaveClinicalData ? ",w/" : ",w/o") :"" )}";
 
         public int? DicomStudyCount { get; set; }
         public int? NoneDicomStudyCount { get; set; }
@@ -266,7 +266,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string CurrentActionUserName { get; set; }
 
-
+        public string HistoryAuditUserName => string.Join(' ', PreliminaryAuditUserName, ReviewAuditUserName);
     }
 
     public class QCChanllengeExportDto
@@ -325,7 +325,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         //public bool IsUrgent { get; set; }
 
-        //public DateTime? ReUploadedTime { get; set; }
+        public DateTime? ReUploadedTime { get; set; }
 
         //public RequestBackStateEnum RequestBackState { get; set; }
 
@@ -676,6 +676,8 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public string? TalkContent { get; set; } = String.Empty;
         public string BlindName { get; set; } = String.Empty;
+
+        [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsUrgent { get; set; }
 
         public DateTime? CheckPassedTime { get; set; }
@@ -831,11 +833,12 @@ namespace IRaCIS.Core.Application.Contracts
         public AuditAdvice AuditAdviceEnum { get; set; }
 
         //审核结论
-        [DictionaryTranslateAttribute("IsPass")]
+
         public bool IsHaveQuestion { get; set; }
 
+        [DictionaryTranslateAttribute("IsPass")]
 
-
+        public bool? IsHaveQuestionView => AuditState == MedicalReviewAuditState.WaitAudit ? null : IsHaveQuestion;
         //public UserSimpleInfo DoctorUser { get; set; }
 
         //public UserSimpleInfo MedicalManagerUser { get; set; }

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

@@ -25,7 +25,8 @@ namespace IRaCIS.Core.Application.Service
            .ForMember(d => d.QCProcessEnum, u => u.MapFrom(s => s.Trial.QCProcessEnum))
           .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.Subject.Code))
           .ForMember(d => d.SubmitUserName, u => u.MapFrom(s => s.SubmitUser.FullName))
-
+          .ForMember(d => d.ClinicalInformationTransmissionEnum, u => u.MapFrom(s => s.Trial.ClinicalInformationTransmissionEnum))
+          
            .ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t => t.IsBaseLine ? t.PreviousHistoryList.Any() || t.PreviousOtherList.Any()
            || t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count > 0)
            || t.PreviousSurgeryList.Any() : false))
@@ -116,7 +117,7 @@ namespace IRaCIS.Core.Application.Service
              .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.Subject.Code))
              .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
 
-             .ForMember(d => d.CheckDialogStr, u => u.MapFrom(t => string.Join(" | ", t.CheckChallengeDialogList.OrderBy(t => t.CreateTime).Select(c => c.CreateUser.UserName + " " + c.CreateTime.ToString("yyyy-MM-dd HH:mm:ss") + " :" + c.TalkContent))))
+             .ForMember(d => d.CheckDialogStr, u => u.MapFrom(t => string.Join("\n\n", t.CheckChallengeDialogList.OrderBy(t => t.CreateTime).Select(c => c.CreateUser.UserName + " (" + c.CreateTime.ToString("yyyy-MM-dd HH:mm:ss") + ") :" + c.TalkContent))))
                .ForMember(d => d.ModalityList, c => c.MapFrom(s =>
                 (s.NoneDicomStudyList.Select(t => t.Modality)
                 .Union(s.StudyList.Select(k => k.ModalityForEdit))).Distinct()))
@@ -154,7 +155,7 @@ namespace IRaCIS.Core.Application.Service
                .ForMember(o => o.MedicalNo, t => t.MapFrom(u => u.VisitTask.Subject.MedicalNo))
                .ForMember(o => o.DoctorUserName, t => t.MapFrom(u => u.VisitTask.DoctorUser.UserName))
                .ForMember(o => o.MedicalManagerUserName, t => t.MapFrom(u => u.MedicalManagerUser.UserName))
-               .ForMember(o => o.QuestionContent, t => t.MapFrom(u=> string.Join('|', u.ReadingMedicalReviewDialogList.Where(t => t.IsHaveQuestion).Select(t=>t.Questioning))) );
+               .ForMember(o => o.QuestionContent, t => t.MapFrom(u=> string.Join("\n\n", u.ReadingMedicalReviewDialogList.Where(t => t.IsHaveQuestion).Select(t=>t.Questioning))) );
 
             CreateMap<VisitTask, TaskMedicalReviewExportDto>()
                 .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName))