IRaCIS.Core.Application/Helper/FileDocProcess/Attribute/DictionaryTranslateAttribute.cs

@@ -60,16 +60,4 @@ namespace IRaCIS.Core.Application.Helper
         }
 
     }
-
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
-    public class DateTimeTranaslateAttribute : Attribute
-    {
-        public string Formart { get; set; }
-
-        public DateTimeTranaslateAttribute(string formart)
-        {
-            Formart = formart;
-
-        }
-    }
 }

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

@@ -985,398 +985,6 @@
             <returns></returns>
             <exception cref="T:System.Exception"></exception>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.ResearchProgramNo">
-            <summary>
-            方案编号 STUDYID
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.Domain">
-            <summary>
-            域 DOMAIN TU  TR RS
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.ValueType">
-            <summary>
-            取值类型 TUSPID  TRSPID RSSPID
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.SubjectCode">
-            <summary>
-            受试者编号 USUBJID 实际展示TrialSiteSubjectCode
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.Vendor">
-            <summary>
-            供应商 TUNAM (Extensive Imaging)
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.UserName">
-            <summary>
-            阅片人 TUEVAL TREVAL  RSEVAL
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.ArmEnum">
-            <summary>
-            阅片人标识 TUEVALID  TREVALID    RSEVALID
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.VisitNum">
-            <summary>
-            访视编号 VISITNUM
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.VisitName">
-            <summary>
-            访视名称 VISIT
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.LatestScanDate">
-            <summary>
-            拍片日期 TUDTC  TRDTC  RSDTC
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.VisitTaskId">
-            <summary>
-            eCRF标识 TUREFID  TRREFID  RSREFID
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.CriterionName">
-            <summary>
-            RSCAT  阅片标准
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_TR_RSBaseModel.IsJudgeSelect">
-            <summary>
-            RSACPTFL  裁定标记 TUACPTFL
-            </summary>    
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_Export.No">
-            <summary>
-            序号 TUSEQ   (同一个访视，所有阅片人选择病灶给个顺序号)
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_Export.ARM_TumorNo">
-            <summary>
-            链接ID TULNKID (阅片人角色_病灶编号)不同访视可以重复
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_Export.TumorIdentificationSimple">
-            <summary>
-            肿瘤识别简称 TUTESTCD
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_Export.TumorIdentificationFullName">
-            <summary>
-            肿瘤识别全称 TUTEST
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_Export.TumorIdentificationResult">
-            <summary>
-            肿瘤鉴定结果 TUORRES
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_Export.TumorIdentificationResultType">
-            <summary>
-            肿瘤识别结果类型 TUSTRESC 
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_Export.BodyPart">
-            <summary>
-            部位 TULOC (对应病灶表的部位，需要国际化)
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_Export.IdentificationMethod">
-            <summary>
-            鉴定方法 TUMETHOD (Modality?)
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TU_Export.BodyPartDes">
-            <summary>
-            部位描述 LOCTEXT
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.TRSEQ">
-            <summary>
-            每个subject 按照顺序编号  TRSEQ
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.TRGRPID">
-             <summary>
-            TRGRPID  组ID  对应TU表肿瘤鉴定结果 TumorIdentificationResult
-             </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.ARM_TumorNo">
-            <summary>
-            TRLNKID  链接ID  对应TU表的链接ID  TumorNo(阅片人角色_病灶编号)
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.ARM_VisitName">
-             <summary>
-            TRLNKGRP  链接组  ARM-任务名（访视名） 对应RS的链接组
-             </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.TumorAssessmentSimpleName">
-            <summary>
-            肿瘤评估简称 TRTESTCD
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.TumorAssessmentFullName">
-            <summary>
-            肿瘤评估全称 TRTEST
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.OriginalMeasurements">
-            <summary>
-            原始测量 TRORRES
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.OriginalUnit">
-            <summary>
-            原始单位 TRORRESU
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.StandardResult_Character">
-            <summary>
-            标准结果（字符） TRSTRESC
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.StandardResult_Numeric">
-            <summary>
-            标准结果（数值） TRORRESU
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.StandardUnit">
-            <summary>
-            标准单位 TRSTRESU
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.CompletionStatus">
-            <summary>
-            完成状态 TRSTAT
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.IdentificationMethod">
-            <summary>
-            完成状态 TRMETHOD
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.TR_Export.NotMeasuredReason">
-            <summary>
-            无法测量原因 TRREASND
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.RSSEQ">
-            <summary>
-            RSSEQ  按照subject 的数据顺序编号
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.ARM_VisitName">
-            <summary>
-            RSLNKGRP 链接组  ARM_任务名(访视名)
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.EfficacyEvaluationSimpleName">
-            <summary>
-            RSTESTCD 疗效评估简称
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.EfficacyEvaluationName">
-            <summary>
-             RSTEST   疗效评估全称
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.RespondEfficacyAssessment">
-            <summary>
-            RSORRES  响应评估原始结果
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.StandardEfficacyAssessment">
-            <summary>
-            RSSTRESC   标准疗效评估
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.CompletionStatus">
-            <summary>
-            RSSTAT 完成状态
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.NotAssessmentReason">
-            <summary>
-            RSREASND  无法评估原因
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.AssessmentReason">
-            <summary>
-            REASASM  评估原因
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.ReAssessmentReason">
-            <summary>
-            REASOVR  重新评估原因
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.RS_Export.UpdateAssessmentReason">
-            <summary>
-            REASUPD 更新评估原因
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.CO_Export.RDOMAIN">
-            <summary>
-            关联域  RS：(访视点备注）  空：裁判选择原因
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.CO_Export.COSEQ">
-            <summary>
-            COSEQ  序号
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.CO_Export.IdentificationVariable">
-            <summary>
-            IDVAR  标识变量    RSSEQ    空：裁判选择原因
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.CO_Export.Identification">
-            <summary>
-            标识  IDVARVAL  RSSEQ具体的值  空：裁判选择原因
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.CO_Export.RemarksQuote">
-            <summary>
-            COREF 备注引用
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.CO_Export.Remarks">
-            <summary>
-            备注 COVAL
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.CO_Export.CODTC">
-            <summary>
-            裁决日期 CODTC
-            </summary>
-        </member>
-        <member name="T:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto">
-            <summary>
-            公共影像导表基类（IVUS / OCT 通用）
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto.ResearchProgramNo">
-            <summary>研究标识符</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto.TrialSiteCode">
-            <summary>中心编号</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto.SubjectCode">
-            <summary>受试者标识符</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto.USUBJID">
-            <summary>受试者唯一标识</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto.VisitName">
-            <summary>访视名称</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto.ArmEnum">
-            <summary>阅片人角色</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto.LatestScanDate">
-            <summary>拍片日期</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto.SignTime">
-            <summary>阅片完成时间</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto.VisitNum">
-            <summary>
-            访视编号 VISITNUM
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IVUS_OCTBaseDto.VisitNote">
-            <summary>访视点备注</summary>
-        </member>
-        <member name="T:IRaCIS.Core.Application.Service.Common.IvusExportDto">
-            <summary>
-            IVUS 导表模型
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IvusExportDto.TARGETV">
-            <summary>靶段</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IvusExportDto.PLAQUE">
-            <summary>斑块编号</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IvusExportDto.EEM">
-            <summary>外弹力膜面积</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IvusExportDto.LUMEN">
-            <summary>管腔面积</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IvusExportDto.PA">
-            <summary>外弹力膜与管腔面积差值</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IvusExportDto.PFC">
-            <summary>回撤中的图像帧数</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IvusExportDto.FC">
-            <summary>分析图像帧数</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IvusExportDto.TOTALEEM">
-            <summary>总外弹力膜面积 (如无可不填)</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IvusExportDto.TOTALPA">
-            <summary>总 PA (如无可不填)</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.IvusExportDto.PAV">
-            <summary>PAV (如无可不填)</summary>
-        </member>
-        <member name="T:IRaCIS.Core.Application.Service.Common.OctExportDto">
-            <summary>
-            OCT 导表模型
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.TARGETV">
-            <summary>靶段</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.PLAQUE">
-            <summary>斑块编号</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.TestID">
-            <summary>测量标识</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.TESTCD">
-            <summary>测量参数名称</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.ORRES">
-            <summary>测量参数值</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.ORRESU">
-            <summary>测量值单位</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.PLATYPE">
-            <summary>斑块类型</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.MINFCT">
-            <summary>最小纤维帽厚度</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.AVGMFCT">
-            <summary>平均纤维帽厚度</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.LAMEAN">
-            <summary>脂质角度平均值</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.LAMAX">
-            <summary>脂质角度最大值</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.MACRI">
-            <summary>巨噬细胞浸润</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.MIARC">
-            <summary>巨噬细胞浸润角度</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.MC">
-            <summary>微通道</summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Service.Common.OctExportDto.CCS">
-            <summary>胆固醇结晶</summary>
-        </member>
         <member name="T:IRaCIS.Core.Application.Service.ExploreRecommendService">
             <summary>
             ExploreRecommendService

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -490,8 +490,6 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int? RandomOrder { get; set; }
         public bool? IsRandomOrderList { get; set; }
-
-        public CriterionType? CriterionType { get; set; }
     }
 
 

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -2344,11 +2344,6 @@ namespace IRaCIS.Core.Application.Service.Common
             if (criterion.CriterionType == CriterionType.OCT)
             {
                 list.Add(new ExportDocumentDes() { Code = StaticData.Export.OCT_ReadingLession_Export, ExportCatogory = ExportResult.OCT_ReadingLession_Export });
-                list.Add(new ExportDocumentDes() { Code = StaticData.Export.OCT_CDISC_Export, ExportCatogory = ExportResult.OCT_CDISC_Export });
-            }
-            if (criterion.CriterionType == CriterionType.IVUS)
-            {
-                list.Add(new ExportDocumentDes() { Code = StaticData.Export.IVUS_CDISC_Export, ExportCatogory = ExportResult.IVUS_CDISC_Export });
             }
             //else if (criterion.CriterionType == CriterionType.SelfDefine)
             {

IRaCIS.Core.Application/Service/Common/Export/CDISCExportBaseModel.cs

@@ -1,513 +0,0 @@
-using IRaCIS.Core.Application.Contracts;
-using IRaCIS.Core.Application.Helper;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Application.Service.Common;
-
-public class TumorCommonQustionInfo
-{
-    //问题标识，肿瘤评估用于区分是什么问题
-    public QuestionType? QuestionType { get; set; }
-
-    public Guid QuestionId { get; set; }
-    public string QuestionName { get; set; }
-
-    public string QuestionValue { get; set; }
-
-    public string TranslateDicName { get; set; }
-
-    public ValueUnit? Unit { get; set; }
-
-    public ValueOfType? ValueType { get; set; }
-}
-
-public class TumorLessionInfo
-{
-    public Guid Id { get; set; }
-
-    public Guid? OrganInfoId { get; set; }
-    //病灶编号
-    public string LessionCode { get; set; }
-
-    public LesionType? LessionType { get; set; }
-
-    public Guid? SplitRowId { get; set; }
-
-    public string? DicomModality { get; set; }
-
-    public string? NoneDicomModality { get; set; }
-
-    //病灶答案
-    public List<TumorLessionAnswerInfo> LessionAnswerList { get; set; }
-}
-
-public class TumorLessionAnswerInfo
-{
-    public QuestionMark? QuestionMark { get; set; }
-
-    //病灶Id
-    public Guid RowId { get; set; }
-
-    //如果是4 就取CustomUnit  否则就是字典翻译
-    [Comment("单位")]
-    public ValueUnit? Unit { get; set; }
-
-
-    public int ShowOrder { get; set; }
-
-    public Guid TableQuesionId { get; set; }
-
-    public string QuestionName { get; set; }
-
-    public string QuestionValue { get; set; }
-
-    public string TranslateDicName { get; set; }
-}
-
-public class TumorGlobalQuestionAnserInfo
-{
-    [Comment("原任务ID")]
-    public Guid TaskId { get; set; }
-
-    public GlobalAnswerType GlobalAnswerType { get; set; }
-
-    [Comment("问题答案")]
-    public string Answer { get; set; } = string.Empty;
-}
-
-public class TumorExportBaseModel : TU_TR_RSBaseModel
-{
-    public List<TumorLessionInfo> LesionList { get; set; } = new List<TumorLessionInfo>();
-
-    public List<TumorCommonQustionInfo> QuestionAnswerList { get; set; }
-
-    public List<TumorGlobalQuestionAnserInfo> GlobalResultList { get; set; }
-
-    #region 后续处理额外添加字段
-
-
-
-    public DateTime? JudgeSignTime { get; set; }
-
-    public Guid? SourceSubjectVisitId { get; set; }
-
-    public List<decimal> SubjectCriterionReadingPeriodVisitNumList { get; set; }
-
-    public decimal VisitTaskNum { get; set; }
-
-    public ReadingTaskState ReadingTaskState { get; set; }
-
-    public ReadingCategory ReadingCategory { get; set; }
-
-    //裁判结果选择的访视或者全局任务Id
-    public Arm? JudgeArmEnum { get; set; }
-
-
-
-
-    //在当前访视触发裁判，或者在截止日期小于等于当前访视的阅片期触发裁判
-    [DictionaryTranslateAttribute("YesOrNoAudit")]
-    public bool? IsTrigerJudge { get; set; }
-
-    //（如果是访视点裁判，则仅在所选阅片人对应访视 显示；如果是阅片期裁判，则在所选阅片人 阅片期内的所有访视 显示此原因）
-    public string JudgeNote { get; set; } = string.Empty;
-
-    public string VisitNote { get; set; }
-    #endregion
-
-
-}
-
-
-public class TU_TR_RSBaseModel
-{
-    /// <summary>
-    /// 方案编号 STUDYID
-    /// </summary>
-    public string ResearchProgramNo { get; set; }
-
-
-
-    /// <summary>
-    /// 域 DOMAIN TU  TR RS
-    /// </summary>
-    public string Domain { get; set; }
-
-
-    /// <summary>
-    /// 取值类型 TUSPID  TRSPID RSSPID
-    /// </summary>
-    public string ValueType { get; set; }
-
-
-    /// <summary>
-    /// 受试者编号 USUBJID 实际展示TrialSiteSubjectCode
-    /// </summary>
-
-    public string SubjectCode { get; set; }
-
-
-    /// <summary>
-    /// 供应商 TUNAM (Extensive Imaging)
-    /// </summary>
-    public string Vendor { get; set; } = "Extensive Imaging";
-
-
-    /// <summary>
-    /// 阅片人 TUEVAL TREVAL  RSEVAL
-    /// </summary>
-    public string UserName { get; set; }
-
-    /// <summary>
-    /// 阅片人标识 TUEVALID  TREVALID    RSEVALID
-    /// </summary>
-    public Arm ArmEnum { get; set; }
-
-    /// <summary>
-    /// 访视编号 VISITNUM
-    /// </summary>
-    public decimal? VisitNum { get; set; }
-
-    /// <summary>
-    /// 访视名称 VISIT
-    /// </summary>
-    public string? VisitName { get; set; }
-
-    /// <summary>
-    /// 拍片日期 TUDTC  TRDTC  RSDTC
-    /// </summary>
-    public DateTime? LatestScanDate { get; set; }
-
-    public DateTime? EarliestScanDate { get; set; }
-
-    /// <summary>
-    /// eCRF标识 TUREFID  TRREFID  RSREFID
-    /// </summary>
-    public Guid VisitTaskId { get; set; }
-
-
-    #region 移动位置
-
-    /// <summary>
-    /// RSCAT  阅片标准
-    /// </summary>
-    public string CriterionName { get; set; }
-
-    /// <summary>
-    /// RSACPTFL  裁定标记 TUACPTFL
-    /// </summary>    
-    //裁判选择标记
-    //根据裁判的任务结果 设置访视任务的这个字段  该字段表示  裁判认同该任务的结果
-    public bool? IsJudgeSelect { get; set; }
-
-    #endregion
-
-    public DateTime? SignTime { get; set; }
-
-    public string TaskName { get; set; }
-
-    #region 额外翻译字段
-
-
-
-    public string IsJudgeSelectStr => IsJudgeSelect == true ? "Y" : "";
-
-    public bool IsTargetPD { get; set; } = false;
-
-    public bool IsOverallResponsePD { get; set; } = false;
-
-    //TR表  靶病灶PD了，访视层级的都是最早拍片日期  RS表 整体肿瘤评估PD了，那么疗效评估的拍片日期都给最早的
-    public bool IsPD => Domain == "TR" ? IsTargetPD : IsOverallResponsePD;
-
-    public string ArmEnumStr { get; set; }
-    public string LatestScanDateStr
-    {
-        get
-        {
-            var date = IsPD ? EarliestScanDate : LatestScanDate;
-            return date?.ToString("yyyy-MM-dd") ?? "";
-        }
-    }
-    public string TrialSiteSubjectCode => ResearchProgramNo + SubjectCode;
-    #endregion
-}
-
-
-public class TU_Export : TU_TR_RSBaseModel
-{
-
-    ///// <summary>
-    ///// 取值类型 TUSPID
-    ///// </summary>
-    //public string TUValueType { get; set; }
-
-
-    /// <summary>
-    /// 序号 TUSEQ   (同一个访视，所有阅片人选择病灶给个顺序号)
-    /// </summary>
-    public int No { get; set; }
-
-
-
-    /// <summary>
-    /// 链接ID TULNKID (阅片人角色_病灶编号)不同访视可以重复
-    /// </summary>
-    public string ARM_TumorNo { get; set; }
-
-    /// <summary>
-    /// 肿瘤识别简称 TUTESTCD
-    /// </summary>
-    public string TumorIdentificationSimple { get; set; }
-
-    /// <summary>
-    /// 肿瘤识别全称 TUTEST
-    /// </summary>
-    public string TumorIdentificationFullName { get; set; }
-
-    /// <summary>
-    /// 肿瘤鉴定结果 TUORRES
-    /// </summary>
-    public string TumorIdentificationResult { get; set; }
-
-    /// <summary>
-    /// 肿瘤识别结果类型 TUSTRESC 
-    /// </summary>
-    public string TumorIdentificationResultType { get; set; }
-
-
-    /// <summary>
-    /// 部位 TULOC (对应病灶表的部位，需要国际化)
-    /// </summary>
-    public string BodyPart { get; set; }
-
-    /// <summary>
-    /// 鉴定方法 TUMETHOD (Modality?)
-    /// </summary>
-    public string IdentificationMethod { get; set; }
-
-
-
-    ///// <summary>
-    ///// 裁定标记 TUACPTFL
-    ///// </summary>
-    //public bool? IsJudgeSelect { get; set; }
-
-
-
-    /// <summary>
-    /// 部位描述 LOCTEXT
-    /// </summary>
-    public string BodyPartDes { get; set; }
-
-
-}
-
-
-public class TR_Export : TU_TR_RSBaseModel
-{
-
-    ///// <summary>
-    ///// 取值类型 TRSPID
-    ///// </summary>
-    //public string TRValueType { get; set; }
-
-
-    /// <summary>
-    /// 每个subject 按照顺序编号  TRSEQ
-    /// </summary>
-    public int TRSEQ { get; set; }
-
-
-    /// <summary>
-    ///TRGRPID  组ID  对应TU表肿瘤鉴定结果 TumorIdentificationResult
-    /// </summary>
-    public string TRGRPID { get; set; }
-
-    /// <summary>
-    /// TRLNKID  链接ID  对应TU表的链接ID  TumorNo(阅片人角色_病灶编号)
-    /// </summary>
-    public string ARM_TumorNo { get; set; }
-
-    /// <summary>
-    ///TRLNKGRP  链接组  ARM-任务名（访视名） 对应RS的链接组
-    /// </summary>
-    public string ARM_VisitName { get; set; }
-
-
-    /// <summary>
-    /// 肿瘤评估简称 TRTESTCD
-    /// </summary>
-    public string TumorAssessmentSimpleName { get; set; }
-
-    /// <summary>
-    /// 肿瘤评估全称 TRTEST
-    /// </summary>
-    public string TumorAssessmentFullName { get; set; }
-
-
-    /// <summary>
-    /// 原始测量 TRORRES
-    /// </summary>
-    public string OriginalMeasurements { get; set; }
-
-    /// <summary>
-    /// 原始单位 TRORRESU
-    /// </summary>
-    public string OriginalUnit { get; set; }
-
-    /// <summary>
-    /// 标准结果（字符） TRSTRESC
-    /// </summary>
-    public string StandardResult_Character => OriginalMeasurements;
-
-    /// <summary>
-    /// 标准结果（数值） TRORRESU
-    /// </summary>
-    public string StandardResult_Numeric => double.TryParse(OriginalMeasurements, out _) ||
-    (OriginalMeasurements?.EndsWith("%") == true &&
-     double.TryParse(OriginalMeasurements.TrimEnd('%'), out _))
-        ? OriginalMeasurements
-        : "";
-
-    /// <summary>
-    /// 标准单位 TRSTRESU
-    /// </summary>
-    public string StandardUnit => OriginalUnit;
-
-
-    /// <summary>
-    /// 完成状态 TRSTAT
-    /// </summary>
-    public string CompletionStatus { get; set; }
-
-
-    /// <summary>
-    /// 完成状态 TRMETHOD
-    /// </summary>
-    public string IdentificationMethod { get; set; }
-
-
-    /// <summary>
-    /// 无法测量原因 TRREASND
-    /// </summary>
-    public string NotMeasuredReason { get; set; }
-
-
-
-}
-
-
-public class RS_Export : TU_TR_RSBaseModel
-{
-    /// <summary>
-    /// RSSEQ  按照subject 的数据顺序编号
-    /// </summary>
-    public int RSSEQ { get; set; }
-
-    /// <summary>
-    /// RSLNKGRP 链接组  ARM_任务名(访视名)
-    /// </summary>
-    public string ARM_VisitName { get; set; }
-
-    /// <summary>
-    /// RSTESTCD 疗效评估简称
-    /// </summary>
-    public string EfficacyEvaluationSimpleName { get; set; }
-
-    /// <summary>
-    ///  RSTEST   疗效评估全称
-    /// </summary>
-    public string EfficacyEvaluationName { get; set; }
-
-    /// <summary>
-    /// RSORRES  响应评估原始结果
-    /// </summary>
-    public string RespondEfficacyAssessment { get; set; }
-    /// <summary>
-    /// RSSTRESC   标准疗效评估
-    /// </summary>
-    public string StandardEfficacyAssessment => RespondEfficacyAssessment;
-
-    /// <summary>
-    /// RSSTAT 完成状态
-    /// </summary>
-    public string CompletionStatus { get; set; }
-    /// <summary>
-    /// RSREASND  无法评估原因
-    /// </summary>
-    public string NotAssessmentReason { get; set; }
-
-
-
-    ///// <summary>
-    ///// 裁定标记 RSACPTFL
-    ///// </summary>
-    //public bool? IsJudgeSelect { get; set; }
-
-    /// <summary>
-    /// REASASM  评估原因
-    /// </summary>
-    public string AssessmentReason { get; set; }
-    /// <summary>
-    /// REASOVR  重新评估原因
-    /// </summary>
-    public string ReAssessmentReason { get; set; }
-
-    /// <summary>
-    /// REASUPD 更新评估原因
-    /// </summary>
-    public string UpdateAssessmentReason { get; set; }
-
-
-    [JsonIgnore]
-    public bool? IsOveralResponse { get; set; }
-
-}
-
-
-public class CO_Export : TU_TR_RSBaseModel
-{
-    /// <summary>
-    /// 关联域  RS：(访视点备注）  空：裁判选择原因
-    /// </summary>
-    public string RDOMAIN { get; set; }
-
-    /// <summary>
-    /// COSEQ  序号
-    /// </summary>
-    public int COSEQ { get; set; }
-
-    /// <summary>
-    /// IDVAR  标识变量    RSSEQ    空：裁判选择原因
-    /// </summary>
-    public string IdentificationVariable { get; set; }
-
-    /// <summary>
-    /// 标识  IDVARVAL  RSSEQ具体的值  空：裁判选择原因
-    /// </summary>
-    public string Identification { get; set; }
-
-    /// <summary>
-    /// COREF 备注引用
-    /// </summary>
-    public string RemarksQuote { get; set; }
-
-    /// <summary>
-    /// 备注 COVAL
-    /// </summary>
-    public string Remarks { get; set; }
-
-    /// <summary>
-    /// 裁决日期 CODTC
-    /// </summary>
-    public string CODTC { get; set; }
-
-
-
-}

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

@@ -2,7 +2,6 @@
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
-using IRaCIS.Core.Application.Service.Common;
 using IRaCIS.Core.Application.ViewModel;
 
 namespace IRaCIS.Core.Application.Service
@@ -105,14 +104,6 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.Subject.TrialSite.TrialSiteCode));
 
 
-            CreateMap<TumorExportBaseModel , TU_Export>();
-            CreateMap<TumorExportBaseModel, TR_Export>();
-            CreateMap<TumorExportBaseModel, RS_Export>();
-            CreateMap<TumorExportBaseModel, CO_Export>();
-
-            CreateMap<IVUS_OCTBaseDto, IvusExportDto>();
-            CreateMap<IVUS_OCTBaseDto, OctExportDto>();
-
         }
     }
 

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -525,12 +525,6 @@ namespace IRaCIS.Core.Domain.Share
         //阅片期一致率
         ReadingPeriodJudgeRatio_Export = 18,
 
