XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改稽查配置

Uat_Study
hang 2022-09-13 16:36:01 +08:00
parent 7109f31406
commit af9394ee0c
5 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
IRaCIS.Core.Domain/Allocation/VisitTask.cs
View File

@ -89,19 +89,6 @@ namespace IRaCIS.Core.Domain.Models
[ForeignKey("SourceSubjectVisitId")] [ForeignKey("SourceSubjectVisitId")]
public SubjectVisit SourceSubjectVisit { get; set; } public SubjectVisit SourceSubjectVisit { get; set; }
//排除一致性分析 因为souceVisitId 没值
//public List<VisitTask> SameVisitTaskList { get; set; }
//public List<VisitTask> SameSubjectVisiTaskList { get; set; }
//public TaskAllocationRule DoctorTaskAllocationRule { get; set; }
public TaskMedicalReviewRule DoctorTaskMedicalReviewRule { get; set; }
[JsonIgnore] [JsonIgnore]
[ForeignKey("JudgeVisitTaskId")] [ForeignKey("JudgeVisitTaskId")]
public VisitTask JudgeVisitTask { get; set; } public VisitTask JudgeVisitTask { get; set; }
@ -117,6 +104,20 @@ namespace IRaCIS.Core.Domain.Models
public List<TaskMedicalReview> TaskMedicalReviewList { get; set; } public List<TaskMedicalReview> TaskMedicalReviewList { get; set; }
//排除一致性分析 因为souceVisitId 没值
//public List<VisitTask> SameVisitTaskList { get; set; }
//public List<VisitTask> SameSubjectVisiTaskList { get; set; }
//public TaskAllocationRule DoctorTaskAllocationRule { get; set; }
public TaskMedicalReviewRule DoctorTaskMedicalReviewRule { get; set; }
//裁判任务的Id //裁判任务的Id
public Guid? JudgeVisitTaskId { get; set; } public Guid? JudgeVisitTaskId { get; set; }

9
IRaCIS.Core.Domain/Allocation/VisitTaskReReading.cs
View File

@ -30,15 +30,15 @@ namespace IRaCIS.Core.Domain.Models
public Guid? NewReReadingTaskId { get; set; } public Guid? NewReReadingTaskId { get; set; }
public Guid RequestReReadingUserId { get; set; } public Guid RequestReReadingUserId { get; set; }
[JsonIgnore]
public User RequestReReadingUser { get; set; } public User RequestReReadingUser { get; set; }
public DateTime RequestReReadingTime { get; set; } public DateTime RequestReReadingTime { get; set; }
[JsonIgnore]
public VisitTask NewReReadingTask { get; set; } public VisitTask NewReReadingTask { get; set; }
[JsonIgnore]
public VisitTask RootReReadingTask { get; set; } public VisitTask RootReReadingTask { get; set; }
[JsonIgnore]
public VisitTask OriginalReReadingTask { get; set; } public VisitTask OriginalReReadingTask { get; set; }
//申请回退类型 //申请回退类型
@ -75,6 +75,7 @@ namespace IRaCIS.Core.Domain.Models
public Guid UpdateUserId { get; set; } public Guid UpdateUserId { get; set; }
[JsonIgnore]
public User CreateUser { get; set; } public User CreateUser { get; set; }
} }

16
IRaCIS.Core.Domain/Image/ImageQA.cs
View File

@ -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;
}
}

16
IRaCIS.Core.Domain/Image/NoneDicomFile.cs
View File

@ -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;
//}
}

6
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -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; return;
@ -651,9 +651,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
TaskName = g.Key.TaskName, TaskName = g.Key.TaskName,
TaskBlindName = g.Key.TaskBlindName, 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 Reason = globalResultList.Where(t => t.VisitTaskId == g.Key.VisitTaskId && t.QuestionId == null).FirstOrDefault()?.Answer ?? String.Empty
}); });