From 2dc0cc35254b9c175d21fe206b8ae047c0a82c57 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 25 Nov 2024 15:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=A1=A8bug=20?= =?UTF-8?q?=E5=88=9D=E6=AD=A5=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/appsettings.Test_HIR.json | 2 +- .../Helper/FileDocProcess/ExcelExportHelper.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.API/appsettings.Test_HIR.json b/IRaCIS.Core.API/appsettings.Test_HIR.json index 2304c208f..bf726cda3 100644 --- a/IRaCIS.Core.API/appsettings.Test_HIR.json +++ b/IRaCIS.Core.API/appsettings.Test_HIR.json @@ -38,7 +38,7 @@ }, "SystemHospitalConfig": { "HospitalCode": "EI", - "HospitalLogoPath": "/System/GeneralDocuments/1716453306898_图片2.png", + "HospitalLogoPath": "/System/GeneralDocuments/1732515108701_肿瘤医院logo 新.jpg", "TrialKeepCount": 60, "HospitalName": "上海展影医疗科技有限公司", "HospitalAliasName": "展影医疗", diff --git a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs index 65aabea98..b94592f59 100644 --- a/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs +++ b/IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs @@ -322,7 +322,7 @@ public static class ExcelExportHelper foreach (var key in dic.Keys) { //是数组 那么找到对应的属性 进行翻译 - if (dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>))) + if (dic[key] != null && dic[key].GetType().GetInterfaces().Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IList<>))) //if (dic[key].GetType().IsAssignableFrom(typeof(JArray))) { @@ -421,7 +421,7 @@ public static class ExcelExportHelper } //中文替换项目术语 - if (data.TrialObjectNameList.Count > 0) + if (data?.TrialObjectNameList.Count > 0) { var replaceObjectList = data.TrialObjectNameList;