修改excel 临时提交

IRaCIS.Core.Application/Helper/ExcelExportHelper.cs

@@ -7,6 +7,7 @@ using MiniExcelLibs;
 using MiniExcelLibs.OpenXml;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using NPOI.HSSF.UserModel;
 
 namespace IRaCIS.Core.Application.Service;
 
@@ -123,4 +124,94 @@ public static class ExcelExportHelper
         #endregion
 
     }
+
+
+
+    public static async Task<MemoryStream> DataExport_NpoiTestAsync(string code, object data, IRepository<CommonDocument> _commonDocumentRepository, IWebHostEnvironment _hostEnvironment, IDictionaryService? _dictionaryService = null, Type? translateType = null, CriterionType? criterionType = null)
+    {
+        //判断是否有字典翻译
+
+        if (_dictionaryService != null && translateType != null)
+        {
+            //一个值 对应不同的字典翻译
+            var needTranslatePropertyList = translateType.GetProperties().Where(t => t.IsDefined(typeof(DictionaryTranslateAttribute), true))
+                .SelectMany(c =>
+                c.GetCustomAttributes(typeof(DictionaryTranslateAttribute), false).Select(f => (DictionaryTranslateAttribute?)f).Where(t => t.CriterionType == criterionType || t.CriterionType == null).Select(k => new { c.Name, k.DicParentCode })
+                ).ToList();
+
+            //字典表查询出所有需要翻译的数据
+
+            var translateDataList = await _dictionaryService.GetBasicDataSelect(needTranslatePropertyList.Select(t => t.DicParentCode).Distinct().ToArray());
+
+            var dic = JsonConvert.DeserializeObject<IDictionary<string, object>>(data.ToJsonNotIgnoreNull());
+
+            foreach (var key in dic.Keys)
+            {
+                //是数组 那么找到对应的属性 进行翻译
+                if (dic[key].GetType().IsAssignableFrom(typeof(JArray)))
+                {
+
+                    var newObjList = new List<object>();
+                    var no = 1;
+
+                    foreach (var item in dic[key] as JArray)
+                    {
+                        var itemDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(item.ToJsonNotIgnoreNull());
+
+                        foreach (var needTranslateProperty in needTranslatePropertyList)
+                        {
+                            var beforeValue = itemDic[needTranslateProperty.Name]?.ToString();
+
+                            itemDic[needTranslateProperty.Name] = translateDataList[needTranslateProperty.DicParentCode].Where(t => t.Code.ToLower() == beforeValue?.ToLower()).FirstOrDefault()?.ValueCN ?? String.Empty;
+                        }
+
+                        itemDic.Add("No", no++);
+                        newObjList.Add(itemDic);
+                    }
+
+                    dic[key] = newObjList;
+
+                }
+            }
+
+
+            data = dic;
+
+
+        }
+
+
+
+
+
+        var (physicalPath, fileNmae) = await FileStoreHelper.GetCommonDocPhysicalFilePathAsync(_hostEnvironment, _commonDocumentRepository, code);
+
+
+        //模板路径
+        var tplPath = physicalPath;
+
+        #region MiniExcel
+
+        var memoryStream = new MemoryStream();
+
+        var config = new OpenXmlConfiguration()
+        {
+            IgnoreTemplateParameterMissing = true,
+        };
+
+        await MiniExcel.SaveAsByTemplateAsync(memoryStream, tplPath, data, config);
+
+        memoryStream.Seek(0, SeekOrigin.Begin);
+
+
+        return memoryStream;
+
+       //var wb = new HSSFWorkbook(memoryStream);
+
+        //var  sheet = wb.GetSheetAt(0);
+
+
+        #endregion
+    }
+
 }

IRaCIS.Core.Application/Helper/FileStoreHelper.cs

@@ -430,9 +430,13 @@ public static class FileStoreHelper
             Directory.CreateDirectory(path);
         }
 
-        var physicalPath = Path.Combine(path, instanceId.ToString() + ".dcm");
+        var physicalPath = Path.Combine(path, instanceId.ToString() );
 
-        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.DicomFolder}/{studyId}/{instanceId}.dcm";
+        var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.DicomFolder}/{studyId}/{instanceId}";
+
+        //var physicalPath = Path.Combine(path, instanceId.ToString() + ".dcm");
+
+        //var relativePath = $"/{StaticData.Folder.IRaCISDataFolder}/{StaticData.Folder.TrialDataFolder}/{trialId}/{siteId}/{subjectId}/{subjectVisitId}/{StaticData.Folder.DicomFolder}/{studyId}/{instanceId}.dcm";
 
         return (physicalPath, relativePath);
     }