修改导表

2023-02-22 16:22:49 +08:00
parent 75f806ce80
commit e3519d47a6
4 changed files with 113 additions and 6 deletions
@@ -383,7 +383,7 @@ namespace IRaCIS.Core.Application.Contracts
        public List<MouduleProgress> ModuleList { get; set; }


-        public List<MouduleProgress> TotalList => VisitList .OrderByDescending(t=>t.Inplan).Union(ModuleList.OrderBy(t=>t.ReadingSetType).ThenBy(t=>t.VisitTaskNum)).ToList();
+        public List<MouduleProgress> TotalList => VisitList.OrderByDescending(t => t.Inplan).Union(ModuleList.OrderBy(t => t.ReadingSetType).ThenBy(t => t.VisitTaskNum)).ToList();


        public class MouduleProgress
@@ -408,7 +408,7 @@ namespace IRaCIS.Core.Application.Contracts

            //阅片期会有
            public ReadingSetType? ReadingSetType { get; set; }
-        }    
+        }

    }

@@ -686,7 +686,7 @@ namespace IRaCIS.Core.Application.Contracts
        public string AgainEvaluateResult { get; set; } = String.Empty;
    }

-    public class GroupAnalysisExport: AnalysisExortCommon
+    public class GroupAnalysisExport : AnalysisExortCommon
    {

        [DictionaryTranslateAttribute("ArmEnum")]
@@ -708,7 +708,7 @@ namespace IRaCIS.Core.Application.Contracts

    }

-    public class SelftAnalysisExport: AnalysisExortCommon
+    public class SelftAnalysisExport : AnalysisExortCommon
    {
        //自身一致性分析任务特有

@@ -771,8 +771,56 @@ namespace IRaCIS.Core.Application.Contracts

    }

+    public class PCWG3LessionInfo
+    {
+        //病灶编号
+        public string LessionCode { get; set; }


+        [DictionaryTranslateAttribute("LesionType")]
+        //病灶类型
+        public string LessionType { get; set; }
+
+        //所在部位
+        public string LessionLocation { get; set; }
+
+
+        //部位描述
+        public string BodyPartDescription { get; set; }
+
+
+        [DictionaryTranslateAttribute("TargetState")]
+        //病灶状态
+        public string LessionState { get; set; }
+    }
+
+    public class PCWG3DetailedOfEvaluatedLesionExport : OverallTumorEvaluationExport
+    {
+
+        [JsonIgnore]
+        public List<PCWG3LessionInfo> LesionList = new List<PCWG3LessionInfo>();
+
+        //病灶编号
+        public string LessionCode { get; set; }
+
+
+        [DictionaryTranslateAttribute("LesionType")]
+        //病灶类型
+        public string LessionType { get; set; }
+
+        //所在部位
+        public string LessionLocation { get; set; }
+
+
+        //部位描述
+        public string BodyPartDescription { get; set; }
+
+
+        [DictionaryTranslateAttribute("EvaluationOfState")]
+        //病灶状态
+        public string LessionState { get; set; }
+    }
+

    //RECIST1.1评估病灶明细表 

@@ -219,6 +219,27 @@ namespace IRaCIS.Core.Application.Service
                    .ForMember(o => o.LessionState, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State).FirstOrDefault().Answer));


+            CreateMap<VisitTask, PCWG3DetailedOfEvaluatedLesionExport>().IncludeBase<VisitTask, OverallTumorEvaluationExport>()
+                 .ForMember(o => o.LesionList, t => t.MapFrom(u => u.LesionList));
+
+
+            CreateMap<ReadingTableAnswerRowInfo, PCWG3LessionInfo>()
+                 .ForMember(o => o.LessionCode, t => t.MapFrom(u => u.RowMark))
+                  .ForMember(o => o.LessionType, t => t.MapFrom(u => (int?)u.ReadingQuestionTrial.LesionType))
+
+                   //位置可能是自己填写的
+                   .ForMember(o => o.LessionLocation, t =>
+                   //t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault().Answer)
+                   t.MapFrom(u => u.OrganInfo.IsCanEditPosition ?
+                   u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault().Answer : isEn_Us ? u.OrganInfo.TULATEN : u.OrganInfo.TULAT)
+                   )
+                   
+                   .ForMember(o => o.BodyPartDescription, t =>
+                    //t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Part).FirstOrDefault().Answer)
+                    t.MapFrom(u => isEn_Us ? u.OrganInfo.PartEN : u.OrganInfo.Part)
+                   )              
+                   .ForMember(o => o.LessionState, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State).FirstOrDefault().Answer));
+
            #endregion