-        TumorCDISC_Export=20,
-
-        IVUS_CDISC_Export = 21,
-
-        OCT_CDISC_Export = 22,
-
     }
 
 
@@ -2343,33 +2337,10 @@ public enum SUVChangeVSBaseline
         MaxAvgLipidAngle = 1020,
 
         /// <summary>
-        /// 斑块类型
+        /// 待定指标
         /// </summary>
         Undetermined = 1021,
 
-        /// <summary>
-        /// 巨噬细胞浸润
-        /// </summary>
-        MacrophageInfiltration = 1022,
-
-        /// <summary>
-        /// 巨噬细胞延伸角度
-        /// </summary>
-        MacrophageExtensionAngle = 1023,
-
-        /// <summary>
-        /// 微通道
-        /// </summary>
-        Microchannels = 1024,
-
-        /// <summary>
-        /// 	胆固醇结晶
-        /// </summary>
-        CholesterolCrystallization = 1025,
-
-
-        
-
         /// <summary>
         /// 第一次测量
         /// </summary>

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

@@ -11,18 +11,6 @@ public class ReadingTableAnswerRowInfo : BaseFullDeleteAuditEntity
     [ForeignKey("InstanceId")]
     public DicomInstance Instance { get; set; }
 
-
-    [JsonIgnore]
-    [ForeignKey("SeriesId")]
-    public DicomSeries DicomSeries { get; set; }
-
-    /// <summary>
-    ///  studyId 关联 dicom 和非dicom  ，这里为了查询方便，默认查询非dicom dicom 通过序列查询
-    /// </summary>
-    [JsonIgnore]
-    [ForeignKey("StudyId")]
-    public NoneDicomStudy NoneDicomStudy { get; set; }
-
     [JsonIgnore]
     [ForeignKey("OrganInfoId")]
     public OrganInfo OrganInfo { get; set; }

