修改

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

@@ -199,8 +199,8 @@ namespace IRaCIS.Core.Application.ViewModel
     
     }
 
-    public class CriterionNidusData : CriterionNidus
-    {
+    public class CriterionNidusData : CriterionNidusSystem
+	{
         public Guid OriginalId { get; set; }
     }
 

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs

@@ -28,7 +28,7 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
         private readonly IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository;
         private readonly IRepository<ReadingOncologyTaskInfo> _readingOncologyTaskInfoRepository;
-        private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository;
+        private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
 
         private readonly IReadingImageTaskService _iReadingImageTaskService;
         private readonly IRepository<User> _userTaskRepository;
@@ -49,7 +49,7 @@ namespace IRaCIS.Core.Application.Service
             IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository,
              IRepository<ReadingGlobalTaskInfo> readingGlobalTaskInfoRepository,
                IRepository<ReadingOncologyTaskInfo> readingOncologyTaskInfoRepository,
-              IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
+              IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
             IRepository<User> userTaskRepository,
             IVisitTaskService visitTaskService,
             IRepository<TaskMedicalReview> taskMedicalReviewRepository,

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs

@@ -27,7 +27,7 @@ namespace IRaCIS.Core.Application.Service
         private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IRepository<OrganTrialInfo> _organTrialInfoRepository;
         private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrial;
-        private readonly IRepository<CriterionNidus> _criterionNidusRepository;
+        private readonly IRepository<CriterionNidusSystem> _criterionNidusRepository;
         private readonly IRepository<CriterionNidusTrial> _criterionNidusTrialRepository;
 		private readonly IRepository<ReadingQuestionCriterionSystem> _readingQuestionCriterionSystemRepository;
 
@@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Service
             IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrial,
 			 IRepository<CriterionNidusTrial> criterionNidusTrialRepository,
 			  IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository,
-			IRepository<CriterionNidus> criterionNidusRepository
+			IRepository<CriterionNidusSystem> criterionNidusRepository
             )
         {
             _organInfoRepository = organInfoRepository;

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs

@@ -19,7 +19,7 @@ namespace IRaCIS.Core.Application.Service.RC
         private readonly IRepository<ReadingQuestionTrial> _readingQuestionTrialRepository;
         private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswer;
         private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
-        private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository;
+        private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
 		private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
 		private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IRepository<SystemCriterionDictionaryCode> _systemCriterionDictionaryCodeRepository;
@@ -32,7 +32,7 @@ namespace IRaCIS.Core.Application.Service.RC
             IRepository<ReadingQuestionCriterionSystem> readingQuestionCriterionSystemRepository,
             IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
             IRepository<ReadingQuestionTrial> readingQuestionTrialRepository,
-               IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
+               IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
 				  IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
 			  IRepository<VisitTask> visitTaskRepository,
                  IRepository<SystemCriterionDictionaryCode> systemCriterionDictionaryCodeRepository,
@@ -135,8 +135,8 @@ namespace IRaCIS.Core.Application.Service.RC
 
             await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.SystemCriterionId && x.ParentCode == ReadingCommon.CriterionDictionary.GlobalAssess);
 
