修改一版

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -4081,24 +4081,23 @@
             阅片问题.标准
             </summary>
         </member>
-        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingQuestionCriterionSystem(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto)">
-            <summary>
-            新增修改系统问题标准
-            </summary>
-            <param name="indto"></param>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetReadingQuestionCriterionSystemList(IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemViewInDto)">
             <summary>
             获取系统问题标准
             </summary>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.DeleteReadingQuestionCriterionSystem(System.Guid)">
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.SetSystemReadingQuestionCriterionIsIsEnable(IRaCIS.Core.Application.Service.Reading.Dto.SetSystemReadingQuestionCriterionIsIsEnable)">
             <summary>
-            删除系统问题标准
+            设置系统问题标准是否生效
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddSystemQuestionCriterion">
+            <summary>
+            添加系统qc问题标准
             </summary>
-            <param name="readingQuestionCriterionSystemId"></param>
             <returns></returns>
         </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingQuestionSystem(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto)">
@@ -4121,6 +4120,12 @@
             <param name="readingQuestionSystemId"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddSystemDataToTrila(System.Guid)">
+            <summary>
+            添加系统数据到项目里面
+            </summary>
+            <returns></returns>  
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingQuestionCriterionTrial(IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto)">
             <summary>
             新增修改项目问题标准（项目）

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -54,6 +54,21 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public string CriterionName { get; set; }=String.Empty;
 	}
 
+	public class CriterionList
+	{
+		public Guid Id { get; set; }
+
+		public string Value { get; set; }
+	}
+
+	public class SetSystemReadingQuestionCriterionIsIsEnable
+	{
+		[NotDefault]
+		public Guid ReadingQuestionCriterionSystemId { get; set; }
+
+		[NotDefault]
+		public bool IsEnable { get; set; }
+	}
 
 	/// <summary>
 	/// 

IRaCIS.Core.Application/Service/Reading/ReadModuleService.cs

@@ -39,8 +39,8 @@ namespace IRaCIS.Application.Services
             IRepository<Subject> subjectRepository,
             IRepository<VisitStage> visitstageRepository,
             IRepository<User> UserRepository,
-             IRepository<Trial> trialRepository,
+            IRepository<Trial> trialRepository,
-              IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
+            IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
             IRepository<ReadModuleView> readModuleViewRepository,
             IRepository<DicomInstance> dicomInstanceRepository,
             IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository,

IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs

@@ -11,6 +11,7 @@ using IRaCIS.Core.Domain.Share.Reading;
 using MassTransit;
 using IRaCIS.Core.Application.Service.Reading;
 using IRaCIS.Core.Infra.EFCore.Common;
