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

@@ -17104,6 +17104,13 @@
              <param name="userInfo"></param>
              <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.GetTrialSiteLatestSurvey(System.Guid)">
+            <summary>
+            获取该中心最新调表信息  如果没有任何调研表，会返回null
+            </summary>
+            <param name="trialSiteId"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.GetTrialSurveyInitInfo(System.Guid)">
             <summary>
             初始登陆界面 项目基本信息+下拉框数据

IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs

@@ -324,13 +324,26 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string BodyPartExamined { get; set; } = string.Empty;
 
-        public string DicomStudyDate { get; set; }
+        public string DicomStudyDate { get; set; } = string.Empty;
 
-        public string DicomStudyTime { get; set; }
+        public string DicomStudyTime { get; set; } = string.Empty;
 
         public List<AddOrUpdateSeriesDto> SeriesList { get; set; }
 
+        #region 模态支持增加字段
 
+        public string Manufacturer { get; set; } = string.Empty;
+
+        public string ManufacturerModelName { get; set; } = string.Empty;
+
+        public string DeviceSerialNumber { get; set; } = string.Empty;
+        public string DeviceUID { get; set; } = string.Empty;
+
+        public string SoftwareVersions { get; set; } = string.Empty;
+
+        public string PatientWeight { get; set; } = string.Empty;
+
+        #endregion
 
     }
 
@@ -358,14 +371,22 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string ImageResizePath { get; set; } = string.Empty;
 
-        public string DicomSeriesDate { get; set; }
+        public string DicomSeriesDate { get; set; } = string.Empty;
 
-        public string DicomSeriesTime { get; set; }
+        public string DicomSeriesTime { get; set; } = string.Empty;
 
 
         public List<AddInstanceDto> InstanceList { get; set; }
 
         public Guid? VisitTaskId { get; set; }
+
+        #region 模态增加
+
+        public string RadiopharmaceuticalInformationSequence { get; set; } = string.Empty;
+
+        public string AcquisitionDate { get; set; } = string.Empty;
+
+        #endregion
     }
 
 
@@ -398,15 +419,46 @@ namespace IRaCIS.Core.Application.Contracts
 
         public long FileSize { get; set; }
 
-        public string SOPClassUID { get; set; }
+        public string SOPClassUID { get; set; } = string.Empty;
 
-        public string MediaStorageSOPClassUID { get; set; }
+        public string MediaStorageSOPClassUID { get; set; } = string.Empty;
 
-        public string TransferSytaxUID { get; set; }
+        public string TransferSytaxUID { get; set; } = string.Empty;
 
-        public string MediaStorageSOPInstanceUID { get; set; }
+        public string MediaStorageSOPInstanceUID { get; set; } = string.Empty;
 
-        public bool IsEncapsulated => DicomTransferSyntax.Lookup(DicomUID.Parse(TransferSytaxUID)).IsEncapsulated;
+        public bool IsEncapsulated => !string.IsNullOrEmpty(TransferSytaxUID) ? DicomTransferSyntax.Lookup(DicomUID.Parse(TransferSytaxUID)).IsEncapsulated : false;
+
+        #region 模态支持增加字段
+
+        public string PhotometricInterpretation { get; set; } = string.Empty;
+
+        public int BitsAllocated { get; set; }
+
+        public string PixelRepresentation { get; set; } = string.Empty;
+
+        public string RescaleIntercept { get; set; } = string.Empty;
+
+        public string RescaleSlope { get; set; } = string.Empty;
+
+        public string ImagePositionPatient { get; set; } = string.Empty;
+        public string ImageOrientationPatient { get; set; } = string.Empty;
+
+        //可能大
+        public string SequenceOfUltrasoundRegions { get; set; } = string.Empty;
+
+        public string FrameTime { get; set; } = string.Empty;
+
+        public string CorrectedImage { get; set; } = string.Empty;
+
+        public string Units { get; set; } = string.Empty;
+        public string DecayCorrection { get; set; } = string.Empty;
+
+        public string EncapsulatedDocument { get; set; } = string.Empty;
+
+
+
+        #endregion
 
     }
 
@@ -536,11 +588,11 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string TaskBlindName { get; set; }
 
-        
+
         public Guid VisitId { get; set; }
 
         public List<DownloadDicomStudyDto> StudyList { get; set; }
