修改对话里面时间时区问题

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -136,7 +136,7 @@ public static class FileStoreHelper
     {
         var doc = await _commonDocumentRepository.FirstOrDefaultAsync(t => t.Code == code);
 
-        var isEn_US = CultureInfo.CurrentCulture.Name!= "zh-CN";
+        var isEn_US = CultureInfo.CurrentCulture.Name!= StaticData.CultureInfo.zh_CN;
         if (doc == null)
         {
                 //---数据库没有找到对应的数据模板文件,请联系系统运维人员。

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -1,4 +1,5 @@
-using IRaCIS.Core.Application.Contracts.DTO;
+using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
+using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
@@ -8,6 +9,7 @@ using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Web;
+using static MassTransit.ValidationResultExtensions;
 
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -36,8 +38,8 @@ namespace IRaCIS.Core.Application.Contracts
     {
         public Guid TrialId { get; set; }
 
-		public Guid? VisitId { get; set; }
+        public Guid? VisitId { get; set; }
-	}
+    }
 
     public class QCVisitSearchDTO : PageInput
     {
@@ -54,8 +56,8 @@ namespace IRaCIS.Core.Application.Contracts
         public Guid TrialId { get; set; }
         public Guid? TrialSiteId { get; set; }
 
-		public Guid? VisitId { get; set; }
+        public Guid? VisitId { get; set; }
-		public Guid? SubjectId { get; set; }
+        public Guid? SubjectId { get; set; }
 
         public string SubjectInfo { get; set; } = String.Empty;
 
@@ -132,7 +134,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
 
-		public string OutEnrollmentVisitName { get; set; } = String.Empty;
+        public string OutEnrollmentVisitName { get; set; } = String.Empty;
 
         public string BodyPartTypes { get; set; } = String.Empty;
 
@@ -211,7 +213,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         //临床数据收集
 
-        public string ClinicalDataCollect => $"{DicomStudyCount},{NoneDicomStudyCount}{(IsBaseLine? (ClinicalInformationTransmissionEnum>0 && IsHaveClinicalData ? ",w/" : ",w/o") :"" )}";
+        public string ClinicalDataCollect => $"{DicomStudyCount},{NoneDicomStudyCount}{(IsBaseLine ? (ClinicalInformationTransmissionEnum > 0 && IsHaveClinicalData ? ",w/" : ",w/o") : "")}";
 
         public int? DicomStudyCount { get; set; }
         public int? NoneDicomStudyCount { get; set; }
@@ -257,7 +259,7 @@ namespace IRaCIS.Core.Application.Contracts
     }
 
 
-    public class QCVisitExportDTO: CRCVisitExportDTO
+    public class QCVisitExportDTO : CRCVisitExportDTO
     {
         //上传人
         public string SubmitUserRealName { get; set; }
@@ -317,10 +319,9 @@ namespace IRaCIS.Core.Application.Contracts
 
         [DictionaryTranslateAttribute("ReuploadEnum")]
         public QCChanllengeReuploadEnum ReuploadEnum { get; set; }
+        public List<DialogInfo> DialogList { get; set; }
 
-
+        public string DialogStr => string.Join("\n\n", DialogList.OrderBy(t => t.CreateTime).Select(c => c.UserName + " (" + ExportExcelConverterDate.DateTimeInternationalToString(c.CreateTime)  + ") :" + c.Content));
-
-        public string DialogStr { get; set; }
 
         //public SubmitStateEnum SubmitState { get; set; }
         //public string? CurrentActionUserName { get; set; }
@@ -341,6 +342,16 @@ namespace IRaCIS.Core.Application.Contracts
 
     }
 
+    public class DialogInfo
+    {
+        public DateTime CreateTime { get; set; }
+
+        public string UserName { get; set; }
+
+        public string Content { get; set; }
+    }
+
+
 
     public class SubjectExportDTO
     {
@@ -717,7 +728,8 @@ namespace IRaCIS.Core.Application.Contracts
         public string CheckResult { get; set; } = String.Empty;
 
 
-        public string CheckDialogStr { get; set; }
+        public List<DialogInfo> CheckDialogList { get; set; }
+        public string CheckDialogStr => string.Join("\n\n", CheckDialogList.OrderBy(t => t.CreateTime).Select(c => c.UserName + " (" + ExportExcelConverterDate.DateTimeInternationalToString(c.CreateTime) + ") :" + c.Content));
 
         public DateTime? CheckBackTime { get; set; }
 
@@ -1218,17 +1230,17 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class GetNextCRCChallengeInDto
     {
-		[NotDefault]
+        [NotDefault]
-		public Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
-		/// <summary>
+        /// <summary>
-		/// QCChallengeId
+        /// QCChallengeId
-		/// </summary>
+        /// </summary>
-		public Guid QCChallengeId { get; set; }
+        public Guid QCChallengeId { get; set; }
-	}
+    }
 
 
-	public class ChallengeQuery : PageInput
+    public class ChallengeQuery : PageInput
     {
         [NotDefault]
         public Guid TrialId { get; set; }
@@ -1247,7 +1259,7 @@ namespace IRaCIS.Core.Application.Contracts
         public Guid? CreateUserId { get; set; }
 
 
-	}
+    }
 
     public class QCCRCChallengeViewModel
     {
@@ -1438,7 +1450,7 @@ namespace IRaCIS.Core.Application.Contracts
         public List<CheckChanllengeDialogDTO> DialogList { get; set; }
     }
 