+using Panda.DynamicWebApi.Attributes;
 
 namespace IRaCIS.Application.Services
 {
@@ -28,6 +29,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
         private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
         private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
+        private readonly IRepository<Dictionary> _dictionaryRepository;
         private readonly IRepository<PreviousPDF> _previousPDFRepository;
 
         public ReadingQuestionService(IRepository<SubjectVisit> subjectVisitRepository,
@@ -38,6 +40,7 @@ namespace IRaCIS.Application.Services
                  IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
             IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
               IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
+               IRepository<Dictionary> dictionaryRepository,
             IRepository<PreviousPDF> previousPDFRepository
           )
         {
@@ -48,20 +51,21 @@ namespace IRaCIS.Application.Services
             this._readingQuestionTrialRepository = readingQuestionTrialRepository;
             _clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
             _clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
+            this._dictionaryRepository = dictionaryRepository;
             this._previousPDFRepository = previousPDFRepository;
         }
 
-        /// <summary>
+        ///// <summary>
-        /// 新增修改系统问题标准
+        ///// 新增修改系统问题标准
-        /// </summary>
+        ///// </summary>
-        /// <param name="indto"></param>
+        ///// <param name="indto"></param>
-        /// <returns></returns>
+        ///// <returns></returns>
-        [HttpPost]
+        //[HttpPost]
-        public async Task<IResponseOutput> AddOrUpdateReadingQuestionCriterionSystem(AddOrUpdateReadingQuestionCriterionSystemInDto indto)
+        //public async Task<IResponseOutput> AddOrUpdateReadingQuestionCriterionSystem(AddOrUpdateReadingQuestionCriterionSystemInDto indto)
-        {
+        //{
-            var entity = await _readingQuestionCriterionSystemRepository.InsertOrUpdateAsync(indto,true);
+        //    var entity = await _readingQuestionCriterionSystemRepository.InsertOrUpdateAsync(indto,true);
-            return ResponseOutput.Ok(entity.Id.ToString());
+        //    return ResponseOutput.Ok(entity.Id.ToString());
-        }
+        //}
 
         /// <summary>
         /// 获取系统问题标准
@@ -70,6 +74,7 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<PageOutput<ReadingQuestionCriterionSystemView>> GetReadingQuestionCriterionSystemList(ReadingQuestionCriterionSystemViewInDto inDto)
         {
+            await AddSystemQuestionCriterion();
             var query=  _readingQuestionCriterionSystemRepository.AsQueryable()
                  .WhereIf(!inDto.CriterionName.IsNullOrEmpty(), x => x.CriterionName.Contains(inDto.CriterionName))
                  .ProjectTo<ReadingQuestionCriterionSystemView>(_mapper.ConfigurationProvider);
@@ -78,18 +83,70 @@ namespace IRaCIS.Application.Services
         }
 
         /// <summary>
-        /// 删除系统问题标准
+        /// 设置系统问题标准是否生效
         /// </summary>
-        /// <param name="readingQuestionCriterionSystemId"></param>
+        /// <param name="inDto"></param>
         /// <returns></returns>
-        [HttpDelete("{readingQuestionCriterionSystemId:guid}")]
+        public async Task<IResponseOutput> SetSystemReadingQuestionCriterionIsIsEnable(SetSystemReadingQuestionCriterionIsIsEnable inDto)
-        public async Task<IResponseOutput> DeleteReadingQuestionCriterionSystem(Guid readingQuestionCriterionSystemId)
         {
-             await _readingQuestionCriterionSystemRepository.DeleteFromQueryAsync(t => t.Id == readingQuestionCriterionSystemId);
+           await _readingQuestionCriterionSystemRepository.UpdatePartialFromQueryAsync(inDto.ReadingQuestionCriterionSystemId, x => new ReadingQuestionCriterionSystem()
-            var success = await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
+            {
-            return ResponseOutput.Result(success);
+                IsEnable = inDto.IsEnable
+            });
+
+            var result =await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok(result);
         }
 
+        /// <summary>
+        /// 添加系统qc问题标准
+        /// </summary>
+        /// <returns></returns>
+        public async Task AddSystemQuestionCriterion()
+        {
+            var useSystemQuestionCriterionIds = _readingQuestionCriterionSystemRepository.Select(x => x.CriterionId);
+
+            var dictionaryParentId =await _dictionaryRepository.Where(x => x.Code == "ReadingStandard").Select(x => x.Id).FirstOrDefaultAsync();
+
+            var criterionList = await _dictionaryRepository.Where(x => x.ParentId == dictionaryParentId && !useSystemQuestionCriterionIds.Contains(x.Id))
+                .Select(x => new CriterionList()
+                {
+                    Id = x.Id,
+                    Value = x.Value
+                }).ToListAsync();
+
+
+            List<ReadingQuestionCriterionSystem> needAddCriterionList = new List<ReadingQuestionCriterionSystem>();
+            criterionList.ForEach(x =>
+            {
+                needAddCriterionList.Add(new ReadingQuestionCriterionSystem()
+                {
+                    CriterionId = x.Id,
+                    CriterionName = x.Value,
+                    IsEnable = false,
+
+                });
+
+            });
+           await  _readingQuestionCriterionSystemRepository.AddRangeAsync(needAddCriterionList);
+
+            await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
+        }
+
+        ///// <summary>
+        ///// 删除系统问题标准
+        ///// </summary>
+        ///// <param name="readingQuestionCriterionSystemId"></param>
+        ///// <returns></returns>
+        //[HttpDelete("{readingQuestionCriterionSystemId:guid}")]
+        //public async Task<IResponseOutput> DeleteReadingQuestionCriterionSystem(Guid readingQuestionCriterionSystemId)
+        //{
+        //     await _readingQuestionCriterionSystemRepository.DeleteFromQueryAsync(t => t.Id == readingQuestionCriterionSystemId);
+        //    var success = await _readingQuestionCriterionSystemRepository.SaveChangesAsync();
+        //    return ResponseOutput.Result(success);
+        //}
+
 
 
         /// <summary>
@@ -133,7 +190,18 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Result(success);
         }
 
+        /// <summary>
+        /// 添加系统数据到项目里面
+        /// </summary>
+        /// <returns></returns>  
+        [NonDynamicMethod]
+        private async Task AddSystemDataToTrila(Guid trialId)
+        {
+            var trialUsrSystemIds = _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId && x.ReadingQuestionCriterionSystemId != null)
+                .Select(x => x.ReadingQuestionCriterionSystemId);
+            var needAddSystemDataList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id)).ToListAsync();
 
+        }
 
 
         /// <summary>