XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-01-14 15:50:13 +08:00
parent 95a203881e b86361bf0e
commit f518b44007
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs
View File

@ -66,6 +66,13 @@ namespace IRaCIS.Core.Application.Service
throw new BusinessValidationFailedException(_localizer["ReadingQuestion_CDISCCodeRepeat"]); throw new BusinessValidationFailedException(_localizer["ReadingQuestion_CDISCCodeRepeat"]);
} }
if(inDto.QuestionList.Any(x=>x.ExportResult.Contains(ExportResult.CDISC)&&x.CDISCCode.IsNullOrEmpty())
|| inDto.TableQuestionList.Any(x => x.ExportResult.Contains(ExportResult.CDISC) && x.CDISCCode.IsNullOrEmpty())
)
{
throw new BusinessValidationFailedException(_localizer["ReadingQuestion_CDISCCodeCannotEmpty"]);
}
List<ExportResult> needAdd = new List<ExportResult>() List<ExportResult> needAdd = new List<ExportResult>()
{ {
ExportResult.DetailedTableOfAdjudicationResults, ExportResult.DetailedTableOfAdjudicationResults,

4
IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
View File

@ -21,6 +21,7 @@ namespace IRaCIS.Core.Application.Service
IRepository<EnrollDetail> _enrollDetailRepository, IRepository<EnrollDetail> _enrollDetailRepository,
IRepository<Dictionary> _dictionaryRepository, IRepository<Dictionary> _dictionaryRepository,
IRepository<Enroll> _enrollRepository, IRepository<Enroll> _enrollRepository,
IOSSService _oSSService,
IRepository<Workload> _workloadRepository, IRepository<Workload> _workloadRepository,
IRepository<Sponsor> _sponsorRepository, IRepository<Sponsor> _sponsorRepository,
IRepository<VisitStage> _visitStageRepository, IRepository<VisitStage> _visitStageRepository,
@ -568,6 +569,9 @@ namespace IRaCIS.Core.Application.Service
await _repository.BatchDeleteNoTrackingAsync<VisitTaskReReading>(t => t.OriginalReReadingTask.TrialId == trialId); await _repository.BatchDeleteNoTrackingAsync<VisitTaskReReading>(t => t.OriginalReReadingTask.TrialId == trialId);
await _repository.BatchDeleteNoTrackingAsync<VisitTask>(t => t.TrialId == trialId); await _repository.BatchDeleteNoTrackingAsync<VisitTask>(t => t.TrialId == trialId);
await _repository.BatchDeleteNoTrackingAsync<TrialStateChange>(t => t.TrialId == trialId); await _repository.BatchDeleteNoTrackingAsync<TrialStateChange>(t => t.TrialId == trialId);
await _oSSService.DeleteFromPrefix(trialId.ToString());
#endregion #endregion