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

修改一版

Browse Source
This commit is contained in:
he
2022-10-10 11:05:11 +08:00
parent b89029adff
commit 5445411c9d
7 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs
+1 -1
View File
@@ -162,7 +162,7 @@ namespace IRaCIS.Core.Application.ViewModel
public class SynchronizeSystemOrganToTrialInDto
{
public Guid TrialId { get; set; }
public Guid TrialCriterionId { get; set; }
IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs
+1 -1
View File
@@ -311,7 +311,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public class SynchronizeCriterionInDto
{
[NotDefault]
public Guid TrialId { get; set; }
public Guid TrialCriterionId { get; set; }
}
public class VerifyeCriterionNeedSynchronizeInDto
IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs
+3 -3
View File
@@ -309,7 +309,7 @@ namespace IRaCIS.Core.Application.Service
public async Task<IResponseOutput> SynchronizeSystemOrganToTrial(SynchronizeSystemOrganToTrialInDto inDto)
{
// 选中的标准进行修改
var readingQuestionCriterionTrial = await _readingQuestionCriterionTrial.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
var readingQuestionCriterionTrial = await _readingQuestionCriterionTrial.Where(x => x.Id==inDto.TrialCriterionId).FirstOrDefaultAsync();
if (readingQuestionCriterionTrial != null)
{
@@ -334,7 +334,7 @@ namespace IRaCIS.Core.Application.Service
criterionNidusList.ForEach(x => x.Id = NewId.NextGuid());
await _criterionNidusRepository.AddRangeAsync(criterionNidusList);
await _organTrialInfoRepository.BatchDeleteNoTrackingAsync(x => x.TrialId == inDto.TrialId);
await _organTrialInfoRepository.BatchDeleteNoTrackingAsync(x => x.TrialId == readingQuestionCriterionTrial.TrialId);
var originalIds = criterionNidusList.Select(x => x.OriginalId).Distinct().ToList();
List<OrganTrialInfo> organTrialInfoList = await _organInfoRepository.Where(x =>x.SystemCriterionId== inDto.SystemCriterionId).Select(x => new OrganTrialInfo()
{
@@ -343,7 +343,7 @@ namespace IRaCIS.Core.Application.Service
IsEnable = true,
TrialCriterionId= readingQuestionCriterionTrial.Id,
OrganInfoId = x.Id,
TrialId = inDto.TrialId,
TrialId = readingQuestionCriterionTrial.TrialId,
}).ToListAsync();
organTrialInfoList.ForEach(x => x.Id = NewId.NextGuid());
IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs
+2 -2
View File
@@ -504,7 +504,7 @@ namespace IRaCIS.Application.Services
/// <returns></returns>
public async Task SynchronizeCriterion(SynchronizeCriterionInDto inDto)
{
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).AsNoTracking().FirstOrDefaultAsync();
var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id==inDto.TrialCriterionId).AsNoTracking().FirstOrDefaultAsync();
if (trialCriterion != null)
{
@@ -590,7 +590,7 @@ namespace IRaCIS.Application.Services
foreach (var x in newTrialTableQuestionList)
{
var tableQuestion = x.Clone();
tableQuestion.TrialId = inDto.TrialId;
tableQuestion.TrialId = trialCriterion.TrialId;
tableQuestion.TrialCriterionId = trialCriterion.Id;
tableQuestion.ReadingQuestionId = copyNewQuestionList.Where(y => y.ReadingQuestionSystemId == x.ReadingQuestionId).Select(y => y.Id).FirstOrDefault();