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

修改code

Uat_Study
hang 2022-04-12 10:51:58 +08:00
parent 977d83924d
commit d41c7cb16f
6 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
View File

@ -34,13 +34,13 @@ namespace IRaCIS.Core.Application.Contracts
public DateTime UploadTime { get; set; } public DateTime UploadTime { get; set; }
public string StudyCode => IsDicom ? DicomStudyCode : "NST" + NoneDicomCode.ToString("D5"); public string StudyCode { get; set; }
[JsonIgnore] //[JsonIgnore]
public string DicomStudyCode { get; set; } = string.Empty; //public string DicomStudyCode { get; set; } = string.Empty;
[JsonIgnore] //[JsonIgnore]
public int NoneDicomCode { get; set; } //public int NoneDicomCode { get; set; }
public bool IsDicom { get; set; } public bool IsDicom { get; set; }
} }

12
IRaCIS.Core.Application/Service/ImageAndDoc/StudyListService.cs
View File

@ -51,8 +51,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
Count = t.SeriesCount, Count = t.SeriesCount,
DicomStudyCode = t.StudyCode, StudyCode = t.StudyCode,
NoneDicomCode = 0,
//DicomStudyCode = t.StudyCode,
//NoneDicomCode = 0,
StudyTime = t.StudyTime, StudyTime = t.StudyTime,
@ -97,8 +99,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
Count = t.NoneDicomFileList.Count(), Count = t.NoneDicomFileList.Count(),
NoneDicomCode = t.Code, StudyCode = t.StudyCode,
DicomStudyCode = string.Empty,
//NoneDicomCode = t.Code,
//DicomStudyCode = string.Empty,
StudyTime = t.ImageDate, StudyTime = t.ImageDate,

2
IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs
View File

@ -10,7 +10,7 @@ namespace IRaCIS.Core.Application.Contracts
/// <summary> NoneDicomStudyView 列表视图模型 </summary> /// <summary> NoneDicomStudyView 列表视图模型 </summary>
public class NoneDicomStudyView public class NoneDicomStudyView
{ {
public string CodeView => "NST" + Code.ToString("D5"); public string CodeView { get; set; }
public int Code {get;set;} public int Code {get;set;}
public Guid Id { get; set; } public Guid Id { get; set; }

1
IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs
View File

@ -50,6 +50,7 @@ namespace IRaCIS.Core.Application.Contracts
entity.Code = _noneDicomStudyRepository.Where(t => t.TrialId == addOrEditNoneDicomStudy.TrialId).Select(t => t.Code).DefaultIfEmpty().Max() + 1; entity.Code = _noneDicomStudyRepository.Where(t => t.TrialId == addOrEditNoneDicomStudy.TrialId).Select(t => t.Code).DefaultIfEmpty().Max() + 1;
} }
entity.StudyCode = "NST" + entity.Code.ToString("D5");
await _repository.SaveChangesAsync(); await _repository.SaveChangesAsync();
var svTime = _repository.Where<SubjectVisit>(t => t.Id == addOrEditNoneDicomStudy.SubjectVisitId).Select(t => new var svTime = _repository.Where<SubjectVisit>(t => t.Id == addOrEditNoneDicomStudy.SubjectVisitId).Select(t => new

3
IRaCIS.Core.Application/Service/QC/_MapConfig.cs
View File

@ -233,7 +233,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<NoneDicomStudy, NoneDicomStudyView>() CreateMap<NoneDicomStudy, NoneDicomStudyView>()
.ForMember(d => d.FileCount, u => u.MapFrom(s => s.NoneDicomFileList.Count)) .ForMember(d => d.FileCount, u => u.MapFrom(s => s.NoneDicomFileList.Count))
.ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => s.NoneDicomFileList)); .ForMember(d => d.NoneDicomStudyFileList, u => u.MapFrom(s => s.NoneDicomFileList))
.ForMember(d => d.CodeView, u => u.MapFrom(s => s.StudyCode));
} }

4
IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs
View File

@ -23,6 +23,8 @@ namespace IRaCIS.Core.Domain.Models
public Subject Subject { get; set; } public Subject Subject { get; set; }
public string StudyCode { get; set; } = string.Empty;
public int Code { get; set; } public int Code { get; set; }
/// <summary> /// <summary>
@ -98,7 +100,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// Description /// Description
/// </summary> /// </summary>
public string Description { get; set; } public string Description { get; set; } = string.Empty;
} }