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

2024-02-22 14:51:38 +08:00
parent d9c7a512e9 38383f34ff
commit 69fd8ec123
37 changed files with 555 additions and 200 deletions
@@ -3,6 +3,7 @@ using DocumentFormat.OpenXml.Presentation;
 using DocumentFormat.OpenXml.Spreadsheet;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Application.Interfaces;
+using IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Contracts.DTO;
 using IRaCIS.Core.Application.Service.Reading.Dto;
@@ -59,7 +60,7 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == param.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = await _trialUseRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
+            var list = await _trialUseRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
                .WhereIf(param.UserTypeId != null, t => t.User.UserTypeId == param.UserTypeId)
                .WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.User.UserName.Contains(param.UserName))

@@ -70,8 +71,10 @@ namespace IRaCIS.Core.Application.Service.Common
                    t => (t.User.FullName).Contains(param.UserRealName))
                .ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider).ToListAsync();

-
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
+

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TrialMaintenanceDTO));

@@ -90,7 +93,7 @@ namespace IRaCIS.Core.Application.Service.Common
        [HttpPost]
        [AllowAnonymous]
        public async Task<IActionResult> TrialSiteUserListExport(SiteCRCExportQueryDTO param,
-            [FromServices] IRepository<CommonDocument> _commonDocumentRepository, 
+            [FromServices] IRepository<CommonDocument> _commonDocumentRepository,
            [FromServices] IDictionaryService _dictionaryService,
             [FromServices] IRepository<Trial> _trialRepository,
               [FromServices] IRepository<TrialSiteUser> _trialSiteUserRepository
@@ -100,21 +103,26 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == param.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = await _trialSiteUserRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
-                .WhereIf(param.IsDeleted != null, t => t.IsDeleted == param.IsDeleted)
-                .WhereIf(!string.IsNullOrWhiteSpace(param.SiteName), t => t.Site.SiteName.Contains(param.SiteName))
-                .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteAliasName),
-                    t => t.TrialSite.TrialSiteAliasName.Contains(param.TrialSiteAliasName))
-                .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteCode),
-                    t => t.TrialSite.TrialSiteCode.Contains(param.TrialSiteCode))
-                .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator,
-                    t => t.UserId == _userInfo.Id)
-                .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => (t.User.FullName).Contains(param.UserKeyInfo)
-                    || t.User.UserName.Contains(param.UserKeyInfo) || t.User.EMail.Contains(param.UserKeyInfo))
+            var list = await _trialSiteUserRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
+                 .WhereIf(param.IsDeleted != null, t => t.IsDeleted == param.IsDeleted)
+                 .WhereIf(!string.IsNullOrWhiteSpace(param.SiteName), t => t.Site.SiteName.Contains(param.SiteName))
+                 .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteAliasName),
+                     t => t.TrialSite.TrialSiteAliasName.Contains(param.TrialSiteAliasName))
+                 .WhereIf(!string.IsNullOrWhiteSpace(param.TrialSiteCode),
+                     t => t.TrialSite.TrialSiteCode.Contains(param.TrialSiteCode))
+                 .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator,
+                     t => t.UserId == _userInfo.Id)
+                 .WhereIf(!string.IsNullOrWhiteSpace(param.UserKeyInfo), t => (t.User.FullName).Contains(param.UserKeyInfo)
+                     || t.User.UserName.Contains(param.UserKeyInfo) || t.User.EMail.Contains(param.UserKeyInfo))

-                .ProjectTo<SiteUserExportDTO>(_mapper.ConfigurationProvider).ToListAsync();
+                 .ProjectTo<SiteUserExportDTO>(_mapper.ConfigurationProvider).ToListAsync();

+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
+
+
+
            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteUserList_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SiteUserExportDTO));

        }
@@ -161,13 +169,14 @@ namespace IRaCIS.Core.Application.Service.Common
                .WhereIf(!string.IsNullOrEmpty(queryParam.OrganizationName), t => t.OrganizationName.Contains(queryParam.OrganizationName))
                .ProjectTo<TrialSiteUserSummaryDto>(_mapper.ConfigurationProvider);

-            data.List = await query.ToListAsync();
-
-
+            var list = await query.ToListAsync();
+            data.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);

            var exportInfo = data;

            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;
+
            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSiteUserSummary_Export, exportInfo, exportInfo.TrialCode, _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TrialSiteUserSummaryDto));

        }
@@ -230,8 +239,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == visitSearchDTO.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId); 
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;


            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialCRCUploadImageList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(CRCVisitExportDTO));
