From af9394ee0cbd6fcf9e0a6939cc618a239274ddf4 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 13 Sep 2022 16:36:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Domain/Allocation/VisitTask.cs | 27 ++++++++++--------- .../Allocation/VisitTaskReReading.cs | 9 ++++--- IRaCIS.Core.Domain/Image/ImageQA.cs | 16 ----------- IRaCIS.Core.Domain/Image/NoneDicomFile.cs | 16 ----------- .../Common/AuditingData.cs | 6 ++--- 5 files changed, 22 insertions(+), 52 deletions(-) delete mode 100644 IRaCIS.Core.Domain/Image/ImageQA.cs delete mode 100644 IRaCIS.Core.Domain/Image/NoneDicomFile.cs diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index ba18698e0..e76d259b7 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -89,19 +89,6 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("SourceSubjectVisitId")] public SubjectVisit SourceSubjectVisit { get; set; } - - - //排除一致性分析 因为souceVisitId 没值 - //public List SameVisitTaskList { get; set; } - - //public List SameSubjectVisiTaskList { get; set; } - - - //public TaskAllocationRule DoctorTaskAllocationRule { get; set; } - - - public TaskMedicalReviewRule DoctorTaskMedicalReviewRule { get; set; } - [JsonIgnore] [ForeignKey("JudgeVisitTaskId")] public VisitTask JudgeVisitTask { get; set; } @@ -117,6 +104,20 @@ namespace IRaCIS.Core.Domain.Models public List TaskMedicalReviewList { get; set; } + + //排除一致性分析 因为souceVisitId 没值 + //public List SameVisitTaskList { get; set; } + + //public List SameSubjectVisiTaskList { get; set; } + + + //public TaskAllocationRule DoctorTaskAllocationRule { get; set; } + + + public TaskMedicalReviewRule DoctorTaskMedicalReviewRule { get; set; } + + + //裁判任务的Id public Guid? JudgeVisitTaskId { get; set; } diff --git a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs index 09d8ed446..f33650584 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs @@ -30,15 +30,15 @@ namespace IRaCIS.Core.Domain.Models public Guid? NewReReadingTaskId { get; set; } public Guid RequestReReadingUserId { get; set; } - + [JsonIgnore] public User RequestReReadingUser { get; set; } public DateTime RequestReReadingTime { get; set; } - + [JsonIgnore] public VisitTask NewReReadingTask { get; set; } - + [JsonIgnore] public VisitTask RootReReadingTask { get; set; } - + [JsonIgnore] public VisitTask OriginalReReadingTask { get; set; } //申请回退类型 @@ -75,6 +75,7 @@ namespace IRaCIS.Core.Domain.Models public Guid UpdateUserId { get; set; } + [JsonIgnore] public User CreateUser { get; set; } } diff --git a/IRaCIS.Core.Domain/Image/ImageQA.cs b/IRaCIS.Core.Domain/Image/ImageQA.cs deleted file mode 100644 index a24d2f9c5..000000000 --- a/IRaCIS.Core.Domain/Image/ImageQA.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; - -namespace IRaCIS.Core.Domain.Models -{ - public class ImageQA : Entity, IAuditAdd - { - public Guid TrialId { get; set; } - public Guid SiteId { get; set; } - public Guid StudyId { get; set; } - public Guid ParentId { get; set; } - public string CommunicationRecord { get; set; } - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } = DateTime.Now; - - } -} \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Image/NoneDicomFile.cs b/IRaCIS.Core.Domain/Image/NoneDicomFile.cs deleted file mode 100644 index a7e01f59d..000000000 --- a/IRaCIS.Core.Domain/Image/NoneDicomFile.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; - -namespace IRaCIS.Core.Domain.Models -{ - - //public class NoneDicomFile : Entity, IAuditAdd - //{ - // public Guid StudyId { get; set; } - - // public string FileName { get; set; } - - // public string Path { get; set; } - // public Guid CreateUserId { get; set; } - // public DateTime CreateTime { get; set; } = DateTime.Now; - //} -} \ No newline at end of file diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index d82ba6964..6734aa053 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -578,7 +578,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common //访视任务 - if (_userInfo.RequestUrl == "ReadingImageTask/SubmitVisitTaskQuestions" && entity.ReadingTaskState != ReadingTaskState.HaveSigned) + if (_userInfo.RequestUrl == "ReadingImageTask/SubmitVisitTaskQuestions" && entity.ReadingTaskState != ReadingTaskState.HaveSigned && type==AuditOpt.Update) { //提交访视任务的时候 会多次更新同一个记录 只记录最后一次 return; @@ -651,9 +651,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common TaskName = g.Key.TaskName, TaskBlindName = g.Key.TaskBlindName, - VisitQuestionAnswerList = g.Select(u => new { u.QuestionName, u.Answer }).ToList(), + VisitQuestionAnswerList = g.OrderBy(t=>t.ShowOrder).Select(u => new { u.QuestionName, u.Answer }).ToList(), - GlobalQuestionAnswerList = g.Select(u => new { u.QuestionName, Answer = globalResultList.Where(t => t.VisitTaskId == g.Key.VisitTaskId && t.QuestionId == u.ReadingQuestionTrialId).FirstOrDefault()?.Answer ?? String.Empty }).ToList(), + GlobalQuestionAnswerList = g.OrderBy(t => t.ShowOrder).Select(u => new { u.QuestionName, Answer = globalResultList.Where(t => t.VisitTaskId == g.Key.VisitTaskId && t.QuestionId == u.ReadingQuestionTrialId).FirstOrDefault()?.Answer ?? String.Empty }).ToList(), Reason = globalResultList.Where(t => t.VisitTaskId == g.Key.VisitTaskId && t.QuestionId == null).FirstOrDefault()?.Answer ?? String.Empty });