非Dicom

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>
             保存任务问题

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]
+        public async Task<IResponseOutput> DeleteTrialFileType(Guid id)
+        {
+            var success = await _readingNoneDicomMarkRepository.DeleteFromQueryAsync(t => t.Id == id, true);
+            return ResponseOutput.Ok();
+        }
+
         /// <summary>
         /// 保存任务问题
         /// </summary>
@@ -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)
+            {
+                var studyId = nonoDicomStudyFileIds.Select(x => x.StudyId).FirstOrDefault();
+
+                var noneDicomids= nonoDicomStudyFileIds.Select(x=>x.NoneDicomFileId).ToList();
+                var noneDicomStudyViewMark =await _noneDicomStudyRepository.Where(x => x.Id == studyId).ProjectTo<TaskDicomStudyView>(_mapper.ConfigurationProvider).FirstNotNullAsync();
+                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>();

IRaCIS.Core.Domain/Reading/ReadingFormAnswer/ReadingNoneDicomMark.cs

@@ -0,0 +1,24 @@
+namespace IRaCIS.Core.Domain.Models;
+
+[Comment("项目阅片 - 非Dicom标记")]
+[Table("ReadingNoneDicomMark")]
+public class ReadingNoneDicomMark : BaseAddAuditEntity
+{
+    #region 导航属性
+    [JsonIgnore]
+    [ForeignKey("StudyId")]
+    public NoneDicomStudy NoneDicomStudy { get; set; }
+    #endregion
+
+    public Guid VisitTaskId { get; set; }
+
+    public Guid? StudyId { get; set; }
+    public Guid? NoneDicomFileId { get; set; }
+    
+    public string Path { get; set; }
+
+    [MaxLength]
+    public string MeasureData { get; set; } = string.Empty;
+
+
+}

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -350,6 +350,8 @@ public class IRaCISDBContext : DbContext
 
     public virtual DbSet<ReadingJudgeInfo> ReadingJudgeInfo { get; set; }
 
+    public virtual DbSet<ReadingNoneDicomMark> ReadingNoneDicomMark { get; set; }
+
     public virtual DbSet<ReadModule> ReadModule { get; set; }
 
 

IRaCIS.Core.Infra.EFCore/Migrations/20250225060347_nonDicommark.cs

@@ -0,0 +1,62 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class nonDicommark : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "ReadingNoneDicomMark",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    VisitTaskId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    StudyId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    NoneDicomFileId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    Path = table.Column<string>(type: "nvarchar(400)", maxLength: 400, nullable: false),
+                    MeasureData = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    CreateUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreateTime = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ReadingNoneDicomMark", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_ReadingNoneDicomMark_NoneDicomStudy_StudyId",
+                        column: x => x.StudyId,
+                        principalTable: "NoneDicomStudy",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_ReadingNoneDicomMark_User_CreateUserId",
+                        column: x => x.CreateUserId,
+                        principalTable: "User",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                },
+                comment: "项目阅片 - 非Dicom标记");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReadingNoneDicomMark_CreateUserId",
+                table: "ReadingNoneDicomMark",
+                column: "CreateUserId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReadingNoneDicomMark_StudyId",
+                table: "ReadingNoneDicomMark",
+                column: "StudyId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "ReadingNoneDicomMark");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -5204,6 +5204,47 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         });
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingNoneDicomMark", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime>("CreateTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid>("CreateUserId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("MeasureData")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<Guid?>("NoneDicomFileId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
+                    b.Property<Guid?>("StudyId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid>("VisitTaskId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreateUserId");
+
+                    b.HasIndex("StudyId");
+
+                    b.ToTable("ReadingNoneDicomMark", t =>
+                        {
+                            t.HasComment("项目阅片 - 非Dicom标记");
+                        });
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingOncologyTaskInfo", b =>
                 {
                     b.Property<Guid>("Id")
@@ -15777,6 +15818,23 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Navigation("ParentQuestion");
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingNoneDicomMark", b =>
+                {
+                    b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")
+                        .WithMany()
+                        .HasForeignKey("CreateUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("IRaCIS.Core.Domain.Models.NoneDicomStudy", "NoneDicomStudy")
+                        .WithMany()
+                        .HasForeignKey("StudyId");
+
+                    b.Navigation("CreateUserRole");
+
+                    b.Navigation("NoneDicomStudy");
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingOncologyTaskInfo", b =>
                 {
                     b.HasOne("IRaCIS.Core.Domain.Models.UserRole", "CreateUserRole")