@@ -280,8 +290,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == challengeQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId); 
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialQCImageChanllengeList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(QCChanllengeExportDto));
        }
@@ -317,8 +328,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == param.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId); 
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectExportDTO));

@@ -425,8 +437,9 @@ namespace IRaCIS.Core.Application.Service.Common

            exportInfo.CriterionName = await _repository.Where<ReadingQuestionCriterionTrial>(u => u.TrialId == dto.TrialId && u.IsConfirm && u.Id == dto.TrialReadingCriterionId).Select(t => t.CriterionName).FirstOrDefaultAsync();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            var (memoryStream, fileName) = await ExcelExportHelper.DataExport_NpoiTestAsync(StaticData.Export.TrialSubjectProgressList_Export, exportInfo, /*"", */_commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SubjectProgressDto));

@@ -491,7 +504,7 @@ namespace IRaCIS.Core.Application.Service.Common
            }

            var memoryStream2 = new MemoryStream();
-            wb.Write(memoryStream2,true);
+            wb.Write(memoryStream2, true);
            memoryStream2.Seek(0, SeekOrigin.Begin);

            return new FileStreamResult(memoryStream2, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
@@ -565,8 +578,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == studyQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;


            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialStudyUploadMonitor_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(UnionStudyMonitorExportDto));
@@ -601,8 +615,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == param.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectReadingPeriodList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadPeriodExportDto));

@@ -690,8 +705,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == studyQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialStudyList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(UnionStudyExportDTO));
        }
@@ -729,8 +745,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == checkQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSubjectVisitCheckList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(PMKCheckEXportDTO));
        }
@@ -780,8 +797,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReadingTaskList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReadingTaskExportDto));
        }
@@ -831,8 +849,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialReReadingTaskList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(ReReadingTaskExportDto));
        }
@@ -873,8 +892,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == inQuery.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialMedicalReviewList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(TaskMedicalReviewExportDto));
        }
@@ -957,8 +977,9 @@ namespace IRaCIS.Core.Application.Service.Common
            var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

            exportInfo.CriterionName = await _repository.Where<ReadingQuestionCriterionTrial>(u => u.TrialId == queryVisitTask.TrialId && u.IsConfirm && u.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionName).FirstOrDefaultAsync();
-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialSelfAnalysisList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(SelftAnalysisExport));
        }
@@ -1060,8 +1081,9 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == queryVisitTask.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();
            exportInfo.CriterionName = await _repository.Where<ReadingQuestionCriterionTrial>(u => u.TrialId == queryVisitTask.TrialId && u.IsConfirm && u.Id == queryVisitTask.TrialReadingCriterionId).Select(t => t.CriterionName).FirstOrDefaultAsync();
-            exportInfo.List = newList;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(newList, _userInfo.TimeZoneId); ;
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;

            return await ExcelExportHelper.DataExportAsync(StaticData.Export.TrialGroupAnalysisList_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(GroupAnalysisExport));
        }
@@ -1145,7 +1167,7 @@ namespace IRaCIS.Core.Application.Service.Common
                {
                    foreach (var item in resultList)
                    {
-                        item.IsGenerateJudge = list.Where(t => t.ReadingCategory == ReadingCategory.Judge && t.SubjectCode == item.SubjectCode && t.VisitTaskNum>item.VisitTaskNum
+                        item.IsGenerateJudge = list.Where(t => t.ReadingCategory == ReadingCategory.Judge && t.SubjectCode == item.SubjectCode && t.VisitTaskNum > item.VisitTaskNum
                       ).OrderByDescending(t => t.VisitTaskNum).FirstOrDefault()?.JudgeArmEnum == item.ArmEnum ? true : false;
                    }
                }
@@ -1213,8 +1235,9 @@ namespace IRaCIS.Core.Application.Service.Common
            //处理裁判标记
            list = DealJudgeMark(criterion.ArbitrationRule, list);

-            exportInfo.List = list;
+            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.IsEn_US = _userInfo.IsEn_Us;
+            exportInfo.ClientZoneId = _userInfo.TimeZoneId;


            return await ExcelExportHelper.DataExportAsync(StaticData.Export.OverallTumorEvaluation_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(OverallTumorEvaluationExport), criterion.CriterionType);
@@ -1272,8 +1295,9 @@ namespace IRaCIS.Core.Application.Service.Common
                //处理裁判标记
                list = DealJudgeMark(criterion.ArbitrationRule, list);

-                exportInfo.List = list;
+                exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
                exportInfo.IsEn_US = _userInfo.IsEn_Us;
+                exportInfo.ClientZoneId = _userInfo.TimeZoneId;


                return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1EvaluationOfTumorEfficacy_Export, exportInfo, $"{exportInfo.ResearchProgramNo}_{exportInfo.CriterionName}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1EvaluationOfTumorEfficacyExport), criterion.CriterionType);
@@ -1305,7 +1329,7 @@ namespace IRaCIS.Core.Application.Service.Common
        {

            //每次查询必须是单标准的
-            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName,t.ArbitrationRule }).FirstOrDefaultAsync();
+            var criterion = await _repository.Where<ReadingQuestionCriterionTrial>(t => t.Id == queryVisitTask.TrialReadingCriterionId).Select(t => new { t.CriterionType, t.CriterionName, t.ArbitrationRule }).FirstOrDefaultAsync();

            var query = _repository.Where<VisitTask>(t => t.TrialId == queryVisitTask.TrialId && t.TaskState == TaskState.Effect && t.IsAnalysisCreate == false && t.ReadingTaskState == ReadingTaskState.HaveSigned)