-            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryList.Select(x => new ReadingCriterionDictionary
-            {
+            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryList.Select(x => new ReadingSystemCriterionDictionary
+			{
                 CriterionId = inDto.SystemCriterionId,
                 DictionaryId = x.DictionaryId,
                 IsSystemCriterion = true,
@@ -206,8 +206,8 @@ namespace IRaCIS.Core.Application.Service.RC
 
             await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.SystemCriterionId && x.ParentCode == ReadingCommon.CriterionDictionary.OncologyAssess);
 
-            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingCriterionDictionary
-            {
+            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingSystemCriterionDictionary
+			{
                 CriterionId = inDto.SystemCriterionId,
                 DictionaryId = x,
                 IsSystemCriterion = true,
@@ -537,7 +537,7 @@ namespace IRaCIS.Core.Application.Service.RC
         [HttpPost]
         public async Task<IResponseOutput> SetDictionaryFollowVisitUse(SetDictionaryFollowVisitUseInDto inDto)
         {
-            await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingCriterionDictionary()
+            await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingSystemCriterionDictionary()
             {
                 IsFollowVisitUse = inDto.IsFollowVisitUse
             });
@@ -556,7 +556,7 @@ namespace IRaCIS.Core.Application.Service.RC
         [HttpPost]
         public async Task<IResponseOutput> SetDictionaryBaseLineUse(SetDictionaryBaseLineUseInDto inDto)
         {
-            await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingCriterionDictionary()
+            await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new ReadingSystemCriterionDictionary()
             {
                 IsBaseLineUse = inDto.IsBaseLineUse
             });
@@ -602,7 +602,7 @@ namespace IRaCIS.Core.Application.Service.RC
         [HttpPost]
         public async Task<bool> EditCriterionDictionary(EditCriterionDictionaryInDto inDto)
         {
-            await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id,x=>new ReadingCriterionDictionary() { 
+            await _readingCriterionDictionaryRepository.UpdatePartialFromQueryAsync(inDto.Id,x=>new ReadingSystemCriterionDictionary() { 
                 CrterionDictionaryGroup=inDto.CrterionDictionaryGroup
             });
 
@@ -620,7 +620,7 @@ namespace IRaCIS.Core.Application.Service.RC
             await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.CriterionId && x.ParentCode == inDto.ParentCode);
 
 
-            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingCriterionDictionary()
+            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryIds.Select(x => new ReadingSystemCriterionDictionary()
             {
                 CriterionId = inDto.CriterionId,
                 DictionaryId = x,
@@ -644,7 +644,7 @@ namespace IRaCIS.Core.Application.Service.RC
         {
             await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == inDto.CriterionId && x.ParentCode == inDto.ParentCode);
 
-            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryList.Select(x => new ReadingCriterionDictionary()
+            await _readingCriterionDictionaryRepository.AddRangeAsync(inDto.DictionaryList.Select(x => new ReadingSystemCriterionDictionary()
             {
                 CriterionId = inDto.CriterionId,
                 DictionaryId = x.DictionaryId,

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

@@ -26,7 +26,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
         private readonly IRepository<Dictionary> _dictionaryRepository;
         private readonly IReadingImageTaskService _iReadingImageTaskService;
-        private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository;
+        private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
         private readonly IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository;
         private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
         private readonly IRepository<Trial> _trialRepository;
@@ -46,7 +46,7 @@ namespace IRaCIS.Application.Services
             IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
             IRepository<Dictionary> dictionaryRepository,
             IReadingImageTaskService iReadingImageTaskService,
-            IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
+            IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
             IRepository<ReadingTableQuestionTrial> readingTableQuestionTrialRepository,
             IRepository<ReadingCriterionPage> readingCriterionPageRepository,
             IRepository<Trial> trialRepository,

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs

@@ -345,8 +345,8 @@ namespace IRaCIS.Application.Services
 
             result.TaskList.ForEach(x =>
             {
-                x.AfterQuestionList = x.BeforeQuestionList
-                .GroupJoin(
+                x.AfterQuestionList = x.BeforeQuestionList.Where(x => x.IsJudgeQuestion)
+				.GroupJoin(
                     globalReadingQuestion
                       , l => new { a = l.QuestionId, b = x.VisitTaskId }
                       , r => new { a = r.QuestionId, b = r.TaskId }

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -42,7 +42,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ReadModule> _readModuleRepository;
         private readonly IRepository<DicomInstance> _dicomInstanceRepository;
         private readonly IRepository<OrganInfo> _organInfoRepository;
-        private readonly IRepository<ReadingCriterionDictionary> _readingCriterionDictionaryRepository;
+        private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
 		private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
 		private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
         private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
@@ -80,7 +80,7 @@ namespace IRaCIS.Application.Services
                   IRepository<DicomInstance> dicomInstanceRepository,
                    IRepository<OrganInfo> organInfoRepository,
                   IMemoryCache cache,
-                  IRepository<ReadingCriterionDictionary> readingCriterionDictionaryRepository,
+                  IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
 				  IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
 				  IRepository<TumorAssessment_RECIST1Point1> tumorAssessmentRepository,
                   IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,

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

@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.SiteCodes, u => u.MapFrom(s => s.ReadingPeriodSites.Select(x => x.TrialSite.TrialSiteCode)))
                 .ForMember(d => d.PlanCount, u => u.MapFrom(s => s.ReadingPeriodPlanList.Count));
 
-            CreateMap<ReadingCriterionDictionary, CriterionDictionaryInfo>()
+            CreateMap<ReadingSystemCriterionDictionary, CriterionDictionaryInfo>()
              .ForMember(d => d.ChildGroup, u => u.MapFrom(s => s.Dictionary.ChildGroup))
             .ForMember(d => d.Code, u => u.MapFrom(s => s.Dictionary.Code))
              .ForMember(d => d.Description, u => u.MapFrom(s => s.Dictionary.Description))
@@ -252,8 +252,8 @@ namespace IRaCIS.Core.Application.Service
 			#region 阅片部位
 
 			CreateMap<CriterionNidusTrial, CriterionNidusView>();
-			CreateMap<CriterionNidus, CriterionNidusView>();
-            CreateMap<CriterionNidus, CriterionNidusAddOrEdit>().ReverseMap();
+			CreateMap<CriterionNidusSystem, CriterionNidusView>();
+            CreateMap<CriterionNidusSystem, CriterionNidusAddOrEdit>().ReverseMap();
 
             CreateMap<OrganInfoAddOrEdit, OrganInfo>();
             CreateMap<OrganInfo, OrganInfoView>();