uat-标注-19

This reverts commit 9bf639dac0.

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/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/_MapConfig.cs

@@ -103,8 +103,6 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(d => d.UserName, u => u.MapFrom(s => s.CreateUserRole.IdentityUser.UserName))
                 .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.Subject.TrialSite.TrialSiteCode));
 
-            CreateMap<IVUS_OCTBaseDto, IvusExportDto>();
-            CreateMap<IVUS_OCTBaseDto, OctExportDto>();
 
         }
     }

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             //要根据标准阅片顺序，确定是否查询单个任务的，还是查询所有的
             var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(t => t.Id == inQuery.TrialReadingCriterionId)
-                 .Select(t => new { t.IsReadingTaskViewInOrder, t.Trial.Modalitys }).FirstNotNullAsync();
+                 .Select(t => new { t.IsReadingTaskViewInOrder, t.Trial.Modalitys,t.IsImageFilter,t.CriterionModalitys }).FirstNotNullAsync();
 
             var subjectCode = string.Empty;
             var subjectId = inQuery.SubjectId;
@@ -329,7 +329,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 {
                     foreach (var item in list)
                     {
-                        item.OrginalStudyList.AddRange(item.OriginalTaskStudyList);
+                        item.OrginalStudyList.AddRange(item.OriginalTaskStudyList.WhereIf(criterionInfo.IsImageFilter, t=>("|" + criterionInfo.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|")));
                     }
                 }
 

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

@@ -516,7 +516,7 @@ namespace IRaCIS.Core.Domain.Share
         /// <summary>
         /// CDISC导出
         /// </summary>
-        NoneTumorCDISC = 8,
+        CDISC = 8,
 
 
         //访视一致率
@@ -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.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";
-
     }