From b5109896c2d4a892eed5dc88332f9a27618994ec Mon Sep 17 00:00:00 2001 From: "{872297557@qq.com}" <872297557@qq.com> Date: Mon, 28 Nov 2022 15:49:34 +0800 Subject: [PATCH] =?UTF-8?q?instance=20=20=E8=BF=94=E5=9B=9Epath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Allocation/VisitTaskHelpeService.cs | 4 ++-- .../Service/ImageAndDoc/DTO/DicomInstanceModel.cs | 3 +++ IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 5019842c..586600d4 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -312,7 +312,7 @@ namespace IRaCIS.Core.Application.Service var allocateSubjectArmList = _visitTaskRepository.Where(t => t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.TrialId == trialId && t.DoctorUserId != null && t.ArmEnum != Arm.JudgeArm) .Select(t => new { t.DoctorUserId, t.ArmEnum }).Distinct().ToList(); - //当前任务没有分配医生，初次分配 + //当前任务没有分配医生，初次分配 不处理 只生成任务，后续根据生成的任务 再进行分配 if (allocateSubjectArmList.Count == 0) { @@ -342,7 +342,7 @@ namespace IRaCIS.Core.Application.Service if (trialReadingCriterionConfig.IsReadingTaskViewInOrder) { - //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，对后续访视不生成或者分配 当前访视生成但是不分配出去 + //之前有回退到影像上传的访视 那么当前访视一致性核查通过的时候，当前访视生成但是不分配出去 var beforeBackVisitTask = await _visitTaskRepository.Where(t => t.TrialId == trialId && t.TrialReadingCriterionId == trialReadingCriterionConfig.TrialReadingCriterionId && t.SubjectId == subjectVisit.SubjectId && t.VisitTaskNum < subjectVisit.VisitNum && t.ReadingCategory == ReadingCategory.Visit && t.SourceSubjectVisit.CheckState != CheckStateEnum.CVPassed).OrderBy(t => t.VisitTaskNum).FirstOrDefaultAsync(); diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomInstanceModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomInstanceModel.cs index d46b7e53..b8832e08 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomInstanceModel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomInstanceModel.cs @@ -22,10 +22,13 @@ namespace IRaCIS.Core.Application.Contracts public Guid SubjectId { get; set; } public Guid SubjectVisitId { get; set; } + public string Path { get; set; } + //public Guid CreateUserId { get; set; } //public DateTime CreateTime { get; set; } //public Guid UpdateUserId { get; set; } //public DateTime UpdateTime { get; set; } + } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs index 7bfc687a..7cfd50b7 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs @@ -156,7 +156,7 @@ namespace IRaCIS.Application.Services var yearStr = DateTime.Now.Year.ToString(); trial.Code = currentYearMaxCodeNext; - trial.TrialCode = (trial.TrialType == TrialType.NoneOfficial ? yearStr.Substring(yearStr.Length - 2) : "T0") + trial.TrialCode + currentYearMaxCodeNext.ToString("D3"); + trial.TrialCode = (trial.TrialType == TrialType.NoneOfficial ? "T0" :yearStr.Substring(yearStr.Length - 2)) + trial.TrialCode + currentYearMaxCodeNext.ToString("D3"); //多选信息