修改一版

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();
                 }
             }

IRaCIS.Core.Domain/Reading/OrganInfo.cs

@@ -48,6 +48,12 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid CriterionNidusId { get; set; }
 
+
+		/// <summary>
+		/// 标准Id
+		/// </summary>
+		public Guid CriterionId { get; set; }
+
 		/// <summary>
 		/// 创建时间
 		/// </summary>

IRaCIS.Core.Domain/Reading/ReadingTableQuestionTrial.cs

@@ -0,0 +1,131 @@
+
+//--------------------------------------------------------------------
+//     此代码由T4模板自动生成  byzhouhang 20210918
+//	   生成时间 2022-08-17 14:36:04 
+//     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
+using System;
+using IRaCIS.Core.Domain.Share;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+namespace IRaCIS.Core.Domain.Models
+{
+	 ///<summary>
+	 /// 项目阅片问题
+	 ///</summary>
+	 [Table("ReadingTableQuestionTrial")]	
+	 public class ReadingTableQuestionTrial : Entity, IAuditAdd
+	 {
+		/// <summary>
+        /// TrialId
+        /// </summary>
+		public Guid TrialId { get; set; }
+	
+		/// <summary>
+        /// ReadingQuestionId
+        /// </summary>
+		public Guid ReadingQuestionId { get; set; }
+	
+		/// <summary>
+        /// Type
+        /// </summary>
+		public string Type { get; set; }
+	
+		/// <summary>
+        /// ParentId
+        /// </summary>
+		public Guid? ParentId { get; set; }
+	
+		/// <summary>
+        /// ParentTriggerValue
+        /// </summary>
+		public string ParentTriggerValue { get; set; }
+	
+		/// <summary>
+        /// QuestionName
+        /// </summary>
+		public string QuestionName { get; set; }
+	
+		/// <summary>
+        /// IsRequired
+        /// </summary>
+		public int IsRequired { get; set; }
+	
+		/// <summary>
+        /// ShowOrder
+        /// </summary>
+		public int ShowOrder { get; set; }
+	
+		/// <summary>
+        /// TypeValue
+        /// </summary>
+		public string TypeValue { get; set; }
+	
+		/// <summary>
+        /// IsEnable
+        /// </summary>
+		public bool IsEnable { get; set; }
+	
+		/// <summary>
+        /// CreateTime
+        /// </summary>
+		public DateTime CreateTime { get; set; }
+	
+		/// <summary>
+        /// CreateUserId
+        /// </summary>
+		public Guid CreateUserId { get; set; }
+	
+		/// <summary>
+        /// Remark
+        /// </summary>
+		public string Remark { get; set; }
+	
+		/// <summary>
+        /// RelevanceId
+        /// </summary>
+		public Guid? RelevanceId { get; set; }
+	
+		/// <summary>
+        /// RelevanceValue
+        /// </summary>
+		public string RelevanceValue { get; set; }
+	
+		/// <summary>
+        /// ShowQuestion
+        /// </summary>
+		public int ShowQuestion { get; set; }
+	
+		/// <summary>
+        /// MaxRowCount
+        /// </summary>
+		public int? MaxRowCount { get; set; }
+	
+		/// <summary>
+        /// DataTableName
+        /// </summary>
+		public string DataTableName { get; set; }
+	
+		/// <summary>
+        /// DataTableColumn
+        /// </summary>
+		public string DataTableColumn { get; set; }
+	
+		/// <summary>
+        /// TableQuestionType
+        /// </summary>
+		public int TableQuestionType { get; set; }
+	
+		/// <summary>
+        /// DependParentId
+        /// </summary>
+		public Guid? DependParentId { get; set; }
+	
+		/// <summary>
+        /// IsDepend
+        /// </summary>
+		public int IsDepend { get; set; }
+	 
+	 }
+
+	  
+}	 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -247,6 +247,8 @@ namespace IRaCIS.Core.Infra.EFCore
 
         public virtual DbSet<CriterionNidus> CriterionNidus { get; set; }
 
+        public virtual DbSet<ReadingTableQuestionTrial> ReadingTableQuestionTrial { get; set; }
+
         #endregion
 
         #region Subject and Visit and study

IRaCIS.Core.Test/DbHelper.ttinclude

@@ -4,7 +4,7 @@
         public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true";
         public static readonly string DbDatabase = "IRaCIS_New_Tet";
         //表名称用字符串,拼接
-        public static readonly string TableName = "CriterionNidus";
+        public static readonly string TableName = "ReadingTableQuestionTrial";
         //具体文件里面  例如service 可以配置是否分页
 	}
 #>