diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 03f5fcb40..eb781384a 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -4706,6 +4706,34 @@ + + + 计算整体肿瘤评估 【测试】 + + 靶病灶 + 非靶病灶 + 新病灶 + + 靶病灶 非靶病灶 存在新病灶 整体肿瘤评估 + 1. CR CR 否 CR + 2. CR ND 否 CR + 3. ND CR 否 CR + 4. CR NN/NE 否/疑似/NE PR + 5. CR CR/ND 疑似/NE PR + 6. PR CR/ND/NN/NE 否/疑似/NE PR + 7. ND CR 疑似/NE PR + 8. SD CR/ND/NN/NE 否/疑似/NE SD + 9. ND NN 否/疑似/NE NN + 10.NE CR/ND/NN/NE 否/疑似/NE NE + 11.ND NE 否/疑似/NE NE + 12.ND ND NE NE + 13.ND ND 否/疑似 ND + 14.PD CR/NN/PD/ND/NE 是/否/疑似/NE PD + 15.CR/PR/SD/PD/ND/NE PD 是/否/疑似/NE PD + 16.CR/PR/SD/PD/ND/NE CR/NN/PD/ND/NE 是 PD + + + 是否存在疾病 diff --git a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs index eecec8682..ffaa76f76 100644 --- a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs @@ -38,7 +38,7 @@ public class AuditDocumentService(IRepository _auditDocumentRepos .ProjectTo(_mapper.ConfigurationProvider); var pageList= await auditDocumentQueryable.ToPagedListAsync(inQuery); - return pageList; + return pageList; } /// @@ -47,11 +47,14 @@ public class AuditDocumentService(IRepository _auditDocumentRepos /// /// [HttpPost] - public async Task UpdateAuditDocument(AuditDocumentUpdateDto inDto) + public async Task UpdateAuditDocument(AuditDocumentUpdateDto inDto) { AuditDocumentAddOrEdit addOrEdit = _mapper.Map(inDto); addOrEdit.IsUpdate = true; - return await AddOrUpdateAuditDocument(addOrEdit); + + var result= await AddOrUpdateAuditDocument(addOrEdit); + + return ResponseOutput.Ok(result.Id); } /// @@ -259,48 +262,53 @@ public class AuditDocumentService(IRepository _auditDocumentRepos [HttpPost] public async Task MovieFileOrFolder(MovieFileOrFolderInDto inDto) { - var file = await _auditDocumentRepository.Where(x => x.Id == inDto.Id).FirstNotNullAsync(); - if (file.AuditDocumentTypeEnum == AuditDocumentType.Folder) + foreach (var id in inDto.Ids) { - var data = await _auditDocumentRepository.Select(x => new DeleteAudit() + var file = await _auditDocumentRepository.Where(x => x.Id == id).FirstNotNullAsync(); + if (file.AuditDocumentTypeEnum == AuditDocumentType.Folder) { - Id = x.Id, - ParentId = x.ParentId, - MainFileId = x.MainFileId - }).ToListAsync(); - if (finChild(new List { inDto.Id }, inDto.ParentId, data)) - { - throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotMove"]); - } + var data = await _auditDocumentRepository.Select(x => new DeleteAudit() + { + Id = x.Id, + ParentId = x.ParentId, + MainFileId = x.MainFileId + }).ToListAsync(); - } - - bool finChild(List ids, Guid ChildId,List data) - { - var child = data.Where(x =>x.ParentId!=null&& ids.Contains(x.ParentId.Value)).ToList(); - if (child.Count() == 0) - { - return false; - } - else if (child.Any(x => x.Id == ChildId)) - { - return true; - } - else - { - var newids = child.Select(x => x.Id).ToList(); - - return finChild(newids, ChildId, data); + if (finChild(new List { id }, inDto.ParentId, data)) + { + throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotMove"]); + } } + + bool finChild(List ids, Guid ChildId, List data) + { + var child = data.Where(x => x.ParentId != null && ids.Contains(x.ParentId.Value)).ToList(); + if (child.Count() == 0) + { + return false; + } + else if (child.Any(x => x.Id == ChildId)) + { + return true; + } + else + { + var newids = child.Select(x => x.Id).ToList(); + + return finChild(newids, ChildId, data); + + } + } + + await _auditDocumentRepository.UpdatePartialFromQueryAsync(id, x => new AuditDocument() + { + ParentId = inDto.ParentId + }); + + await _auditDocumentRepository.SaveChangesAsync(); } - - await _auditDocumentRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new AuditDocument() - { - ParentId = inDto.ParentId - }); - - await _auditDocumentRepository.SaveChangesAsync(); + return ResponseOutput.Ok(); } diff --git a/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs index d1341dd7a..e0db95589 100644 --- a/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs +++ b/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs @@ -76,7 +76,7 @@ public class GetHistoricalVersionOutDto public class MovieFileOrFolderInDto { - public Guid Id { get; set; } + public List Ids { get; set; } public Guid ParentId { get; set; } } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs index c6bbdf293..720b08306 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs @@ -1227,7 +1227,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 10.NE CR/ND/NN/NE 否/疑似/NE NE new CalculationDto(){ Column1=ReadingCommon.EnumToString(new List() { TargetAssessment.NE }), - Column2=ReadingCommon.EnumToString(new List() { NoTargetAssessment.CR, NoTargetAssessment.ND, NoTargetAssessment.NN,, NoTargetAssessment.NE, }), + Column2=ReadingCommon.EnumToString(new List() { NoTargetAssessment.CR, NoTargetAssessment.ND, NoTargetAssessment.NN, NoTargetAssessment.NE, }), Column3=ReadingCommon.EnumToString(new List() { NewLesionAssessment.No,NewLesionAssessment.Suspected, NewLesionAssessment.NE}), Column4=ReadingCommon.EnumToString(new List() { OverallAssessment.NE }), },