diff --git a/IRaCIS.Core.API/Audit of MINT - 副本.pdf b/IRaCIS.Core.API/Audit of MINT - 副本.pdf deleted file mode 100644 index 8680cc668..000000000 Binary files a/IRaCIS.Core.API/Audit of MINT - 副本.pdf and /dev/null differ diff --git a/IRaCIS.Core.API/Audit of MINT.pdf b/IRaCIS.Core.API/Audit of MINT.pdf deleted file mode 100644 index 8680cc668..000000000 Binary files a/IRaCIS.Core.API/Audit of MINT.pdf and /dev/null differ diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs index 679ccc7ba..e584bd411 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs @@ -66,11 +66,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 获取访视列表 /// 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 /// public bool IsCRCUpload { get; set; } + + /// + /// 是否签名 + /// + public bool IsSign { get; set; } + /// /// 文件数量 /// @@ -252,7 +258,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 项目ID /// - public Guid TrialId { get; set; } + [Required(ErrorMessage = "TrialId为null")] + public Guid TrialId { get; set; } /// /// 阅片期临床数据ID @@ -262,13 +269,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 对象ID /// + [Required(ErrorMessage = "ReadingId为null")] public Guid ReadingId { get; set; } + [Required(ErrorMessage = "SubjectId为null")] public Guid SubjectId { get; set; } /// /// 是否是访视 /// + [Required(ErrorMessage = "IsVisit为null")] public bool IsVisit { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs index b3fe213bc..59686bf49 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs @@ -51,7 +51,6 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task 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> GetTrialClinicalDataSelect(GetTrialClinicalDataSelectIndto inDto) { - + var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId); List 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, diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 81e10e9da..94f7852b1 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -141,17 +141,17 @@ namespace IRaCIS.Core.Domain.Share.Reading /// public enum ClinicalUploadType { - /// - /// 表格 - /// - [Display(Name = "表格")] - Table = 0, - /// /// PDF /// [Display(Name = "PDF")] - PDF = 1, + PDF = 0, + + /// + /// 表格 + /// + [Display(Name = "表格")] + Table = 1, } diff --git a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs index 677939a50..ba4718b4d 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingClinicalData.cs @@ -45,6 +45,11 @@ namespace IRaCIS.Core.Domain.Models /// public DateTime CreateTime { get; set; } + /// + /// 是否签名 + /// + public bool IsSign { get; set; } + /// /// 创建人 /// diff --git a/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs b/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs index 5145e8821..8d791bd90 100644 --- a/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs +++ b/IRaCIS.Core.Domain/Reading/View/ReadingClinicalDataView.cs @@ -49,8 +49,13 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsCRCUpload { get; set; } - + /// + /// 是否签名 + /// + public bool IsSign { get; set; } + + + - } }