修改导表

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

@@ -370,7 +370,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         [DictionaryTranslateAttribute("AuditStateRC")]
         public AuditStateEnum AuditState { get; set; }
-        
+
 
         [DictionaryTranslateAttribute("CheckState")]
         public CheckStateEnum CheckState { get; set; }
@@ -411,7 +411,11 @@ namespace IRaCIS.Core.Application.Contracts
     {
         //public TaskAllocationState TaskAllocationState { get; set; }
 
-        //public DateTime? AllocateTime { get; set; }
+        [DictionaryTranslateAttribute("Subject_Visit_Status")]
+        public SubjectStatus SubjectStatus { get; set; }
+
+
+        public DateTime? AllocateTime { get; set; }
 
         //public bool IsPMSetBack { get; set; }
 
@@ -433,7 +437,10 @@ namespace IRaCIS.Core.Application.Contracts
 
         public DateTime? CreateTime { get; set; }
 
+        [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsUrgent { get; set; }
+
+        [DictionaryTranslateAttribute("ArmEnum")]
         public Arm ArmEnum { get; set; }
 
         public String TrialSiteCode { get; set; } = String.Empty;
@@ -455,11 +462,11 @@ namespace IRaCIS.Core.Application.Contracts
     }
 
 
-    public class ReReadingTaskExportDto
+    public class ReReadingTaskExportDto : ReadingTaskExportDto
     {
 
 
-        public ReadingTaskExportDto ApplyTask { get; set; }
+        //public ReadingTaskExportDto ApplyTask { get; set; }
 
 
 
@@ -488,7 +495,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
 
-     public class TaskMedicalReviewExportDto : ReadingTaskExportDto
+    public class TaskMedicalReviewExportDto : ReadingTaskExportDto
     {
 
         public string MedicalNo { get; set; } = string.Empty;
@@ -501,20 +508,20 @@ namespace IRaCIS.Core.Application.Contracts
         [DictionaryTranslateAttribute("MedicalReviewDoctorUserIdea")]
         public MedicalReviewDoctorUserIdea DoctorUserIdeaEnum { get; set; }
 
-        /// <summary>
-        /// 审核建议
-        /// </summary>
+        [DictionaryTranslateAttribute("AuditAdvice")]
         public AuditAdvice AuditAdviceEnum { get; set; }
 
-
+        [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsHaveQuestion { get; set; }
 
 
 
-        public UserSimpleInfo DoctorUser { get; set; }
+        //public UserSimpleInfo DoctorUser { get; set; }
 
-        public UserSimpleInfo MedicalManagerUser { get; set; }
+        //public UserSimpleInfo MedicalManagerUser { get; set; }
 
+        //public string DoctorUserName { get; set; }
+        public string MedicalManagerUserName { get; set; }
 
         /// <summary>
         /// 医学审核对话关闭原因
@@ -525,9 +532,153 @@ namespace IRaCIS.Core.Application.Contracts
         /// <summary>
         /// 无效的 为True无效
         /// </summary>
+        [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsInvalid { get; set; }
     }
 
+
+    public class SelftAnalysisExport
+    {
+        public Guid Id { get; set; }
+        public string TaskName { get; set; }
+        public string TaskBlindName { get; set; }
+
+        public decimal VisitTaskNum { get; set; }
+        public bool? IsSelfAnalysis { get; set; }
+
+        //自身一致性分析任务特有
+        public bool? IsAnalysisDiffToOriginalData { get; set; }
+
+
+        public string TrialReadingCriterionName { get; set; }
+
+        public CriterionType CriterionType { get; set; }
+
+        public String TrialSiteCode { get; set; } = String.Empty;
+        public string SubjectCode { get; set; } = String.Empty;
+
+
+        [DictionaryTranslateAttribute("ArmEnum")]
+        public Arm ArmEnum { get; set; }
+        public string UserName { get; set; }
+
+        public string EvaluateResult { get; set; }
+
+        public string AgainEvaluateResult { get; set; } = String.Empty;
+    }
+
+
+
+    public class OverallTumorEvaluationExport
+    {
+        public String TrialSiteCode { get; set; } = String.Empty;
+        public string SubjectCode { get; set; } = String.Empty;
+
+        public Guid Id { get; set; }
+        public string TaskName { get; set; }
+        public string TaskBlindName { get; set; }
+
+        public decimal VisitTaskNum { get; set; }
+
+
+        [DictionaryTranslateAttribute("ArmEnum")]
+        public Arm ArmEnum { get; set; }
+        public string UserName { get; set; }
+
+
+        //public CriterionType CriterionType { get; set; }
+
+        [DictionaryTranslateAttribute("OverallAssessment", CriterionType.RECIST1Pointt1)]
+        [DictionaryTranslateAttribute("VisitTumorEvaluation", CriterionType.PCWG3)]
+        //整体肿瘤评估结果  需要翻译  
+        public string OverallTumorEvaluationResult { get; set; }
+
+        public Guid? JudgeResultTaskId { get; set; }
+
+        [DictionaryTranslateAttribute("YesOrNo")]
+        public bool IsGenerateJudge => JudgeResultTaskId != null;
+
+
+
+    }
+
+
+
+    public class RECIST1Point1EvaluationOfTumorEfficacyExport : OverallTumorEvaluationExport
+    {
+        [DictionaryTranslateAttribute("TargetAssessment", CriterionType.RECIST1Pointt1)]
+        // 靶病灶评估
+        public string TargetlesionEvaluationResult { get; set; }
+
+        [DictionaryTranslateAttribute("NoTargetAssessment", CriterionType.RECIST1Pointt1)]
+        // 非靶病灶评估
+        public string NoneTargetlesionEvaluationResult { get; set; }
+
+        // 是否存在新病灶
+        [DictionaryTranslateAttribute("NewLesionAssessment", CriterionType.RECIST1Pointt1)]
+        public string IsExistNewlesionEvaluationResult { get; set; }
+
+
+
+    }
+
+    //RECIST1.1评估病灶明细表 
+    public class RECIST1Point1DetailedOfEvaluatedLesionExport : RECIST1Point1EvaluationOfTumorEfficacyExport
+    {
+
+        //病灶编号
+        public string LessionCode { get; set; }
+
+
+        //病灶类型
+        public string LessionType { get; set; }
+
+        //所在部位
+        public string LessionLocation { get; set; }
+
+        //所在器官
+        public string LessionOrgan { get; set; }
+
+        //是否淋巴结
+        public string IsLymph { get; set; }
+
+        //部位描述
+        public string BodyPartDescription { get; set; }
+
+        //测量值
+        public string MeasurementResult { get; set; }
+
+
+        //长径
+        public string LongDiameter { get; set; }
+
+        //短径
+        public string ShortDiameter { get; set; }
+
+        //病灶状态
+        public string LessionState { get; set; }
+    }
+
+
+    public class PGW3DetailedOfEvaluatedLesionExport : OverallTumorEvaluationExport
+    {
+        //病灶编号
+        public string LessionCode { get; set; }
+
+
+        //病灶类型
+        public string LessionType { get; set; }
+
+        //所在部位
+        public string LessionLocation { get; set; }
+
+        //部位描述
+        public string BodyPartDescription { get; set; }
+
+        //病灶状态
+        public string LessionState { get; set; }
+    }
+
     #endregion