修改提交接口

2023-03-21 16:01:39 +08:00
parent 2842791af4
commit afe5f1e58f
11 changed files with 200 additions and 53 deletions
@@ -32,7 +32,10 @@ namespace IRaCIS.Core.Application.ViewModel
        public string TrialSiteCode { get; set; }
        public SubjectStatus SubjectStatus { get; set; }

-        public List<EvaluationInfo> EvaluationList { get; set; }
+        public List<EvaluationInfo> FinalEvaluationList { get; set; }
+
+
+        public List<EvaluationInfo> ReadingEvaluationList { get; set; }
    }


@@ -65,11 +65,15 @@ namespace IRaCIS.Core.Application.Service

            var resultTrialReadingCriterionId = Guid.Empty;

+            var curentCriterionType = CriterionType.NoCriterion;
+
            //BM  需要找基线 两个人做的结果
            if (trialReadingCritionList.First(t => t.Id == inQuery.TrialReadingCriterionId).CriterionType == CriterionType.RECIST1Pointt1_MB)
            {
                
                resultTrialReadingCriterionId = trialReadingCritionList.First(t => t.CriterionType == CriterionType.RECIST1Point1).Id;
+
+                curentCriterionType = CriterionType.RECIST1Pointt1_MB;
            }


@@ -96,16 +100,43 @@ namespace IRaCIS.Core.Application.Service

                                                         IsJoinEvaluation = subjectCriteriaEvaluation.IsJoinEvaluation,

-                                                         EvaluationList=subject.SubjectAdditionalEvaluationResult.Where(t=>t.IsFinalResult && t.TrialReadingCriterionId==resultTrialReadingCriterionId).Select(u=>new EvaluationInfo() 
-                                                         { Answer=u.Answer,FinalTranslateDictionaryCode=u.FinalTranslateDictionaryCode,QuestioName=u.TrialReadingQuestion .QuestionName,QuestioNameEn=u.TrialReadingQuestion.QuestionEnName}).ToList()
+
+                                                         ReadingEvaluationList= subject.ReadingTaskQuestionAnswerList
+                                                         .Where(t=>t.ReadingQuestionCriterionTrialId == resultTrialReadingCriterionId && t.ReadingQuestionTrial.IsAdditional==true && t.ReadingQuestionTrial.Type!="group" && t.VisitTask.SourceSubjectVisit.IsBaseLine)
+                                                         .Select(u=>new EvaluationInfo()
+                                                         {
+                                                             Answer=u.Answer,
+                                                             QuestioName=u.ReadingQuestionTrial.QuestionName,
+                                                             QuestioNameEn=u.ReadingQuestionTrial.QuestionEnName,
+                                                             FinalTranslateDictionaryCode=u.ReadingQuestionTrial.DictionaryCode
+                                                         }).ToList()
+
+                                                         //EvaluationList=subject
+                                                         //.SubjectAdditionalEvaluationResult
+                                                         //.Where(t=>t.IsFinalResult && t.TrialReadingCriterionId==resultTrialReadingCriterionId)
+                                                         //.Select(u=>new EvaluationInfo() 
+                                                         //{ Answer=u.Answer,FinalTranslateDictionaryCode=u.FinalTranslateDictionaryCode,QuestioName=u.TrialReadingQuestion .QuestionName,QuestioNameEn=u.TrialReadingQuestion.QuestionEnName}).ToList()
+
+
                                                     };

-
-
-
-
            var pageList = await subjectCriteriaEvaluationQueryable.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField == string.Empty ? nameof(SubjectCriteriaEvaluationView.SubjectCode) : inQuery.SortField, inQuery.Asc);

+            switch (curentCriterionType)
+            {
+              
+                case CriterionType.RECIST1Pointt1_MB:
+
+
+                    break;
+                default:
+                    break;
+            }
+
+
+
+
+
            return pageList;
        }