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

修改 trila subjectVisit

Uat_Study
hang 2022-08-24 16:26:11 +08:00
parent 545c04e5db
commit 6d7fcbb726
5 changed files with 59 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,24 +96,24 @@ namespace IRaCIS.Core.Domain.Models
//public List<VisitTask> SameSubjectVisiTaskList { get; set; }
public TaskConsistentRule TaskConsistentRule { get; set; }
//public TaskAllocationRule DoctorTaskAllocationRule { get; set; }
public TaskMedicalReviewRule DoctorTaskMedicalReviewRule { get; set; }
[JsonIgnore]
[ForeignKey("JudgeVisitTaskId")]
public VisitTask JudgeVisitTask { get; set; }
//public SubjectUser SujectArm { get; set; }
[JsonIgnore]
public Subject Subject { get; set; }
[JsonIgnore]
public List<TaskMedicalReview> TaskMedicalReviewList { get; set; }
@ -166,7 +166,7 @@ namespace IRaCIS.Core.Domain.Models
#region 裁判任务特有
[JsonIgnore]
//对于裁判任务而言，触发裁判的列表
public List<VisitTask> JudgeVisitList { get; set; }
@ -209,11 +209,12 @@ namespace IRaCIS.Core.Domain.Models
#endregion
[JsonIgnore]
public List<ReadingTaskQuestionAnswer> ReadingTaskQuestionAnswerList { get; set; } = new List<ReadingTaskQuestionAnswer>();
//重阅或者退回影像的记录中间表
[JsonIgnore]
public List<TaskInfluence> TaskInfluenceList { get; set; } = new List<TaskInfluence>();
}

7
IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj
View File

@ -24,4 +24,11 @@
<Folder Include="SQLFile\" />
</ItemGroup>
<ItemGroup>
<Using Include=" Newtonsoft.Json;" />
<!-- Global using -->
</ItemGroup>
</Project>

40
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -16,28 +16,35 @@ namespace IRaCIS.Core.Domain.Models
TrialDicList = new List<TrialDictionary>();
}
[JsonIgnore]
public List<TaskConsistentRule> TaskConsistentRuleList { get; set; }
[JsonIgnore]
public List<SubjectUser> SubjectDoctorUserList { get; set; } = new List<SubjectUser>();
[JsonIgnore]
public List<VisitTask> VisitTaskList { get; set; } = new List<VisitTask>() { };
[JsonIgnore]
public List<TrialSiteSurvey> TrialSiteSurveyList { get; set; } = new List<TrialSiteSurvey>();
[JsonIgnore]
public List<TrialDocument> TrialDocumentList { get; set; }
[JsonIgnore]
public List<Enroll> EnrollList { get; set; } = new List<Enroll>();
[JsonIgnore]
public List<Workload> WorkloadList { get; set; } = new List<Workload>();
[JsonIgnore]
public List<TrialUser> TrialUserList { get; set; } = new List<TrialUser>();
[JsonIgnore]
public List<ReadingQuestionCriterionTrial> ReadingQuestionCriterionTrialList { get; set; } = new List<ReadingQuestionCriterionTrial>();
[JsonIgnore]
public List<Subject> SubjectList { get; set; } = new List<Subject>();
[JsonIgnore]
public List<DicomStudy> StudyList { get; set; } = new List<DicomStudy>();
[JsonIgnore]
public List<TrialSite> TrialSiteList { get; set; } = new List<TrialSite>();
[JsonIgnore]
public List<TrialSiteUser> TrialSiteUserList { get; set; } = new List<TrialSiteUser>();
[JsonIgnore]
[ForeignKey("DeclarationTypeId")]
public Dictionary DeclarationType { get; set; }
@ -46,29 +53,30 @@ namespace IRaCIS.Core.Domain.Models
public Guid IndicationTypeId { get; set; } = Guid.Empty;
public Guid? PhaseId { get; set; } = Guid.Empty;
[JsonIgnore]
[ForeignKey("IndicationTypeId")]
public Dictionary IndicationType { get; set; }
[JsonIgnore]
[ForeignKey("PhaseId")]
public Dictionary Phase { get; set; }
[JsonIgnore]
[ForeignKey("SponsorId")]
public Sponsor Sponsor { get; set; }
[JsonIgnore]
[ForeignKey("CROId")]
public CRO CRO { get; set; }
[JsonIgnore]
[ForeignKey("ReviewModeId")]
public Dictionary ReviewMode { get; set; }
[JsonIgnore]
public List<ClinicalDataTrialSet> clinicalDataTrialSets { get; set; } = new List<ClinicalDataTrialSet> { };
[JsonIgnore]
public virtual ICollection<TrialStatusDetail> ClinicalTrialProjectDetails { get; set; }
[JsonIgnore]
public virtual ICollection<TrialDictionary> TrialDicList { get; set; }
@ -90,7 +98,7 @@ namespace IRaCIS.Core.Domain.Models
[StringLength(500)]
public string TrialStatusStr { get; set; } = StaticData.TrialState.TrialInitializing;
[JsonIgnore]
public List<TrialStateChange> TrialStateChangeList { get; set; } = new List<TrialStateChange>();