IRaCIS.Core.Infra.EFCore/EntityConfigration/ImageConfigration.cs

@@ -32,7 +32,7 @@ public class DicomSeriesConfigration : IEntityTypeConfiguration<DicomSeries>
         builder.HasMany(s => s.DicomInstanceList).WithOne(di => di.DicomSerie).HasForeignKey(t => t.SeriesId).HasPrincipalKey(se => se.Id);
 
         builder.HasMany(s => s.SubjectCriteriaEvaluationVisitStudyFilterList).WithOne(di => di.Series).HasForeignKey(t => t.SeriesId).HasPrincipalKey(se => se.Id);
-
+        
     }
 }
 
@@ -42,10 +42,10 @@ public class DicomInstanceConfigration : IEntityTypeConfiguration<DicomInstance>
     {
         builder.HasKey(e => e.SeqId);
 
-        builder.HasOne(e => e.DicomStudy).WithMany(c => c.InstanceList).HasForeignKey(t => t.StudyId).HasPrincipalKey(st => st.Id);
+        builder.HasOne(e => e.DicomStudy).WithMany(c=>c.InstanceList).HasForeignKey(t=>t.StudyId).HasPrincipalKey(st => st.Id);
 
         builder.HasMany(s => s.ReadingTableAnswerRowInfoList).WithOne(di => di.Instance).HasForeignKey(t => t.InstanceId).HasPrincipalKey(se => se.Id);
-
+        
     }
 }
 
