面板基础统计预提交

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

@@ -608,10 +608,32 @@ namespace IRaCIS.Core.Application.Image.QA
             }
             else if (fileName.EndsWith(".csv"))
             {
+                #region   临时方案   MiniExcel读取  然后保存为xlsx  再用 Magicodes验证数据
 
                 //因为csv 需要加配置文件 不然都是null
-                    etcCheckList = MiniExcel.Query<CheckViewModel>(filePath, null, configuration: config).ToList();
+                etcCheckList = MiniExcel.Query<CheckViewModel>(filePath, null, configuration: config).ToList();
 
+                var csVToXlsxPath = Path.Combine(uploadFolderPath, DateTime.Now.ToString("yyyy-MM-dd-hh-mm-ss") + Path.GetFileNameWithoutExtension(fileName) + ".xlsx");
+
+                await MiniExcel.SaveAsAsync(csVToXlsxPath, etcCheckList, excelType: ExcelType.XLSX);
+
+
+                var Importer = new ExcelImporter();
+
+                var import = await Importer.Import<CheckViewModel>(File.OpenRead(csVToXlsxPath));
+
+                if (import.Exception != null) return ResponseOutput.NotOk(import.Exception.ToString());
+
+                if (import.RowErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.RowErrors));
+
+                if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors));
+
+                etcCheckList = import.Data.ToList();
+
+                #endregion
+
+
+                #region 导入组件有问题
                 //var Importer = new CsvImporter();
 
                 //var import = await Importer.Import<CheckViewModel>(File.OpenRead(filePath));
@@ -623,6 +645,8 @@ namespace IRaCIS.Core.Application.Image.QA
                 //if (import.TemplateErrors.Count > 0) return ResponseOutput.NotOk(JsonConvert.SerializeObject(import.TemplateErrors));
 
                 //etcCheckList = import.Data.ToList();
+                #endregion
+
             }
             //ExcelReaderFactory  需要自己验证数据 并且从固定列取数据
             else
@@ -1725,7 +1749,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             var info = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).ProjectTo<DicomTrialSiteSubjectInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
 
-            var targetPath ="/IMPORT-IMAGES/"+info.TrialCode + "_" + info.SubjectCode + "_" + info.VisitName;
+            var targetPath = "/IMPORT-IMAGES/" + info.TrialCode + "_" + info.SubjectCode + "_" + info.VisitName;
 
             var path = _dicomFileStoreHelper.GetSubjectVisitPath(info.TrialId, info.SiteId, info.SubjectId, info.SubjectVisitId);
 
@@ -1755,14 +1779,14 @@ namespace IRaCIS.Core.Application.Image.QA
 
                     foreach (var studyFolder in studyFolders)
                     {
-                        if (!session.FileExists(Path.Combine(targetPath,studyFolder.Name)))
+                        if (!session.FileExists(Path.Combine(targetPath, studyFolder.Name)))
                         {
                             session.CreateDirectory(targetPath);
                         }
 
                         foreach (var file in studyFolder.GetFiles())
                         {
-                            if (file.Extension.Contains("dcm",StringComparison.OrdinalIgnoreCase))
+                            if (file.Extension.Contains("dcm", StringComparison.OrdinalIgnoreCase))
                             {
                                 string remoteFilePath =
                                     RemotePath.TranslateLocalPathToRemote(file.FullName, studyFolder.FullName, targetPath);
@@ -1779,20 +1803,20 @@ namespace IRaCIS.Core.Application.Image.QA
                             }
                         }
                     }
-              
+
                 }
 
             }
             catch (Exception e)
             {
-              
+
 
                 await _subjectVisitRepository.UpdateFromQueryAsync(t => t.Id == subjectVisitId,
                       u => new SubjectVisit() { ForwardState = ForwardStateEnum.ForwardFailed });
 
 
             }
-           
+
 
             await _subjectVisitRepository.UpdateFromQueryAsync(t => t.Id == subjectVisitId,
                 u => new SubjectVisit() { ForwardState = ForwardStateEnum.Forwarded });

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

@@ -47,7 +47,6 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-            CreateMap<QANotice, QANoticeDTO>();