添加json

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -144,8 +144,15 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> AddOrUpdateNoneDicomStudy(DataInspectionDto<NoneDicomStudyAddOrEdit> 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<string, object> keyValuePairs = new Dictionary<string, object>();
+                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);
         }
 
 

IRaCIS.Core.Application/Service/Inspection/InspectionService.cs

@@ -150,6 +150,8 @@ namespace IRaCIS.Core.Application.Service.Inspection
         }
 
 
+     
+
         /// <summary>
         /// 通用逻辑封装
         /// </summary>
@@ -320,6 +322,24 @@ namespace IRaCIS.Core.Application.Service.Inspection
 
         }
 
+        /// <summary>
+        /// 往json里面添加属性
+        /// </summary>
+        /// <param name="json">json</param>
+        /// <param name="keyValues">字典</param>
+        /// <returns></returns>
+        public string AddJsonItem(string json, Dictionary<string,object> keyValues)
+        {
+          
+            var JsonData = JsonConvert.DeserializeObject<IDictionary<string, object>>(json);
+            foreach (var item in keyValues)
+            {
+                JsonData.Add(item.Key, item.Value);
+            }
+            return JsonConvert.SerializeObject(JsonData);
+
+        }
+
         /// <summary>
         /// 处理枚举
         /// </summary>

IRaCIS.Core.Application/Service/Inspection/Interface/IInspectionService.cs

@@ -13,6 +13,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.Interface
 
         Task<PageOutput<GetDataInspectionOutDto>> GetInspectionData(GetDataInspectionDto dto);
 
+        string AddJsonItem(string json, Dictionary<string, object> keyValues);
         void MapData(dynamic data, dynamic mapData);
 
         Task<IResponseOutput> VerifySignatureAsync(SignDTO signDTO);

IRaCIS.Core.Application/Service/QC/Interface/INoneDicomStudyService.cs

@@ -12,7 +12,7 @@ namespace IRaCIS.Core.Application.Contracts
 {
     public interface INoneDicomStudyService
     {
-        Task<IResponseOutput> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy);
+        Task<IResponseOutput<string>> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy);
         Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId);
         Task<IResponseOutput> DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId);
         Task<List<NoneDicomStudyFileView>> GetNoneDicomStudyFileList(Guid noneDicomStudyId);

IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs

@@ -55,7 +55,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         [UnitOfWork]
         [TypeFilter(typeof(TrialResourceFilter))]
-        public async Task<IResponseOutput> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy)
+        public async Task<IResponseOutput<string>> 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);
 
         }
 

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -915,6 +915,7 @@ namespace IRaCIS.Core.Application.Image.QA
             return ResponseOutput.Ok();
         }
 
+
         /// <summary>
         /// 验证是否质疑都关闭了 可以审核通过和不通过
         /// </summary>
@@ -930,7 +931,8 @@ namespace IRaCIS.Core.Application.Image.QA
             }
             return ResponseOutput.Ok();
         }
-
+        
+    
 
 
         /// <summary>