diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
index 9de1b4307..de2e57822 100644
--- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
@@ -217,8 +217,7 @@ namespace IRaCIS.Core.Application.Service
                          //t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Part).FirstOrDefault().Answer)
                          //   t.MapFrom(u => u.OrganInfo.IsCanEditPosition ?
                          //u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault()!.Answer : isEn_Us ? u.OrganInfo.TULATEN : u.OrganInfo.TULAT)
-                         t.MapFrom(u => u.OrganInfo.IsCanEditPosition ?
-                             u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.Location).FirstOrDefault()!.Answer : "")
+                         t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.BodyPartDescription).FirstOrDefault()!.Answer)
                     )
                    
                     .ForMember(o => o.LongDiameter, t => t.MapFrom(u => u.LesionAnswerList.Where(c => c.ReadingTableQuestionTrial.QuestionMark == QuestionMark.MajorAxis).FirstOrDefault()!.Answer))
diff --git a/IRaCIS.Core.Infrastructure/_IRaCIS/ObjectExtension.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/ObjectExtension.cs
index 687ac403f..c51693fe3 100644
--- a/IRaCIS.Core.Infrastructure/_IRaCIS/ObjectExtension.cs
+++ b/IRaCIS.Core.Infrastructure/_IRaCIS/ObjectExtension.cs
@@ -61,7 +61,7 @@ namespace IRaCIS.Core.Infrastructure.Extention
                 object propertyValue = property.GetValue(obj);
 
                 // 如果属性的类型是枚举，将其值保留为整数
-                if (property.PropertyType.IsEnum || Nullable.GetUnderlyingType(property.PropertyType)?.IsEnum == true)
+                if (property.PropertyType.IsEnum || (Nullable.GetUnderlyingType(property.PropertyType)?.IsEnum == true && propertyValue!=null) )
                 {
                     dictionary.Add(propertyName, (int)propertyValue);
                 }