-    public class QCCheckWithModalityView: QCCheckViewModel
+    public class QCCheckWithModalityView : QCCheckViewModel
     {
         public DateTime? EarliestScanDate { get; set; }
 
@@ -1446,7 +1458,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public List<string> ModalityList { get; set; }
 
-        public string Modalitys =>string.Join(',', ModalityList);
+        public string Modalitys => string.Join(',', ModalityList);
     }
 
     public class QCCheckViewModel
@@ -1599,7 +1611,7 @@ namespace IRaCIS.Core.Application.Contracts
         public DateTime? PreliminaryAuditTime { get; set; }
 
 
-        public DateTime? AuditTime  => QCProcessEnum == TrialQCProcess.SingleAudit ? PreliminaryAuditTime : (QCProcessEnum == TrialQCProcess.DoubleAudit ? ReviewAuditTime : null);
+        public DateTime? AuditTime => QCProcessEnum == TrialQCProcess.SingleAudit ? PreliminaryAuditTime : (QCProcessEnum == TrialQCProcess.DoubleAudit ? ReviewAuditTime : null);
     }
 
 

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

@@ -42,7 +42,10 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(d => d.ReviewAuditUserName, u => u.MapFrom(s => s.ReviewAuditUser.UserName));
 
 
-
+            CreateMap<QCChallengeDialog, DialogInfo>()
+              .ForMember(d => d.CreateTime, u => u.MapFrom(s => s.CreateTime))
+              .ForMember(d => d.UserName, u => u.MapFrom(s => s.CreateUser.UserName))
+              .ForMember(d => d.Content, u => u.MapFrom(s => s.TalkContent));
 
             CreateMap<QCChallenge, QCChanllengeExportDto>()
 
@@ -53,7 +56,10 @@ namespace IRaCIS.Core.Application.Service
               .ForMember(d => d.CreateUserName, u => u.MapFrom(s => s.CreateUser.UserName))
               .ForMember(d => d.LatestReplyUserName, u => u.MapFrom(t => t.LatestReplyUser.UserName))
 
-              .ForMember(d => d.DialogStr, u => u.MapFrom(t => string.Join("\n\n", t.DialogList.OrderBy(t => t.CreateTime).Select(c => c.CreateUser.UserName + " (" + c.CreateTime.ToString("yyyy-MM-dd HH:mm:ss") + ") :" + c.TalkContent))))
+              .ForMember(d => d.DialogList, u => u.MapFrom(t => t.DialogList))
+
+              //.ForMember(d => d.DialogStr, u => u.MapFrom(t => string.Join("\n\n", t.DialogList.OrderBy(t => t.CreateTime)
+              //.Select(c => c.CreateUser.UserName + " (" + c.CreateTime.ToString("yyyy-MM-dd HH:mm:ss") + ") :" + c.TalkContent))))
 
               .ForMember(d => d.SubjectState, u => u.MapFrom(s => s.SubjectVisit.Subject.Status));
 
