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

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

Test_IRC_Net8
he 2025-09-23 11:15:43 +08:00
parent d37c1cb872 da2afd0d5a
commit e641e78fb3
3 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs
View File

@ -102,6 +102,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
public string BodyPartForEdit { get; set; } public string BodyPartForEdit { get; set; }
public string BodyPartForEditOther { get; set; }
public DateTime? StudyTime { get; set; } public DateTime? StudyTime { get; set; }
public string Modalities { get; set; } public string Modalities { get; set; }
@ -126,6 +128,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
public string BodyPart { get; set; } public string BodyPart { get; set; }
public string BodyPartForEditOther { get; set; }
public string Modality { get; set; } public string Modality { get; set; }
public DateTime ImageDate { get; set; } public DateTime ImageDate { get; set; }

30
IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
View File

@ -190,6 +190,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
ModalityForEdit = t.ModalityForEdit, ModalityForEdit = t.ModalityForEdit,
BodyPartExamined = t.BodyPartExamined, BodyPartExamined = t.BodyPartExamined,
BodyPartForEdit = t.BodyPartForEdit, BodyPartForEdit = t.BodyPartForEdit,
BodyPartForEditOther = t.BodyPartForEditOther,
StudyCode = t.StudyCode, StudyCode = t.StudyCode,
StudyTime = t.StudyTime, StudyTime = t.StudyTime,
@ -209,6 +210,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
ModalityForEdit = t.ModalityForEdit, ModalityForEdit = t.ModalityForEdit,
BodyPartExamined = t.BodyPartExamined, BodyPartExamined = t.BodyPartExamined,
BodyPartForEdit = t.BodyPartForEdit, BodyPartForEdit = t.BodyPartForEdit,
BodyPartForEditOther = t.BodyPartForEditOther,
StudyCode = t.StudyCode, StudyCode = t.StudyCode,
StudyTime = t.StudyTime, StudyTime = t.StudyTime,
@ -524,6 +526,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
await _taskInstanceRepository.AddAsync(isntance); await _taskInstanceRepository.AddAsync(isntance);
} }
} }
findStudy = study;
} }
else else
{ {
@ -609,6 +614,30 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
} }
#region 只配置单个部位自动赋值
var originStudy = _dicomStudyRepository.Where(t => t.TrialId == incommand.TrialId && t.StudyInstanceUid == findStudy.StudyInstanceUid).FirstOrDefault();
if (originStudy != null)
{
findStudy.BodyPartForEdit = originStudy.BodyPartForEdit;
findStudy.BodyPartForEditOther = originStudy.BodyPartForEditOther;
}
////项目配置的影像部位
//var trialBodyParts = _trialRepository.Where(t => t.Id == trialId).Select(t => t.BodyPartTypes).FirstOrDefault();
//var trialBodyPartList = trialBodyParts.Split('|', StringSplitOptions.RemoveEmptyEntries);
//if (trialBodyPartList.Count() == 1)
//{
// var first = trialBodyPartList.First();
// findStudy.BodyPartForEdit = first;
//}
#endregion
var @lock2 = _distributedLockProvider.CreateLock($"StudyCommit"); var @lock2 = _distributedLockProvider.CreateLock($"StudyCommit");
using (await @lock2.AcquireAsync()) using (await @lock2.AcquireAsync())
@ -734,6 +763,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
Description = ns.Description, Description = ns.Description,
ImageDate = ns.ImageDate, ImageDate = ns.ImageDate,
BodyPart = ns.BodyPart, BodyPart = ns.BodyPart,
BodyPartForEditOther=ns.BodyPartForEditOther,
FileCount = ns.FileCount, FileCount = ns.FileCount,
Modality = ns.Modality, Modality = ns.Modality,
StudyCode = ns.StudyCode, StudyCode = ns.StudyCode,

24
IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
View File

@ -323,29 +323,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
} }
#region 只配置单个部位自动赋值
var originStudy = _dicomStudyRepository.Where(t => t.TrialId == incommand.TrialId && t.StudyInstanceUid == findStudy.StudyInstanceUid).FirstOrDefault();
if(originStudy != null)
{
findStudy.BodyPartForEdit=originStudy.BodyPartForEdit;
findStudy.BodyPartForEditOther = originStudy.BodyPartForEditOther;
}
////项目配置的影像部位
//var trialBodyParts = _trialRepository.Where(t => t.Id == trialId).Select(t => t.BodyPartTypes).FirstOrDefault();
//var trialBodyPartList = trialBodyParts.Split('|', StringSplitOptions.RemoveEmptyEntries);
//if (trialBodyPartList.Count() == 1)
//{
// var first = trialBodyPartList.First();
// findStudy.BodyPartForEdit = first;
//}
#endregion
var @lock2 = _distributedLockProvider.CreateLock($"StudyCommit"); var @lock2 = _distributedLockProvider.CreateLock($"StudyCommit");