diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 6e76f3bf1..91da57445 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -10218,6 +10218,11 @@
问题分类
+
+
+ 问题分类
+
+
评估结果
@@ -15001,6 +15006,13 @@
+
+
+ 获取单个表格问题及答案 过滤问题
+
+
+
+
获取自定义问题以及答案
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
index 7f69b3f71..947e73c9a 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
@@ -581,9 +581,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
};
- var addEntity = await _studyMonitorRepository.AddAsync(studyMonitor, true);
+ //var addEntity = await _studyMonitorRepository.AddAsync(studyMonitor, true);
- return ResponseOutput.Ok(addEntity.Id);
+ return ResponseOutput.Ok(Guid.NewGuid());
}
@@ -644,20 +644,20 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
{
var trialId = incommand.TrialId;
- var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == incommand.StudyMonitorId);
- studyMonitor.UploadFinishedTime = DateTime.Now;
- studyMonitor.ArchiveFinishedTime = DateTime.Now;
- studyMonitor.FailedFileCount = incommand.FailedFileCount;
- studyMonitor.IsSuccess = incommand.FailedFileCount == 0;
- studyMonitor.RecordPath = incommand.RecordPath;
- studyMonitor.FileSize = incommand.Study.SeriesList.SelectMany(t => t.InstanceList).Sum(t => t.FileSize);
+ //var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == incommand.StudyMonitorId);
+ //studyMonitor.UploadFinishedTime = DateTime.Now;
+ //studyMonitor.ArchiveFinishedTime = DateTime.Now;
+ //studyMonitor.FailedFileCount = incommand.FailedFileCount;
+ //studyMonitor.IsSuccess = incommand.FailedFileCount == 0;
+ //studyMonitor.RecordPath = incommand.RecordPath;
+ //studyMonitor.FileSize = incommand.Study.SeriesList.SelectMany(t => t.InstanceList).Sum(t => t.FileSize);
var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString());
var findStudy = await _dicomStudyRepository.FirstOrDefaultAsync(t => t.Id == studyId);
- studyMonitor.StudyId = studyId;
- studyMonitor.StudyCode = findStudy?.StudyCode ?? "";
- studyMonitor.IsDicomReUpload = findStudy != null;
+ //studyMonitor.StudyId = studyId;
+ //studyMonitor.StudyCode = findStudy?.StudyCode ?? "";
+ //studyMonitor.IsDicomReUpload = findStudy != null;
if (incommand.Study.SeriesList.SelectMany(t => t.InstanceList).Count() == 0)
@@ -668,7 +668,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
}
//上传
- if (studyMonitor.IsDicomReUpload == false)
+ if ((findStudy != null) == false)
{
var addStudy = _mapper.Map(incommand.Study);
@@ -713,7 +713,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
- studyMonitor.StudyCode = addStudy.StudyCode;
+ //studyMonitor.StudyCode = addStudy.StudyCode;
foreach (var seriesItem in incommand.Study.SeriesList)
diff --git a/IRaCIS.Core.Infra.EFCore/Interceptor/AuditEntityInterceptor.cs b/IRaCIS.Core.Infra.EFCore/Interceptor/AuditEntityInterceptor.cs
index c577ba2dd..abe6c281f 100644
--- a/IRaCIS.Core.Infra.EFCore/Interceptor/AuditEntityInterceptor.cs
+++ b/IRaCIS.Core.Infra.EFCore/Interceptor/AuditEntityInterceptor.cs
@@ -48,7 +48,7 @@ public class AuditEntityInterceptor(IUserInfo _userInfo,
AuditEntities(eventData.Context);
//IRC稽查 放在savechange 之前 不影响之前的逻辑
- IRCDataInspection(eventData.Context);
+ //IRCDataInspection(eventData.Context);
//return result;
@@ -64,7 +64,7 @@ public class AuditEntityInterceptor(IUserInfo _userInfo,
AuditEntities(eventData.Context);
//IRC稽查 放在savechange 之前 不影响之前的逻辑
- IRCDataInspection(eventData.Context);
+ //IRCDataInspection(eventData.Context);
//return result;