@@ -111,13 +117,20 @@ namespace IRaCIS.Core.Application.Service
                    .ForMember(d => d.FirstGiveMedicineTime, u => u.MapFrom(s => s.Subject.FirstGiveMedicineTime))
                 .ForMember(d => d.TrialReadingCriterionName, u => u.MapFrom(s => s.TrialReadingCriterion.CriterionName));
 
+            CreateMap<CheckChallengeDialog, DialogInfo>()
+            .ForMember(d => d.CreateTime, u => u.MapFrom(s => s.CreateTime))
+            .ForMember(d => d.UserName, u => u.MapFrom(s => s.CreateUser.UserName))
+            .ForMember(d => d.Content, u => u.MapFrom(s => s.TalkContent));
 
             CreateMap<SubjectVisit, PMKCheckEXportDTO>()
              .ForMember(d => d.TalkContent, u => u.MapFrom(s => s.CheckChallengeDialogList.OrderByDescending(y => y.CreateTime).Select(x => x.TalkContent).FirstOrDefault()))
              .ForMember(d => d.SubjectCode, u => u.MapFrom(s => s.Subject.Code))
              .ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
 
-             .ForMember(d => d.CheckDialogStr, u => u.MapFrom(t => string.Join("\n\n", t.CheckChallengeDialogList.OrderBy(t => t.CreateTime).Select(c => c.CreateUser.UserName + " (" + c.CreateTime.ToString("yyyy-MM-dd HH:mm:ss") + ") :" + c.TalkContent))))
+              .ForMember(d => d.CheckDialogList, u => u.MapFrom(s => s.CheckChallengeDialogList))
+               //.ForMember(d => d.CheckDialogStr, u => u.MapFrom(t => string.Join("\n\n",
+               //t.CheckChallengeDialogList.OrderBy(t => t.CreateTime).Select(c => c.CreateUser.UserName + " (" + c.CreateTime.ToString("yyyy-MM-dd HH:mm:ss") + ") :" + c.TalkContent))))
+
                .ForMember(d => d.ModalityList, c => c.MapFrom(s =>
                 (s.NoneDicomStudyList.Select(t => t.Modality)
                 .Union(s.StudyList.Select(k => k.ModalityForEdit))).Distinct()))
@@ -155,7 +168,7 @@ namespace IRaCIS.Core.Application.Service
                .ForMember(o => o.MedicalNo, t => t.MapFrom(u => u.VisitTask.Subject.MedicalNo))
                .ForMember(o => o.DoctorUserName, t => t.MapFrom(u => u.VisitTask.DoctorUser.UserName))
                .ForMember(o => o.MedicalManagerUserName, t => t.MapFrom(u => u.MedicalManagerUser.UserName))
-               .ForMember(o => o.QuestionContent, t => t.MapFrom(u=> string.Join("\n\n", u.ReadingMedicalReviewDialogList.Where(t => t.IsHaveQuestion).Select(t=>t.Questioning))) );
+               .ForMember(o => o.QuestionContent, t => t.MapFrom(u => string.Join("\n\n", u.ReadingMedicalReviewDialogList.Where(t => t.IsHaveQuestion).Select(t => t.Questioning))));
 
             CreateMap<VisitTask, TaskMedicalReviewExportDto>()
                 .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName))
@@ -173,8 +186,8 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
                 .ForMember(o => o.IsBaseline, t => t.MapFrom(u => u.SourceSubjectVisit.IsBaseLine))
                     .ForMember(o => o.EvaluateResult, t => t.MapFrom(u =>
-                    u.SourceSubjectVisit.IsBaseLine? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.ExistDisease).FirstOrDefault()!.Answer
+                    u.SourceSubjectVisit.IsBaseLine ? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.ExistDisease).FirstOrDefault()!.Answer
-                                                     : u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstOrDefault()!.Answer  ))
+                                                     : u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).FirstOrDefault()!.Answer))
 
                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName));
 
