提交 修改

IRaCIS.Core.API/Controllers/InspectionController.cs

@@ -120,6 +120,7 @@ namespace IRaCIS.Core.API.Controllers
             {
                 return ResponseOutput.NotOk(fun.ErrorMessage);
             }
+
             return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
         }
 
@@ -155,10 +156,11 @@ namespace IRaCIS.Core.API.Controllers
             if (opt.OptCommand.Id == null)
             {
                 Dictionary<string, object> keyValuePairs = new Dictionary<string, object>();
-                keyValuePairs.Add("CodeView", fun.Data);
+                keyValuePairs.Add("CodeView", fun.Data.StudyCode);
                 opt.AuditInfo.JsonDetail = _inspectionService.AddJsonItem(opt.AuditInfo.JsonDetail, keyValuePairs);
             }
 
+            opt.AuditInfo.GeneralId = fun.Data.Id;
             return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
         }
 
@@ -173,6 +175,7 @@ namespace IRaCIS.Core.API.Controllers
         public async Task<IResponseOutput> DeleteNoneDicomStudy(DataInspectionDto<IDDto> opt)
         {
             var fun = _noneDicomStudyService.DeleteNoneDicomStudy;
+            opt.AuditInfo.GeneralId = opt.OptCommand.Id;
             return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
         }
 
@@ -188,6 +191,7 @@ namespace IRaCIS.Core.API.Controllers
         public async Task<IResponseOutput> deleteNoneDicomStudyFile(DataInspectionDto<IDDto> opt)
         {
             var fun = _noneDicomStudyService.DeleteNoneDicomStudyFile;
+            opt.AuditInfo.GeneralId = opt.OptCommand.Id;
             return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
         }
 
@@ -204,9 +208,9 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> AddOrUpdatePreviousHistory(DataInspectionDto<PreviousHistoryAddOrEdit> opt)
         {
-
-            var fun = _clinicalDataService.AddOrUpdatePreviousHistory;
-            return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
+            var fun = await _clinicalDataService.AddOrUpdatePreviousHistory(opt.OptCommand);
+            opt.AuditInfo.GeneralId = fun.Data;
+            return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
         }
 
 
@@ -220,6 +224,7 @@ namespace IRaCIS.Core.API.Controllers
         public async Task<IResponseOutput> DeletePreviousHistory(DataInspectionDto<IDDto> opt)
         {
             var fun = _clinicalDataService.DeletePreviousHistory;
+            opt.AuditInfo.GeneralId = opt.OptCommand.Id;
             return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
         }
 
@@ -235,9 +240,9 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> AddOrUpdatePreviousSurgery(DataInspectionDto<PreviousSurgeryAddOrEdit> opt)
         {
-
-            var fun = _clinicalDataService.AddOrUpdatePreviousSurgery;
-            return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
+            var fun = await _clinicalDataService.AddOrUpdatePreviousSurgery(opt.OptCommand);
+            opt.AuditInfo.GeneralId = fun.Data;
+            return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
         }
 
 
@@ -250,8 +255,8 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> DeletePreviousSurgery(DataInspectionDto<IDDto> opt)
         {
-
             var fun = _clinicalDataService.DeletePreviousSurgery;
+            opt.AuditInfo.GeneralId = opt.OptCommand.Id;
             return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
         }
 
@@ -265,9 +270,9 @@ namespace IRaCIS.Core.API.Controllers
         [UnitOfWork]
         public async Task<IResponseOutput> AddOrUpdatePreviousOther(DataInspectionDto<PreviousOtherAddOrEdit> opt)
         {
-
-            var fun = _clinicalDataService.AddOrUpdatePreviousOther;
-            return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo, fun);
+            var fun = await _clinicalDataService.AddOrUpdatePreviousOther(opt.OptCommand);
+            opt.AuditInfo.GeneralId = fun.Data;
+            return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun);
         }
 
 
@@ -282,6 +287,7 @@ namespace IRaCIS.Core.API.Controllers
         {
 
             var fun = _clinicalDataService.DeletePreviousOther;
+            opt.AuditInfo.GeneralId = opt.OptCommand.Id;
             return await _inspectionService.Enforcement(opt.OptCommand.Id, opt.AuditInfo, opt.SignInfo, fun);
         }
         #endregion