@@ -1363,8 +1387,9 @@ namespace IRaCIS.Core.Application.Service.Common

                //处理裁判标记
                list = DealJudgeMark(criterion.ArbitrationRule, list);
-                exportInfo.List = exportList;
+                exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(exportList, _userInfo.TimeZoneId); 
                exportInfo.IsEn_US = _userInfo.IsEn_Us;
+                exportInfo.ClientZoneId = _userInfo.TimeZoneId;

                return await ExcelExportHelper.DataExportAsync(StaticData.Export.RECIST1Point1DetailedOfEvaluatedLesion_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(RECIST1Point1DetailedOfEvaluatedLesionExport), criterion.CriterionType);

@@ -1396,8 +1421,10 @@ namespace IRaCIS.Core.Application.Service.Common

                //处理裁判标记
                list = DealJudgeMark(criterion.ArbitrationRule, list);
-                exportInfo.List = exportList;
+
+                exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(exportList, _userInfo.TimeZoneId); ;
                exportInfo.IsEn_US = _userInfo.IsEn_Us;
+                exportInfo.ClientZoneId = _userInfo.TimeZoneId;

                return await ExcelExportHelper.DataExportAsync(StaticData.Export.PCWG3Point1DetailedOfEvaluatedLesion_Export, exportInfo, $"{exportInfo.ResearchProgramNo}", _commonDocumentRepository, _hostEnvironment, _dictionaryService, typeof(PCWG3DetailedOfEvaluatedLesionExport), criterion.CriterionType);

@@ -164,19 +164,19 @@ namespace IRaCIS.Core.Application.Service
                VerifyExp = t => t.Code == addOrEditInternationalization.Code && t.InternationalizationType == addOrEditInternationalization.InternationalizationType,

                VerifyMsg = $"该类型已有{addOrEditInternationalization.Code}名称的国际化标识",
-                IsVerify = internationalizationType == 1
+                IsVerify =  true /*internationalizationType == 1*/
            };

            //前端验证标识重复与否
-            var verifyExp2 = new EntityVerifyExp<Internationalization>()
-            {
-                VerifyExp = t => t.Code == addOrEditInternationalization.Code && t.InternationalizationType == addOrEditInternationalization.InternationalizationType && t.Description == addOrEditInternationalization.Description,
+            //var verifyExp2 = new EntityVerifyExp<Internationalization>()
+            //{
+            //    VerifyExp = t => t.Code == addOrEditInternationalization.Code && t.InternationalizationType == addOrEditInternationalization.InternationalizationType && t.Description == addOrEditInternationalization.Description,

-                VerifyMsg = $"该类型已有{addOrEditInternationalization.Description}下的{addOrEditInternationalization.Code}名称的国际化标识",
-                IsVerify = internationalizationType == 0
-            };
+            //    VerifyMsg = $"该类型已有{addOrEditInternationalization.Description}下的{addOrEditInternationalization.Code}名称的国际化标识",
+            //    IsVerify = internationalizationType == 0
+            //};

