From f698d777190bce72959ccc35fc4f35febdbc4024 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 22 May 2023 18:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReadingImageTaskService.cs                | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 283d2e51c..1c52065c3 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -43,11 +43,11 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ReadModule> _readModuleRepository;
         private readonly IRepository<DicomInstance> _dicomInstanceRepository;
         private readonly IRepository<OrganInfo> _organInfoRepository;
-		private readonly IRepository<TrialDocument> _trialDocumentRepository;
-		private readonly IRepository<User> _userRepository;
-		private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
-		private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
-		private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
+        private readonly IRepository<TrialDocument> _trialDocumentRepository;
+        private readonly IRepository<User> _userRepository;
+        private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
+        private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
+        private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
         private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
         private readonly IRepository<ReadingTableQuestionSystem> _readingTableQuestionSystemRepository;
         private readonly IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository;
@@ -82,12 +82,12 @@ namespace IRaCIS.Application.Services
                   IRepository<ReadModule> readModuleRepository,
                   IRepository<DicomInstance> dicomInstanceRepository,
                   IRepository<OrganInfo> organInfoRepository,
-			      IRepository<TrialDocument> trialDocumentRepository,
-				  IRepository<User> userRepository,
-				  IMemoryCache cache,
+                  IRepository<TrialDocument> trialDocumentRepository,
+                  IRepository<User> userRepository,
+                  IMemoryCache cache,
                   IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
-				  IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
-				  IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
+                  IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
+                  IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
                   IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
                   IRepository<ReadingTableQuestionSystem> readingTableQuestionSystemRepository,
                   IRepository<ReadingTableQuestionTrial> readingTableQuestionTrialRepository,
@@ -119,9 +119,9 @@ namespace IRaCIS.Application.Services
             this._readModuleRepository = readModuleRepository;
             this._dicomInstanceRepository = dicomInstanceRepository;
             this._organInfoRepository = organInfoRepository;
-			this._trialDocumentRepository = trialDocumentRepository;
-			this._userRepository = userRepository;
-			this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
+            this._trialDocumentRepository = trialDocumentRepository;
+            this._userRepository = userRepository;
+            this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
             this._tumorAssessmentRepository = tumorAssessmentRepository;
             this._readingTableAnswerRowInfoRepository = readingTableAnswerRowInfoRepository;
             this._readingTableQuestionSystemRepository = readingTableQuestionSystemRepository;
@@ -131,7 +131,7 @@ namespace IRaCIS.Application.Services
             this._readingQuestionCriterionSystemRepository = readingQuestionCriterionSystemRepository;
             this._readingTrialCriterionDictionaryRepository = readingTrialCriterionDictionaryRepository;
 
-			this._readingQuestionSystem = ReadingQuestionSystem;
+            this._readingQuestionSystem = ReadingQuestionSystem;
             this._noneDicomStudyFileSystem = noneDicomStudyFileSystem;
             this._readingQuestionTrialRepository = readingQuestionTrialRepository;
             this._cache = cache;
@@ -147,11 +147,12 @@ namespace IRaCIS.Application.Services
         public async Task<List<GetManualListOutDto>> GetManualList(GetManualListInDto inDto)
         {
             UserTypeEnum userType = (UserTypeEnum)_userInfo.UserTypeEnumInt;
-			//_userInfo.UserTypeId 
+            //_userInfo.UserTypeId 
 
-			return await _trialDocumentRepository.Where(x => x.TrialId == inDto.TrialId 
-            &&x.TrialDocConfirmedUserList.Any(y=>y.ConfirmUserId== _userInfo.Id)
+            return await _trialDocumentRepository.Where(x => x.TrialId == inDto.TrialId
+            && x.TrialDocConfirmedUserList.Any(y => y.ConfirmUserId == _userInfo.Id)
             && x.NeedConfirmedUserTypeList.Any(y => y.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+             .Where(t => t.FileType.Code == "2" || t.FileType.Code == "6")
 				   .Select(x => new GetManualListOutDto()
 				   {
                        Id=x.Id,
@@ -1141,11 +1142,14 @@ namespace IRaCIS.Application.Services
                 QuestionMark.Part,
             };
 
-            orders.ForEach(x =>
+            foreach (var x in orders)
             {
                 Dictionary<string, string> answers = new Dictionary<string, string>();
-                var rowInfo = tableAnsweRowInfos.Where(y => y.RowIndex == x && y.QuestionId == item.Id).FirstOrDefault();
-              
+                var rowInfo = tableAnsweRowInfos.First(y => y.RowIndex == x && y.QuestionId == item.Id);
+                if (rowInfo == null)
+                {
+                    continue;
+                }
 
                 var rowAnswer = thisAnswer.Where(y => y.RowId == rowInfo.Id).OrderBy(y => y.ShowOrder).ToList();
 
@@ -1244,7 +1248,7 @@ namespace IRaCIS.Application.Services
 
 
                 item.TableQuestions.Answers.Add(answers);
-            });
+            };
 
             if (item.Childrens != null && item.Childrens.Count != 0)
             {