@@ -76,7 +76,7 @@ public class TaskInstanceConfigration : IEntityTypeConfiguration<TaskInstance>
     {
         builder.HasKey(e => e.SeqId);
 
-        builder.HasOne(e => e.TaskStudy).WithMany(t => t.InstanceList).HasForeignKey(t => t.StudyId).HasPrincipalKey(st => st.Id);
+        builder.HasOne(e => e.TaskStudy).WithMany(t=>t.InstanceList).HasForeignKey(t => t.StudyId).HasPrincipalKey(st => st.Id);
     }
 }
 
@@ -112,18 +112,6 @@ public class SCPInstanceConfigration : IEntityTypeConfiguration<SCPInstance>
 }
 
 
-public class ReadingTableAnswerRowInfoConfigration : IEntityTypeConfiguration<ReadingTableAnswerRowInfo>
-{
-    public void Configure(EntityTypeBuilder<ReadingTableAnswerRowInfo> builder)
-    {
-
-
-        builder.HasOne(e => e.DicomSeries).WithMany().HasForeignKey(t => t.SeriesId).HasPrincipalKey(st => st.Id);
-
-        //builder.HasOne(e => e.Instance).WithMany().HasForeignKey(t => t.InstanceId).HasPrincipalKey(st => st.Id);
-    }
-}
-
 
 
 

