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

修复bug

Uat_Study
hang 2022-04-12 10:19:33 +08:00
parent eefe406b99
commit 046c13ecf4
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Common/ExcelExportHelper.cs
View File

@ -38,7 +38,7 @@ public static class ExcelExportHelper
return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
{ {
FileDownloadName = $"{exportFileNamePrefix}_{doc.Name}_{DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")}.xlsx" FileDownloadName = $"{exportFileNamePrefix}_{doc.Name.Substring(0,doc.Name.LastIndexOf('.'))}{DateTime.Now.ToString("yyyy-MM-dd:hh:mm:ss")}.xlsx"
}; };
#endregion #endregion

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

@ -83,6 +83,12 @@ namespace IRaCIS.Core.Application.Contracts
[HttpDelete("{noneDicomStudyId:guid}/{trialId:guid}")] [HttpDelete("{noneDicomStudyId:guid}/{trialId:guid}")]
public async Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId) public async Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId)
{ {
if (_noneDicomStudyRepository.Where(t => t.Id == noneDicomStudyId)
.Any(t => t.NoneDicomFileList.Count() > 0))
{
return ResponseOutput.NotOk("先移除文件，才允许删除非Dicom");
}
var noneDicomStudy = await _noneDicomStudyRepository.FirstOrDefaultAsync(t => t.Id == noneDicomStudyId); var noneDicomStudy = await _noneDicomStudyRepository.FirstOrDefaultAsync(t => t.Id == noneDicomStudyId);
if (noneDicomStudy == null) return Null404NotFound(noneDicomStudy); if (noneDicomStudy == null) return Null404NotFound(noneDicomStudy);
@ -107,6 +113,12 @@ namespace IRaCIS.Core.Application.Contracts
LatestScanDate = maxArray.Max() LatestScanDate = maxArray.Max()
}); });
//如果既没有 dicom数据 也没有非dicom 文件 那么提交状态变更回去
if (await _repository.CountAsync<DicomStudy>(t => t.SubjectVisitId == noneDicomStudy.SubjectVisitId) == 0 && await _repository.CountAsync<NoneDicomStudyFile>(t => t.NoneDicomStudy.SubjectVisitId == noneDicomStudy.SubjectVisitId) == 0)
{
await _repository.UpdateFromQueryAsync<SubjectVisit>(t => t.Id == noneDicomStudy.SubjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit, u => new SubjectVisit() { VisitExecuted = 0, SubmitState = SubmitStateEnum.None });
}
return ResponseOutput.Ok(); return ResponseOutput.Ok();
} }