diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index a4e5663af..10ade6544 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -144,8 +144,15 @@ namespace IRaCIS.Core.API.Controllers [UnitOfWork] public async Task AddOrUpdateNoneDicomStudy(DataInspectionDto opt) { - var fun = _noneDicomStudyService.AddOrUpdateNoneDicomStudy; - return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun); + var fun = await _noneDicomStudyService.AddOrUpdateNoneDicomStudy(opt.OptCommand); + if (opt.OptCommand.Id == null) + { + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("CodeView", fun.Data); + opt.AuditInfo.JsonDetail = _inspectionService.AddJsonItem(opt.AuditInfo.JsonDetail, keyValuePairs); + } + + return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun); } diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index 6d8b51f3c..f08dcfbb1 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -150,6 +150,8 @@ namespace IRaCIS.Core.Application.Service.Inspection } + + /// /// 通用逻辑封装 /// @@ -320,6 +322,24 @@ namespace IRaCIS.Core.Application.Service.Inspection } + /// + /// 往json里面添加属性 + /// + /// json + /// 字典 + /// + public string AddJsonItem(string json, Dictionary keyValues) + { + + var JsonData = JsonConvert.DeserializeObject>(json); + foreach (var item in keyValues) + { + JsonData.Add(item.Key, item.Value); + } + return JsonConvert.SerializeObject(JsonData); + + } + /// /// 处理枚举 /// diff --git a/IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs index a8ab1d8e7..b425acea0 100644 --- a/IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs @@ -13,6 +13,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.Interface Task> GetInspectionData(GetDataInspectionDto dto); + string AddJsonItem(string json, Dictionary keyValues); void MapData(dynamic data, dynamic mapData); Task VerifySignatureAsync(SignDTO signDTO); diff --git a/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs index 0467bfb06..ee879ebc5 100644 --- a/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs @@ -12,7 +12,7 @@ namespace IRaCIS.Core.Application.Contracts { public interface INoneDicomStudyService { - Task AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy); + Task> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy); Task DeleteNoneDicomStudy(Guid noneDicomStudyId); Task DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId); Task> GetNoneDicomStudyFileList(Guid noneDicomStudyId); diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs index 0b79a70e1..7098cf151 100644 --- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs @@ -55,7 +55,7 @@ namespace IRaCIS.Core.Application.Contracts [UnitOfWork] [TypeFilter(typeof(TrialResourceFilter))] - public async Task AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy) + public async Task> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy) { var entity = await _noneDicomStudyRepository.InsertOrUpdateAsync(addOrEditNoneDicomStudy, false); @@ -90,7 +90,7 @@ namespace IRaCIS.Core.Application.Contracts await _repository.SaveChangesAsync(); - return ResponseOutput.Ok(entity.Id); + return ResponseOutput.Ok(entity.StudyCode); } diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index d0e3ea134..e1607c306 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -915,6 +915,7 @@ namespace IRaCIS.Core.Application.Image.QA return ResponseOutput.Ok(); } + /// /// 验证是否质疑都关闭了 可以审核通过和不通过 /// @@ -930,7 +931,8 @@ namespace IRaCIS.Core.Application.Image.QA } return ResponseOutput.Ok(); } - + + ///