IRaCIS.Core.Infrastructure/_IRaCIS/ObjectExtension.cs

@@ -1,7 +1,6 @@
 using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
 using Newtonsoft.Json;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 
@@ -76,12 +75,6 @@ namespace IRaCIS.Core.Infrastructure.Extention
 
             foreach (PropertyInfo property in properties)
             {
-                if (typeof(IEnumerable).IsAssignableFrom(property.PropertyType)
-            && property.PropertyType != typeof(string))
-                {
-                    continue;
-                }
-
                 string propertyName = property.Name;
                 object propertyValue = property.GetValue(obj);
                 // 如果属性的类型是枚举，将其值保留为整数

IRaCIS.Core.Infrastructure/_IRaCIS/_Config/_StaticData.cs

@@ -306,15 +306,6 @@ public static class StaticData
 
         public const string SystenMedicalQCQuestionsList_Export = "SystenMedicalQCQuestionsList_Export";
 
-        //一致性全量核查导出
-        public const string TrialConsistentFUllCheckList_Export = "TrialConsistentFUllCheckList_Export";
-
-        public const string TumorCDISC_Export = "TumorCDISC_Export";
-
-        public const string IVUS_CDISC_Export = "IVUS_CDISC_Export";
-
-        public const string OCT_CDISC_Export = "OCT_CDISC_Export";
-
     }