导表修改

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; }