From 27f0a0fcfa5375bc690b87b5cb6cd1a788c88591 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 24 Jan 2024 14:13:15 +0800 Subject: [PATCH 01/11] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=9B=9E=E9=80=80bug]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 30 +++++++++++++++++++ .../Service/Allocation/VisitTaskService.cs | 12 ++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 1604e2e36..328e313f8 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -6702,6 +6702,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 @@ -6790,6 +6795,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 @@ -7153,6 +7163,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 @@ -7213,6 +7228,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 @@ -7558,6 +7578,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 @@ -7903,6 +7928,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index 96c28bf13..ef9eb8ee7 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -2281,7 +2281,13 @@ namespace IRaCIS.Core.Application.Service.Allocation #region 方式二 - var origenalTask = influenceTaskList.Where(t => t.Id == task.Id).FirstOrDefault(); + + //pm退回的时候，影响的任务里不一定有该任务id 双重 分配了一个人，退回的时候，选择的是未分配的 + + //var origenalTask = influenceTaskList.Where(t => t.Id == task.Id).FirstOrDefault(); + + var origenalTask = await _visitTaskRepository.FindAsync(task.Id); + foreach (var influenceTask in influenceTaskList) { @@ -2340,7 +2346,9 @@ namespace IRaCIS.Core.Application.Service.Allocation await SetMedicalReviewInvalidAsync(currentVisitList); - var origenalTask = currentVisitList.Where(t => t.Id == task.Id).First(); + //var origenalTask = currentVisitList.Where(t => t.Id == task.Id).First(); + + var origenalTask = await _visitTaskRepository.FindAsync(task.Id); foreach (var influenceTask in currentVisitList) { From 34358060202fa1f2eae292e1c889b5d049083c7d Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 24 Jan 2024 14:40:09 +0800 Subject: [PATCH 02/11] =?UTF-8?q?[=E9=80=80=E5=9B=9Ebug2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs index ef9eb8ee7..863ef4c7e 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs @@ -1088,7 +1088,7 @@ namespace IRaCIS.Core.Application.Service.Allocation .WhereIf(critrion.IsAutoCreate == false, t => !t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(f => f.IsGeneratedTask == false && t.VisitTaskNum > f.SubjectVisit.VisitNum)) // 前序 不存在 未一致性核查未通过的 - .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum > sv.VisitNum)) + .Where(t => !t.Subject.SubjectVisitList.Any(sv => sv.CheckState != CheckStateEnum.CVPassed && t.VisitTaskNum >= sv.VisitNum)) //.WhereIf(critrion.IsAutoCreate == false, t => t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId).Any(t => t.IsGeneratedTask == false) ? //t.VisitTaskNum <= t.Subject.SubjectCriteriaEvaluationVisitFilterList.Where(t => t.TrialReadingCriterionId == trialReadingCriterionId && t.IsGeneratedTask == false).Min(t => t.SubjectVisit.VisitNum) : true) //.Where(t => t.Subject.SubjectVisitList.Any(t => t.CheckState != CheckStateEnum.CVPassed) ? t.VisitTaskNum <= t.Subject.SubjectVisitList.Where(t => t.CheckState != CheckStateEnum.CVPassed).Min(t => t.VisitNum) : true) From a00e84018a05f658f0b81ffb349a59ec7502439e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 24 Jan 2024 17:57:52 +0800 Subject: [PATCH 03/11] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BAbug]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Helper/ExcelExportHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs index d347e03a4..3eed41f3b 100644 --- a/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs +++ b/IRaCIS.Core.Application/Helper/ExcelExportHelper.cs @@ -342,7 +342,7 @@ public static class ExcelExportHelper IgnoreTemplateParameterMissing = true, }; - await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, translateData, config); + await MiniExcel.SaveAsByTemplateAsync(memoryStream, templateStream.ToArray(), translateData, config); memoryStream.Seek(0, SeekOrigin.Begin); From c8510bea2a878dc00325e5d6608a71b195c3a70e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 25 Jan 2024 11:03:07 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=A2=9E=E5=8A=A0[RuntimeIdentifiers]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/IRaCIS.Core.API.csproj | 1 + .../IRaCIS.Core.Application.xml | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj index e31429292..4f0bec8a2 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj +++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj @@ -6,6 +6,7 @@ 354572d4-9e15-4099-807c-63a2d29ff9f2 default Linux + linux-x64;win-x64 1.0.1.001 上海展影医疗科技有限公司 IRC影像系统 (EICS) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 1604e2e36..328e313f8 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -6702,6 +6702,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 @@ -6790,6 +6795,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 @@ -7153,6 +7163,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 @@ -7213,6 +7228,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 @@ -7558,6 +7578,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 @@ -7903,6 +7928,11 @@ 限制编辑 + + + 限制显示 + + 最大答案长度 From dae5c0440f0baa7945495af0efcb698ecd97d970 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 25 Jan 2024 11:24:21 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 30 ++++++++++++++++++++++++++ IRaCIS.Core.API/IRaCIS.Core.API.csproj | 1 - 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..fe1152bdb --- /dev/null +++ b/.dockerignore @@ -0,0 +1,30 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md +!**/.gitignore +!.git/HEAD +!.git/config +!.git/packed-refs +!.git/refs/heads/** \ No newline at end of file diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj index 4f0bec8a2..e31429292 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj +++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj @@ -6,7 +6,6 @@ 354572d4-9e15-4099-807c-63a2d29ff9f2 default Linux - linux-x64;win-x64 1.0.1.001 上海展影医疗科技有限公司 IRC影像系统 (EICS) From 6a212926e0a92a9d4cd672db9b3c634ced82076e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 25 Jan 2024 12:24:31 +0800 Subject: [PATCH 06/11] =?UTF-8?q?[=E9=80=80=E5=9B=9Ebug3=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskHelpeService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 76bb7d6ea..8315655ae 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -693,7 +693,7 @@ namespace IRaCIS.Core.Application.Service var existCurrentVisitTaskList = _visitTaskRepository.Where(t => t.TrialId == trialId && t.SubjectId == subjectVisit.SubjectId && t.TrialReadingCriterionId == trialReadingCriterionId && t.TaskState == TaskState.Effect - && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null && t.SourceSubjectVisitId == subjectVisit.Id).ToList(); + /* && t.TaskAllocationState == TaskAllocationState.NotAllocate && t.DoctorUserId == null*/ && t.SourceSubjectVisitId == subjectVisit.Id).ToList(); VisitTask? task1 = null; VisitTask? task2 = null; From 4ca8003d2495b725c065883cda7088b8e94b6c54 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 26 Jan 2024 09:39:34 +0800 Subject: [PATCH 07/11] =?UTF-8?q?[site=E6=90=9C=E7=B4=A2=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E5=90=8D=E5=AD=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/TrialSiteService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs index 2406b12c1..2054c1e6e 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs @@ -194,10 +194,10 @@ namespace IRaCIS.Core.Application.Services var siteQueryable = _siteRepository.AsQueryable(true) - .WhereIf(!string.IsNullOrWhiteSpace(searchModel.SiteName), t => t.SiteName.Contains(searchModel.SiteName) || t.SiteNameCN.Contains(searchModel.SiteName)) + .WhereIf(!string.IsNullOrWhiteSpace(searchModel.SiteName), t => t.SiteName.Contains(searchModel.SiteName) || t.SiteNameCN.Contains(searchModel.SiteName) || t.AliasName.Contains(searchModel.SiteName)) .WhereIf(!string.IsNullOrWhiteSpace(searchModel.AliasName), t => t.AliasName.Contains(searchModel.AliasName)) - .WhereIf(!string.IsNullOrWhiteSpace(searchModel.City), t => t.City.Contains(searchModel.City)) - .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Country), t => t.Country.Contains(searchModel.Country)) + .WhereIf(!string.IsNullOrWhiteSpace(searchModel.City), t => t.City.Contains(searchModel.City)) + .WhereIf(!string.IsNullOrWhiteSpace(searchModel.Country), t => t.Country.Contains(searchModel.Country)) .ProjectTo(_mapper.ConfigurationProvider, new { trialId = searchModel.TrialId , isEn_Us =_userInfo.IsEn_Us}); From c2bb3010ccf664b3607215d4fdc5f9738d85b44c Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 26 Jan 2024 10:15:22 +0800 Subject: [PATCH 08/11] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E6=A0=B8=E6=9F=A5=E6=A8=A1=E6=9D=BF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommandAndQueries/ConsistencyVerificationRequest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/_MediatR/CommandAndQueries/ConsistencyVerificationRequest.cs b/IRaCIS.Core.Application/_MediatR/CommandAndQueries/ConsistencyVerificationRequest.cs index a0b97d911..06387c87c 100644 --- a/IRaCIS.Core.Application/_MediatR/CommandAndQueries/ConsistencyVerificationRequest.cs +++ b/IRaCIS.Core.Application/_MediatR/CommandAndQueries/ConsistencyVerificationRequest.cs @@ -92,10 +92,10 @@ namespace IRaCIS.Core.Application.MediatR.CommandAndQueries //[Required(ErrorMessage = "检查日期不能为空")] - [CanConvertToTime(ErrorMessage = "Does not conform to Stusy Date format")] + [CanConvertToTime(ErrorMessage = "Does not conform to Study Date format")] - [ImporterHeader(Name = "Stusy Date", AutoTrim = true)] - [ExcelColumnName("Stusy Date")] + [ImporterHeader(Name = "Study Date", AutoTrim = true)] + [ExcelColumnName("Study Date")] public string StudyDate { get; set; } = string.Empty; From e365818ef55c629cfd89867f9ba90aeb8cae2a2b Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 26 Jan 2024 14:10:19 +0800 Subject: [PATCH 09/11] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E9=87=8D=E4=BC=A0?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=A3=80=E6=9F=A5id...]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index e9f5a7e53..d0ba6166b 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -247,6 +247,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc //重传的时候也要赋值检查Id studyMonitor.StudyId = study.Id; + studyMonitor.StudyCode = study.StudyCode; //特殊处理逻辑 study.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Union(study.Modalities.Split("、", StringSplitOptions.RemoveEmptyEntries)).Distinct()); From 48f44b892089d5e230f0a0ea8304afdcbb116960 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 26 Jan 2024 14:11:20 +0800 Subject: [PATCH 10/11] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index d0ba6166b..fc7583337 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -132,7 +132,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc [HttpGet] public IResponseOutput DicomUploadInProgress(Guid trialId, string studyInstanceUid) { - _provider.Set($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(30)); + _provider.Set($"StudyUid_{trialId}_{studyInstanceUid}", _userInfo.Id, TimeSpan.FromSeconds(15)); return ResponseOutput.Ok(); From 1d38fc087995e9e8ef6005886f481446105fab21 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 29 Jan 2024 11:01:49 +0800 Subject: [PATCH 11/11] x --- IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index fc7583337..eb978edc1 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -340,8 +340,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc } - - [HttpPost] public async Task> GetDicomAndNoneDicomStudyList(StudyQuery studyQuery) {