diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs index f3f1e32ab..9104ecead 100644 --- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs @@ -11,12 +11,7 @@ namespace IRaCIS.Core.Application.Service { public CommonConfig() { - CreateMap() - .ForMember(o => o.MessageTime, t => t.MapFrom(u => u.MessageTime.ToString())); - CreateMap(); - - CreateMap(); CreateMap().ReverseMap(); diff --git a/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs b/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs index bb8df3f3a..8c452b890 100644 --- a/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs +++ b/IRaCIS.Core.Application/Service/Doctor/DoctorService.cs @@ -12,7 +12,6 @@ namespace IRaCIS.Application.Services public class DoctorService : BaseService, IDoctorService { private readonly IRepository _doctorRepository; - private readonly IRepository _messageRepository; private readonly IRepository _enrollRepository; private readonly IRepository _doctorDictionaryRepository; private readonly IRepository _attachmentRepository; @@ -26,7 +25,7 @@ namespace IRaCIS.Application.Services public DoctorService(IRepository doctorInfoRepository, IRepository dictionaryRepository, - IRepository sysMessageRepository, IRepository intoGroupRepository, + IRepository intoGroupRepository, IRepository doctorDictionaryRepository, IRepository attachmentRepository, IRepository doctorCriterionFileRepository, @@ -35,7 +34,6 @@ namespace IRaCIS.Application.Services IRepository trialExtRepository, IRepository vacationRepository) { _doctorRepository = doctorInfoRepository; - _messageRepository = sysMessageRepository; _enrollRepository = intoGroupRepository; _doctorDictionaryRepository = doctorDictionaryRepository; _attachmentRepository = attachmentRepository; @@ -457,20 +455,20 @@ namespace IRaCIS.Application.Services if (success) { - if (!string.IsNullOrWhiteSpace(auditResumeParam.MessageContent)) - { - var message = new Message - { - FromUserId = userId, - ToDoctorId = auditResumeParam.Id, - Title = "Resume review results", - Content = auditResumeParam.MessageContent, - HasRead = false, - MessageTime = DateTime.Now - }; - await _repository.AddAsync(message); - success = await _repository.SaveChangesAsync(); - } + //if (!string.IsNullOrWhiteSpace(auditResumeParam.MessageContent)) + //{ + // var message = new Message + // { + // FromUserId = userId, + // ToDoctorId = auditResumeParam.Id, + // Title = "Resume review results", + // Content = auditResumeParam.MessageContent, + // HasRead = false, + // MessageTime = DateTime.Now + // }; + // await _repository.AddAsync(message); + // success = await _repository.SaveChangesAsync(); + //} } return ResponseOutput.Result(success); diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs index 32032bdac..58b3583cb 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/InstanceService.cs @@ -11,13 +11,14 @@ namespace IRaCIS.Core.Application.Services { private readonly IRepository _instanceRepository; private readonly IRepository _studyRepository; - private readonly IRepository _keyInstanceRepository; - public InstanceService(IRepository instanceRepository, IRepository studyRepository, - IRepository keyInstanceRepository ) + //private readonly IRepository _keyInstanceRepository; + public InstanceService(IRepository instanceRepository, IRepository studyRepository + //,IRepository keyInstanceRepository + ) { _instanceRepository = instanceRepository; _studyRepository = studyRepository; - _keyInstanceRepository = keyInstanceRepository; + //_keyInstanceRepository = keyInstanceRepository; } /// 指定资源Id，获取Dicom序列所属的实例信息列表 @@ -42,11 +43,11 @@ namespace IRaCIS.Core.Application.Services [HttpGet, Route("{seriesId:guid}/{tpCode?}/{key?}")] public IEnumerable List(Guid seriesId, string tpCode, bool? key) { - if (key != null && key.HasValue && key.Value) - { - return _keyInstanceRepository.Where(s => s.TpCode == tpCode).Select(t => t.InstanceId).Distinct(); - } - else + //if (key != null && key.HasValue && key.Value) + //{ + // return _keyInstanceRepository.Where(s => s.TpCode == tpCode).Select(t => t.InstanceId).Distinct(); + //} + //else return _instanceRepository.Where(s => s.SeriesId == seriesId).OrderBy(s => s.InstanceNumber).Select(t => t.Id); } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs index 8dab5e9b9..c9247660c 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs @@ -10,19 +10,20 @@ namespace IRaCIS.Core.Application.Services [AllowAnonymous] public class SeriesService : BaseService { - private readonly IRepository _imageLabelRepository; + //private readonly IRepository _keyInstanceRepository; + // private readonly IRepository _imageLabelRepository; + private readonly IRepository _seriesRepository; private readonly IRepository _instanceRepository; private readonly IRepository _studyRepository; - private readonly IRepository _keyInstanceRepository; - public SeriesService(IRepository instanceRepository, IRepository studyRepository, - IRepository keyInstanceRepository, IRepository seriesRepository, IRepository imageLabelRepository) + public SeriesService(IRepository instanceRepository, IRepository studyRepository, IRepository seriesRepository + /* IRepository keyInstanceRepository, IRepository imageLabelRepository*/) { _seriesRepository = seriesRepository; _instanceRepository = instanceRepository; _studyRepository = studyRepository; - _keyInstanceRepository = keyInstanceRepository; - _imageLabelRepository = imageLabelRepository; + //_keyInstanceRepository = keyInstanceRepository; + //_imageLabelRepository = imageLabelRepository; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs index 86e510f07..7947167ce 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs @@ -19,8 +19,7 @@ namespace IRaCIS.Core.Application.Service CreateMap(); - CreateMap(); - CreateMap(); + CreateMap(); //影像上传 检查 @@ -73,11 +72,9 @@ namespace IRaCIS.Core.Application.Service CreateMap(); - CreateMap(); - CreateMap(); CreateMap() .ForMember(o => o.IsDeleted, t => t.MapFrom(u => u.DicomSerie.IsDeleted)) diff --git a/IRaCIS.Core.Application/Service/ReadingAndReport/DTO/GlobalReportDTO.cs b/IRaCIS.Core.Application/Service/ReadingAndReport/DTO/GlobalReportDTO.cs index 02bb2b3e6..bb3f617ee 100644 --- a/IRaCIS.Core.Application/Service/ReadingAndReport/DTO/GlobalReportDTO.cs +++ b/IRaCIS.Core.Application/Service/ReadingAndReport/DTO/GlobalReportDTO.cs @@ -69,7 +69,6 @@ namespace IRaCIS.Core.Application.Contracts public class AdReportDTO { - public WorkloadAD ADInfo { get; set; } = new WorkloadAD(); public PreviousGlobalReadsView Global1 { get; set; } = new PreviousGlobalReadsView(); public PreviousGlobalReadsView Global2 { get; set; } = new PreviousGlobalReadsView(); diff --git a/IRaCIS.Core.Application/Service/ReadingAndReport/_MapConfig.cs b/IRaCIS.Core.Application/Service/ReadingAndReport/_MapConfig.cs index a6da341b3..2cccc10dd 100644 --- a/IRaCIS.Core.Application/Service/ReadingAndReport/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/ReadingAndReport/_MapConfig.cs @@ -12,10 +12,7 @@ namespace IRaCIS.Core.Application.Service { CreateMap(); - CreateMap(); - CreateMap(); - CreateMap(); } } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs index 69f46a855..d165c1cc4 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs @@ -548,7 +548,6 @@ namespace IRaCIS.Application.Services await _repository.BatchDeleteAsync(t => t.OriginalReReadingTask.TrialId == trialId); await _repository.BatchDeleteAsync(t => t.TrialId == trialId); - await _repository.BatchDeleteAsync(t => t.TrialId == trialId); await _repository.BatchDeleteAsync(t => t.TrialId == trialId) ; return ResponseOutput.Ok(); diff --git a/IRaCIS.Core.Domain/Abandon/ImageLabel.cs b/IRaCIS.Core.Domain/Abandon/ImageLabel.cs deleted file mode 100644 index 2b985400c..000000000 --- a/IRaCIS.Core.Domain/Abandon/ImageLabel.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("ImageLabel")] - public class ImageLabel : Entity - { - public string TpCode { get; set; } = string.Empty; - public Guid StudyId { get; set; } = Guid.Empty; - public Guid SeriesId { get; set; } = Guid.Empty; - public Guid InstanceId { get; set; } = Guid.Empty; - public string LabelValue { get; set; } = string.Empty; - } -} diff --git a/IRaCIS.Core.Domain/Abandon/KeyInstance.cs b/IRaCIS.Core.Domain/Abandon/KeyInstance.cs deleted file mode 100644 index bea65ae05..000000000 --- a/IRaCIS.Core.Domain/Abandon/KeyInstance.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("KeyInstance")] - public class KeyInstance : Entity, IAuditAdd, IAuditUpdate - { - - public string TpCode { get; set; } - public Guid SeriesId { get; set; } - public Guid InstanceId { get; set; } - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } = DateTime.Now; - public Guid UpdateUserId { get; set; } - public DateTime UpdateTime { get; set; } = DateTime.Now; - } -} diff --git a/IRaCIS.Core.Domain/Abandon/Message.cs b/IRaCIS.Core.Domain/Abandon/Message.cs deleted file mode 100644 index 51689a9b9..000000000 --- a/IRaCIS.Core.Domain/Abandon/Message.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("Message")] - public class Message : Entity - { - public Guid ToDoctorId { get; set; } - public Guid FromUserId { get; set; } - public string Title { get; set; } = string.Empty; - public string Content { get; set; } = string.Empty; - public DateTime MessageTime { get; set; } - public bool HasRead { get; set; } - public string Memo { get; set; } = string.Empty; - - } -} diff --git a/IRaCIS.Core.Domain/Abandon/Report/GlobalRS.cs b/IRaCIS.Core.Domain/Abandon/Report/GlobalRS.cs deleted file mode 100644 index a5eb5ca35..000000000 --- a/IRaCIS.Core.Domain/Abandon/Report/GlobalRS.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -namespace IRaCIS.Core.Domain.Models -{ - public class GlobalRS : Entity - { - public Guid GlobalId { get; set; } - public string TpCode { get; set; } - public decimal VisitNum { get; set; } - public bool Agree { get; set; } - public string NewRS { get; set; } - public string Note { get; set; } - - } -} \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Abandon/Report/GlobalResult.cs b/IRaCIS.Core.Domain/Abandon/Report/GlobalResult.cs deleted file mode 100644 index 1e6a2d7dd..000000000 --- a/IRaCIS.Core.Domain/Abandon/Report/GlobalResult.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; - -namespace IRaCIS.Core.Domain.Models -{ - public class GlobalResult:Entity - { - public Guid GlobalId { get; set; } - public Guid SubjectId { get; set; } - public string SubjectCode { get; set; } - - public decimal VisitNum { get; set; } - public string SubjectNote { get; set; }=String.Empty; - public string Result { get; set; } = String.Empty; - - } -} \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Abandon/Report/Report.cs b/IRaCIS.Core.Domain/Abandon/Report/Report.cs deleted file mode 100644 index 8e59d146c..000000000 --- a/IRaCIS.Core.Domain/Abandon/Report/Report.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations.Schema; -using System.Text; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("Report")] - public class Report : Entity - { - public bool Qualified { get; set; } = true; - public string DiseaseProgression { get; set; } = string.Empty; - public string NotEvaluable { get; set; } = string.Empty; - public string Timepoint { get; set; } = string.Empty; - public string TrialCode { get; set; } = string.Empty; - public string SubjectCode { get; set; } = string.Empty; - public decimal? VisitNum { get; set; } - public string VisitName { get; set; } = string.Empty; - public int? DiseaseSituation { get; set; } - public string Comment { get; set; } - public Guid? TPId { get; set; } - public Guid? DicomStudyId { get; set; } - public string TpCode { get; set; } = string.Empty; - public bool AffectRead { get; set; } = false;//是否影响读片 - public string AffectReadNote { get; set; } = string.Empty;//备注说明 - } -} diff --git a/IRaCIS.Core.Domain/Abandon/Report/TU_TR_RS.cs b/IRaCIS.Core.Domain/Abandon/Report/TU_TR_RS.cs deleted file mode 100644 index f07461255..000000000 --- a/IRaCIS.Core.Domain/Abandon/Report/TU_TR_RS.cs +++ /dev/null @@ -1,129 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("TU")] - public class TU : Entity - { - //病灶类型 1-非淋巴结靶病灶，2-淋巴结靶病灶，3-非靶病灶，，4-疑似新病灶，5-明确新病灶 - public int LesionType { get; set; } - public string STUDYID { get; set; } - public string DOMAIN { get; set; } = "TU"; - public string USUBJID { get; set; } - public int TUSEQ { get; set; } - public string TUGRPID { get; set; } = string.Empty; - public string TUREFID { get; set; } = string.Empty;//内部或外部的肿瘤/病灶标识。 例如：医学影像 ID - public string TUSPID { get; set; } = string.Empty; - public string TULNKID { get; set; } = string.Empty; - public string TUTESTCD { get; set; } = string.Empty; - public string TUTEST { get; set; } = string.Empty; - - //肿瘤标识的结果。 肿瘤标识的结果是对标识肿瘤的分类。 - //例如，当 TUTESTCD=TUMIDENT (肿瘤/病灶标识)时， - //TUORRES的值可能是 TARGET, NON-TARGET, NEW或者 BENIGN ABNORMALITY - public string TUORRES { get; set; } = string.Empty; - public string TUSTRESC { get; set; } = string.Empty; - public string TUNAM { get; set; } = string.Empty; - public string TULOC { get; set; } = string.Empty; - public string TULAT { get; set; } = string.Empty; - public string TUDIR { get; set; } = string.Empty; - public string TUPORTOT { get; set; } = string.Empty; - public string TUMETHOD { get; set; } = string.Empty; - public string TUEVAL { get; set; } = string.Empty; - public string TUEVALID { get; set; } = string.Empty; - public string TUACPTFL { get; set; } = string.Empty; - public decimal VISITNUM { get; set; } = 0; - public string VISIT { get; set; } = string.Empty; - public int VISITDY { get; set; } - public string EPOCH { get; set; } = string.Empty; - public string TUDTC { get; set; } = string.Empty; - public int TUDY { get; set; } = 0; - public string LocDescription { get; set; } = string.Empty; - - public string TpCode { get; set; } = string.Empty; - } - - [Table("TR")] - public class TR : Entity - { - public string STUDYID { get; set; } = string.Empty; - public string DOMAIN { get; set; } = "TR"; - public string USUBJID { get; set; } = string.Empty; - public int TRSEQ { get; set; } - public string TRGRPID { get; set; } = string.Empty; - public string TRREFID { get; set; } = string.Empty; - public string TRSPID { get; set; } = string.Empty; - public string TRLNKID { get; set; } = string.Empty; - public string TRLNKGRP { get; set; } = string.Empty; - public string TRTESTCD { get; set; } = string.Empty; - public string TRTEST { get; set; } = string.Empty; - public string TRORRES { get; set; } = string.Empty; - public double TRORRES_Double - { - get { - double temp = 0; - double.TryParse(TRORRES, out temp); - return temp; - } - } - public string TRORRESU { get; set; } = string.Empty; - public string TRSTRESC { get; set; } = string.Empty; - public double TRSTRESN { get; set; } = 0; - public string TRSTRESU { get; set; } = string.Empty; - public string TRSTAT { get; set; } = string.Empty; - public string TRREASND { get; set; } = string.Empty; - public string TRNAM { get; set; } = string.Empty; - public string TRMETHOD { get; set; } = string.Empty; - public string TREVAL { get; set; } = string.Empty; - public string TREVALID { get; set; } = string.Empty; - public string TRACPTFL { get; set; } = string.Empty; - public decimal VISITNUM { get; set; } = 0; - public string VISIT { get; set; } = string.Empty; - public int VISITDY { get; set; } = 0; - public string EPOCH { get; set; } = string.Empty; - public string TRDTC { get; set; } = string.Empty; - public int TRDY { get; set; } = 0; - public string Note { get; set; } // 备注 - public bool CoveredLesion { get; set; } = true;//本次扫描是否覆盖该病灶 - public string TpCode { get; set; } = string.Empty; - } - - [Table("RS")] - public class RS : Entity - { - public string STUDYID { get; set; } = string.Empty; - public string DOMAIN { get; set; } = "RS"; - public string USUBJID { get; set; } = string.Empty; - public int RSSEQ { get; set; } - public string RSGRPID { get; set; } = string.Empty; - public string RSREFID { get; set; } = string.Empty; - public string RSSPID { get; set; } = string.Empty; - public string RSLNKID { get; set; } = string.Empty; - public string RSLNKGRP { get; set; } = string.Empty; - public string RSTESTCD { get; set; } = string.Empty; - public string RSTEST { get; set; } = string.Empty; - public string RSCAT { get; set; } = string.Empty; - public string RSORRES { get; set; } = string.Empty; - public string RSSTRESC { get; set; } = string.Empty; - public string RSSTAT { get; set; } = string.Empty; - public string RSREASND { get; set; } = string.Empty; - public string RSNAM { get; set; } = string.Empty; - - public string RSEVAL { get; set; } = string.Empty; - public string RSEVALID { get; set; } = string.Empty; - public string RSACPTFL { get; set; } = string.Empty; - public decimal VISITNUM { get; set; } = 0; - public string VISIT { get; set; } = string.Empty; - public int VISITDY { get; set; } = 0; - public string EPOCH { get; set; } = string.Empty; - public string RSDTC { get; set; } = string.Empty; - public int RSDY { get; set; } = 0; - public string TpCode { get; set; } = string.Empty; - public Guid StudyGuid { get; set; } = Guid.Empty; - public Guid TrialGuid { get; set; } = Guid.Empty; - public Guid SubjectGuid { get; set; } = Guid.Empty; - public string Note { get; set; } = string.Empty; - - } -} diff --git a/IRaCIS.Core.Domain/Abandon/StudyDTF.cs b/IRaCIS.Core.Domain/Abandon/StudyDTF.cs deleted file mode 100644 index 0523fa865..000000000 --- a/IRaCIS.Core.Domain/Abandon/StudyDTF.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - public class StudyDTF : Entity, IAuditAdd - { - [ForeignKey("StudyId")] - public DicomStudy DicomStudy { get; set; } - public Guid StudyId { get; set; } = Guid.Empty; - - public string FileName { get; set; } = string.Empty; - - public string Path { get; set; } = string.Empty; - - - //public byte[] RowVersion { get; set; } = default; - - - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } = DateTime.Now; - } -} \ No newline at end of file diff --git a/IRaCIS.Core.Domain/Abandon/StudyReviewer.cs b/IRaCIS.Core.Domain/Abandon/StudyReviewer.cs deleted file mode 100644 index 8dc51927a..000000000 --- a/IRaCIS.Core.Domain/Abandon/StudyReviewer.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("StudyReviewer")] - public class StudyReviewer : Entity, IAuditAdd - { - public Guid StudyId { get; set; } - public Guid ReviewerId { get; set; } - - public Guid TrialId { get; set; } - - // 2是 ad 1是tp - public int WorkloadType { get; set; } = 0; - public int Status { get; set; } = 30; - public Guid CreateUserId { get; set; } - public DateTime CreateTime { get; set; } = DateTime.Now; - } -} diff --git a/IRaCIS.Core.Domain/Abandon/StudyStatusDetail.cs b/IRaCIS.Core.Domain/Abandon/StudyStatusDetail.cs deleted file mode 100644 index 825d38075..000000000 --- a/IRaCIS.Core.Domain/Abandon/StudyStatusDetail.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("StudyStatusDetail")] - public class StudyStatusDetail : Entity - { - public Guid StudyId { get; set; } - public int Status { get; set; } = 0; - public string OptUserName { get; set; } = string.Empty; - public DateTime OptTime { get; set; } = DateTime.Now; - public string Note { get; set; } = string.Empty; - } -} diff --git a/IRaCIS.Core.Domain/Abandon/SystemLog.cs b/IRaCIS.Core.Domain/Abandon/SystemLog.cs deleted file mode 100644 index 37e6e248e..000000000 --- a/IRaCIS.Core.Domain/Abandon/SystemLog.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("SystemLog")] - public partial class SystemLog : Entity - { - public string ApiPath { get; set; } = string.Empty; - public string Params { get; set; } = string.Empty; - public string Result { get; set; } = string.Empty; - public DateTime RequestTime { get; set; } = DateTime.Now; - public long ElapsedMilliseconds { get; set; } = 0; - public Guid OptUserId { get; set; } = Guid.Empty; - public string OptUserName { get; set; } = string.Empty; - public string ClientIP { get; set; } = string.Empty; - public bool Status { get; set; } = true; - public string Message { get; set; } = string.Empty; - public string LogCategory { get; set; } = string.Empty; - } -} diff --git a/IRaCIS.Core.Domain/Abandon/TrialAttachment.cs b/IRaCIS.Core.Domain/Abandon/TrialAttachment.cs deleted file mode 100644 index 9cbae133e..000000000 --- a/IRaCIS.Core.Domain/Abandon/TrialAttachment.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("TrialAttachment")] - public class TrialAttachment : Entity, IAuditUpdate, IAuditAdd - { - public Guid TrialId { get; set; } - public string Type { get; set; } = String.Empty; - public string DocumentName { get; set; } = String.Empty; - public string DocumentPath { get; set; } = String.Empty; - - public string UserTypes { get; set; } = String.Empty; - - public DateTime CreateTime { get; set; } - public Guid CreateUserId { get; set; } - public DateTime UpdateTime { get; set; } - public Guid UpdateUserId { get; set; } - } -} diff --git a/IRaCIS.Core.Domain/Abandon/WorkloadDistribution.cs b/IRaCIS.Core.Domain/Abandon/WorkloadDistribution.cs deleted file mode 100644 index d5972cc07..000000000 --- a/IRaCIS.Core.Domain/Abandon/WorkloadDistribution.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations.Schema; - -namespace IRaCIS.Core.Domain.Models -{ - [Table("WorkloadTP")] - public class WorkloadTP : Entity - { - public Guid TrialId { get; set; } - public Guid SiteId { get; set; } - public Guid SubjectId { get; set; } - public Guid SubjectVisitId { get; set; } - public Guid StudyId { get; set; } - public string TimepointCode { get; set; } - public Guid ReviewerId { get; set; } - public int Status { get; set; } - public DateTime UpdateTime { get; set; } - } - - [Table("WorkloadGlobal")] - public class WorkloadGlobal : Entity - { - public Guid SiteId { get; set; } - public Guid VisitId { get; set; } - public string VisitName { get; set; } - - - // 项目Id，受试者Id，num 共同决定 Global 关联的所有study， - // 暂定设计成这样，后期如有需要，爱用中间表 关联。 - public Guid TrialId { get; set; } - public Guid SubjectId { get; set; } - public decimal VisitNum { get; set; } - - public string GlobalCode { get; set; } - public Guid ReviewerId { get; set; } - public int Status { get; set; } - public DateTime UpdateTime { get; set; } - } - - [Table("WorkloadAD")] - public class WorkloadAD : Entity - { - public Guid TrialId { get; set; } - public Guid SiteId { get; set; } - public Guid SubjectId { get; set; } - public string ADCode { get; set; } - public Guid ReviewerId { get; set; } - public int Status { get; set; } - public DateTime UpdateTime { get; set; } - public Guid Global1Id { get; set; } - public Guid Global2Id { get; set; } - - public Guid? SelectGlobalId { get; set; } - - public string AdNote { get; set; } - } - - [Table("WorkloadDetail")] - public class WorkloadDetail : Entity - { - public Guid WorkloadId { get; set; } - public string OptUserName { get; set; } - public DateTime OptTime { get; set; } = DateTime.Now; - public int Status { get; set; } - public Guid ReviewerId { get; set; } = Guid.Empty; - } -} diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index af07c7462..c1e7eed83 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -311,7 +311,6 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet PreviousOther { get; set; } public virtual DbSet PreviousHistory { get; set; } - public virtual DbSet StudyDTF { get; set; } public virtual DbSet DicomStudys { get; set; } public virtual DbSet DicomSeries { get; set; } public virtual DbSet DicomInstances { get; set; } @@ -367,7 +366,6 @@ namespace IRaCIS.Core.Infra.EFCore public virtual DbSet TrialSiteEquipmentSurvey { get; set; } public virtual DbSet TrialSiteSurvey { get; set; } - public virtual DbSet StudyStatusDetails { get; set; } diff --git a/IRaCIS.Core.Infra.EFCore/Report/ITU_TR_RSRepository.cs b/IRaCIS.Core.Infra.EFCore/Report/ITU_TR_RSRepository.cs deleted file mode 100644 index 98f0bfff7..000000000 --- a/IRaCIS.Core.Infra.EFCore/Report/ITU_TR_RSRepository.cs +++ /dev/null @@ -1,17 +0,0 @@ -using IRaCIS.Core.Domain.Models; -using System; -using System.Collections.Generic; -using System.Text; - -namespace IRaCIS.Core.Infra.EFCore -{ - public interface ITURepository : IRepository - { - } - public interface ITRRepository : IRepository - { - } - public interface IRSRepository : IRepository - { - } -} diff --git a/IRaCIS.Core.Infra.EFCore/Report/IWorkloadDistributionRepository.cs b/IRaCIS.Core.Infra.EFCore/Report/IWorkloadDistributionRepository.cs deleted file mode 100644 index 8be864125..000000000 --- a/IRaCIS.Core.Infra.EFCore/Report/IWorkloadDistributionRepository.cs +++ /dev/null @@ -1,19 +0,0 @@ -using IRaCIS.Core.Domain.Models; -using IRaCIS.Core.Domain; - -namespace IRaCIS.Core.Infra.EFCore -{ - public interface IWorkloadTPRepository : IRepository - { - } - public interface IWorkloadGlobalRepository : IRepository - { - } - public interface IWorkloadADRepository : IRepository - { - } - - public interface IWorkloadDetailRepository : IRepository - { - } -} diff --git a/IRaCIS.Core.Infra.EFCore/Report/TU_TR_RSRepository.cs b/IRaCIS.Core.Infra.EFCore/Report/TU_TR_RSRepository.cs deleted file mode 100644 index 14200d8b6..000000000 --- a/IRaCIS.Core.Infra.EFCore/Report/TU_TR_RSRepository.cs +++ /dev/null @@ -1,27 +0,0 @@ -using IRaCIS.Core.Infra.EFCore; -using IRaCIS.Core.Domain.Models; - -namespace IRaCIS.Core.Infra.EFCore -{ - //public class TURepository : Repository, ITURepository - //{ - // public TURepository(IRaCISDBContext db) : base(db) - // { - - // } - //} - //public class TRRepository : Repository, ITRRepository - //{ - // public TRRepository(IRaCISDBContext db) : base(db) - // { - - // } - //} - //public class RSRepository : Repository, IRSRepository - //{ - // public RSRepository(IRaCISDBContext db) : base(db) - // { - - // } - //} -} diff --git a/IRaCIS.Core.Infra.EFCore/Report/WorkloadDistributionRepository.cs b/IRaCIS.Core.Infra.EFCore/Report/WorkloadDistributionRepository.cs deleted file mode 100644 index a63d1201d..000000000 --- a/IRaCIS.Core.Infra.EFCore/Report/WorkloadDistributionRepository.cs +++ /dev/null @@ -1,35 +0,0 @@ -using IRaCIS.Core.Infra.EFCore; -using IRaCIS.Core.Domain.Models; - -namespace IRaCIS.Core.Infra.EFCore -{ - //public class WorkloadTPRepository : Repository, IWorkloadTPRepository - //{ - // public WorkloadTPRepository(IRaCISDBContext db) : base(db) - // { - - // } - //} - //public class WorkloadGlobalRepository : Repository, IWorkloadGlobalRepository - //{ - // public WorkloadGlobalRepository(IRaCISDBContext db) : base(db) - // { - - // } - //} - //public class WorkloadADRepository : Repository, IWorkloadADRepository - //{ - // public WorkloadADRepository(IRaCISDBContext db) : base(db) - // { - - // } - //} - - //public class WorkloadDetailRepository : Repository, IWorkloadDetailRepository - //{ - // public WorkloadDetailRepository(IRaCISDBContext db) : base(db) - // { - - // } - //} -}