20240806 导表修改代码

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

@@ -7,6 +7,7 @@ using Newtonsoft.Json;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using System.Web;
 
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -161,9 +162,61 @@ namespace IRaCIS.Core.Application.Contracts
 
     #region 导出模型
 
+
+    public class TrainingRecordExportDTO
+    {
+        public Guid Id { get; set; }
+
+        public Guid FileTypeId { get; set; }
+
+        public Guid UserTypeId { get; set; }
+
+        public string FileType { get; set; }
+
+        public string Name { get; set; }
+
+        [DictionaryTranslateAttribute("IsSystemDoc")]
+        public bool IsSystemDoc { get; set; }
+
+        [DictionaryTranslateAttribute("YesOrNo")]
+        public bool IsDeleted { get; set; }
+
+        //上传时间
+        public DateTime CreateTime { get; set; }
+
+        [DictionaryTranslateAttribute("YesOrNo")]
+        public bool IsConfirmed { get; set; }
+
+        public string RealName { get; set; }
+
+        public string UserName { get; set; }
+
+        public string UserTypeShortName { get; set; }
+
+
+        public DateTime? ConfirmTime { get; set; }
+    }
+
     public class CRCVisitExportDTO
     {
-        public ChallengeStateEnum ChallengeState { get; set; }
+        //关闭 未关闭
+        [DictionaryTranslateAttribute("CheckIsClosedEnum")]
+        public ChallengeStateEnum CheckIsClosedEnum { get; set; }
+
+        //强行要分为两个字段  有无质疑
+        [DictionaryTranslateAttribute("YesOrNo")]
+        public bool IsChallengeClosed => (int)CheckIsClosedEnum > 0;
+
+        //临床数据收集
+
+        public string ClinicalDataCollect => $"{DicomStudyCount},{NoneDicomStudyCount}{(IsBaseLine? (ClinicalInformationTransmissionEnum>0 &&IsHaveClinicalData ? "w/" : "w/o") :"" )}";
+
+        public int? DicomStudyCount { get; set; }
+        public int? NoneDicomStudyCount { get; set; }
+
+        public int ClinicalInformationTransmissionEnum { get; set; }
+
+        public bool IsBaseLine { get; set; }
 
         [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsUrgent { get; set; }
@@ -197,12 +250,31 @@ namespace IRaCIS.Core.Application.Contracts
         public DateTime? ReviewAuditTime { get; set; }
         public DateTime? PreliminaryAuditTime { get; set; }
 
+        //审核通过时间
         public DateTime? AuditTime => QCProcessEnum == TrialQCProcess.SingleAudit ? PreliminaryAuditTime : (QCProcessEnum == TrialQCProcess.DoubleAudit ? ReviewAuditTime : null);
     }
 
 
+    public class QCVisitExportDTO: CRCVisitExportDTO
+    {
+        //上传人
+        public string SubmitUserRealName { get; set; }
+
+        public string PreliminaryAuditUserName { get; set; }
+
+        public string ReviewAuditUserName { get; set; }
+
+        public string CurrentActionUserName { get; set; }
+
+
+    }
+
     public class QCChanllengeExportDto
     {
+        //审核批次
+        [DictionaryTranslateAttribute("CurrentQCType")]
+        public CurrentQC? CurrentQCEnum { get; set; }
+
 
         [DictionaryTranslateAttribute("Subject_Visit_Status")]
         public SubjectStatus SubjectState { get; set; }
@@ -654,7 +726,6 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class ReadingTaskExportDto
     {
-        //public TaskAllocationState TaskAllocationState { get; set; }
 
         [DictionaryTranslateAttribute("Subject_Visit_Status")]
         public SubjectStatus SubjectStatus { get; set; }
@@ -662,13 +733,14 @@ namespace IRaCIS.Core.Application.Contracts
 
         public DateTime? AllocateTime { get; set; }
 
-        //public bool IsPMSetBack { get; set; }
 
         public string TaskCode { get; set; }
 
         public string TaskName { get; set; }
         public string TaskBlindName { get; set; }
 
+        public string FinalTaskName => TaskName != TaskBlindName ? $"{TaskName}/{TaskBlindName}" : TaskName;
+
         public decimal VisitTaskNum { get; set; }
 
         [DictionaryTranslateAttribute("ReadingCategory")]
@@ -690,6 +762,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public String TrialSiteCode { get; set; } = String.Empty;
         public string SubjectCode { get; set; } = String.Empty;
+        public string MedicalNo { get; set; }
+        public string FinalSubjectCode { get; set; }
 
         public string TrialReadingCriterionName { get; set; }
 
@@ -711,8 +785,7 @@ namespace IRaCIS.Core.Application.Contracts
     {
 
 
-        //public ReadingTaskExportDto ApplyTask { get; set; }
-
+        
 
 
         public string? ReReadingNewTaskCode { get; set; }
@@ -742,8 +815,7 @@ namespace IRaCIS.Core.Application.Contracts
     public class TaskMedicalReviewExportDto : ReadingTaskExportDto
     {
 
-        public string MedicalNo { get; set; } = string.Empty;
-
+        public string QuestionContent { get; set; }
 
         [DictionaryTranslateAttribute("MedicalReviewAuditState")]
         public MedicalReviewAuditState AuditState { get; set; }
@@ -755,7 +827,8 @@ namespace IRaCIS.Core.Application.Contracts
         [DictionaryTranslateAttribute("AuditAdvice")]
         public AuditAdvice AuditAdviceEnum { get; set; }
 
-        [DictionaryTranslateAttribute("YesOrNo")]
+        //审核结论
+        [DictionaryTranslateAttribute("IsPass")]
         public bool IsHaveQuestion { get; set; }
 
 
@@ -764,7 +837,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         //public UserSimpleInfo MedicalManagerUser { get; set; }
 
-        //public string DoctorUserName { get; set; }
+        public string DoctorUserName { get; set; }
+
+
         public string MedicalManagerUserName { get; set; }
 
         /// <summary>