+
Dear {0},
-
- As the IRC service provider of {1} trial (Protocol ID is {2}), Extensive Imaging invites you to participate in IRC-related work of this trial.
+
+ Hello, as the IRC supplier of [ {1} (Protocol ID is {2}) ] project，Extiming sincerely invites you to participate in the IRC related work of this project. Your guidance and suggestions are welcome.
- Digital workflow is implemented for this trial, and your account information is as follows:
+ This project adopts electronic workflow. The system and your account information are as follows：
-
+
Trial ID: {3}
@@ -25,26 +25,26 @@
Protocol ID: {2}
- Study Name: {1}
+ Study name: {1}
- User Name: {4}
+ User name: {4}
Role: {5}
-
-
Best regards,
-
Extensive Imaging
+
+
Best Regards
+
Extensive Imaging
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
index d6bfd963e..2aadf9005 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon.html
@@ -8,18 +8,20 @@
- 亲爱的用户 ,
+ Hello {0},
感谢您使用展影云平台。
- {0}，验证码是: {1}，请在3分钟内输入该验证码，进行后续操作。如非本人操作，请忽略该邮件。
+ {1}，验证码是: {2}。
+
+
+ 请在3分钟内输入该验证码，进行后续操作
-
-
祝您顺利！/Best Regards
-
展影医疗
+
祝您顺利！
+
上海展影医疗科技有限公司
diff --git a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html
index e828eb2ea..06b1b5c89 100644
--- a/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html
+++ b/IRaCIS.Core.API/wwwroot/EmailTemplate/UserOptCommon_US.html
@@ -4,25 +4,25 @@
Title
-
+
-
- Dear Sir or Madam:
+
+ Hello {0},
-
- Thank you for using our IRC imaging system.
+
+ Thank you for using Extensive Imaging’s cloud system!
-
- {0}, the verification code is {1}. Please enter this code within 3 minutes for follow-up operations.
+
+ {1}, and the verification code is {2}.
-
- If you are not the intended person, please ignore this email.
+
+ Please enter this verification code within 3 minutes for subsequent operations.
-
-
Best regards,
-
Extensive Imaging
+
+
Best Regards
+
Extensive Imaging
diff --git a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs
index 7b1ab197b..bc7db9531 100644
--- a/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs
+++ b/IRaCIS.Core.Application/Service/Common/CommonDocumentService.cs
@@ -114,7 +114,7 @@ namespace IRaCIS.Core.Application.Service
[HttpDelete("{commonDocumentId:guid}")]
public async Task
DeleteCommonDocument(Guid commonDocumentId)
{
- var success = await _commonDocumentRepository.DeleteFromQueryAsync(t => t.Id == commonDocumentId, true);
+ var success = await _commonDocumentRepository.DeleteFromQueryAsync(t => t.Id == commonDocumentId, true,true);
return ResponseOutput.Ok();
}
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/DTO/PersonalWorkstationViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
index f8d22c930..b532ad300 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs
@@ -288,7 +288,7 @@ namespace IRaCIS.Core.Application.Contracts
public string TrialStatusStr { get; set; }
-
+ #region PM
public int? ExpetiedTaskCount { get; set; }
@@ -299,6 +299,9 @@ namespace IRaCIS.Core.Application.Contracts
public int? PendingResponseCount { get; set; }
+ #endregion
+
+
public bool IsIQCHaveToBeDone { get; set; }
public bool IsCRCHaveToBeDone { get; set; }
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index ac8f54f33..11415ad04 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -1283,25 +1283,6 @@ namespace IRaCIS.Core.Application
}
- #region 废弃
- #region 上传影像
-
- #endregion
-
- #region QC
-
- #endregion
-
- #region 一致性核查
-
- #endregion
-
- #region 阅片
-
- #endregion
-
- #endregion
-
#endregion
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.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs b/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs
index 46b8e1861..016c334b5 100644
--- a/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs
+++ b/IRaCIS.Core.Application/_MediatR/Handlers/ConsistencyVerificationHandler.cs
@@ -112,14 +112,14 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
StringBuilder dialogMsg = new StringBuilder();
- //---您好,根据本系统自动识别，该受试者当前访视在IRC系统中已提交的影像检查情况如下：
+ //---您好,根据本系统自动识别，该受试者当前访视在IRC系统中已提交的影像检查情况如下：
dialogMsg.Append(StaticData.International("ConsistencyVerification_Img"));
var num = 0;
List paramInfoList = new List();
foreach (var item in dbVisitStudyList)
{
num++;
- dialogMsg.AppendLine($"
{num}.{item.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}");
+ dialogMsg.AppendLine($"
{num}. {item.StudyDate} {(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}");
paramInfoList.Add(new ParamInfoDto()
{
Modality = item.Modality,
@@ -176,7 +176,7 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
if (dbExceptExcel.Count() == 0 && excelExceptDB.Count() == 0)
{
dialogMsg.AppendLine($"
");
- //---核对EDC数据，完全一致, 审核通过
+ //---核对EDC数据，完全一致, 审核通过
dialogMsg.AppendLine(StaticData.International("ConsistencyVerification_EDCA"));
@@ -184,9 +184,9 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
dbSV.CheckState = CheckStateEnum.CVPassed;
dbSV.CheckUserId = _userInfo.Id;
dbSV.CheckPassedTime = DateTime.Now;
- //---核对EDC数据，完全一致
+ //---核对EDC数据，完全一致
dbSV.CheckResult = StaticData.International("ConsistencyVerification_EDCB");
- //---自动核查通过
+ //---自动核查通过
dbSV.ManualPassReason = StaticData.International("ConsistencyVerification_Auto");
//维护状态
@@ -214,14 +214,19 @@ namespace IRaCIS.Core.Application.MediatR.Handlers
{
num++;
//影像检查(EDC 缺少) ConsistencyVerification_EdcL
- dialogMsg.AppendLine($"
{num}.{item.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_EdcL")} ");
+
+
+ dialogMsg.AppendLine($"
{num}. {StaticData.International("ConsistencyVerification_EdcL")}{item.StudyDate}{(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}");
+
}
foreach (var item in excelExceptDB)
{
num++;
+
// 影像检查(IRC 缺少)
- dialogMsg.AppendLine($"
{num}.{item.StudyDate}{StaticData.International("ConsistencyVerification_Of")}{item.Modality}{StaticData.International("ConsistencyVerification_IrcL")} ");
+ dialogMsg.AppendLine($"
{num}. {StaticData.International("ConsistencyVerification_IrcL")}{item.StudyDate}{(_userInfo.IsEn_Us ? string.Empty : StaticData.International("ConsistencyVerification_Of"))}{item.Modality}{StaticData.International("ConsistencyVerification_ImgC")}");
+
}
dialogMsg.AppendLine($"
");
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)
- // {
-
- // }
- //}
-}