diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 6e483f49a..560a343ad 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -236,6 +236,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public bool IsBaseLine { get; set; } + public DateTime? LatestScanDate { get; set; } + public string TaskName { get; set; } public decimal VisitTaskNum { get; set; } @@ -361,6 +363,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public Guid QuestionId { get; set; } + /// + /// 器官Id + /// + public Guid? OrganInfoId { get; set; } + /// /// VisitTaskId /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs index cee011d65..47587676b 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs @@ -167,6 +167,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate IsBaseLine = x.SourceSubjectVisit.IsBaseLine, VisitTaskId = x.Id, TaskName = x.TaskName, + LatestScanDate= x.SourceSubjectVisit==null?x.SourceSubjectVisit.LatestScanDate:null, VisitTaskNum = x.VisitTaskNum, IsCurrentTask = x.Id == visitTaskId, diff --git a/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs new file mode 100644 index 000000000..287084480 --- /dev/null +++ b/IRaCIS.Core.Domain/Dcotor/DoctorCriterionFile.cs @@ -0,0 +1,62 @@ + +//-------------------------------------------------------------------- +// 此代码由T4模板自动生成 byzhouhang 20210918 +// 生成时间 2023-01-09 14:34:17 +// 对此文件的更改可能会导致不正确的行为,并且如果重新生成代码,这些更改将会丢失。 +using System; +using IRaCIS.Core.Domain.Share; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +namespace IRaCIS.Core.Domain.Models +{ + /// + ///DoctorCriterionFile + /// + [Table("DoctorCriterionFile")] + public class DoctorCriterionFile : Entity, IAuditAdd + { + + /// + /// 文件名称 + /// + public string FileName { get; set; } + + /// + /// 文件路径 + /// + public string FilePath { get; set; } + + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } + + /// + /// 医生Id + /// + public Guid DoctorId { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 文件类型 + /// + public int FileType { get; set; } + + /// + /// CreateUserId + /// + public Guid CreateUserId { get; set; } + + /// + /// CreateTime + /// + public DateTime CreateTime { get; set; } + + } + + +} diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 0e8954184..62db6efb0 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -173,6 +173,8 @@ namespace IRaCIS.Core.Infra.EFCore #region Doctor public virtual DbSet Dictionary { get; set; } public virtual DbSet Doctor { get; set; } + + public virtual DbSet DoctorCriterionFile { get; set; } public virtual DbSet DoctorDictionary { get; set; } public virtual DbSet Postgraduate { get; set; } public virtual DbSet Education { get; set; } diff --git a/IRaCIS.Core.Test/DbHelper.ttinclude b/IRaCIS.Core.Test/DbHelper.ttinclude index 6964fe06d..248bd742b 100644 --- a/IRaCIS.Core.Test/DbHelper.ttinclude +++ b/IRaCIS.Core.Test/DbHelper.ttinclude @@ -4,7 +4,7 @@ public static readonly string ConnectionString = "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_New_Tet;User ID=sa;Password=dev123456DEV;TrustServerCertificate=true"; public static readonly string DbDatabase = "IRaCIS_New_Tet"; //ַ,ƴ - public static readonly string TableName = "TrialEmailNoticeUser"; + public static readonly string TableName = "DoctorCriterionFile"; //ļ service Ƿҳ } #>