From ecae4f663a02638f51b3dc5737c667efa2e6b517 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 30 Aug 2023 15:08:38 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6--032?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Document/EmailSendService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs index 388791b9b..4dbef0741 100644 --- a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs +++ b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs @@ -333,7 +333,7 @@ namespace IRaCIS.Core.Application.Service if(onlyToUserId!=null) { - copyUserList.Where(t=>t.UserId == onlyToUserId).ToList(); + toUserList.Where(t=>t.UserId == onlyToUserId).ToList(); } if (toUserList.Count() == 0) From b2f4fa3fb934ecc701d532f119288ab1a43be0fb Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 30 Aug 2023 15:14:08 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6--033?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Document/EmailSendService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs index 4dbef0741..e3569f5e9 100644 --- a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs +++ b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs @@ -333,7 +333,7 @@ namespace IRaCIS.Core.Application.Service if(onlyToUserId!=null) { - toUserList.Where(t=>t.UserId == onlyToUserId).ToList(); + toUserList= toUserList.Where(t=>t.UserId == onlyToUserId).ToList(); } if (toUserList.Count() == 0) From 0b9cf600ba4e3ece8a4cacdbda5bcedb49d9b2b0 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 30 Aug 2023 16:34:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8A=A0=20=E7=9C=8B=E5=86=85=E5=AD=98?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Document/EmailSendService.cs | 2 +- .../SiteSurvey/TrialSiteSurveyService.cs | 2 +- IRaCIS.Core.Application/TestService.cs | 35 ++++++++++++------- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs index e3569f5e9..47242c497 100644 --- a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs +++ b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs @@ -120,7 +120,7 @@ namespace IRaCIS.Core.Application.Service /// public async Task SendTrialImageQCTaskEmailAsync(Guid trialId) { - var trialInfo = _repository.Where(t => t.Id == trialId).Select(t => new { t.ResearchProgramNo, t.ExperimentName, t.TrialCode, t.TrialStatusStr }).FirstOrDefault(); + var trialInfo = _repository.Where(t => t.Id == trialId).Select(t => new { t.ResearchProgramNo, t.ExperimentName, t.TrialCode, t.TrialStatusStr }).FirstNotNullAsync(); //找到 该项目的IQC 用户Id var userList = await _repository.Where(t => t.TrialId == trialId).Where(t => t.User.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.User.FullName }).ToListAsync(); diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 20b6138a6..eeb90d390 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -260,7 +260,7 @@ namespace IRaCIS.Core.Application.Contracts var currentLatest = dbEntityList.OrderByDescending(t => t.CreateTime).FirstOrDefault(); - if (currentLatest.Email != userInfo.EmailOrPhone) + if (currentLatest!.Email != userInfo.EmailOrPhone) { //---该中心下已经有其他用户已填写的调研表，您不被允许继续填写 return ResponseOutput.NotOk(_localizer["TrialSiteSurvey_AlreadyFilledByOtherUsers"]); diff --git a/IRaCIS.Core.Application/TestService.cs b/IRaCIS.Core.Application/TestService.cs index fb175609a..aea881b0c 100644 --- a/IRaCIS.Core.Application/TestService.cs +++ b/IRaCIS.Core.Application/TestService.cs @@ -46,25 +46,34 @@ namespace IRaCIS.Application.Services } - - [AllowAnonymous] - public async Task InternationazitionInit() + public async Task GetMemoryStoreData() { - var rows = await MiniExcel.QueryAsync(@"C:\Users\Administrator\Desktop\Export\vue.xlsx"); + - foreach (var row in rows) - { - await _repository.InsertOrUpdateAsync(row); - - } - - await _repository.SaveChangesAsync(); - - return ResponseOutput.Ok(); + return ResponseOutput.Ok(new { StaticData.En_US_Dic , StaticData.Zh_CN_Dic }); } + + + //[AllowAnonymous] + //public async Task InternationazitionInit() + //{ + + + // var rows = await MiniExcel.QueryAsync(@"C:\Users\Administrator\Desktop\Export\vue.xlsx"); + + // foreach (var row in rows) + // { + // await _repository.InsertOrUpdateAsync(row); + + // } + + // await _repository.SaveChangesAsync(); + + // return ResponseOutput.Ok(); + //} [AllowAnonymous] [UnitOfWork] public async Task Get() From 5a3127bb8ef6b62ed0aeb9ed116842cf8b2b1e76 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 30 Aug 2023 16:42:45 +0800 Subject: [PATCH 4/7] x --- IRaCIS.Core.Application/Service/Document/EmailSendService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs index 47242c497..76263b36f 100644 --- a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs +++ b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs @@ -120,7 +120,7 @@ namespace IRaCIS.Core.Application.Service /// public async Task SendTrialImageQCTaskEmailAsync(Guid trialId) { - var trialInfo = _repository.Where(t => t.Id == trialId).Select(t => new { t.ResearchProgramNo, t.ExperimentName, t.TrialCode, t.TrialStatusStr }).FirstNotNullAsync(); + var trialInfo = await _repository.Where(t => t.Id == trialId).Select(t => new { t.ResearchProgramNo, t.ExperimentName, t.TrialCode, t.TrialStatusStr }).FirstNotNullAsync(); //找到 该项目的IQC 用户Id var userList = await _repository.Where(t => t.TrialId == trialId).Where(t => t.User.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.User.FullName }).ToListAsync(); From 684dbbd8e10b9b3433d0c78f6b14ec056cce2691 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 31 Aug 2023 10:10:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Management/UserService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Management/UserService.cs b/IRaCIS.Core.Application/Service/Management/UserService.cs index df02f5c8d..32df5fa15 100644 --- a/IRaCIS.Core.Application/Service/Management/UserService.cs +++ b/IRaCIS.Core.Application/Service/Management/UserService.cs @@ -690,7 +690,7 @@ namespace IRaCIS.Application.Services var userLogQueryable = _userLogRepository - .WhereIf(inQuery.TrialId != null, t => t.LoginUser.UserTrials.Any(c => c.TrialId == inQuery.TrialId && c.UserId == t.CreateUserId)) + .WhereIf(inQuery.TrialId != null, t => t.LoginUser.UserTrials.Any(c => c.TrialId == inQuery.TrialId && c.UserId == t.LoginUserId)) .WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType) .WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate) .WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate) From 65b52a1836cfe8d2b6eebca72a1a305cea32f07c Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 31 Aug 2023 10:10:29 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/AuditingData.cs | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 5c4f5eba2..00df8532b 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -2526,6 +2526,37 @@ namespace IRaCIS.Core.Infra.EFCore.Common #endregion + #region PI 审核 + + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(PIAudit))) + { + var type = GetEntityAuditOpt(item); + + var entity = item.Entity as PIAudit; + + await InsertInspection(item.Entity as PIAudit, type, x => new InspectionConvertDTO() + { + ObjectRelationParentId = entity.VisitTaskId, + IsDistinctionInterface=true + }); + } + + + foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectVisitClinicalDialog))) + { + var type = GetEntityAuditOpt(item); + + var entity = item.Entity as SubjectVisitClinicalDialog; + + await InsertInspection(item.Entity as SubjectVisitClinicalDialog, type, x => new InspectionConvertDTO() + { + ObjectRelationParentId = entity.SubjectVisitId, + IsDistinctionInterface = false + }); + } + + #endregion + //任务 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(VisitTask))) { From 3c9b87ba01e14e613eca9ad0973c92c7c4ff2a97 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 31 Aug 2023 13:30:39 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/UploadDownLoadController.cs | 139 +++++++++--------- 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs index a0e64ae87..1b5d4681f 100644 --- a/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs +++ b/IRaCIS.Core.API/Controllers/UploadDownLoadController.cs @@ -440,7 +440,7 @@ namespace IRaCIS.Core.API.Controllers #region 废弃 - + ///// ///// 上传临床数据 多文件 @@ -674,78 +674,79 @@ namespace IRaCIS.Core.API.Controllers - //public class UploadNoneDicomFileCommand - //{ - // public Guid TrialId { get; set; } - // public Guid SubjectVisitId { get; set; } - // public Guid NoneDicomStudyId { get; set; } - // public Guid StudyMonitorId { get; set; } - // public List UploadedFileList { get; set; } = new List(); - - - // public class OSSFileDTO - // { - // public string FilePath { get; set; } - // public string FileName { get; set; } - // public int FileFize { get; set; } - // } - //} - - ///// - ///// 上传非Dicom 文件 支持压缩包 多文件上传 - ///// - ///// - ///// - ////[DisableRequestSizeLimit] - //[HttpPost("NoneDicomStudy/UploadNoneDicomFile")] - //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] - ////[Authorize(Policy = IRaCISPolicy.CRC)] - //public async Task UploadNoneDicomFile(UploadNoneDicomFileCommand incommand, - // [FromServices] IRepository _noneDicomStudyRepository, [FromServices] IRepository _studyMonitorRepository) - //{ - - // var subjectVisitId = incommand.SubjectVisitId; - // var studyMonitorId = incommand.StudyMonitorId; - // var noneDicomStudyId = incommand.NoneDicomStudyId; - - - // await _qCCommon.VerifyIsCRCSubmmitAsync(_repository, _userInfo, subjectVisitId); - - // var sv = (await _repository.Where(t => t.Id == subjectVisitId).Select(t => new { t.TrialId, t.SiteId, t.SubjectId }).FirstOrDefaultAsync()).IfNullThrowConvertException(); - - // var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == studyMonitorId); - - // studyMonitor.UploadFinishedTime = DateTime.Now; - - // foreach (var item in incommand.UploadedFileList) - // { - // await _repository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId }); - - // } - // var uploadFinishedTime = DateTime.Now; - - // var noneDicomStudy = await _noneDicomStudyRepository.FirstOrDefaultAsync((t => t.Id == noneDicomStudyId)); - - // noneDicomStudy.FileCount = noneDicomStudy.FileCount + incommand.UploadedFileList.Count; - - // studyMonitor.FileCount = incommand.UploadedFileList.Count; - // studyMonitor.FileSize = incommand.UploadedFileList.Sum(t => t.FileFize); - // studyMonitor.IsDicom = false; - // studyMonitor.IsDicomReUpload = false; - // studyMonitor.StudyId = noneDicomStudyId; - // studyMonitor.StudyCode = noneDicomStudy.StudyCode; - // studyMonitor.ArchiveFinishedTime = DateTime.Now; - // studyMonitor.IP = _userInfo.IP; - - // await _repository.SaveChangesAsync(); - - // return ResponseOutput.Ok(); - //} - #endregion + public class UploadNoneDicomFileCommand + { + public Guid TrialId { get; set; } + public Guid SubjectVisitId { get; set; } + public Guid NoneDicomStudyId { get; set; } + public Guid StudyMonitorId { get; set; } + + + public List UploadedFileList { get; set; } = new List(); + + + public class OSSFileDTO + { + public string FilePath { get; set; } + public string FileName { get; set; } + public int FileFize { get; set; } + } + } + + /// + /// 上传非Dicom 文件 支持压缩包 多文件上传 + /// + /// + /// + //[DisableRequestSizeLimit] + [HttpPost("NoneDicomStudy/UploadNoneDicomFile")] + [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] + //[Authorize(Policy = IRaCISPolicy.CRC)] + public async Task UploadNoneDicomFile(UploadNoneDicomFileCommand incommand, + [FromServices] IRepository _noneDicomStudyRepository, [FromServices] IRepository _studyMonitorRepository) + { + + var subjectVisitId = incommand.SubjectVisitId; + var studyMonitorId = incommand.StudyMonitorId; + var noneDicomStudyId = incommand.NoneDicomStudyId; + + + await _qCCommon.VerifyIsCRCSubmmitAsync(_repository, _userInfo, subjectVisitId); + + var sv = (await _repository.Where(t => t.Id == subjectVisitId).Select(t => new { t.TrialId, t.SiteId, t.SubjectId }).FirstOrDefaultAsync()).IfNullThrowConvertException(); + + var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == studyMonitorId); + + studyMonitor.UploadFinishedTime = DateTime.Now; + + foreach (var item in incommand.UploadedFileList) + { + await _repository.AddAsync(new NoneDicomStudyFile() { FileName = item.FileName, Path = item.FilePath, NoneDicomStudyId = noneDicomStudyId }); + + } + var uploadFinishedTime = DateTime.Now; + + var noneDicomStudy = await _noneDicomStudyRepository.FirstOrDefaultAsync((t => t.Id == noneDicomStudyId)); + + noneDicomStudy.FileCount = noneDicomStudy.FileCount + incommand.UploadedFileList.Count; + + studyMonitor.FileCount = incommand.UploadedFileList.Count; + studyMonitor.FileSize = incommand.UploadedFileList.Sum(t => t.FileFize); + studyMonitor.IsDicom = false; + studyMonitor.IsDicomReUpload = false; + studyMonitor.StudyId = noneDicomStudyId; + studyMonitor.StudyCode = noneDicomStudy.StudyCode; + studyMonitor.ArchiveFinishedTime = DateTime.Now; + studyMonitor.IP = _userInfo.IP; + + await _repository.SaveChangesAsync(); + + return ResponseOutput.Ok(); + } /// /// 一致性核查 excel上传 支持三种格式