IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -377,7 +377,7 @@ namespace IRaCIS.Core.Application.Contracts
         //public bool IsUrgent { get; set; }
 
         //[ExcelColumn(Name = "FirstGiveMedicineTime", Format = "yyyy-MM-dd")]
-        public DateOnly? FirstGiveMedicineTime { get; set; }
+        public DateTime? FirstGiveMedicineTime { get; set; }
 
 
         public string FirstGiveMedicineTimeStr => FirstGiveMedicineTime?.ToString("yyyy-MM-dd");

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -263,7 +263,8 @@ public partial class Trial : BaseFullDeleteAuditEntity
     [Comment("项目术语配置Json字符串")]
     [StringLength(2000)]
     public List<TrialObjectNameConfig> TrialObjectNameList { get; set; }
-
+    //[NotMapped]
+    //public List<TrialObjectNameConfig> TrialObjectNameList => JsonConvert.DeserializeObject<List<TrialObjectNameConfig>>(TrialObjectNameConfigStr) ?? new List<TrialObjectNameConfig>();
 }
 
 [ComplexType]
@@ -274,4 +275,5 @@ public class TrialObjectNameConfig
     public string TrialName { get; set; }
 
     public bool IsDefault { get; set; }
+
 }

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -67,13 +67,13 @@ public class IRaCISDBContext : DbContext
             // 使用部分加密值转换器，前 2 个字符不加密，方便模糊搜索
             entity.Property(e => e.Name).HasConversion(new PartialEncryptionConverter(2));
 
-            //entity.OwnsMany(x => x.TestJsonObjectLsit, ownedNavigationBuilder =>
+            entity.OwnsMany(x => x.TestJsonObjectLsit, ownedNavigationBuilder =>
-            //{
+            {
-            //    ownedNavigationBuilder.ToJson();
+                ownedNavigationBuilder.ToJson();
-            //});
+            });
 
-            entity.Property(e => e.TestJsonObjectLsit).HasConversion(v => v == null ? "[]" : JsonConvert.SerializeObject(v),
+            //entity.Property(e => e.TestJsonObjectLsit).HasConversion(v => v == null ? "[]" : JsonConvert.SerializeObject(v),
-                v => string.IsNullOrEmpty(v) ? null : JsonConvert.DeserializeObject<List<TestJsonObject>>(v));
+            //    v => string.IsNullOrEmpty(v) ? null : JsonConvert.DeserializeObject<List<TestJsonObject>>(v));
         });
 
         modelBuilder.Entity<Trial>(entity =>
@@ -595,9 +595,8 @@ public class TestLength : Entity
     [StringLength(1000)]
     public List<TestEnum> TestEnumList { get; set; } = new List<TestEnum>();
 
+    [MaxLength]
     public List<TestJsonObject> TestJsonObjectLsit { get; set; }
-
-    public DateOnly? TestDate { get; set; }
 }
 
 

IRaCIS.Core.Infrastructure/Extention/ExportExcelDateConverter.cs

@@ -94,12 +94,6 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
                     needDealTime = TimeZoneInfo.ConvertTime(needDealTime, TimeZoneInfo.Local, TimeZoneInfo.FindSystemTimeZoneById(clientZoneId));
                 }
 
-                if (needDealTime.Hour == 0 && needDealTime.Minute == 0 && needDealTime.Second == 0)
-                {
-                    return needDealTime.ToString("yyyy-MM-dd");
-                }
-                else
-                {
                 if (isEn_US)
                 {
                     //暂时保持一致，等需求确认，修改英文要展示的日期格式
@@ -110,9 +104,6 @@ namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
                     return needDealTime.ToString("yyyy-MM-dd HH:mm:ss");
                 }
             }
-
-
-            }
             else
             {
                 return string.Empty;