修改一版

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

@@ -163,6 +163,11 @@ namespace IRaCIS.Core.Application.ViewModel
         /// </summary>
         public Guid CriterionNidusId { get; set; }
 
+        /// <summary>
+		/// 标准 病灶类型
+		/// </summary>
+		public Guid CriterionId { get; set; }
+
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }
     }

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

@@ -244,17 +244,19 @@ namespace IRaCIS.Core.Application.Service
                 await _criterionNidusRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == trialCriterionId);
                 List<CriterionNidusData> criterionNidusList = await _criterionNidusRepository.Where(x => x.CriterionId == inDto.SystemCriterionId).Select(x => new CriterionNidusData()
                 {
-                    Id = NewId.NextGuid(),
+                    Id = x.Id,
                     CriterionId = trialCriterionId,
                     NidusType = x.NidusType,
                     NidusTypeCN = x.NidusTypeCN,
                     OriginalId = x.Id,
                 }).ToListAsync();
 
+                criterionNidusList.ForEach(x => x.Id = NewId.NextGuid());
+
                 await _criterionNidusRepository.AddRangeAsync(criterionNidusList);
                 await _organTrialInfoRepository.BatchDeleteNoTrackingAsync(x => x.TrialId == inDto.TrialId);
                 var originalIds = criterionNidusList.Select(x => x.OriginalId).Distinct().ToList();
-                List<OrganTrialInfo> organTrialInfoList = await _organInfoRepository.Where(x => originalIds.Contains(x.CriterionNidusId)).Select(x => new OrganTrialInfo()
+                List<OrganTrialInfo> organTrialInfoList = await _organInfoRepository.Where(x =>x.CriterionId== inDto.SystemCriterionId).Select(x => new OrganTrialInfo()
                 {
                     CriterionNidusId = x.CriterionNidusId,
                     Id = NewId.NextGuid(),

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

@@ -31,6 +31,7 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
         private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
         private readonly IRepository<Dictionary> _dictionaryRepository;
+        private readonly IRepository<ReadingTableQuestionTrial> _readingTableQuestionTrialRepository;
         private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
         private readonly IRepository<Trial> _trialRepository;
         private readonly IRepository<ReadingTableQuestionSystem> _readingTableQuestionSystemRepository;
@@ -46,6 +47,7 @@ namespace IRaCIS.Application.Services
             IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
             IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
             IRepository<Dictionary> dictionaryRepository,
+             IRepository<ReadingTableQuestionTrial> readingTableQuestionTrialRepository,
                  IRepository<ReadingCriterionPage> readingCriterionPageRepository,
                IRepository<Trial> trialRepository,
           IRepository<ReadingTableQuestionSystem> readingTableQuestionSystemRepository,
@@ -61,6 +63,7 @@ namespace IRaCIS.Application.Services
             this._clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
             this._clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
             this._dictionaryRepository = dictionaryRepository;
+            this._readingTableQuestionTrialRepository = readingTableQuestionTrialRepository;
             this._readingCriterionPageRepository = readingCriterionPageRepository;
             this._trialRepository = trialRepository;
             this._readingTableQuestionSystemRepository = readingTableQuestionSystemRepository;
@@ -322,6 +325,9 @@ namespace IRaCIS.Application.Services
                     {
                         SynchronizeTime = DateTime.Now
                     });
+
+
+                    //var list
                     await _readingQuestionTrialRepository.SaveChangesAsync();
                 }
             }