diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomInstanceModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomInstanceModel.cs index e823f20f4..d46b7e539 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomInstanceModel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomInstanceModel.cs @@ -55,6 +55,9 @@ namespace IRaCIS.Core.Application.Contracts public SubmitStateEnum SubmitState { get; set; } + public AuditStateEnum AuditState { get; set; } + public ForwardStateEnum ForwardState { get; set; } + //public string SubjectName => LastName + " / " + FirstName; //public string FirstName { get; set; } = string.Empty; //public string LastName { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 341054aa0..038b02c99 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -1943,10 +1943,10 @@ namespace IRaCIS.Core.Application.Image.QA var info = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).ProjectTo(_mapper.ConfigurationProvider).FirstOrDefaultAsync(); Dictionary keyValuePairs = new Dictionary() { - {"SubmitState","已提交" }, - { "AuditState","通过"}, - { "CheckState",info.CheckState== CheckStateEnum.CVIng? "核查中": "核查通过"}, - { "ForwardState",""} + {"SubmitState",info.SubmitState }, + { "AuditState",info.AuditState}, + { "CheckState",info.CheckState}, + { "ForwardState",info.ForwardState} }; DataInspection data = new DataInspection() @@ -2016,14 +2016,14 @@ namespace IRaCIS.Core.Application.Image.QA await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() { ForwardState = ForwardStateEnum.Forwarded, ForwardUserId = _userInfo.Id, ForwardTime = DateTime.Now }); - keyValuePairs["ForwardState"] = "转发成功"; + keyValuePairs["ForwardState"] = ForwardStateEnum.Forwarded; } catch (Exception e) { await _subjectVisitRepository.BatchUpdateAsync(t => t.Id == subjectVisitId, u => new SubjectVisit() { ForwardState = ForwardStateEnum.ForwardFailed }); - keyValuePairs["ForwardState"] = "转发失败"; + keyValuePairs["ForwardState"] = ForwardStateEnum.ForwardFailed; } diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs index 591243212..9154b68a7 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs +++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs @@ -602,10 +602,7 @@ namespace IRaCIS.Core.Infra.EFCore IsSign = false, CreateTime = createtime, Identification = "Init|Subject|Status|Subject", - JsonDetail = JsonConvert.SerializeObject(new - { - Status = "新增", - }) + JsonDetail = JsonConvert.SerializeObject(entity) }); } await AddListInspectionRecordAsync(datas);