@@ -191,15 +204,15 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.JudgeArmEnum, t => t.MapFrom(u => u.JudgeResultTask.ArmEnum))
 
                 .ForMember(o => o.OverallTumorEvaluationResult, t => t.MapFrom(u =>
-               criterionType == CriterionType.RECIST1Point1 ?( u.SourceSubjectVisit.IsBaseLine==true ? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.ExistDisease).FirstOrDefault()!.Answer:
+               criterionType == CriterionType.RECIST1Point1 ? (u.SourceSubjectVisit.IsBaseLine == true ? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.ExistDisease).FirstOrDefault()!.Answer :
-               u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).Select(t=>t.IsGlobalChange?t.GlobalChangeAnswer:t.Answer).FirstOrDefault())
+               u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.Tumor).Select(t => t.IsGlobalChange ? t.GlobalChangeAnswer : t.Answer).FirstOrDefault())
                 : criterionType == CriterionType.PCWG3 ? u.ReadingTaskQuestionAnswerList.Where(c => c.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation).FirstOrDefault()!.Answer : String.Empty
                 ))
 
                 .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
-                 //.ForMember(o => o.GlobalTaskAnswerList, t => t.MapFrom(u => u.GlobalVisitResultList.Where(t=>t.GlobalAnswerType== GlobalAnswerType.Question).Select(c=>new GlobalAnswerInfo() { GlobalTaskVisitNum=c.VisitTask.VisitTaskNum,VisitTaskId=c.TaskId ,Answer=c.Answer})))
+                //.ForMember(o => o.GlobalTaskAnswerList, t => t.MapFrom(u => u.GlobalVisitResultList.Where(t=>t.GlobalAnswerType== GlobalAnswerType.Question).Select(c=>new GlobalAnswerInfo() { GlobalTaskVisitNum=c.VisitTask.VisitTaskNum,VisitTaskId=c.TaskId ,Answer=c.Answer})))
 
 
                 ;
@@ -220,7 +233,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<ReadingTableAnswerRowInfo, RECIST1Point1LessionInfo>()
                   .ForMember(o => o.LessionCode, t => t.MapFrom(u => u.RowMark))
-                   .ForMember(o => o.LessionType, t => t.MapFrom(u =>(int?) u.ReadingQuestionTrial.LesionType))
+                   .ForMember(o => o.LessionType, t => t.MapFrom(u => (int?)u.ReadingQuestionTrial.LesionType))
                     .ForMember(o => o.IsLymph, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.IsLymph).FirstOrDefault()!.Answer))
 
                     //位置可能是自己填写的
@@ -412,11 +425,11 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.Sex, u => u.MapFrom(s => s.Subject.Sex))
                  .ForMember(d => d.Age, u => u.MapFrom(t => t.Subject.Age))
                  .ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t => t.PreviousHistoryList.Any() || t.PreviousOtherList.Any()
-                 || t.Subject.ClinicalFormList.Any(x=>x.ClinicalDataTrialSet.UploadRole==UploadRole.CRC&& x.ReadingId==t.Id)
+                 || t.Subject.ClinicalFormList.Any(x => x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ReadingId == t.Id)
                  || t.ReadingClinicalDataList.Any(x => x.ClinicalDataTrialSet.UploadRole == Domain.Share.UploadRole.CRC && x.ReadingClinicalDataPDFList.Count > 0)
                  || t.PreviousSurgeryList.Any()))
 
-                   .ForMember(d => d.IsHaveUploadFailed, u => u.MapFrom(t => t.StudyList.SelectMany(c=>c.DicomStudyMonitorList).Any(h => h.FailedFileCount>0) ))
+                   .ForMember(d => d.IsHaveUploadFailed, u => u.MapFrom(t => t.StudyList.SelectMany(c => c.DicomStudyMonitorList).Any(h => h.FailedFileCount > 0)))
 
                   //.ForMember(d => d.VisitName, u => u.MapFrom(t =>t.InPlan? t.VisitStage.VisitName : t.VisitName))
                   //.ForMember(d => d.VisitNum, u => u.MapFrom(t => t.InPlan ? t.VisitStage.VisitNum : t.VisitNum))
@@ -581,7 +594,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<NoneDicomStudy, NoneDicomStudyView>()
                 //.ForMember(d => d.FileCount, u => u.MapFrom(s => s.NoneDicomFileList.Count))
-                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip? s.NoneDicomFileList.Where(t=>!t.FileType.Contains(StaticData.FileType.Zip)): s.NoneDicomFileList))
+                .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => isFilterZip ? s.NoneDicomFileList.Where(t => !t.FileType.Contains(StaticData.FileType.Zip)) : s.NoneDicomFileList))
                 .ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));