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

修改

Uat_Study
he 2022-10-17 09:26:28 +08:00
parent fe4160571e
commit 5cfe8c6596
4 changed files with 13 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
View File

@ -13,6 +13,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public Guid VisitTaskId { get; set; } public Guid VisitTaskId { get; set; }
public bool IsChangeOtherTask { get; set; } public bool IsChangeOtherTask { get; set; }
} }

32
IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
View File

@ -214,20 +214,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
{ {
public Guid? Id { get; set; } public Guid? Id { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 对象ID
/// </summary>
public Guid ReadingId { get; set; }
/// <summary>
/// 受试者ID
/// </summary>
public Guid SubjectId { get; set; }
/// <summary> /// <summary>
/// 阅片临床数据ID /// 阅片临床数据ID
@ -257,20 +243,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid? Id { get; set; } public Guid? Id { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 对象ID
/// </summary>
public Guid ReadingId { get; set; }
/// <summary>
/// 受试者ID
/// </summary>
public Guid SubjectId { get; set; }
/// <summary> /// <summary>
/// 阅片临床数据ID /// 阅片临床数据ID
@ -291,11 +264,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// 是否为访视 /// 是否为访视
/// </summary> /// </summary>
public bool IsVisit { get; set; } public bool IsVisit { get; set; }
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
} }

24
IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
View File

@ -87,14 +87,14 @@ namespace IRaCIS.Application.Services
var entity = _mapper.Map<ReadingClinicalData>(indto); var entity = _mapper.Map<ReadingClinicalData>(indto);
entity.ReadingClinicalDataPDFList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF() entity.ReadingClinicalDataPDFList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF()
{ {
TrialId = entity.TrialId, //TrialId = entity.TrialId,
SubjectId = indto.SubjectId, //SubjectId = indto.SubjectId,
FileName = x.FileName, FileName = x.FileName,
Path = x.Path, Path = x.Path,
ClinicalDataTrialSetId = indto.ClinicalDataTrialSetId, //ClinicalDataTrialSetId = indto.ClinicalDataTrialSetId,
IsVisit = indto.IsVisit, //IsVisit = indto.IsVisit,
ClinicalDataLevel = clinicalDataTrialSet.ClinicalDataLevel, //ClinicalDataLevel = clinicalDataTrialSet.ClinicalDataLevel,
ReadingId = indto.ReadingId //ReadingId = indto.ReadingId
}).ToList(); }).ToList();
entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded; entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
@ -113,14 +113,14 @@ namespace IRaCIS.Application.Services
var addFileList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF() var addFileList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF()
{ {
TrialId = entity.TrialId, //TrialId = entity.TrialId,
SubjectId = indto.SubjectId, //SubjectId = indto.SubjectId,
FileName = x.FileName, FileName = x.FileName,
Path = x.Path, Path = x.Path,
ClinicalDataTrialSetId = indto.ClinicalDataTrialSetId, //ClinicalDataTrialSetId = indto.ClinicalDataTrialSetId,
IsVisit = indto.IsVisit, //IsVisit = indto.IsVisit,
ClinicalDataLevel = clinicalDataTrialSet.ClinicalDataLevel, //ClinicalDataLevel = clinicalDataTrialSet.ClinicalDataLevel,
ReadingId = indto.ReadingId, //ReadingId = indto.ReadingId,
ReadingClinicalDataId = entity.Id, ReadingClinicalDataId = entity.Id,
}).ToList(); }).ToList();
await _readingClinicalDataPDFRepository.AddRangeAsync(addFileList); await _readingClinicalDataPDFRepository.AddRangeAsync(addFileList);

33
IRaCIS.Core.Domain/Reading/ClinicalData/ReadingClinicalDataPDF.cs
View File

@ -13,21 +13,6 @@ namespace IRaCIS.Core.Domain.Models
[Table("ReadingClinicalDataPDF")] [Table("ReadingClinicalDataPDF")]
public class ReadingClinicalDataPDF : Entity, IAuditAdd public class ReadingClinicalDataPDF : Entity, IAuditAdd
{ {
/// <summary>
/// 项目ID
/// </summary>
public Guid TrialId { get; set; }
/// <summary>
/// 对象ID
/// </summary>
public Guid ReadingId { get; set; }
/// <summary>
/// 受试者ID
/// </summary>
public Guid SubjectId { get; set; }
/// <summary> /// <summary>
/// 阅片临床数据ID /// 阅片临床数据ID
/// </summary> /// </summary>
@ -45,15 +30,6 @@ namespace IRaCIS.Core.Domain.Models
[Required] [Required]
public string FileName { get; set; } public string FileName { get; set; }
/// <summary>
/// 是否为访视
/// </summary>
public bool IsVisit { get; set; }
/// <summary>
/// 临床级别
/// </summary>
public ClinicalLevel ClinicalDataLevel { get; set; }
/// <summary> /// <summary>
/// 创建时间 /// 创建时间
@ -65,15 +41,6 @@ namespace IRaCIS.Core.Domain.Models
/// </summary> /// </summary>
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
/// <summary>
/// 项目模板Id
/// </summary>
public Guid ClinicalDataTrialSetId { get; set; }
[ForeignKey("ReadingClinicalDataId")] [ForeignKey("ReadingClinicalDataId")]
public ReadingClinicalData ReadingClinicalData { get; set; } public ReadingClinicalData ReadingClinicalData { get; set; }