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

修改领取逻辑

Browse Source
This commit is contained in:
hang
2022-04-28 16:52:17 +08:00
parent 89a96fd7d6
commit 963f093ce4
4 changed files with 66 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.API/Controllers/InspectionController.cs
+26 -25
View File
@@ -58,7 +58,7 @@ namespace IRaCIS.Core.API.Controllers
ITrialConfigService _trialConfigService,
INoneDicomStudyService noneDicomStudyService,
ISubjectService _subjectService,
ISubjectVisitService subjectVisitService,
IQCOperationService qCOperationService,
IClinicalDataService clinicalDataService,
@@ -82,7 +82,7 @@ namespace IRaCIS.Core.API.Controllers
this._dataInspectionRepository = dataInspectionRepository;
}
//[HttpPost, Route("Inspection/Test")]
//public async Task Test(string Table, string ForeignKeyValue, string ForeignKeyText, string value)
//{
@@ -100,8 +100,8 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork]
public async Task<IResponseOutput> AbandonTrial(DataInspectionDto<AbandonTrial> opt)
{
var fun = await _trialConfigService.AbandonTrial(opt.OptCommand.trialId,opt.OptCommand.isAbandon);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
var fun = await _trialConfigService.AbandonTrial(opt.OptCommand.trialId, opt.OptCommand.isAbandon);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
}
/// <summary>
@@ -183,7 +183,7 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> AddOrUpdateQCQuestionAnswerList(DataInspectionDto<AddOrUpdateQCQuestionAnswerListDto> opt)
{
var fun = await _qCOperationService.AddOrUpdateQCQuestionAnswerList(opt.OptCommand.qcQuestionAnswerCommands, opt.OptCommand.trialId, opt.OptCommand.subjectVisitId,opt.OptCommand.trialQCProcess,opt.OptCommand.currentQCType);
var fun = await _qCOperationService.AddOrUpdateQCQuestionAnswerList(opt.OptCommand.qcQuestionAnswerCommands, opt.OptCommand.trialId, opt.OptCommand.subjectVisitId, opt.OptCommand.trialQCProcess, opt.OptCommand.currentQCType);
if (!fun.IsSuccess)
{
return ResponseOutput.NotOk(fun.ErrorMessage);
@@ -204,7 +204,7 @@ namespace IRaCIS.Core.API.Controllers
var fun = await _qCOperationService.AddOrUpdateQCChallenge(opt.OptCommand.qaQuestionCommand, opt.OptCommand.trialId, opt.OptCommand.trialQCProcess, opt.OptCommand.currentQCType);
opt.AuditInfo.GeneralId = fun.Id;
Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
keyValuePairs.Add("ChallengeCode", "Q" + fun.ChallengeCode.ToString("D5") );
keyValuePairs.Add("ChallengeCode", "Q" + fun.ChallengeCode.ToString("D5"));
opt.AuditInfo.JsonDetail = _inspectionService.AddJsonItem(opt.AuditInfo.JsonDetail, keyValuePairs);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, ResponseOutput.Ok());
}
@@ -266,7 +266,7 @@ namespace IRaCIS.Core.API.Controllers
{
var fun = _qCOperationService.AddCheckChallengeReply;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
}
@@ -327,8 +327,8 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork]
public async Task<IResponseOutput> UpdateModality(DataInspectionDto<UpdateModalityDto> opt)
{
var fun =await _qCOperationService.UpdateModality(opt.OptCommand.id, opt.OptCommand.type, opt.OptCommand.modality, opt.OptCommand.bodyPart);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
var fun = await _qCOperationService.UpdateModality(opt.OptCommand.id, (Guid)opt.AuditInfo.SubjectVisitId, opt.OptCommand.type, opt.OptCommand.modality, opt.OptCommand.bodyPart);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
}
/// <summary>
@@ -359,7 +359,7 @@ namespace IRaCIS.Core.API.Controllers
/// </summary>
[HttpPost, Route("Inspection/QCOperation/SetVisitUrgent")]
[UnitOfWork]
public async Task<IResponseOutput> SetVisitUrgent(DataInspectionDto<SetVisitUrgentDto> opt )
public async Task<IResponseOutput> SetVisitUrgent(DataInspectionDto<SetVisitUrgentDto> opt)
{
var fun = await _qCOperationService.SetVisitUrgent(opt.OptCommand.trialId, opt.OptCommand.subjectVisitId, opt.OptCommand.setOrCancel);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
@@ -386,7 +386,7 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> SetReuploadFinished(DataInspectionDto<CRCReuploadFinishedCommand> opt)
{
var fun = _qCOperationService.SetReuploadFinished;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
}
/// <summary>
@@ -423,9 +423,9 @@ namespace IRaCIS.Core.API.Controllers
/// <returns></returns>
[HttpPost, Route("Inspection/QCOperation/UploadVisitCheckExcel")]
[UnitOfWork]
public async Task<IResponseOutput> UploadVisitCheckExcel(IFormFile file, [FromForm]UploadVisitCheckExcelDto opt)
public async Task<IResponseOutput> UploadVisitCheckExcel(IFormFile file, [FromForm] UploadVisitCheckExcelDto opt)
{
var fun = await _qCOperationService.UploadVisitCheckExcel(file, opt.trialId);
return fun;
@@ -466,7 +466,7 @@ namespace IRaCIS.Core.API.Controllers
return ResponseOutput.NotOk(fun.ErrorMessage);
}
opt.AuditInfo.NeedSava = false;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
}
@@ -507,7 +507,7 @@ namespace IRaCIS.Core.API.Controllers
}
opt.AuditInfo.GeneralId = fun.Data.Id;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
}
@@ -554,7 +554,7 @@ namespace IRaCIS.Core.API.Controllers
{
var fun = await _clinicalDataService.AddOrUpdatePreviousHistory(opt.OptCommand);
opt.AuditInfo.GeneralId = fun.Data;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
}
@@ -586,7 +586,7 @@ namespace IRaCIS.Core.API.Controllers
{
var fun = await _clinicalDataService.AddOrUpdatePreviousSurgery(opt.OptCommand);
opt.AuditInfo.GeneralId = fun.Data;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
}
@@ -616,7 +616,7 @@ namespace IRaCIS.Core.API.Controllers
{
var fun = await _clinicalDataService.AddOrUpdatePreviousOther(opt.OptCommand);
opt.AuditInfo.GeneralId = fun.Data;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, null, fun);
}
@@ -666,8 +666,8 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork]
public async Task<IResponseOutput> DeleteVisitStage(DataInspectionDto<IDDto> opt)
{
var fun = _visitPlanService.DeleteVisitStage;
var fun = _visitPlanService.DeleteVisitStage;
return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
}
@@ -825,11 +825,12 @@ namespace IRaCIS.Core.API.Controllers
return ResponseOutput.NotOk(data.ErrorMessage);
}
var fun = _trialConfigService.TrialConfigSignatureConfirm;
return await _inspectionService.Enforcement(new SignConfirmDTO() {
TrialId=opt.OptCommand.TrialId,
SignCode=opt.OptCommand.SignCode
return await _inspectionService.Enforcement(new SignConfirmDTO()
{
TrialId = opt.OptCommand.TrialId,
SignCode = opt.OptCommand.SignCode
}, opt.AuditInfo, opt.SignInfo, fun);
}
/// <summary>
@@ -934,7 +935,7 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> UpdateSubjectStatus(InsUpdateSubjectStatus opt)
{
var fun = _subjectService.UpdateSubjectStatus;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
}