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

提交 修改

Uat_Study
he 2022-04-13 17:51:30 +08:00
parent 2f3a67ba17
commit 88117a84f7
10 changed files with 52 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,7 @@ namespace IRaCIS.Core.API.Controllers
{
return ResponseOutput.NotOk(fun.ErrorMessage);
}
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
}
@ -155,10 +156,11 @@ namespace IRaCIS.Core.API.Controllers
if (opt.OptCommand.Id == null)
{
Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
keyValuePairs.Add("CodeView", fun.Data);
keyValuePairs.Add("CodeView", fun.Data.StudyCode);
opt.AuditInfo.JsonDetail = _inspectionService.AddJsonItem(opt.AuditInfo.JsonDetail, keyValuePairs);
}
opt.AuditInfo.GeneralId = fun.Data.Id;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
}
@ -173,6 +175,7 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> DeleteNoneDicomStudy(DataInspectionDto<IDDto> opt)
{
var fun = _noneDicomStudyService.DeleteNoneDicomStudy;
opt.AuditInfo.GeneralId = opt.OptCommand.Id;
return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
}
@ -188,6 +191,7 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> deleteNoneDicomStudyFile(DataInspectionDto<IDDto> opt)
{
var fun = _noneDicomStudyService.DeleteNoneDicomStudyFile;
opt.AuditInfo.GeneralId = opt.OptCommand.Id;
return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
}
@ -204,9 +208,9 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork]
public async Task<IResponseOutput> AddOrUpdatePreviousHistory(DataInspectionDto<PreviousHistoryAddOrEdit> opt)
{
var fun = _clinicalDataService.AddOrUpdatePreviousHistory;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
var fun = await _clinicalDataService.AddOrUpdatePreviousHistory(opt.OptCommand);
opt.AuditInfo.GeneralId = fun.Data;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
}
@ -220,6 +224,7 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> DeletePreviousHistory(DataInspectionDto<IDDto> opt)
{
var fun = _clinicalDataService.DeletePreviousHistory;
opt.AuditInfo.GeneralId = opt.OptCommand.Id;
return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
}
@ -235,9 +240,9 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork]
public async Task<IResponseOutput> AddOrUpdatePreviousSurgery(DataInspectionDto<PreviousSurgeryAddOrEdit> opt)
{
var fun = _clinicalDataService.AddOrUpdatePreviousSurgery;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
var fun = await _clinicalDataService.AddOrUpdatePreviousSurgery(opt.OptCommand);
opt.AuditInfo.GeneralId = fun.Data;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
}
@ -250,8 +255,8 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork]
public async Task<IResponseOutput> DeletePreviousSurgery(DataInspectionDto<IDDto> opt)
{
var fun = _clinicalDataService.DeletePreviousSurgery;
opt.AuditInfo.GeneralId = opt.OptCommand.Id;
return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
}
@ -265,9 +270,9 @@ namespace IRaCIS.Core.API.Controllers
[UnitOfWork]
public async Task<IResponseOutput> AddOrUpdatePreviousOther(DataInspectionDto<PreviousOtherAddOrEdit> opt)
{
var fun = _clinicalDataService.AddOrUpdatePreviousOther;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
var fun = await _clinicalDataService.AddOrUpdatePreviousOther(opt.OptCommand);
opt.AuditInfo.GeneralId = fun.Data;
return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
}
@ -282,6 +287,7 @@ namespace IRaCIS.Core.API.Controllers
{
var fun = _clinicalDataService.DeletePreviousOther;
opt.AuditInfo.GeneralId = opt.OptCommand.Id;
return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
}
#endregion

8
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -95,7 +95,13 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
/// 访视计划ID
/// </summary>
public Guid? VisitStageId { get; set; }
/// <summary>
/// 通用ID
/// </summary>
public Guid? GeneralId { get; set; }
////需要单独处理

