修改一版

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

@@ -3859,6 +3859,12 @@
             仲裁规则
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingInfoSignTime">
+            <summary>
+            阅片信息签名时间
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.Id">
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingType">
             <summary>
             阅片模式
@@ -3961,6 +3967,27 @@
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsArbitrationReading">
             <summary>
+            标准
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.ReadingInfoSignTime">
+            <summary>
+            阅片信息签名时间
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.DigitPlaces">
+            <summary>
+            修约小数点
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.TrialCriterionId">
+            <summary>
+            项目标准Id
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingCriterionInfoOutDto.ReadingCriterionPageList">
+            <summary>
+            项目分页
             仲裁阅片
             </summary>
         </member>

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

@@ -375,6 +375,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 标准ID
 		/// </summary>
 		public Guid CriterionId { get; set; }
+
+
+		public Guid? ReadingCriterionPageId { get; set; }
 	}
 
 	public class GetTrialCriterionOtherQuestionInDto

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

@@ -693,7 +693,7 @@ namespace IRaCIS.Application.Services
                 }
             }
 
-            if (await _readingQuestionTrialRepository.AnyAsync(x => x.Id != indto.Id && x.ShowOrder == indto.ShowOrder&&x.TrialId==indto.TrialId&&x.ReadingQuestionCriterionTrialId==indto.ReadingQuestionCriterionTrialId))
+            if (await _readingQuestionTrialRepository.AnyAsync(x => x.Id != indto.Id && x.ShowOrder == indto.ShowOrder&&x.TrialId==indto.TrialId&&x.ReadingQuestionCriterionTrialId==indto.ReadingQuestionCriterionTrialId&&x.ReadingCriterionPageId==indto.ReadingCriterionPageId))
             {
                 throw new BusinessValidationFailedException("问题编号重复");
             }
@@ -770,6 +770,7 @@ namespace IRaCIS.Application.Services
         public async Task<List<string>> GetTrialGroupNameList(GetTrialGroupNameListInDto inDto)
         {
             var result = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.CriterionId && x.Type == "group")
+                .WhereIf(inDto.ReadingCriterionPageId!=null,x=>x.ReadingCriterionPageId==inDto.ReadingCriterionPageId)
                   .Select(x => x.GroupName).ToListAsync();
 
             return result;

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

@@ -328,6 +328,18 @@ namespace IRaCIS.Core.Application.Contracts
         public int ArbitrationRule { get; set; } = 2;
 
 
+        /// <summary>
+        /// 阅片信息签名时间
+        /// </summary>
+        public DateTime? ReadingInfoSignTime { get; set; }
+
+        public bool IsSign {
+            get {
+                return this.ReadingInfoSignTime != null;
+            }
+        }
+
+
 
         ///// <summary>
         ///// 全局阅片
@@ -361,9 +373,9 @@ namespace IRaCIS.Core.Application.Contracts
 
 
 
-     
 
-      
+
+
     }
 
     public class ReadingCriterionPageDto
@@ -536,6 +548,20 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class GetTrialReadingCriterionInfoOutDto
     {
+
+        /// <summary>
+        /// 阅片信息签名时间
+        /// </summary>
+        public DateTime? ReadingInfoSignTime { get; set; }
+
+        public bool IsSign
+        {
+            get
+            {
+                return this.ReadingInfoSignTime != null;
+            }
+        }
+
         /// <summary>
         /// 修约小数点
         /// </summary>

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

@@ -119,7 +119,7 @@ namespace IRaCIS.Core.Application
             GetTrialReadingCriterionInfoOutDto result = new GetTrialReadingCriterionInfoOutDto();
             result.ReadingCriterionPageList = await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ProjectTo<ReadingCriterionPageDto>(_mapper.ConfigurationProvider).ToListAsync();
             var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
-
+            result.ReadingInfoSignTime = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x=>x.ReadingInfoSignTime).FirstOrDefaultAsync();
             if (trialCriterion != null)
             {
                 result.DigitPlaces = trialCriterion.DigitPlaces;