Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -12201,7 +12201,7 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserLog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingOncologyTaskInfo},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Application.Service.IVisitTaskService,IRaCIS.Core.Application.Contracts.IReadingClinicalDataService,IRaCIS.Core.Application.Service.IReadingCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserFeedBack},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingGlobalTaskInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingCriterionPage},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskRelation},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingJudgeInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.OrganInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Application.Service.ReadingCalculate.Interface.ILuganoCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingCustomTag},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionMark},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTrialCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableAnswerRowInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Application.Service.IGeneralCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskStudy},IRaCIS.Core.Application.Service.ImageAndDoc.IDownloadAndUploadService,IRaCIS.Core.Application.Interfaces.ITrialEmailNoticeConfigService,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer,ZiggyCreatures.Caching.Fusion.IFusionCache)">
+        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudy},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingNoneDicomMark},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserLog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingOncologyTaskInfo},IRaCIS.Core.Application.Service.IVisitTaskHelpeService,IRaCIS.Core.Application.Service.IVisitTaskService,IRaCIS.Core.Application.Contracts.IReadingClinicalDataService,IRaCIS.Core.Application.Service.IReadingCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserFeedBack},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.ServiceVerifyConfigOption},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingGlobalTaskInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingCriterionPage},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskRelation},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingJudgeInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.OrganInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Application.Service.ReadingCalculate.Interface.ILuganoCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingCustomTag},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionMark},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTrialCriterionDictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableAnswerRowInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionSystem},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Application.Service.IGeneralCalculateService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskStudy},IRaCIS.Core.Application.Service.ImageAndDoc.IDownloadAndUploadService,IRaCIS.Core.Application.Interfaces.ITrialEmailNoticeConfigService,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer,ZiggyCreatures.Caching.Fusion.IFusionCache)">
             <summary>
             IR影像阅片
             </summary>
@@ -12635,6 +12635,27 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.AddNoneDicomMark(IRaCIS.Core.Application.Service.Reading.Dto.AddNoneDicomMarkInDto)">
+            <summary>
+            添加非Dicom标记
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.GetNoneDicomMarkListOutDto(IRaCIS.Core.Application.Service.Reading.Dto.GetNoneDicomMarkListInDtoDto)">
+            <summary>
+            获取非Dicom标记
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.DeleteTrialFileType(System.Guid)">
+            <summary>
+            删除非Dicom标记
+            </summary>
+            <param name="id"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingImageTaskService.SaveVisitTaskQuestions(IRaCIS.Core.Application.Service.Reading.Dto.SubmitVisitTaskQuestionsInDto)">
             <summary>
             保存任务问题
@@ -14183,14 +14204,9 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.TrialEmailNoticeConfigAddOrEdit">
             <summary> TrialEmailNoticeConfigAddOrEdit  列表查询参数模型</summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.GetTrialFileTypeDataInDto.IsAuthorizedView">
+        <member name="P:IRaCIS.Core.Application.ViewModel.GetTrialFileTypeDataInDto.IsEnable">
             <summary>
-            是否授权
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.TrialFileTypeAddOrEdit.IsAuthorizedView">
-            <summary>
-            是否授权
+            是否启用
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.ViewModel.TrialFileTypeAddOrEdit.ShowOrder">

IRaCIS.Core.Application/Service/Document/DTO/TrialFileTypeViewModel.cs

@@ -36,7 +36,7 @@ public class SetAuthorizedViewInDto
 {
     public Guid Id { get; set; }
 
-    public bool IsAuthorizedView { get; set; }
+    public bool IsEnable { get; set; }
 }
 
 public class GetTrialFileTypeDataInDto
@@ -44,9 +44,9 @@ public class GetTrialFileTypeDataInDto
     public Guid TrialId { get; set; }
 
     /// <summary>
-    /// 是否授权
+    /// 是否启用
     /// </summary>
