修改

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

@@ -67,10 +67,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 	/// </summary>
 	public class GetReadingClinicalDataListIndto :PageInput
 	{
-		[Required]
+		[Required(ErrorMessage = "SubjectId为null")]
 		public Guid SubjectId { get; set; }
 
-		[Required]
+		[Required(ErrorMessage = "ReadingId为null")]
 		public Guid ReadingId { get; set; }
 	}
 
@@ -212,6 +212,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public bool IsCRCUpload { get; set; }
 
+
+		/// <summary>
+		/// 是否签名
+		/// </summary>
+		public bool  IsSign { get; set; }
+
 		/// <summary>
 		/// 文件数量
 		/// </summary>
@@ -252,6 +258,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 项目ID
 		/// </summary>
+		[Required(ErrorMessage = "TrialId为null")]
 		public Guid TrialId { get; set; }
 
 		/// <summary>
@@ -262,13 +269,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// <summary>
 		/// 对象ID
 		/// </summary>
+		[Required(ErrorMessage = "ReadingId为null")]
 		public Guid ReadingId { get; set; }
 
+		[Required(ErrorMessage = "SubjectId为null")]
 		public Guid SubjectId { get; set; }
 
 		/// <summary>
 		/// 是否是访视
 		/// </summary>
+		[Required(ErrorMessage = "IsVisit为null")]
 		public bool IsVisit { get; set; }
 
 	}

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

@@ -51,7 +51,6 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<IResponseOutput> AddOrUpdateReadingClinicalData(AddOrUpdateReadingClinicalDataDto indto)
         {
-
             var existsQuery = _readingClinicalDataRepository
                 .WhereIf(indto.Id != null,x=>x.Id!=indto.Id)
                 .Where(x => x.ClinicalDataTrialSetId == indto.ClinicalDataTrialSetId&&x.ReadingId==indto.ReadingId);
@@ -130,13 +129,12 @@ namespace IRaCIS.Application.Services
         [HttpPost]
         public async Task<List<GetTrialClinicalDataSelectOutDto>> GetTrialClinicalDataSelect(GetTrialClinicalDataSelectIndto inDto)
         {
-
+            var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId);
             List<GetTrialClinicalDataSelectOutDto> clinicalList = await _clinicalDataTrialSetRepository.Where(x=>x.TrialId==inDto.TrialId&&x.IsConfirm&&x.ClinicalDataSetName!= "既往局部治疗史")
+               .Where(x=> !usedIdsQuery.Contains(x.Id))
                 .WhereIf(inDto.IsVisit,x=>x.ClinicalDataLevel == ClinicalLevel.Subject||x.ClinicalDataLevel== ClinicalLevel.SubjectVisit)
                 .WhereIf(!inDto.IsVisit, x => x.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataLevel == ClinicalLevel.Read)
 
-                //.WhereIf(inDto.ReadingClinicalDataId==null, x=> _readingClinicalDataPDFRepository.Where(y=>y.ObjectId==inDto.ObjectId&&))
-
                 .Select(x => new GetTrialClinicalDataSelectOutDto()
             {
                 ClinicalDataLevel = x.ClinicalDataLevel,

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -141,17 +141,17 @@ namespace IRaCIS.Core.Domain.Share.Reading
 	/// </summary>
 	public enum ClinicalUploadType
     {
-        /// <summary>
-        /// 表格
-        /// </summary>
-        [Display(Name = "表格")]
-        Table = 0,
-
         /// <summary>
         /// PDF
         /// </summary>
         [Display(Name = "PDF")]
-        PDF = 1,
+        PDF = 0,
+
+        /// <summary>
+        /// 表格
+        /// </summary>
+        [Display(Name = "表格")]
+        Table = 1,
 
     }
 

IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs

@@ -45,6 +45,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public DateTime CreateTime { get; set; }
 
+		/// <summary>
+		/// 是否签名
+		/// </summary>
+		public bool IsSign { get; set; }
+
 		/// <summary>
 		/// 创建人
 		/// </summary>

IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs

@@ -49,6 +49,11 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
         public bool IsCRCUpload { get; set; }
 
+        /// <summary>
+        /// 是否签名
+        /// </summary>
+        public bool IsSign { get; set; }
+