-            var entity = await _internationalizationRepository.InsertOrUpdateAsync(addOrEditInternationalization, true, verifyExp1, verifyExp2);
+            var entity = await _internationalizationRepository.InsertOrUpdateAsync(addOrEditInternationalization, true, verifyExp1/*, verifyExp2*/);

            if (addOrEditInternationalization.InternationalizationType == 1)
            {
@@ -8,6 +8,7 @@ using AutoMapper;
 using IRaCIS.Application.Contracts;
 using Microsoft.Extensions.Options;
 using Medallion.Threading;
+using System.Text.RegularExpressions;

 namespace IRaCIS.Application.Services
 {
@@ -82,6 +83,13 @@ namespace IRaCIS.Application.Services
            _distributedLockProvider = distributedLockProvider;
        }

+
+        private string ReplaceCompanyName(string needDealtxt)
+        {
+            return needDealtxt.Replace("{company}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyName : _systemEmailConfig.CompanyNameCN)
+                .Replace("{{company abbreviation}}", _userInfo.IsEn_Us ? _systemEmailConfig.CompanyShortName : _systemEmailConfig.CompanyShortNameCN);
+        }
+
        //重置邮箱 
        public async Task SendMailEditEmail(Guid userId, string userName, string emailAddress, int verificationCode)
        {
@@ -112,7 +120,7 @@ namespace IRaCIS.Application.Services
                var templateInfo = SourceReader.ReadToEnd();


-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),

                  //---尊敬的
                  _localizer["Mail_Dear", userName],
@@ -179,7 +187,7 @@ namespace IRaCIS.Application.Services
                var templateInfo = SourceReader.ReadToEnd();


-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                    "",
                //---您正在进行邮箱重置密码操作
                   _localizer["Mail_ResettingPassword"],
@@ -247,7 +255,7 @@ namespace IRaCIS.Application.Services
                var templateInfo = SourceReader.ReadToEnd();


-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                    "",
                //---您正在参与展影医疗IRC项目
                   _localizer["Mail_IRCProject"],
@@ -314,7 +322,7 @@ namespace IRaCIS.Application.Services
                var templateInfo = SourceReader.ReadToEnd();


-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                    "",
                //---您正在参与展影医疗IRC项目中心调研工作
                   _localizer["Mail_CenterResearchReminder"],
@@ -403,7 +411,7 @@ namespace IRaCIS.Application.Services
                var templateInfo = SourceReader.ReadToEnd();


-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                   sysUserInfo.FullName,
                   sysUserInfo.UserName,
                   sysUserInfo.UserTypeRole.UserTypeShortName,
@@ -450,7 +458,7 @@ namespace IRaCIS.Application.Services
                var templateInfo = SourceReader.ReadToEnd();


-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                   sysUserInfo.FullName,
                   sysUserInfo.UserName,
                   sysUserInfo.UserTypeRole.UserTypeShortName,
@@ -512,7 +520,7 @@ namespace IRaCIS.Application.Services

                var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";

-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                    sysUserInfo.FullName,
                    trialInfo.ExperimentName,
                    trialInfo.ResearchProgramNo,
@@ -574,7 +582,7 @@ namespace IRaCIS.Application.Services

                var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";

-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                    sysUserInfo.FullName,
                    trialInfo.ExperimentName,
                    trialInfo.ResearchProgramNo,
@@ -696,7 +704,7 @@ namespace IRaCIS.Application.Services

                var redirectUrl = $"{domain}/api/User/UserRedirect?url={System.Web.HttpUtility.UrlEncode(routeUrl)}";

-                builder.HtmlBody = string.Format(templateInfo,
+                builder.HtmlBody = string.Format(ReplaceCompanyName(templateInfo),
                    sysUserInfo.FullName,
                    trialInfo.ExperimentName,
                    trialInfo.ResearchProgramNo,
@@ -6,6 +6,7 @@ using MiniExcelLibs.Attributes;
 using Newtonsoft.Json;
 using IRaCIS.Core.Application.Contracts;
 using IRaCIS.Core.Application.Helper;
+using System;

 namespace IRaCIS.Application.Contracts
 {
@@ -119,10 +120,11 @@ namespace IRaCIS.Application.Contracts
    public class ExcelExportInfo : TrialSelectDTO
    {
       
-        public string CurrentTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+        public string CurrentTime  => TimeZoneInfo.ConvertTime(DateTime.Now, TimeZoneInfo.Local, TimeZoneInfo.FindSystemTimeZoneById(ClientZoneId)).ToString("yyyy-MM-dd HH:mm:ss");

        public bool IsEn_US { get; set; }

+        public string ClientZoneId { get; set; } = string.Empty;
        public object List { get; set; }

    }