增加Global Using
continuous-integration/drone/push Build is passing

This commit is contained in:
2024-09-20 10:19:08 +08:00
parent 115017197b
commit fc30cb39ee
408 changed files with 11031 additions and 12556 deletions
@@ -3,12 +3,10 @@
// 生成时间 2022-06-07 13:16:33
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
//--------------------------------------------------------------------
using System;
using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using IRaCIS.Application.Contracts;
using IRaCIS.Core.Domain.Share;
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.ViewModel
{
@@ -112,18 +110,19 @@ namespace IRaCIS.Core.Application.ViewModel
public List<CriterionReadingCategory> CriterionCategoryList =>
TrialReadingCriterionList.Select(t =>
new CriterionReadingCategory() {
EnrollId = EnrollId,
TrialReadingCriterionId = t.TrialReadingCriterionId,
new CriterionReadingCategory()
{
EnrollId = EnrollId,
TrialReadingCriterionId = t.TrialReadingCriterionId,
ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList()
}).ToList();
//CriterionReadingCategoryList.Count == 0 ? TrialReadingCriterionList.Select(t => new CriterionReadingCategory() { EnrollId = EnrollId, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList() :
// CriterionReadingCategoryList
//.GroupBy(t => new { t.TrialReadingCriterionId, t.EnrollId })
//.Select(g => new CriterionReadingCategory() { EnrollId = g.Key.EnrollId, TrialReadingCriterionId = g.Key.TrialReadingCriterionId, ReadingCategorys = g.Select(t => t.ReadingCategory).OrderBy(t=>t).ToList() }).ToList();
//CriterionReadingCategoryList.Count == 0 ? TrialReadingCriterionList.Select(t => new CriterionReadingCategory() { EnrollId = EnrollId, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList() :
// CriterionReadingCategoryList
//.GroupBy(t => new { t.TrialReadingCriterionId, t.EnrollId })
//.Select(g => new CriterionReadingCategory() { EnrollId = g.Key.EnrollId, TrialReadingCriterionId = g.Key.TrialReadingCriterionId, ReadingCategorys = g.Select(t => t.ReadingCategory).OrderBy(t=>t).ToList() }).ToList();
}
@@ -212,7 +211,7 @@ namespace IRaCIS.Core.Application.ViewModel
public class GenerateTaskCommand
{
public Guid TrialId { get; set; }
//针对访视产生任务的 有用
public bool IsAssignSubjectToDoctor { get; set; }
@@ -3,9 +3,7 @@
// 生成时间 2022-07-01 15:33:01
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
//--------------------------------------------------------------------
using System;
using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
@@ -81,7 +79,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid DoctorUserId { get; set; }
}
public class ConsistentConfirmGenerateCommand: SelfConsistentSimpleQuery
public class ConsistentConfirmGenerateCommand : SelfConsistentSimpleQuery
{
@@ -104,10 +102,10 @@ namespace IRaCIS.Core.Application.ViewModel
public bool IsAutoAllocateGenerateTask { get; set; }
}
public class DoctorSelfConsistentSubjectView: ConsistentCommonView
public class DoctorSelfConsistentSubjectView : ConsistentCommonView
{
public string FirstGlobalVisitName { get; set; } = string.Empty;
public string? BlindSubjectCode { get; set; }
public string? BlindSubjectCode { get; set; }
public List<VisitTaskSimpleDTO> VisitTaskList { get; set; }
@@ -130,14 +128,14 @@ namespace IRaCIS.Core.Application.ViewModel
public int? ValidVisitCount { get; set; }
}
public class DoctorGroupConsistentSubjectView: ConsistentCommonView
public class DoctorGroupConsistentSubjectView : ConsistentCommonView
{
public List<VisitTaskGroupSimpleDTO> SubjectTaskVisitList => VisitTaskList.GroupBy(t => new { t.SubjectId, t.VisitTaskNum }).Where(g => g.Count() == 2).Select(g => g.First()).OrderBy(t=>t.VisitTaskNum).ToList();
public List<VisitTaskGroupSimpleDTO> SubjectTaskVisitList => VisitTaskList.GroupBy(t => new { t.SubjectId, t.VisitTaskNum }).Where(g => g.Count() == 2).Select(g => g.First()).OrderBy(t => t.VisitTaskNum).ToList();
public List<VisitTaskGroupSimpleDTO> VisitTaskList { get; set; } = new List<VisitTaskGroupSimpleDTO>();
public List<UserSimpleInfo> DoctorUserList { get; set; }=new List<UserSimpleInfo>();
public List<UserSimpleInfo> DoctorUserList { get; set; } = new List<UserSimpleInfo>();
}
public class VisitTaskGroupSimpleDTO
@@ -175,10 +173,10 @@ namespace IRaCIS.Core.Application.ViewModel
public bool IsClinicalDataSign { get; set; }
}
public class VisitTaskSimpleDTO :VisitTaskGroupSimpleDTO
public class VisitTaskSimpleDTO : VisitTaskGroupSimpleDTO
{
public Guid? Id { get; set; }
public string TaskCode { get; set; }
@@ -289,7 +287,7 @@ namespace IRaCIS.Core.Application.ViewModel
public class GetConsistentRuleOut
{
public TaskConsistentRuleBasic? ConsistentRuleBasic { get; set; }
public TaskConsistentRuleBasic? ConsistentRuleBasic { get; set; }
/// <summary>
/// 任务展示访视 读片任务显示是否顺序
/// </summary>
@@ -316,7 +314,7 @@ namespace IRaCIS.Core.Application.ViewModel
public string VirtualSiteCode { get; set; }
}
public class UpdateTrialSiteCodeCommandView: UpdateTrialSiteCodeCommand
public class UpdateTrialSiteCodeCommandView : UpdateTrialSiteCodeCommand
{
public DateTime Creatime { get; set; }
}
@@ -3,11 +3,8 @@
// 生成时间 2022-06-29 13:36:46
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
//--------------------------------------------------------------------
using System;
using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.ViewModel
{
@@ -33,7 +30,7 @@ namespace IRaCIS.Core.Application.ViewModel
public List<TaskBasicIdView> ActualTumorTaskList { get; set; }
[JsonIgnore]
public List<TaskBasicIdView> GeneratedVisitTaskList { get; set; }
@@ -3,9 +3,7 @@
// 生成时间 2022-06-29 10:59:50
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
//--------------------------------------------------------------------
using System;
using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.ViewModel
@@ -69,7 +67,7 @@ namespace IRaCIS.Core.Application.ViewModel
{
if (!ReadingDurationTimeSpan.HasValue)
return "";
else return string.Format("{0}h:{1}m:{2}s", (SignTime - FirstReadingTime)?.Hours, (SignTime - FirstReadingTime)?.Minutes, (SignTime - FirstReadingTime)?.Seconds)
else return string.Format("{0}h:{1}m:{2}s", (SignTime - FirstReadingTime)?.Hours, (SignTime - FirstReadingTime)?.Minutes, (SignTime - FirstReadingTime)?.Seconds)
/*string.Format("{0}分钟", (ReadingDurationTimeSpan)?.TotalMinutes)*/;
}
}
@@ -102,18 +100,18 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? SubjectId { get; set; }
public Guid? MedicalManagerUserId { get; set; }
public Guid? MedicalManagerUserId { get; set; }
public DateTime? BeginSignTime { get; set; }
public AuditAdvice? AuditAdviceEnum { get; set; }
public DateTime? BeginSignTime { get; set; }
public AuditAdvice? AuditAdviceEnum { get; set; }
public DateTime? EndSignTime { get; set; }
public DateTime? EndSignTime { get; set; }
public bool IsGetBeRead { get; set; } = false;
public bool IsGetBeRead { get; set; } = false;
public bool IsGetNextMedicalReviewTask { get; set; } = false;
public bool IsGetNextMedicalReviewTask { get; set; } = false;
public string SubjectCode { get; set; } = String.Empty;
public string SubjectCode { get; set; } = String.Empty;
public string TrialSiteCode { get; set; } = String.Empty;
public string TaskName { get; set; } = String.Empty;
@@ -133,7 +131,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? TrialReadingCriterionId { get; set; }
public MedicalReviewDoctorUserIdea? DoctorUserIdeaEnum { get; set; }
public MedicalReviewDoctorUserIdea? DoctorUserIdeaEnum { get; set; }
public Arm? ArmEnum { get; set; }
@@ -3,11 +3,9 @@
// 生成时间 2022-06-07 14:10:54
// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。
//--------------------------------------------------------------------
using System;
using IRaCIS.Core.Domain.Share;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.ViewModel
{
@@ -86,9 +84,9 @@ namespace IRaCIS.Core.Application.ViewModel
public bool IsClinicalDataSign { get; set; }
public CompleteClinicalDataEnum CompleteClinicalDataEnum =>
public CompleteClinicalDataEnum CompleteClinicalDataEnum =>
(IsNeedClinicalDataSign && IsClinicalDataSign) ? CompleteClinicalDataEnum.Complete : (IsNeedClinicalDataSign && IsClinicalDataSign == false) ? CompleteClinicalDataEnum.NotComplete : CompleteClinicalDataEnum.NA;
/// <summary>
@@ -99,7 +97,7 @@ namespace IRaCIS.Core.Application.ViewModel
/// <summary>
/// 任务展示访视 读片任务显示是否顺序
/// </summary>
public ReadingOrder IsReadingTaskViewInOrder { get; set; }
public ReadingOrder IsReadingTaskViewInOrder { get; set; }
/// <summary>
@@ -163,7 +161,7 @@ namespace IRaCIS.Core.Application.ViewModel
public bool IsCanEditUrgentState { get; set; }
public DateTime? FirstReadingTime { get;set; }
public DateTime? FirstReadingTime { get; set; }
public string ReadingDuration
{
@@ -224,7 +222,7 @@ namespace IRaCIS.Core.Application.ViewModel
public int ConsistentClinicalDataCount { get; set; } = 0;
public bool IsReReadingOrBackInfluenceAnalysis { get; set; }
public bool IsReReadingOrBackInfluenceAnalysis { get; set; }
}
@@ -318,7 +316,7 @@ namespace IRaCIS.Core.Application.ViewModel
if (this.SuggesteFinishedTime != null)
{
var date = DateTime.Now;
var timeSpan = SuggesteFinishedTime.Value- date;
var timeSpan = SuggesteFinishedTime.Value - date;
if (timeSpan.TotalDays <= 2)
{
return 1;
@@ -339,12 +337,12 @@ namespace IRaCIS.Core.Application.ViewModel
}
}
public int UrgentCount { get; set; }
public int UrgentCount { get; set; }
public List<IRUnreadTaskView> UnReadCanReadTaskList { get; set; } = new List<IRUnreadTaskView>();
public List<IRUnreadTaskView> UnReadCanReadTaskList { get; set; } = new List<IRUnreadTaskView>();
public List<IRUnreadTaskView> UnReadTaskList { get; set; } = new List<IRUnreadTaskView>();
public List<IRUnreadTaskView> UnReadTaskList { get; set; } = new List<IRUnreadTaskView>();
}
public class IRUnreadTaskView
@@ -391,13 +389,13 @@ namespace IRaCIS.Core.Application.ViewModel
}
public class GetReadingIQueryableInDto:PageInput
public class GetReadingIQueryableInDto : PageInput
{
public Guid TrialId { get; set; }
public Guid TrialId { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
public string? SubjectCode { get; set; } = null;
@@ -409,7 +407,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid TrialId { get; set; }
public Guid? TrialSiteId { get; set; }
public Guid? TrialSiteId { get; set; }
public Guid? SubjectId { get; set; }
@@ -435,7 +433,7 @@ namespace IRaCIS.Core.Application.ViewModel
public DateTime? BeginSignTime { get; set; }
public DateTime? EndSignTime { get; set; }
public DateTime? EndSignTime { get; set; }
public DateTime? BeginRequestReReadingTime { get; set; }
public DateTime? EndRequestReReadingTime { get; set; }
@@ -553,7 +551,7 @@ namespace IRaCIS.Core.Application.ViewModel
public int? SubjectAllocateState { get; set; }
public List<Arm> ArmList { get; set; }=new List<Arm>() { };
public List<Arm> ArmList { get; set; } = new List<Arm>() { };
[NotDefault]
public Guid TrialReadingCriterionId { get; set; }