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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-03-23 13:24:07 +08:00
parent b0f189c338 bd028771b6
commit 354dba5de7
4 changed files with 537 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1036
IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs
View File

File diff suppressed because it is too large Load Diff

14
IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
View File

@ -1173,7 +1173,12 @@ namespace IRaCIS.Core.Application.Service.Allocation
var trialReadingCriterionId = taskList.First()!.TrialReadingCriterionId; var trialReadingCriterionId = taskList.First()!.TrialReadingCriterionId;
var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException(); var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == trialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsAutoCreate, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
if (criterionConfig.IsAutoCreate == false)
{
return ResponseOutput.NotOk("手动生成任务的不允许PM 申请影像重阅");
}
foreach (var task in taskList) foreach (var task in taskList)
{ {
@ -1952,7 +1957,12 @@ namespace IRaCIS.Core.Application.Service.Allocation
var task = (await _visitTaskRepository.Where(t => t.Id == taskId).FirstOrDefaultAsync()).IfNullThrowException(); var task = (await _visitTaskRepository.Where(t => t.Id == taskId).FirstOrDefaultAsync()).IfNullThrowException();
var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == task.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException(); var criterionConfig = (await _trialReadingCriterionRepository.Where(x => x.Id == task.TrialReadingCriterionId).Select(x => new { x.ReadingTool, x.IsAutoCreate, x.IsReadingTaskViewInOrder }).FirstOrDefaultAsync()).IfNullThrowException();
if (criterionConfig.IsAutoCreate==false)
{
return ResponseOutput.NotOk("手动生成任务的不允许影像退回");
}
if (task.TaskState != TaskState.Effect || task.ReadingCategory != ReadingCategory.Visit || task.ReadingTaskState == ReadingTaskState.HaveSigned) if (task.TaskState != TaskState.Effect || task.ReadingCategory != ReadingCategory.Visit || task.ReadingTaskState == ReadingTaskState.HaveSigned)
{ {

2
IRaCIS.Core.Application/Service/Document/_MapConfig.cs
View File

@ -20,7 +20,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<TrialDocument, TrialDocumentView>() CreateMap<TrialDocument, TrialDocumentView>()
.ForMember(d => d.FileType, u => u.MapFrom(s => s.FileType.MappedValue)) .ForMember(d => d.FileType, u => u.MapFrom(s => s.FileType.MappedValue))
.ForMember(d => d.IsSomeUserSigned, u => u.MapFrom(s => s.TrialDocConfirmedUserList.Any())) .ForMember(d => d.IsSomeUserSigned, u => u.MapFrom(s => s.TrialDocConfirmedUserList.Any(t=>t.ConfirmTime!=null)))
.ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path )); .ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path ));

3
IRaCIS.Core.Application/Service/Reading/AdditionalEvaluate/SubjectCriteriaEvaluationService.cs
View File

@ -516,13 +516,14 @@ namespace IRaCIS.Core.Application.Service
SeriesNumber = series.SeriesNumber, SeriesNumber = series.SeriesNumber,
SeriesTime = series.SeriesTime, SeriesTime = series.SeriesTime,
InstanceCount=series.InstanceCount,
StudyTime = series.DicomStudy.StudyTime, StudyTime = series.DicomStudy.StudyTime,
StudyId = series.StudyId, StudyId = series.StudyId,
SeriesId = series.Id, SeriesId = series.Id,
SubjectVisitId = series.SubjectVisitId, SubjectVisitId = series.SubjectVisitId,
TrialReadingCriterionId = inQuery.TrialReadingCriterionId, TrialReadingCriterionId = inQuery.TrialReadingCriterionId,
IsReading=visitStudyFilter.IsReading, IsReading=visitStudyFilter.IsReading,
Id = visitStudyFilter.Id, Id = visitStudyFilter.Id,
CreateTime = visitStudyFilter.CreateTime, CreateTime = visitStudyFilter.CreateTime,