diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index a5969cce7..7595caccd 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -7526,6 +7526,13 @@ + + + 清空医学审核问题 + + + + @@ -9618,6 +9625,13 @@ 项目QC 问题 管理 + + + 清空Qc问题 + + + + 父问题 下拉框选项 需要排除自己 、把自己设置为父亲 (互为父亲) 、是自己孙辈的(明明是自己子孙,却设置为自己父亲) @@ -10322,6 +10336,13 @@ + + + 获取下一个未签名的文件 + + + + 具体用户看到的 系统文件列表 + 项目类型文档 diff --git a/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs index 574b33bf8..6c5a6999a 100644 --- a/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs +++ b/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs @@ -104,6 +104,15 @@ namespace IRaCIS.Core.Application.Contracts } + public class GetNextUnSignDocumentInDto + { + [NotDefault] + public Guid TrialId { get; set; } + + public bool Asc { get; set; } = true; + public string SortField { get; set; } = ""; + } + public class TrialUserDocUnionQuery: PageInput { [NotDefault] diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index 3a9acc25e..808b2f680 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -66,6 +66,32 @@ namespace IRaCIS.Core.Application.Services } + /// + /// 获取下一个未签名的文件 + /// + /// + /// + [HttpPost] + public async Task GetNextUnSignDocument(GetNextUnSignDocumentInDto inDto) + { + var result =await this.GetUserDocumentList(new TrialUserDocUnionQuery() + { + Asc = inDto.Asc, + IsSign = false, + SortField = inDto.SortField, + PageIndex = 1, + PageSize = 1, + }); + + if (result.Data.CurrentPageData.Count() > 0) + { + return result.Data.CurrentPageData.First(); + } + else { + return null; + } + + } /// /// 具体用户看到的 系统文件列表 + 项目类型文档 diff --git a/IRaCIS.Core.Application/Service/QC/DTO/TrialQCQuestionConfigureViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/TrialQCQuestionConfigureViewModel.cs index 2c95bd487..0d83d094d 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/TrialQCQuestionConfigureViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/TrialQCQuestionConfigureViewModel.cs @@ -71,6 +71,11 @@ namespace IRaCIS.Core.Application.Contracts public string TypeValue { get; set; } } + public class EmptyQCQuestionInDto + { + public Guid TrialId { get; set; } + } + ///TrialQCQuestionQuery 列表查询参数模型 public class TrialQCQuestionQuery { diff --git a/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs b/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs index 54b65d983..981fbcdd9 100644 --- a/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs +++ b/IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs @@ -32,6 +32,18 @@ namespace IRaCIS.Core.Application.Contracts this._qCQuestionRepository = qCQuestionRepository; } + /// + /// 清空Qc问题 + /// + /// + /// + [HttpPost] + public async Task EmptyQCQuestion(EmptyQCQuestionInDto inDto) + { + await _trialQcQuestionRepository.DeleteFromQueryAsync(x => x.TrialId == inDto.TrialId); + await _trialQcQuestionRepository.SaveChangesAsync(); + return ResponseOutput.Result(true); + } [HttpPost] public async Task<(List, object)> GetTrialQCQuestionConfigureList(TrialQCQuestionQuery queryTrialQCQuestionConfigure) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs index 6c8326c6a..e2e9128a2 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs @@ -319,6 +319,11 @@ namespace IRaCIS.Core.Application.ViewModel public List Childrens { get; set; } } + public class EmptMedicineTrialQuestionInDto + { + public Guid TrialReadingCriterionId { get; set; } + } + ///ReadingMedicineTrialQuestionQuery 列表查询参数模型 public class ReadingMedicineTrialQuestionQuery:PageInput { diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs index 94fcf1e41..456eb480d 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs @@ -138,16 +138,29 @@ namespace IRaCIS.Core.Application.Service return ResponseOutput.Result(result); } - #endregion + #endregion - #region 项目 + #region 项目 - /// 获取项目的医学审核问题 - /// - /// - /// - [HttpPost] + /// + /// 清空医学审核问题 + /// + /// + /// + [HttpPost] + public async Task EmptMedicineTrialQuestion(EmptMedicineTrialQuestionInDto inDto) + { + await _readingMedicineTrialQuestionRepository.DeleteFromQueryAsync(x => x.TrialReadingCriterionId == inDto.TrialReadingCriterionId); + await _readingMedicineTrialQuestionRepository.SaveChangesAsync(); + return ResponseOutput.Result(true); + } + + /// 获取项目的医学审核问题 + /// + /// + /// + [HttpPost] public async Task<(PageOutput, object)> GetReadingMedicineTrialQuestionList(ReadingMedicineTrialQuestionQuery inDto) { var query = _readingMedicineTrialQuestionRepository.AsQueryable()