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

Merge branch 'Test_HIR_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_HIR_Net8
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
he 2025-09-04 09:46:54 +08:00
parent 5cc192b317 ba12a2977b
commit 77eac6c1d0
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
IRC.Core.SCP/Service/CStoreSCPService.cs
View File

@ -364,11 +364,14 @@ namespace IRaCIS.Core.SCP.Service
// 替换原 PixelData // 替换原 PixelData
dicomFile.Dataset.AddOrUpdate(newFragments); dicomFile.Dataset.AddOrUpdate(newFragments);
// 重新保存 dicom 到流
ms.SetLength(0);
dicomFile.Save(ms);
} }
// 重新保存 dicom 到流
ms.SetLength(0);
dicomFile.Save(ms);
ms.Position = 0; ms.Position = 0;
#endregion #endregion

8
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

@ -1411,7 +1411,7 @@ namespace IRaCIS.Application.Services
// 预先处理1： 删除未提交的所有绑定的检查记录，所有检查一起考虑绑定 // 预先处理1： 删除未提交的所有绑定的检查记录，所有检查一起考虑绑定
await _studySubjectVisitRepository.BatchDeleteNoTrackingAsync(t => t.SubjectId == subjectId && t.SubjectVisit.SubmitState != SubmitStateEnum.Submitted); await _studySubjectVisitRepository.DeleteFromQueryAsync(t => t.SubjectId == subjectId && t.SubjectVisit.SubmitState != SubmitStateEnum.Submitted);
//预处理2 找到该subjecct 已提交的访视的最大检查时间，绑定的检查时间要比这个时间要大 //预处理2 找到该subjecct 已提交的访视的最大检查时间，绑定的检查时间要比这个时间要大
@ -1531,7 +1531,7 @@ namespace IRaCIS.Application.Services
inCommand.PatientIdList = dbPatientIdList.Union(inCommand.PatientIdList).Distinct().ToList(); inCommand.PatientIdList = dbPatientIdList.Union(inCommand.PatientIdList).Distinct().ToList();
// 预先处理2： 删除未提交的所有绑定的检查记录，所有检查一起考虑绑定 // 预先处理2： 删除未提交的所有绑定的检查记录，所有检查一起考虑绑定
await _studySubjectVisitRepository.BatchDeleteNoTrackingAsync(t => t.SubjectId == subjectId && t.SubjectVisit.SubmitState != SubmitStateEnum.Submitted); await _studySubjectVisitRepository.DeleteFromQueryAsync(t => t.SubjectId == subjectId && t.SubjectVisit.SubmitState != SubmitStateEnum.Submitted);
//预处理3 找到该subjecct 已提交的访视的最大检查时间，绑定的检查时间要比这个时间要大 //预处理3 找到该subjecct 已提交的访视的最大检查时间，绑定的检查时间要比这个时间要大
@ -1581,7 +1581,7 @@ namespace IRaCIS.Application.Services
{ {
await _subjectPatientRepository.DeleteAsync(find); await _subjectPatientRepository.DeleteAsync(find);
await _studySubjectVisitRepository.BatchDeleteNoTrackingAsync(t => t.SubjectId == find.SubjectId && t.SCPStudy.PatientId == patientId); //await _studySubjectVisitRepository.BatchDeleteNoTrackingAsync(t => t.SubjectId == find.SubjectId && t.SCPStudy.PatientId == patientId);
await _subjectPatientRepository.SaveChangesAsync(); await _subjectPatientRepository.SaveChangesAsync();
@ -1594,7 +1594,7 @@ namespace IRaCIS.Application.Services
var dbPatientIdList = _subjectPatientRepository.Where(t => t.SubjectId == subjectId).Select(t => t.PatientId).ToList(); var dbPatientIdList = _subjectPatientRepository.Where(t => t.SubjectId == subjectId).Select(t => t.PatientId).ToList();
// 预先处理2： 删除未提交的所有绑定的检查记录，所有检查一起考虑绑定 // 预先处理2： 删除未提交的所有绑定的检查记录，所有检查一起考虑绑定
await _studySubjectVisitRepository.BatchDeleteNoTrackingAsync(t => t.SubjectId == subjectId && t.SubjectVisit.SubmitState != SubmitStateEnum.Submitted); await _studySubjectVisitRepository.DeleteFromQueryAsync(t => t.SubjectId == subjectId && t.SubjectVisit.SubmitState != SubmitStateEnum.Submitted);
//预处理3 找到该subjecct 已提交的访视的最大检查时间，绑定的检查时间要比这个时间要大 //预处理3 找到该subjecct 已提交的访视的最大检查时间，绑定的检查时间要比这个时间要大