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

修改

Uat_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> <param name="inDto"></param>
<returns></returns> <returns></returns>
</member> </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)"> <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRECISTHCCCalculate.GetIsExistDisease(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary> <summary>
是否存在疾病 是否存在疾病

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

@ -47,11 +47,14 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<AuditDocument> UpdateAuditDocument(AuditDocumentUpdateDto inDto) public async Task<IResponseOutput> UpdateAuditDocument(AuditDocumentUpdateDto inDto)
{ {
AuditDocumentAddOrEdit addOrEdit = _mapper.Map<AuditDocumentAddOrEdit>(inDto); AuditDocumentAddOrEdit addOrEdit = _mapper.Map<AuditDocumentAddOrEdit>(inDto);
addOrEdit.IsUpdate = true; addOrEdit.IsUpdate = true;
return await AddOrUpdateAuditDocument(addOrEdit);
var result= await AddOrUpdateAuditDocument(addOrEdit);
return ResponseOutput.Ok(result.Id);
} }
/// <summary> /// <summary>
@ -259,7 +262,9 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
[HttpPost] [HttpPost]
public async Task<IResponseOutput> MovieFileOrFolder(MovieFileOrFolderInDto inDto) public async Task<IResponseOutput> MovieFileOrFolder(MovieFileOrFolderInDto inDto)
{ {
var file = await _auditDocumentRepository.Where(x => x.Id == inDto.Id).FirstNotNullAsync(); foreach (var id in inDto.Ids)
{
var file = await _auditDocumentRepository.Where(x => x.Id == id).FirstNotNullAsync();
if (file.AuditDocumentTypeEnum == AuditDocumentType.Folder) if (file.AuditDocumentTypeEnum == AuditDocumentType.Folder)
{ {
var data = await _auditDocumentRepository.Select(x => new DeleteAudit() var data = await _auditDocumentRepository.Select(x => new DeleteAudit()
@ -268,7 +273,8 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
ParentId = x.ParentId, ParentId = x.ParentId,
MainFileId = x.MainFileId MainFileId = x.MainFileId
}).ToListAsync(); }).ToListAsync();
if (finChild(new List<Guid> { inDto.Id }, inDto.ParentId, data))
if (finChild(new List<Guid> { id }, inDto.ParentId, data))
{ {
throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotMove"]); throw new BusinessValidationFailedException(_localizer["AuditDocument_CanNotMove"]);
} }
@ -295,12 +301,14 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
} }
} }
await _auditDocumentRepository.UpdatePartialFromQueryAsync(inDto.Id, x => new AuditDocument() await _auditDocumentRepository.UpdatePartialFromQueryAsync(id, x => new AuditDocument()
{ {
ParentId = inDto.ParentId ParentId = inDto.ParentId
}); });
await _auditDocumentRepository.SaveChangesAsync(); await _auditDocumentRepository.SaveChangesAsync();
}
return ResponseOutput.Ok(); 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 class MovieFileOrFolderInDto
{ {
public Guid Id { get; set; } public List<Guid> Ids { get; set; }
public Guid ParentId { 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 // 10.NE CR/ND/NN/NE 否/疑似/NE NE
new CalculationDto(){ new CalculationDto(){
Column1=ReadingCommon.EnumToString(new List<TargetAssessment>() { TargetAssessment.NE }), 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}), Column3=ReadingCommon.EnumToString(new List<NewLesionAssessment>() { NewLesionAssessment.No,NewLesionAssessment.Suspected, NewLesionAssessment.NE}),
Column4=ReadingCommon.EnumToString(new List<OverallAssessment>() { OverallAssessment.NE }), Column4=ReadingCommon.EnumToString(new List<OverallAssessment>() { OverallAssessment.NE }),
}, },