From 62c39ee163620c058c25839ba26733cf0d816b99 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 21 Feb 2023 16:45:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.csproj | 10 +++++-----
.../Service/QC/DTO/QCListViewModel.cs | 12 +++++++++---
.../Reading/ReadingPeriod/ReadModule.cs | 12 ++++++------
IRaCIS.Core.Domain/Visit/SubjectVisit.cs | 4 ----
4 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
index 60d33f8c2..386d4600c 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
@@ -77,14 +77,14 @@
true
-
-
+
+
true
-
+
true
-
+
@@ -92,7 +92,7 @@
true
-
+
true
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index 5c8e4c22a..35656dde6 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -4,6 +4,7 @@ using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Share;
using MiniExcelLibs.Attributes;
using Newtonsoft.Json;
+using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Application.Contracts
@@ -243,9 +244,13 @@ namespace IRaCIS.Core.Application.Contracts
//public DateTime? SignDate { get; set; }
//public bool IsUrgent { get; set; }
- //[ExcelFormat("yyyy-MM-dd")]
+ [ExcelFormat("MMMM dd, yyyy")]
public DateTime? FirstGiveMedicineTime { get; set; }
+ [ExcelColumn(Name = "FirstGiveMedicineTime", Format = "yyyy-MM-dd")]
+
+ public string FirstGiveMedicineTimeStr => FirstGiveMedicineTime?.ToString("yyyy-MM-dd");
+
public DateTime? OutEnrollmentTime { get; set; }
public DateTime? VisitOverTime { get; set; }
@@ -416,7 +421,7 @@ namespace IRaCIS.Core.Application.Contracts
public SubjectStatus SubjectStatus { get; set; }
public string TrialReadingCriterionName { get; set; }
-
+ [ExcelFormat("yyyy-MM-dd")]
public DateTime? FirstGiveMedicineTime { get; set; }
public string ModuleName { get; set; }
@@ -439,7 +444,7 @@ namespace IRaCIS.Core.Application.Contracts
public string Modality { get; set; } = string.Empty;
- //[ExcelFormat("yyyy-MM-dd")]
+ [ExcelFormat("yyyy-MM-dd")]
public DateTime? StudyTime { get; set; }
public string SubjectCode { get; set; } = String.Empty;
@@ -1141,6 +1146,7 @@ namespace IRaCIS.Core.Application.Contracts
public RequestBackStateEnum RequestBackState { get; set; }
+ [ExcelFormat("yyyy-MM-dd")]
public DateTime? StudyTime { get; set; }
public DateTime? CheckTime { get; set; }
public CheckChanllengeTypeEnum CheckChallengeState { get; set; }
diff --git a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
index fed6a88c8..aa09506c0 100644
--- a/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
+++ b/IRaCIS.Core.Domain/Reading/ReadingPeriod/ReadModule.cs
@@ -19,13 +19,13 @@ namespace IRaCIS.Core.Domain.Models
public ReadingQuestionCriterionTrial TrialReadingCriterion { get; set; }
- [JsonIgnore]
- public List ModuleTaskList { get; set; }
+ [JsonIgnore]
+ public List ModuleTaskList { get; set; }
- ///
- /// 受试者ID
- ///
- public Guid SubjectId { get; set; }
+ ///
+ /// 受试者ID
+ ///
+ public Guid SubjectId { get; set; }
public Guid TrialReadingCriterionId { get; set; }
diff --git a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs
index 35b4139fc..2b36d9fe6 100644
--- a/IRaCIS.Core.Domain/Visit/SubjectVisit.cs
+++ b/IRaCIS.Core.Domain/Visit/SubjectVisit.cs
@@ -231,10 +231,6 @@ namespace IRaCIS.Core.Domain.Models
- [JsonIgnore]
-
- public List TrialReadingCriterionList { get; set; }
-
public ReadingStatusEnum ReadingStatus { get; set; }