-    public bool IsAuthorizedView { get; set; } = false;
+    public bool IsEnable { get; set; } = false;
 }
 public class CopySystemFileTypeToTrialInDto
 {
@@ -91,11 +91,6 @@ public class TrialFileTypeAddOrEdit
 
     public Guid TrialId { get; set; }
 
-    /// <summary>
-    /// 是否授权
-    /// </summary>
-    public bool IsAuthorizedView { get; set; }
-
     /// <summary>
     /// 显示顺序    
     /// </summary>

IRaCIS.Core.Application/Service/Document/TrialFileTypeService.cs

@@ -11,6 +11,7 @@ using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Infrastructure.Extention;
 using System.Threading.Tasks;
 using IRaCIS.Core.Infra.EFCore;
+using MassTransit;
 namespace IRaCIS.Core.Application.Service;
 
 /// <summary>
@@ -117,7 +118,10 @@ public class TrialFileTypeService(IRepository<TrialFileType> _trialFileTypeRepos
                 .ProjectTo<TrialFileType>(_mapper.ConfigurationProvider)
                 .ToListAsync();
 
-            trialFileTypeList.ForEach(x => x.TrialId = inDto.TrialId);
+            trialFileTypeList.ForEach(x => {
+                x.TrialId = inDto.TrialId;
+                x.Id = NewId.NextGuid();
+            });
 
             await _trialFileTypeRepository.AddRangeAsync(trialFileTypeList, true);
         }
@@ -138,15 +142,20 @@ public class TrialFileTypeService(IRepository<TrialFileType> _trialFileTypeRepos
             TrialId = inDto.TrialId
         });
         var trialFileTypeList = await _trialFileTypeRepository.Where(x=>x.TrialId==inDto.TrialId)
-               .WhereIf(inDto.IsAuthorizedView, x => x.IsAuthorizedView)
+               .WhereIf(inDto.IsEnable, x => x.IsEnable)
                .OrderBy(x=>x.ShowOrder)
                .ProjectTo<TrialFileTypeView>(_mapper.ConfigurationProvider)
                .ToListAsync();
 
-        List<TrialFileTypeData> result= trialFileTypeList.GroupBy(x =>new { x.ArchiveTypeEnum},(key,list)=>new TrialFileTypeData() {
-        ArchiveTypeEnum= key.ArchiveTypeEnum,
-        TrialFileTypeList=list.OrderBy(y=>y.ShowOrder).ToList(),
-        }).OrderBy(x=>x.ArchiveTypeEnum).ToList();
+        List<TrialFileTypeData> result = new List<TrialFileTypeData>();
+        foreach (ArchiveType type in Enum.GetValues(typeof(ArchiveType)))
+        {
+            result.Add(new TrialFileTypeData()
+            {
+                ArchiveTypeEnum = type,
+                TrialFileTypeList = trialFileTypeList.Where(x => x.ArchiveTypeEnum == type).ToList()
+            });
+        }
 
         return new GetTrialFileTypeDataOutDto() { TrialFileTypeDataList = result };
 
@@ -161,7 +170,7 @@ public class TrialFileTypeService(IRepository<TrialFileType> _trialFileTypeRepos
     [HttpPost]
     public async Task<IResponseOutput> SetAuthorizedView(SetAuthorizedViewInDto inDto)
     {
-        await _trialFileTypeRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.Id, x => new TrialFileType() { IsAuthorizedView = inDto.IsAuthorizedView }, true);
+        await _trialFileTypeRepository.UpdatePartialFromQueryAsync(x => x.Id == inDto.Id, x => new TrialFileType() { IsEnable = inDto.IsEnable }, true);
         return ResponseOutput.Ok();
     }
 

IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs

@@ -13,6 +13,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int FileCount { get; set; }
 
+        public bool IsCriticalSequence { get; set; } = false;
+
         public List<NoneDicomStudyFileView> NoneDicomStudyFileList { get; set; } = new List<NoneDicomStudyFileView>();
 
 

IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs

@@ -2365,6 +2365,32 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid VisitTaskId { get; set; }
     }
 
+    public class GetNoneDicomMarkListOutDto
+    {
+        public List<AddNoneDicomMarkInDto> NoneDicomMarkList { get; set; }
+    }
+
+
+    public class GetNoneDicomMarkListInDtoDto
+    {
+        public Guid VisitTaskId { get; set; }
+    }
+
+    public class AddNoneDicomMarkInDto 
+    {
+        public Guid? Id { get; set; }
+
+        public Guid VisitTaskId { get; set; }
+
+        public Guid? StudyId { get; set; }
+        public Guid? NoneDicomFileId { get; set; }
+
+        public string Path { get; set; }
+
+        public string MeasureData { get; set; } = string.Empty;
+
+    }
+
     /// <summary>
     /// 
     /// </summary>

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -32,6 +32,8 @@ namespace IRaCIS.Core.Application.Service
         IRepository<NoneDicomStudy> _noneDicomStudyRepository,
         IRepository<VisitTask> _visitTaskRepository,
         IRepository<Trial> _trialRepository,
