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

修改

Test_IRC_Net8
he 2025-03-31 14:01:29 +08:00
parent 56e316e6a1
commit f781027388
4 changed files with 77 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -4706,6 +4706,34 @@
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRECISTHCCCalculate.CalculationGetImgOncology(System.String,System.String,System.String)">
<summary>
计算整体肿瘤评估 【测试】
</summary>
<param name="targetLesion">靶病灶</param>
<param name="noTargetLesion"> 非靶病灶</param>
<param name="newLesions">新病灶</param>
<remarks>
靶病灶 非靶病灶 存在新病灶 整体肿瘤评估
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
</remarks>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRECISTHCCCalculate.GetIsExistDisease(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary>
是否存在疾病

86
IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs
View File

@ -38,7 +38,7 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
.ProjectTo<AuditDocumentView>(_mapper.ConfigurationProvider);
var pageList= await auditDocumentQueryable.ToPagedListAsync(inQuery);
return pageList;
return pageList;
}
/// <summary>
@ -47,11 +47,14 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
/// <param name="inDto"></param>
/// <returns></returns>
[HttpPost]
public async Task<AuditDocument> UpdateAuditDocument(AuditDocumentUpdateDto inDto)
public async Task<IResponseOutput> UpdateAuditDocument(AuditDocumentUpdateDto inDto)
{
AuditDocumentAddOrEdit addOrEdit = _mapper.Map<AuditDocumentAddOrEdit>(inDto);
addOrEdit.IsUpdate = true;
return await AddOrUpdateAuditDocument(addOrEdit);
var result= await AddOrUpdateAuditDocument(addOrEdit);
return ResponseOutput.Ok(result.Id);
}
/// <summary>
@ -259,48 +262,53 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
[HttpPost]
public async Task<IResponseOutput> 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<Guid> { 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<Guid> ids, Guid ChildId,List<DeleteAudit> 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<Guid> { id }, inDto.ParentId, data))
{
throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotMove"]);
}
}
bool finChild(List<Guid> ids, Guid ChildId, List<DeleteAudit> 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();
}

2
IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs
View File

@ -76,7 +76,7 @@ public class GetHistoricalVersionOutDto
public class MovieFileOrFolderInDto
{
public Guid Id { get; set; }
public List<Guid> Ids { get; set; }
public Guid ParentId { get; set; }
}

2
IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
View File

@ -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>() { TargetAssessment.NE }),
Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR, NoTargetAssessment.ND, NoTargetAssessment.NN,, NoTargetAssessment.NE, }),
Column2=ReadingCommon.EnumToString(new List<NoTargetAssessment>() { NoTargetAssessment.CR, NoTargetAssessment.ND, NoTargetAssessment.NN, NoTargetAssessment.NE, }),
Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected, NewLesionAssessment.NE}),
Column4=ReadingCommon.EnumToString(new List<OverallAssessment>() { OverallAssessment.NE }),
},