修改一版

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

@@ -229,7 +229,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 当前ID
 		/// </summary>
-		public Guid? ReadingQuestionTrialId { get; set; }
+		public Guid? Id { get; set; }
 	}
 
 	public class GetSystemCriterionOtherQuestionInDto
@@ -240,7 +240,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 当前ID
 		/// </summary>
-		public Guid? ReadingQuestionSystemId { get; set; }
+		public Guid? Id { get; set; }
 	}
 
 	public class ReadingQuestionSystemViewInDto : PageInput

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

@@ -65,7 +65,7 @@ namespace IRaCIS.Application.Services
             }
             if (addOrEditReadingPeriodSet.ReadingPeriodName == "Global")
             {
-                return ResponseOutput.NotOk("阅片期名称不能为");
+                return ResponseOutput.NotOk("阅片期名称不能为Global");
             }
             if (addOrEditReadingPeriodSet.Id == null)
             {
@@ -117,7 +117,6 @@ namespace IRaCIS.Application.Services
         public async Task<PageOutput<PreviewTheReadingListOutDto>> GetPreviewTheReadingList(PreviewTheReadingListInDto inDto)
         {
 
-
             // 当前项目 最晚拍片日期不为null  中心筛选
             var visitQuery = _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId &&x.LatestScanDate!=null&&!x.IsLostVisit)
                 .WhereIf(inDto.ReadingScope== ReadingScopeEnum.Site, x => inDto.SiteIds.Contains(x.SiteId));

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

@@ -180,8 +180,14 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<List<CriterionOtherQuestionOutDto>> GetSystemCriterionOtherQuestion(GetSystemCriterionOtherQuestionInDto inDto)
         {
+            var types = new List<string>()
+            {
+                "select","radio"
+
+            };
             var questionList =await _readingQuestionSystemRepository.Where(x => x.ReadingQuestionCriterionSystemId == inDto.ReadingQuestionCriterionSystemId)
-                .WhereIf(inDto.ReadingQuestionSystemId != null, x => x.Id != inDto.ReadingQuestionSystemId)
+                .Where(x=> types.Contains(x.Type))
+                .WhereIf(inDto.Id != null, x => x.Id != inDto.Id)
                 .Select(x => new CriterionOtherQuestionOutDto()
                 {
                     QuestionId = x.Id,
@@ -396,8 +402,14 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<List<CriterionOtherQuestionOutDto>> GetTrialCriterionOtherQuestion(GetTrialCriterionOtherQuestionInDto inDto)
         {
+            var types = new List<string>()
+            {
+                "select","radio"
+
+            };
             var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId)
-                .WhereIf(inDto.ReadingQuestionTrialId != null, x => x.Id != inDto.ReadingQuestionTrialId)
+                   .Where(x => types.Contains(x.Type))
+                .WhereIf(inDto.Id != null, x => x.Id != inDto.Id)
                 .Select(x => new CriterionOtherQuestionOutDto()
                 {
                     QuestionId = x.Id,

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -16,7 +16,9 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public string SubjectCodeRule { get; set; } = string.Empty;
 
+        public List<Guid> TrialCriterionIds { get; set; } = new List<Guid>();
 
+        public List<string> TrialCriterionNames { get; set; } = new List<string>();
 
         public List<Guid> ClinicalDataTrialSetIds { get; set; } = new List<Guid>();
 
@@ -80,6 +82,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public List<Guid> CriterionIds { get; set; } = new List<Guid>();
 
+        public List<Guid> TrialCriterionIds { get; set; } = new List<Guid>();
+
 
         public Guid TrialId { get; set; }
 
@@ -218,6 +222,7 @@ namespace IRaCIS.Core.Application.Contracts
     public class TrialConfigDTO: BasicTrialConfig
     {
 
+
         public List<Guid> CriterionIds { get; set; } = new List<Guid>();
 
         public List<string> ClinicalDataSetNames { get; set; } = new List<string>();

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -325,10 +325,10 @@ namespace IRaCIS.Core.Application
             }
 
             var trialInfo = await _trialRepository.Where(t => t.Id == trialConfig.TrialId, true).Include(t => t.TrialDicList.Where(u => u.KeyName == StaticData.Criterion)).FirstOrDefaultAsync();
-
             if (trialInfo == null) return Null404NotFound(trialInfo);
 
             _mapper.Map(trialConfig, trialInfo);
+
             trialInfo.UpdateTime = DateTime.Now;
 
 

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

@@ -146,6 +146,8 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<AssginSiteCRCCommand, TrialSiteUser>();
             CreateMap<Domain.Models.Trial, TrialConfigDTO>().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id))
+                    .ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v =>v.IsConfirm).Select(r => r.Id)))
+                    .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v => v.IsConfirm).Select(r => r.CriterionName)))
                  .ForMember(t => t.ClinicalDataTrialSetIds, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.Id)))
                    .ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.ClinicalDataSetName)))
                 .ForMember(t => t.CriterionIds, u => u.MapFrom(c => c.TrialDicList.Where(v => v.KeyName == StaticData.Criterion).Select(r => r.DictionaryId)));

IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs

@@ -43,8 +43,16 @@ namespace IRaCIS.Core.Domain.Models
 		public Guid CreateUserId { get; set; }
 
 
+		/// <summary>
+		/// 是否确认
+		/// </summary>
+		public bool IsConfirm { get; set; }
 
-
+		/// <summary>
+		/// 项目
+		/// </summary>
+		[ForeignKey("TrialId")]
+		public Trial Trial { get; set; }
 	}
 
 

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -24,6 +24,8 @@ namespace IRaCIS.Core.Domain.Models
         public List<Workload> WorkloadList { get; set; }
         public List<TrialUser> TrialUserList { get; set; } = new List<TrialUser>();
 
+        public List<ReadingQuestionCriterionTrial> ReadingQuestionCriterionTrialList { get; set; } = new List<ReadingQuestionCriterionTrial>();
+
         public List<Subject> SubjectList { get; set; } = new List<Subject>();
 
         public List<DicomStudy> StudyList { get; set; } = new List<DicomStudy>();
@@ -65,6 +67,8 @@ namespace IRaCIS.Core.Domain.Models
         public virtual ICollection<TrialStatusDetail> ClinicalTrialProjectDetails { get; set; }
         public virtual ICollection<TrialDictionary> TrialDicList { get; set; }
 
+       
+
         [StringLength(100)]
         public string TrialCode { get; set; } = string.Empty;