+        IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository,
+        IRepository<ReadingNoneDicomMark> _readingNoneDicomMarkRepository,
         IRepository<UserLog> _userLogRepository,
         IRepository<ReadingTableQuestionAnswer> _readingTableQuestionAnswerRepository,
         IRepository<ReadingOncologyTaskInfo> _readingOncologyTaskInfoRepository,

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs

@@ -1,6 +1,7 @@
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Filter;
 using IRaCIS.Core.Application.Service.Reading.Dto;
+using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
 using MassTransit;
 using Microsoft.AspNetCore.Mvc;
@@ -31,6 +32,49 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
+        /// <summary>
+        /// 添加非Dicom标记
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> AddNoneDicomMark(AddNoneDicomMarkInDto inDto)
+        {
+            var entity = await _readingNoneDicomMarkRepository.InsertOrUpdateAsync(inDto, true);
+            return ResponseOutput.Ok(entity.Id);
+        }
+
+        /// <summary>
+        /// 获取非Dicom标记
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<GetNoneDicomMarkListOutDto> GetNoneDicomMarkListOutDto(GetNoneDicomMarkListInDtoDto inDto)
+        {
+           var result=  await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId)
+            
+               .ProjectTo<AddNoneDicomMarkInDto>(_mapper.ConfigurationProvider)
+               .ToListAsync();
+
+            return new GetNoneDicomMarkListOutDto()
+            {
+                NoneDicomMarkList = result
+            };
+        }
+
+        /// <summary>
+        /// 删除非Dicom标记
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpPost("{id:guid}")]
+        public async Task<IResponseOutput> DeleteTrialFileType(Guid id)
+        {
+            var success = await _readingNoneDicomMarkRepository.DeleteFromQueryAsync(t => t.Id == id, true);
+            return ResponseOutput.Ok();
+        }
+
         /// <summary>
         /// 保存任务问题
         /// </summary>
@@ -84,7 +128,7 @@ namespace IRaCIS.Core.Application.Service
                 visitIds.AddRange(await _subjectVisitRepository.Where(x => x.VisitNum <= task.VisitNum && x.SubjectId == task.SubjectId).Select(x => x.Id).ToListAsync());
             }
 
-            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisistTaskId).Select(t => new { t.BlindSubjectCode, t.TrialReadingCriterionId, t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync();
+            var taskinfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisistTaskId).Select(t => new { t.BlindSubjectCode, t.ReadingTaskState, t.TrialReadingCriterionId, t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync();
 
 
 
@@ -106,6 +150,20 @@ namespace IRaCIS.Core.Application.Service
             List<NoneDicomStudyView> result = await noneDicomStudyQueryable.ToListAsync();
 
 
+            var nonoDicomStudyFileIds=await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == inDto.VisistTaskId).ToListAsync();
+            if (nonoDicomStudyFileIds.Count > 0&& taskinfo.ReadingTaskState== ReadingTaskState.HaveSigned)
+            {
+                var studyId = nonoDicomStudyFileIds.Select(x => x.StudyId).FirstOrDefault();
+
+                var noneDicomids= nonoDicomStudyFileIds.Select(x=>x.NoneDicomFileId).ToList();
+                var noneDicomStudyViewMark =new NoneDicomStudyView() { Id = Guid.NewGuid() };
+                noneDicomStudyViewMark.IsCriticalSequence = true;
+                noneDicomStudyViewMark.NoneDicomStudyFileList = await _noneDicomStudyFileRepository.Where(x => noneDicomids.Contains(x.Id)).ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).ToListAsync();
+                result.Insert(0, noneDicomStudyViewMark);
+            }
+
+          
+
             var trialInfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => new
             {
                 x.ClinicalInformationTransmissionEnum,

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -65,6 +65,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TrialClinicalTableQuestion, ClinicalTablePreviewDto>();
             #endregion
             CreateMap<TableMarkInfo, ReadingTaskQuestionMark>();
+            CreateMap<AddNoneDicomMarkInDto, ReadingNoneDicomMark>();
+            CreateMap<ReadingNoneDicomMark, AddNoneDicomMarkInDto>();
             CreateMap<ReadingTaskQuestionMark, TableMarkInfo>();
             CreateMap<VisitTask, VisitTaskDto>();
             CreateMap<SaveTableQuestionMarkInDto, ReadingTaskQuestionMark>();