-        public List<DownloadNoneDicomStudyDto> NoneDicomStudyList { get; set; } 
+        public List<DownloadNoneDicomStudyDto> NoneDicomStudyList { get; set; }
     }
 
     public class DownloadDicomStudyDto
@@ -551,14 +603,14 @@ namespace IRaCIS.Core.Application.Contracts
         public string StudyInstanceUid { get; set; }
         public string StudyDIRPath { get; set; }
 
-        public List<DownloadDicomSeriesDto> SeriesList { get; set; } 
+        public List<DownloadDicomSeriesDto> SeriesList { get; set; }
     }
 
     public class DownloadDicomSeriesDto
     {
         public string Modality { get; set; }
 
-        public List<DownloadDicomInstanceDto> InstanceList { get; set; } 
+        public List<DownloadDicomInstanceDto> InstanceList { get; set; }
     }
 
     public class DownloadDicomInstanceDto
@@ -735,7 +787,7 @@ namespace IRaCIS.Core.Application.Contracts
        ? $"{TotalReadingImageSize.Value / 1024d / 1024d:F3} MB"
        : "0.000 MB";
 
-        public string ImageTypeStr => $"{(IsHaveDicom ? "DICOM" : "")}{(IsHaveNoneDicom&&IsHaveDicom?" , ":"")}{(IsHaveNoneDicom ? "Non-DICOM" : "")}";
+        public string ImageTypeStr => $"{(IsHaveDicom ? "DICOM" : "")}{(IsHaveNoneDicom && IsHaveDicom ? " , " : "")}{(IsHaveNoneDicom ? "Non-DICOM" : "")}";
 
         public bool IsHaveDicom { get; set; }
 

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -302,6 +302,19 @@ namespace IRaCIS.Core.Application.Contracts
 
         #region 中心调研修改
 
+        /// <summary>
+        /// 获取该中心最新调表信息  如果没有任何调研表，会返回null
+        /// </summary>
+        /// <param name="trialSiteId"></param>
+        /// <returns></returns>
+        public async Task<TrialSiteSurveyView?> GetTrialSiteLatestSurvey(Guid trialSiteId)
+        {
+            return await _trialSiteSurveyRepository.Where(t => t.TrialSiteId == trialSiteId).OrderByDescending(t => t.CreateTime).ProjectTo<TrialSiteSurveyView>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+        }
+
+
+
+
         /// <summary>
         /// 初始登陆界面 项目基本信息+下拉框数据
         /// </summary>
@@ -631,11 +644,11 @@ namespace IRaCIS.Core.Application.Contracts
                 copy.State = TrialSiteSurveyEnum.ToSubmit;
                 copy.IsDeleted = false;
 
-                copy.Phone = string.Empty;
-                copy.UserName = string.Empty;
+                //copy.Phone = string.Empty;
+                //copy.UserName = string.Empty;
                 copy.Email = userInfo.EmailOrPhone;
                 copy.Id = Guid.Empty;
-                copy.CreateTime = DateAndTime.Now;
+                copy.CreateTime = DateTime.Now;
 
                 if (userInfo.ReplaceUserEmailOrPhone != userInfo.EmailOrPhone)
                 {

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -427,7 +427,7 @@ namespace IRaCIS.Application.Contracts
     public class SiteStatDTO : SiteStatSimpleDTO
     {
 
-
+        public bool IsHaveSiteSurveyRecord { get; set; }
 
         //public int? VisitCount { get; set; }
         //public int? SubjectCount { get; set; }

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

@@ -128,7 +128,8 @@ namespace IRaCIS.Core.Application.Service
             .ForMember(d => d.VisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.IsDeleted == false && t.SubmitState != SubmitStateEnum.None)))
              .ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count(t => t.IsDeleted == false)))
            //.ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count()))
-           .ForMember(d => d.UserNameList, u => u.MapFrom(s => s.CRCUserList.Where(t => t.IsDeleted == false).Select(u => u.UserRole.IdentityUser.FullName)));
+           .ForMember(d => d.UserNameList, u => u.MapFrom(s => s.CRCUserList.Where(t => t.IsDeleted == false).Select(u => u.UserRole.IdentityUser.FullName)))
+           .ForMember(t => t.IsHaveSiteSurveyRecord, u => u.MapFrom(t => t.TrialSiteSurveyList.Any()));
             #endregion