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

修改一版

Uat_Study
he 2022-05-07 13:44:28 +08:00
parent 0c31f0e863
commit 096933436d
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -892,7 +892,7 @@ namespace IRaCIS.Core.Application.Image.QA
var success3 = await _dicomSeriesrepository.DeleteFromQueryAsync(t => t.StudyId == id); var success3 = await _dicomSeriesrepository.DeleteFromQueryAsync(t => t.StudyId == id,true);
var success4 = await _repository.BatchDeleteAsync<StudyMonitor>(t => t.StudyId == id); var success4 = await _repository.BatchDeleteAsync<StudyMonitor>(t => t.StudyId == id);
//删除 物理文件 //删除 物理文件

22
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -125,7 +125,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common
// 访视 // 访视
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectVisit))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectVisit)))
{ {
var subjectCode = (item.Entity as SubjectVisit).Subject?.Code; var entity = item.Entity as SubjectVisit;
switch (GetRequestUrl())
{
case "QCOperation/ObtainOrCancelQCTask":
type = type +"/"+ entity.IsTake.ToString();
break;
}
var subjectCode = entity.Subject?.Code;
await InsertInspection<SubjectVisit>(item, type, x => new DataInspection() await InsertInspection<SubjectVisit>(item, type, x => new DataInspection()
{ {
SubjectCode= subjectCode, SubjectCode= subjectCode,
@ -158,6 +166,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
// 其他治疗史 // 其他治疗史
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousOther))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PreviousOther)))
{ {
await InsertInspection<PreviousOther>(item, type, x => new DataInspection() await InsertInspection<PreviousOther>(item, type, x => new DataInspection()
{ {
GeneralId = x.Id, GeneralId = x.Id,
@ -180,14 +189,17 @@ namespace IRaCIS.Core.Infra.EFCore.Common
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(DicomSeries))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(DicomSeries)))
{ {
var entity = item.Entity as DicomSeries; var entity = item.Entity as DicomSeries;
if (entity.DicomStudy == null)
{
entity.DicomStudy =await _dbContext.DicomStudys.FirstOrDefaultAsync(x=>x.Id== entity.StudyId);
}
await InsertInspection<DicomSeries>(item, type, x => new DataInspection() await InsertInspection<DicomSeries>(item, type, x => new DataInspection()
{ {
GeneralId = x.Id, GeneralId = x.Id,
}, new }, new
{ {
StudyCode = entity.DicomStudy.StudyCode, StudyCode = entity.DicomStudy?.StudyCode,
Modalities = entity.DicomStudy.Modalities, Modalities = entity.DicomStudy?.Modalities,
}); });
} }
@ -215,6 +227,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//质疑 //质疑
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(QCChallenge))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(QCChallenge)))
{ {
type = _userInfo.UserTypeShortName +"/"+ type;
await InsertInspection<QCChallenge>(item, type, x => new DataInspection() await InsertInspection<QCChallenge>(item, type, x => new DataInspection()
{ {
GeneralId = x.Id, GeneralId = x.Id,
@ -224,6 +237,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//一致性核查 //一致性核查
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(CheckChallengeDialog))) foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(CheckChallengeDialog)))
{ {
type = _userInfo.UserTypeShortName + "/" + type;
await InsertInspection<CheckChallengeDialog>(item, type, x => new DataInspection() await InsertInspection<CheckChallengeDialog>(item, type, x => new DataInspection()
{ {
GeneralId = x.Id, GeneralId = x.Id,