修改动态导表

2024-10-23 17:44:09 +08:00
parent 5ee5bac4ad
commit a701c082d9
9 changed files with 278 additions and 244 deletions
@@ -1057,6 +1057,12 @@ namespace IRaCIS.Core.Application.Contracts

    }

+    public class DymamicQuestionInfo
+    {
+        public QuestionMark? QuestionMark { get; set; }
+        public string QuestionName { get; set; }
+        public string TranslateDicName { get; set; }
+    }


    public class CommonQuesionInfo
@@ -1069,9 +1075,90 @@ namespace IRaCIS.Core.Application.Contracts

        public string TranslateDicName { get; set; }
    }
-    public class CommonEvaluationExport : OverallTumorEvaluationExport
+    public class CommonEvaluationExport
    {
        public List<CommonQuesionInfo> QuestionAnswerList { get; set; }
+
+        public String TrialSiteCode { get; set; } = String.Empty;
+        public string SubjectCode { get; set; } = String.Empty;
+
+        public Guid Id { get; set; }
+
+        public Guid? DoctorUserId { get; set; }
+
+        public string TaskName { get; set; }
+        public string TaskBlindName { get; set; }
+
+        public decimal VisitTaskNum { get; set; }
+
+        public bool? IsBaseline { get; set; }
+
+
+        [DictionaryTranslateAttribute("ArmEnum")]
+        public Arm ArmEnum { get; set; }
+        public string UserName { get; set; }
+
+        public ReadingTaskState ReadingTaskState { get; set; }
+
+        public ReadingCategory ReadingCategory { get; set; }
+
+        //裁判结果选择的访视或者全局任务Id
+        public Arm? JudgeArmEnum { get; set; }
+
+        //裁判选择标记
+        //根据裁判的任务结果 设置访视任务的这个字段  该字段表示  裁判认同该任务的结果
+        [DictionaryTranslateAttribute("YesOrNo")]
+        public bool? IsJudgeSelect { get; set; }
+
+
+        //在当前访视触发裁判，或者在截止日期小于等于当前访视的阅片期触发裁判
+        [DictionaryTranslateAttribute("YesOrNo")]
+        public bool IsTrigerJudge { get; set; }
+
+        //（如果是访视点裁判，则仅在所选阅片人对应访视 显示；如果是阅片期裁判，则在所选阅片人 阅片期内的所有访视 显示此原因）
+        public string JudgeNote { get; set; } = string.Empty;
+
+        public string VisitNote { get; set; }
+    }
+
+    public class CommonLessionExport : CommonEvaluationExport
+    {
+        /// <summary>
+        /// 最终导出的病灶信息
+        /// </summary>
+        public List<CommonLessionQuestionAnswerInfo> LessionAnswerList { get; set; }
+
+
+        [JsonIgnore]
+        public List<CommonLessionInfo> LesionList { get; set; } = new List<CommonLessionInfo>();
+    }
+
+    public class CommonLessionInfo
+    {
+        //病灶编号
+        public string LessionCode { get; set; }
+
+        public string LessionType { get; set; }
+
+        //病灶答案
+        public List<CommonLessionQuestionAnswerInfo> LessionAnswerList { get; set; }
+
+    }
+
+    public class CommonLessionQuestionAnswerInfo
+    {
+        public string LessionCode { get; set; }
+
+        public string LessionType { get; set; }
+
+
+        public QuestionMark? QuestionMark { get; set; }
+
+        public string QuestionName { get; set; }
+
+        public string QuestionValue { get; set; }
+
+        public string TranslateDicName { get; set; }
    }


@@ -1146,7 +1233,7 @@ namespace IRaCIS.Core.Application.Contracts


        //在当前访视触发裁判，或者在截止日期小于等于当前访视的阅片期触发裁判
-        [DictionaryTranslateAttribute("YesOrNo")] 
+        [DictionaryTranslateAttribute("YesOrNo")]
        public bool IsTrigerJudge { get; set; }

        //（如果是访视点裁判，则仅在所选阅片人对应访视 显示；如果是阅片期裁判，则在所选阅片人 阅片期内的所有访视 显示此原因）