4
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -278,7 +278,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
await SetEnum(addDto);
var add = _mapper.Map<DataInspection>(addDto);
Guid? parentId = null;
parentId = (await _repository.GetQueryable<DataInspection>().Where( x => x.TrialId == add.TrialId && x.SubjectVisitId == add.SubjectVisitId && x.SubjectId == add.SubjectId && x.SiteId == add.SiteId&&x.ChildrenType==add.ChildrenType && x.ObjectType==add.ObjectType&&x.VisitStageId==add.VisitStageId).OrderByDescending(x => x.CreateTime).FirstOrDefaultAsync())?.Id;
parentId = (await _repository.GetQueryable<DataInspection>().Where( x => x.TrialId == add.TrialId && x.SubjectVisitId == add.SubjectVisitId && x.SubjectId == add.SubjectId && x.SiteId == add.SiteId&&x.ChildrenType==add.ChildrenType && x.ObjectType==add.ObjectType&&x.VisitStageId==add.VisitStageId&&x.GeneralId==add.GeneralId).OrderByDescending(x => x.CreateTime).FirstOrDefaultAsync())?.Id;
add.ParentId = parentId;
add.CreateTime = DateTime.Now;
add.CreateUserId = _userInfo.Id;
@ -319,7 +319,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
foreach (var add in datas)
{
add.ParentId = (await _repository.GetQueryable<DataInspection>().Where(x => x.TrialId == add.TrialId && x.SubjectVisitId == add.SubjectVisitId && x.SubjectId == add.SubjectId && x.SiteId == add.SiteId && x.ChildrenType == add.ChildrenType && x.ObjectType == add.ObjectType&&x.VisitStageId==add.VisitStageId).OrderByDescending(x => x.CreateTime).FirstOrDefaultAsync())?.Id;
add.ParentId = (await _repository.GetQueryable<DataInspection>().Where(x => x.TrialId == add.TrialId && x.SubjectVisitId == add.SubjectVisitId && x.SubjectId == add.SubjectId && x.SiteId == add.SiteId && x.ChildrenType == add.ChildrenType && x.ObjectType == add.ObjectType&&x.VisitStageId==add.VisitStageId&& x.GeneralId == add.GeneralId).OrderByDescending(x => x.CreateTime).FirstOrDefaultAsync())?.Id;
add.CreateUserId = _userInfo.Id;
add.IP = _userInfo.IP;
await SetInspectionNameValue(add);

6
IRaCIS.Core.Application/Service/QC/ClinicalDataService.cs
View File

@ -155,7 +155,7 @@ namespace IRaCIS.Core.Application.Contracts
}
[HttpPost("{trialId:guid}")]
public async Task<IResponseOutput> AddOrUpdatePreviousHistory(PreviousHistoryAddOrEdit addOrEditPreviousHistory)
public async Task<IResponseOutput<Guid>> AddOrUpdatePreviousHistory(PreviousHistoryAddOrEdit addOrEditPreviousHistory)
{
var entity = await _previousHistoryRepository.InsertOrUpdateAsync(addOrEditPreviousHistory, true);
@ -180,7 +180,7 @@ namespace IRaCIS.Core.Application.Contracts
[HttpPost("{trialId:guid}")]
public async Task<IResponseOutput> AddOrUpdatePreviousOther(PreviousOtherAddOrEdit addOrEditPreviousOther)
public async Task<IResponseOutput<Guid>> AddOrUpdatePreviousOther(PreviousOtherAddOrEdit addOrEditPreviousOther)
{
var entity = await _previousOtherRepository.InsertOrUpdateAsync(addOrEditPreviousOther, true);
return ResponseOutput.Ok(entity.Id);
@ -205,7 +205,7 @@ namespace IRaCIS.Core.Application.Contracts
}
[HttpPost("{trialId:guid}")]
public async Task<IResponseOutput> AddOrUpdatePreviousSurgery(PreviousSurgeryAddOrEdit addOrEditPreviousSurgery)
public async Task<IResponseOutput<Guid>> AddOrUpdatePreviousSurgery(PreviousSurgeryAddOrEdit addOrEditPreviousSurgery)
{
var entity = await _previousSurgeryRepository.InsertOrUpdateAsync(addOrEditPreviousSurgery, true);

6
IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs
View File

@ -63,6 +63,12 @@ namespace IRaCIS.Core.Application.Contracts
}
public class NoneDicomStudyAddReturnDto
{
public Guid Id{ get; set; }
public string StudyCode { get; set; } = string.Empty;
}
}

