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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-08-05 17:59:27 +08:00
parent ef63c19c93 cda134e92c
commit 2bb4630351
3 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
IRaCIS.Core.API/Controllers/InspectionController.cs
View File

@ -308,11 +308,28 @@ namespace IRaCIS.Core.API.Controllers
}
/// <summary>
/// 提交结构化录入并签名
/// </summary>
/// <param name="opt"></param>
/// <returns></returns>
/// <summary>
/// PM签名一致性分析临床数据
/// </summary>
/// <param name="opt"></param>
/// <returns></returns>
[HttpPost, Route("Inspection/ReadingClinicalData/SignConsistencyAnalysisReadingClinicalData")]
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
[UnitOfWork]
public async Task<IResponseOutput> SignConsistencyAnalysisReadingClinicalData(DataInspectionDto<SignConsistencyAnalysisReadingClinicalDataInDto> opt)
{
var singid = await _inspectionService.RecordSing(opt.SignInfo);
var result = await _readingClinicalDataService.SignConsistencyAnalysisReadingClinicalData(opt.Data);
await _inspectionService.CompletedSign(singid, result);
return result;
}
/// <summary>
/// 提交结构化录入并签名
/// </summary>
/// <param name="opt"></param>
/// <returns></returns>
[HttpPost, Route("Inspection/ClinicalAnswer/SubmitClinicalFormAndSign")]
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]

22
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -733,10 +733,11 @@ namespace IRaCIS.Application.Services
if (inDto.ReadingId == null)
{
var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(x => x.Id == inDto.VisitTaskId);
inDto.ReadingId = visitTask.SouceReadModuleId ?? visitTask.SourceSubjectVisitId;
readingNameOrTaskBlindName = visitTask.TaskBlindName;
}
inDto.SelectIsSign = false;
var result = await GetClinicalDataList(inDto);
if (readingNameOrTaskBlindName.IsNullOrEmpty())
{
readingNameOrTaskBlindName = await _subjectVisitRepository.Where(x => x.Id == inDto.ReadingId).Select(x => x.VisitName).FirstOrDefaultAsync();
@ -746,8 +747,7 @@ namespace IRaCIS.Application.Services
}
}
inDto.SelectIsSign = false;
var result = await GetClinicalDataList(inDto);
var readingIds = result.Select(x => x.ReadingId).ToList();
@ -878,8 +878,9 @@ namespace IRaCIS.Application.Services
CriterionEnumList = x.ClinicalDataTrialSet.CriterionEnumList,
TrialClinicalDataSetCriteriaList = x.ClinicalDataTrialSet.TrialClinicalDataSetCriteriaList,
Id = x.Id,
UploadRole = x.ClinicalDataTrialSet.UploadRole,
IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
// 这里现在都是PM上传的 前端会判断是否可以上传
UploadRole = UploadRole.PM,
IsCRCUpload = false,
IsBlind = x.IsBlind,
IsComplete = x.IsComplete,
FileCount = x.FileCount,
@ -889,6 +890,8 @@ namespace IRaCIS.Application.Services
Id = y.Id,
FileName = y.FileName,
Path = y.Path,
Size=y.Size,
Type=y.Type,
CreateTime = y.CreateTime,
}).ToList(),
});
@ -928,6 +931,8 @@ namespace IRaCIS.Application.Services
Id = y.Id,
FileName = y.FileName,
Path = y.Path,
Size = y.Size,
Type = y.Type,
CreateTime = y.CreateTime,
}).ToList(),
}).ToListAsync();
@ -968,6 +973,8 @@ namespace IRaCIS.Application.Services
Id = y.Id,
FileName = y.FileName,
Path = y.Path,
Size = y.Size,
Type = y.Type,
CreateTime = y.CreateTime,
}).ToList(),
@ -1245,7 +1252,8 @@ namespace IRaCIS.Application.Services
{
IsSign = true,
IsBlind = inDto.IsBlind,
IsComplete = inDto.IsComplete
IsComplete = inDto.IsComplete,
ReadingClinicalDataState= ReadingClinicalDataStatus.HaveSigned,
});
await _readingClinicalDataPDFRepository.SaveChangesAsync();
return ResponseOutput.Ok(pdfCount);

2
IRaCIS.Core.Application/Service/Reading/Interface/IReadingClinicalDataService.cs
View File

@ -29,5 +29,7 @@ namespace IRaCIS.Core.Application.Contracts
Task DealVisiTaskClinicalDataSignedAsync(Guid trialId, Guid subjectId, Guid readingId, bool isVisit, Guid trialReadingCritrialId);
Task<IResponseOutput> SignConsistencyAnalysisReadingClinicalData(SignConsistencyAnalysisReadingClinicalDataInDto inDto);
}
}