From f13c2bf7cc7376df0d4f3dcbe8c8bb502432204f Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 26 Jun 2025 13:59:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Doctor/DTO/DoctorModel.cs | 7 +++++++ .../Service/Doctor/DoctorListService.cs | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs index 335955f65..100d4271d 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs @@ -242,6 +242,8 @@ namespace IRaCIS.Application.Contracts public class ConfirmationReviewerDTO : DoctorOptDTO { + public Guid DoctorId { get; set; } + public int DoctorTrialState { get; set; } public string OptUserName { get; set; } = string.Empty; @@ -249,6 +251,11 @@ namespace IRaCIS.Application.Contracts public DateTime? OptTime { get; set; } public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss"); + public UserTypeEnum? AuditTypeEnum { get; set; } + public DateTime? AuditTime { get; set; } + public string AuditUserName { get; set; } = string.Empty; + public string? AuditTimeStr => AuditTime?.ToString("yyyy-MM-dd HH:mm:ss"); + //SPM 需要看到 public DateTime? SubmmitTime { get; set; } public string SubmmitUserName { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs b/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs index 4a12e84c2..6440c6423 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs @@ -337,14 +337,29 @@ namespace IRaCIS.Core.Application.Service doctorPageList.CurrentPageData.ToList().ForEach(u => { u.DoctorTrialState = (int)EnrollStatus.InviteIntoGroup; - var opt = enrollStateList.OrderByDescending(x=>x.OptTime).FirstOrDefault(t => t.DoctorId == u.Id); + + var lastState= enrollStateList.OrderByDescending(x=>x.OptTime).FirstOrDefault(t => t.DoctorId == u.Id); + if (lastState != null) + { + u.DoctorTrialState = lastState.IntoGroupState; + } + var opt = enrollStateList.Where(x => x.IntoGroupState == 10).FirstOrDefault(t => t.DoctorId == u.Id); if (opt != null) { - u.DoctorTrialState = opt.IntoGroupState; + u.OptTime = opt.OptTime; u.UserTypeEnum = opt.UserTypeEnum; u.OptUserName = opt.OptUserName; } + + var approved = enrollStateList.Where(x => x.IntoGroupState == 8).FirstOrDefault(t => t.DoctorId == u.Id); + + if (approved != null) + { + u.AuditTime = approved.OptTime; + u.AuditTypeEnum = approved.UserTypeEnum; + u.AuditUserName = approved.OptUserName; + } }); return doctorPageList; From 2260a5621ed7eb77697d587c1c469d9040404259 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 30 Jun 2025 10:38:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index ebeb45bdb..c0be105b2 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1487,7 +1487,7 @@ namespace IRaCIS.Core.Application.Service foreach (var x in orders) { Dictionary answers = new Dictionary(); - var rowInfo = tableAnsweRowInfos.First(y => y.RowIndex == x && y.QuestionId == item.Id); + var rowInfo = tableAnsweRowInfos.FirstOrDefault(y => y.RowIndex == x && y.QuestionId == item.Id); if (rowInfo == null) { continue; From 1e72d83284d9f2db750104f891b18e1ae9a4972a Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 30 Jun 2025 13:26:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=9D=9EDicom=E9=98=85=E7=89=87=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/QC/DTO/NoneDicomStudyFileViewModel.cs | 2 ++ .../Reading/ReadingImageTask/ReadingNoDicomTaskService.cs | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs index 55a5f8b02..d291fce1d 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyFileViewModel.cs @@ -19,6 +19,8 @@ namespace IRaCIS.Core.Application.Contracts public bool IsReading { get; set; } public bool IsDeleted { get; set; } + + public DateTime? MarkTime { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs index e2c9288b9..a0732cb4b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs @@ -161,6 +161,13 @@ namespace IRaCIS.Core.Application.Service var noneDicomStudyViewMark = new NoneDicomStudyView() { Id = Guid.NewGuid() }; noneDicomStudyViewMark.IsCriticalSequence = true; noneDicomStudyViewMark.NoneDicomStudyFileList = await _noneDicomStudyFileRepository.Where(x => noneDicomids.Contains(x.Id)).ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); + + foreach (var item in noneDicomStudyViewMark.NoneDicomStudyFileList) + { + item.MarkTime = nonoDicomStudyFileIds.Where(x => x.NoneDicomFileId == item.Id).Select(x => x.CreateTime).FirstOrDefault(); + } + + noneDicomStudyViewMark.NoneDicomStudyFileList= noneDicomStudyViewMark.NoneDicomStudyFileList.OrderBy(x => x.MarkTime).ToList(); result.Insert(0, noneDicomStudyViewMark); } From 8d8865cef781fdb6182ece2b6c7b8b60f0c00e63 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 30 Jun 2025 14:28:20 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E5=85=A5?= =?UTF-8?q?=E9=A1=B9=E5=90=8C=E6=84=8F=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs b/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs index 6440c6423..819173880 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DoctorListService.cs @@ -302,8 +302,6 @@ namespace IRaCIS.Core.Application.Service .Where(x => x.TrialId == inQuery.TrialId && x.EnrollStatus >= EnrollStatus.InviteIntoGroup); var enrollStateList = await query .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); - enrollStateList = enrollStateList.GroupBy(e => e.DoctorId) - .Select(g => g.OrderByDescending(e => e.OptTime).FirstOrDefault()).ToList(); enrollStateList = enrollStateList .WhereIf(inQuery.OptStartTime != null, x => x.OptTime >= inQuery.OptStartTime)