修改

IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs

@@ -78,6 +78,10 @@ namespace IRaCIS.Application.Contracts
 
     }
 
+    public class GetBasicDataAllSelectInDto
+    {
+        public Guid? TrialReadingCriterionId { get; set; }
+    }
 
 
     public class BasicDicSelect

IRaCIS.Core.Application/Service/Common/DictionaryService.cs

@@ -20,10 +20,12 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<TrialDictionary> _trialDictionaryRepository;
         private readonly IRepository<Doctor> _doctorRepository;
         private readonly IRepository<Trial> _trialRepository;
+        private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository;
         private readonly IReadingQuestionService _readingQuestionService;
 
         public DictionaryService(IRepository<Dictionary> sysDicRepository, IRepository<DoctorDictionary> doctorDictionaryRepository, IRepository<TrialDictionary> trialDictionaryRepository,
             IRepository<Doctor> doctorRepository, IRepository<Trial> trialRepository,
+             IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
             IReadingQuestionService readingQuestionService
 
 
@@ -34,7 +36,7 @@ namespace IRaCIS.Application.Services
             _trialDictionaryRepository = trialDictionaryRepository;
             _doctorRepository = doctorRepository;
             _trialRepository = trialRepository;
-         
+            this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository;
             this._readingQuestionService = readingQuestionService;
         }
 
@@ -222,11 +224,44 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <returns></returns>
         [AllowAnonymous]
-        public async Task<Dictionary<string, List<BasicDicSelect>>> GetBasicDataAllSelect()
+        public async Task<Dictionary<string, List<BasicDicSelect>>> GetBasicDataAllSelect(GetBasicDataAllSelectInDto inDto)
         {
             var searchList = await _dicRepository.Where(t => t.ParentId != null && t.IsEnable ).ProjectTo<BasicDicSelect>(_mapper.ConfigurationProvider).ToListAsync();
 
-            return searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList());
+            var result = searchList.GroupBy(t => t.ParentCode).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList());
+
+            if (inDto.TrialReadingCriterionId == null)
+            {
+                return result;
+            }
+            else
+            {
+                var criterionDictionList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == inDto.TrialReadingCriterionId).Select(x => new BasicDicSelect()
+                {
+                    ChildGroup = x.Dictionary.ChildGroup,
+                    Code = x.Dictionary.Code,
+                    DataTypeEnum = x.Dictionary.DataTypeEnum,
+                    ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum,
+                    ShowOrder = x.Dictionary.ShowOrder,
+                    ParentCode = x.ParentCode,
+                    Id = x.DictionaryId,
+                    ParentId = x.Dictionary.ParentId,
+                    Value = x.Dictionary.Value,
+                    ValueCN = x.Dictionary.ValueCN
+
+                }).ToListAsync();
+
+                var criterionDic = criterionDictionList.GroupBy(x => x.Code).ToDictionary(g => g.Key, g => g.OrderBy(t => t.ShowOrder).ToList());
+
+                foreach (var item in criterionDic)
+                {
+                    result[item.Key] = item.Value;
+                }
+
+                return result;
+            }
+
+           
         }
 
         #region 稽查相关