diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index 5126261a9..a5c0261b6 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -34,13 +34,13 @@ namespace IRaCIS.Core.Application.Contracts public DateTime UploadTime { get; set; } - public string StudyCode => IsDicom ? DicomStudyCode : "NST" + NoneDicomCode.ToString("D5"); + public string StudyCode { get; set; } - [JsonIgnore] - public string DicomStudyCode { get; set; } = string.Empty; - [JsonIgnore] - public int NoneDicomCode { get; set; } + //[JsonIgnore] + //public string DicomStudyCode { get; set; } = string.Empty; + //[JsonIgnore] + //public int NoneDicomCode { get; set; } public bool IsDicom { get; set; } } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyListService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyListService.cs index a02d0ee25..8b5aed6f0 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyListService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyListService.cs @@ -51,8 +51,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc Count = t.SeriesCount, - DicomStudyCode = t.StudyCode, - NoneDicomCode = 0, + StudyCode = t.StudyCode, + + //DicomStudyCode = t.StudyCode, + //NoneDicomCode = 0, StudyTime = t.StudyTime, @@ -97,8 +99,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc Count = t.NoneDicomFileList.Count(), - NoneDicomCode = t.Code, - DicomStudyCode = string.Empty, + StudyCode = t.StudyCode, + + //NoneDicomCode = t.Code, + //DicomStudyCode = string.Empty, StudyTime = t.ImageDate, diff --git a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs index f4786ca1b..920e37a81 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/NoneDicomStudyViewModel.cs @@ -10,7 +10,7 @@ namespace IRaCIS.Core.Application.Contracts /// NoneDicomStudyView 列表视图模型 public class NoneDicomStudyView { - public string CodeView => "NST" + Code.ToString("D5"); + public string CodeView { get; set; } public int Code {get;set;} public Guid Id { get; set; } diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs index 985ac4231..9a38f64bd 100644 --- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs @@ -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.StudyCode = "NST" + entity.Code.ToString("D5"); await _repository.SaveChangesAsync(); var svTime = _repository.Where(t => t.Id == addOrEditNoneDicomStudy.SubjectVisitId).Select(t => new diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs index f2cac1e4f..846e0b26c 100644 --- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs @@ -233,7 +233,8 @@ namespace IRaCIS.Core.Application.Service CreateMap() .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)); } diff --git a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs index f3531cb02..3528bddf7 100644 --- a/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs +++ b/IRaCIS.Core.Domain/QC/NoneDicom/NoneDicomStudy.cs @@ -23,6 +23,8 @@ namespace IRaCIS.Core.Domain.Models public Subject Subject { get; set; } + public string StudyCode { get; set; } = string.Empty; + public int Code { get; set; } /// @@ -98,8 +100,8 @@ namespace IRaCIS.Core.Domain.Models /// /// Description /// - public string Description { get; set; } - - } + public string Description { get; set; } = string.Empty; + + } }