6
IRaCIS.Core.Application/Service/QC/Interface/IClinicalDataService.cs
View File

@ -12,10 +12,10 @@ namespace IRaCIS.Core.Application.Contracts
{
public interface IClinicalDataService
{
Task<IResponseOutput> AddOrUpdatePreviousHistory(PreviousHistoryAddOrEdit addOrEditPreviousHistory);
Task<IResponseOutput> AddOrUpdatePreviousOther(PreviousOtherAddOrEdit addOrEditPreviousOther);
Task<IResponseOutput<Guid>> AddOrUpdatePreviousHistory(PreviousHistoryAddOrEdit addOrEditPreviousHistory);
Task<IResponseOutput<Guid>> AddOrUpdatePreviousOther(PreviousOtherAddOrEdit addOrEditPreviousOther);
Task<IResponseOutput> AddOrUpdatePreviousPDF(PreviousPDFAddOrEdit addOrEditPreviousPDF);
Task<IResponseOutput> AddOrUpdatePreviousSurgery(PreviousSurgeryAddOrEdit addOrEditPreviousSurgery);
Task<IResponseOutput<Guid>> AddOrUpdatePreviousSurgery(PreviousSurgeryAddOrEdit addOrEditPreviousSurgery);
Task<IResponseOutput> DeletePreviousHistory(Guid previousHistoryId);
Task<IResponseOutput> DeletePreviousOther(Guid previousOtherId);
Task<IResponseOutput> DeletePreviousPDF(Guid previousPDFId);

2
IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs
View File

@ -12,7 +12,7 @@ namespace IRaCIS.Core.Application.Contracts
{
public interface INoneDicomStudyService
{
Task<IResponseOutput<string>> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy);
Task<IResponseOutput<NoneDicomStudyAddReturnDto>> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy);
Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId);
Task<IResponseOutput> DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId);
Task<List<NoneDicomStudyFileView>> GetNoneDicomStudyFileList(Guid noneDicomStudyId);

10
IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
View File

@ -55,7 +55,7 @@ namespace IRaCIS.Core.Application.Contracts
[UnitOfWork]
[TypeFilter(typeof(TrialResourceFilter))]
public async Task<IResponseOutput<string>> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy)
public async Task<IResponseOutput<NoneDicomStudyAddReturnDto>> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy)
{
var entity = await _noneDicomStudyRepository.InsertOrUpdateAsync(addOrEditNoneDicomStudy, false);
@ -89,8 +89,12 @@ namespace IRaCIS.Core.Application.Contracts
await _repository.SaveChangesAsync();
return ResponseOutput.Ok(entity.StudyCode);
NoneDicomStudyAddReturnDto noneDicom = new NoneDicomStudyAddReturnDto()
{
StudyCode= entity.StudyCode,
Id= entity.Id
};
return ResponseOutput.Ok(noneDicom);
}

1
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -965,6 +965,7 @@ namespace IRaCIS.Core.Application.Image.QA
SubjectId = x.SubjectId,
TrialId = x.TrialId,
SubjectVisitId=x.SubjectVisitId,
GeneralId=x.Id,
JsonDetail = JsonConvert.SerializeObject(new
{
studyUid=x.StudyCode,

5
IRaCIS.Core.Domain/Trial/DataInspection.cs
View File

@ -154,6 +154,11 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid? VisitStageId { get; set; }
/// <summary>
/// 通用Id
/// </summary>
public Guid? GeneralId { get; set; }
}