修改

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

@@ -13,6 +13,7 @@ using Newtonsoft.Json;
 using IRaCIS.Core.Application.Service.Inspection.Interface;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
 using Nito.AsyncEx;
+using IRaCIS.Application.Interfaces;
 
 namespace IRaCIS.Core.Application.Contracts
 {
@@ -25,6 +26,7 @@ namespace IRaCIS.Core.Application.Contracts
         private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository;
         private readonly IHttpContextAccessor _httpContext;
         private readonly IWebHostEnvironment _hostEnvironment;
+        private readonly IDictionaryService _dictionaryService;
         private readonly IInspectionService _inspectionService;
         private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository;
 
@@ -35,6 +37,7 @@ namespace IRaCIS.Core.Application.Contracts
         public NoneDicomStudyService(IRepository<NoneDicomStudy> noneDicomStudyRepository,
              IHttpContextAccessor httpContext,
               IWebHostEnvironment hostEnvironment,
+                  IDictionaryService dictionaryService,
                 IInspectionService inspectionService,
             IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository)
         {
@@ -42,6 +45,7 @@ namespace IRaCIS.Core.Application.Contracts
 
             this._httpContext = httpContext;
             this._hostEnvironment = hostEnvironment;
+            this._dictionaryService = dictionaryService;
             this._inspectionService = inspectionService;
             _noneDicomStudyFileRepository = noneDicomStudyFileRepository;
         }
@@ -139,7 +143,7 @@ namespace IRaCIS.Core.Application.Contracts
                 Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
                 JsonDetail = JsonConvert.SerializeObject(new
                 {
-                    SubmitState = "待提交",
+                    SubmitState = await _dictionaryService.GetBasicDataTranslateItem("SubmitState", subvisit.SubmitState),
                 })
             });
 
@@ -193,7 +197,7 @@ namespace IRaCIS.Core.Application.Contracts
                     Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
                     JsonDetail = JsonConvert.SerializeObject(new
                     {
-                        SubmitState = "待提交",
+                        SubmitState = await _dictionaryService.GetBasicDataTranslateItem("SubmitState", subvisit.SubmitState),
                     })
                 });
 

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

@@ -21,6 +21,7 @@ using IRaCIS.Core.Application.Service.Inspection.Interface;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Application.Service.Inspection.DTO;
 using Nito.AsyncEx;
+using IRaCIS.Application.Interfaces;
 
 namespace IRaCIS.Core.Application.Image.QA
 {
@@ -31,9 +32,11 @@ namespace IRaCIS.Core.Application.Image.QA
         private readonly DicomFileStoreHelper _dicomFileStoreHelper;
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
         private readonly IRepository<DicomStudy> _dicomStudyRepository;
+        private readonly IRepository<Dictionary> _dictionaryrepository;
         private readonly IRepository<Trial> _trialRepository;
         private readonly IMediator _mediator;
         private readonly IInspectionService _inspectionService;
+        private readonly IDictionaryService _dictionaryService;
         private object _locker = new object();
 
         private readonly AsyncLock _mutex = new AsyncLock();
@@ -42,15 +45,19 @@ namespace IRaCIS.Core.Application.Image.QA
             IRepository<Trial> trialRepository,
             IMediator mediator,
             IInspectionService inspectionService,
-            IRepository<DicomStudy> dicomStudyRepository
+            IDictionaryService dictionaryService,
+            IRepository<DicomStudy> dicomStudyRepository,
+                IRepository<Dictionary> dictionaryrepository
             )
         {
             _dicomFileStoreHelper = dicomFileStoreHelper;
             _subjectVisitRepository = subjectVisitRepository;
             _dicomStudyRepository = dicomStudyRepository;
+            this._dictionaryrepository = dictionaryrepository;
             _mediator = mediator;
            _trialRepository = trialRepository;
             _inspectionService = inspectionService;
+            this._dictionaryService = dictionaryService;
         }
 
         #region QC质疑 以及回复 关闭
@@ -1046,7 +1053,7 @@ namespace IRaCIS.Core.Application.Image.QA
                 Identification = "Edit|Visit|Status|Visit-Image Upload|Add Image",
                 JsonDetail = JsonConvert.SerializeObject(new
                 {
-                    SubmitState = "待提交",
+                    SubmitState = await _dictionaryService.GetBasicDataTranslateItem("SubmitState", subvisit.SubmitState),
                 })
             });
             await _inspectionService.AddListInspectionRecordAsync(datas);