33
IRaCIS.Core.Domain/Visit/SubjectVisit.cs
View File

@ -10,12 +10,13 @@ namespace IRaCIS.Core.Domain.Models
public class SubjectVisit : Entity, IAuditUpdate, IAuditAdd, ISoftDelete
{
//一个访视 对应有对应Site的 TrialSiteCode 所以 fluentApi中配置 TrialSite 连表用TrialId SiteId 双字段
[JsonIgnore]
public TrialSite TrialSite { get; set; }
public Guid TrialId { get; set; }
public Guid SubjectId { get; set; }
public Guid SiteId { get; set; }
[JsonIgnore]
public VisitStage VisitStage { get; set; }
public Guid? VisitStageId { get; set; }
public int VisitDay { get; set; }
@ -118,6 +119,7 @@ namespace IRaCIS.Core.Domain.Models
/// </summary>
public Guid? OutPlanPreviousVisitId { get; set; }
[JsonIgnore]
[ForeignKey("OutPlanPreviousVisitId")]
public SubjectVisit OutPlanPreviousVisit { get; set; }
@ -125,6 +127,7 @@ namespace IRaCIS.Core.Domain.Models
//public DateTime? ClinicalDataSignTime { get; set; }
[JsonIgnore]
[ForeignKey("ClinicalDataSignUserId")]
public User ClinicalDataSignUser { get; set; }
@ -132,12 +135,15 @@ namespace IRaCIS.Core.Domain.Models
public User ForwardUser { get; set; }
[JsonIgnore]
[ForeignKey("PreliminaryAuditUserId")]
public User PreliminaryAuditUser { get; set; }
[JsonIgnore]
[ForeignKey("ReviewAuditUserId")]
public User ReviewAuditUser { get; set; }
[JsonIgnore]
[ForeignKey("CurrentActionUserId")]
public User CurrentActionUser { get; set; }
@ -172,12 +178,15 @@ namespace IRaCIS.Core.Domain.Models
//导航属性
[JsonIgnore]
[ForeignKey("TrialId")]
public Trial Trial { get; set; }
[JsonIgnore]
[ForeignKey("SiteId")]
public Site Site { get; set; }
[JsonIgnore]
[ForeignKey("SubjectId")]
public Subject Subject { get; set; }
@ -188,28 +197,28 @@ namespace IRaCIS.Core.Domain.Models
////一个访视 对应该Site下的多个CRC管理 必须加这个 不然生成的sql 会报 TrialSiteUserId 不存在该列名
//public List<TrialSiteUser> TrialSiteUserList { get; set; }
[JsonIgnore]
public List<PreviousHistory> PreviousHistoryList { get; set; }
[JsonIgnore]
public List<PreviousOther> PreviousOtherList { get; set; }
[JsonIgnore]
public List<PreviousSurgery> PreviousSurgeryList { get; set; }
[JsonIgnore]
public List<PreviousPDF> PreviousPDFList { get; set; }
[JsonIgnore]
public List<ReadingClinicalData> ReadingClinicalDataList { get; set; }
[JsonIgnore]
public List<CheckChallengeDialog> CheckChallengeDialogList { get; set; } = new List<CheckChallengeDialog>();
[JsonIgnore]
public List<DicomStudy> StudyList { get; set; } = new List<DicomStudy>();
[JsonIgnore]
public List<NoneDicomStudy> NoneDicomStudyList { get; set; } = new List<NoneDicomStudy>();
[JsonIgnore]
public List<QCChallenge> QCChallengeList { get; set; } = new List<QCChallenge>();
[JsonIgnore]
public List<QCChallengeDialog> QCChallengeDialogList { get; set; } = new List<QCChallengeDialog>();
[JsonIgnore]
public List<VisitTask> VisitTaskList { get; set; } = new List<VisitTask>();
public ReadingStatusEnum ReadingStatus { get; set; }