Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Doctor/AttachmentService.cs

@@ -9,7 +9,7 @@ namespace IRaCIS.Core.Application.Service
     /// 医生文档关联关系维护
     /// </summary>
     [ApiExplorerSettings(GroupName = "Reviewer")]
-    public class AttachmentService(IRepository<Attachment> _attachmentrepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IAttachmentService
+    public class AttachmentService(IRepository<Attachment> _attachmentrepository, IRepository<Doctor> _doctorrepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IAttachmentService
     {
 
 
@@ -35,6 +35,11 @@ namespace IRaCIS.Core.Application.Service
             //}
 
             var success = await _attachmentrepository.BatchDeleteNoTrackingAsync(a => a.Id == param.Id);
+
+            await _doctorrepository.BatchUpdateNoTrackingAsync(x => x.GCPId == param.Id, x => new Doctor()
+            {
+                GCPId= default(Guid),
+            });
             return ResponseOutput.Result(success);
         }
 

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

@@ -458,7 +458,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public List<string> ParentTriggerValueList { get; set; } = new List<string>();
         public List<string> RelevanceValueList { get; set; } = new List<string>();
 
+        [Comment("导出标识")]
+        public ExportIdentification? ExportIdentification { get; set; }
 
+        [Comment("导出结果")]
+        public string ExportResultStr { get; set; } = "[]";
+
+        public List<ExportResult> ExportResult { get; set; }
     }
 
     ///<summary> ReadingTableQuestionSystemAddOrEdit  列表查询参数模型</summary>
@@ -567,6 +573,14 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string QuestionEnName { get; set; } = string.Empty;
 
+        [Comment("导出标识")]
+        public ExportIdentification? ExportIdentification { get; set; }
+
+        [Comment("导出结果")]
+        public string ExportResultStr { get; set; } = "[]";
+
+        public List<ExportResult> ExportResult { get; set; }
+
 
         public List<string> ParentTriggerValueList { get; set; } = new List<string>();
         public List<string> RelevanceValueList { get; set; } = new List<string>();

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -408,6 +408,7 @@ namespace IRaCIS.Core.Application.Service
         {
             indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
             indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
+            indto.ExportResultStr = JsonConvert.SerializeObject(indto.ExportResult);
             var entity = await _readingTableQuestionSystemRepository.InsertOrUpdateAsync(indto, true);
 
             return ResponseOutput.Ok(entity.Id.ToString());
@@ -746,6 +747,7 @@ namespace IRaCIS.Core.Application.Service
             indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
             indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
 
+            indto.ExportResultStr = JsonConvert.SerializeObject(indto.ExportResult);
             if (indto.Id != null)
             {
                 var relationList = await GetQuestionCalculateRelation(new GetQuestionCalculateRelationInDto()

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionSystem.cs

@@ -142,5 +142,30 @@ public class ReadingTableQuestionSystem : BaseAddAuditEntity
     [Comment("分类算法")]
     public string ClassifyAlgorithms { get; set; } = string.Empty;
 
+    [Comment("导出标识")]
+    public ExportIdentification? ExportIdentification { get; set; }
+
+    [Comment("导出结果")]
+    public string ExportResultStr { get; set; } = "[]";
+
+    [NotMapped]
+    public List<ExportResult> ExportResult
+    {
+        get
+        {
+            try
+            {
+                var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
+                return result == null ? new List<ExportResult>() : result;
+            }
+            catch (Exception)
+            {
+
+                return new List<ExportResult>();
+            }
+
+        }
+    }
+
 
 }

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingTableQuestionTrial.cs

@@ -154,4 +154,29 @@ public class ReadingTableQuestionTrial : BaseAddAuditEntity
 
     [Comment("分类问题表格Id")]
     public Guid? ClassifyTableQuestionId { get; set; }
+
+    [Comment("导出标识")]
+    public ExportIdentification? ExportIdentification { get; set; }
+
+    [Comment("导出结果")]
+    public string ExportResultStr { get; set; } = "[]";
+
+    [NotMapped]
+    public List<ExportResult> ExportResult
+    {
+        get
+        {
+            try
+            {
+                var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
+                return result == null ? new List<ExportResult>() : result;
+            }
+            catch (Exception)
+            {
+
+                return new List<ExportResult>();
+            }
+
+        }
+    }
 }

IRaCIS.Core.Infra.EFCore/Migrations/20241022084419_tablequestion10221643.cs

@@ -0,0 +1,66 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class tablequestion10221643 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ExportIdentification",
+                table: "ReadingTableQuestionTrial",
+                type: "int",
+                nullable: true,
+                comment: "导出标识");
+
+            migrationBuilder.AddColumn<string>(
+                name: "ExportResultStr",
+                table: "ReadingTableQuestionTrial",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "[]",
+                comment: "导出结果");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ExportIdentification",
+                table: "ReadingTableQuestionSystem",
+                type: "int",
+                nullable: true,
+                comment: "导出标识");
+
+            migrationBuilder.AddColumn<string>(
+                name: "ExportResultStr",
+                table: "ReadingTableQuestionSystem",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "[]",
+                comment: "导出结果");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ExportIdentification",
+                table: "ReadingTableQuestionTrial");
+
+            migrationBuilder.DropColumn(
+                name: "ExportResultStr",
+                table: "ReadingTableQuestionTrial");
+
+            migrationBuilder.DropColumn(
+                name: "ExportIdentification",
+                table: "ReadingTableQuestionSystem");
+
+            migrationBuilder.DropColumn(
+                name: "ExportResultStr",
+                table: "ReadingTableQuestionSystem");
+        }
+    }
+}

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

@@ -6346,6 +6346,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("nvarchar(400)")
                         .HasComment("字典code");
 
+                    b.Property<int?>("ExportIdentification")
+                        .HasColumnType("int")
+                        .HasComment("导出标识");
+
+                    b.Property<string>("ExportResultStr")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)")
+                        .HasComment("导出结果");
+
                     b.Property<string>("FileType")
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)")
@@ -6533,6 +6543,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("nvarchar(400)")
                         .HasComment("字典code");
 
+                    b.Property<int?>("ExportIdentification")
+                        .HasColumnType("int")
+                        .HasComment("导出标识");
+
+                    b.Property<string>("ExportResultStr")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)")
+                        .HasComment("导出结果");
+
                     b.Property<string>("FileType")
                         .IsRequired()
                         .HasMaxLength(400)