From 20d4ab82d645176d2d0d489f81c91c702d0f0d6f Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Mon, 25 Apr 2022 14:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs | 3 +++
IRaCIS.Core.Application/Service/QC/_MapConfig.cs | 3 ++-
IRaCIS.Core.Domain/Common/JsonConvert.cs | 2 --
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index 713e7be56..9d3c767a1 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -143,6 +143,9 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsHaveClinicalData { get; set; }
+ public int? Age { get; set; }
+ public string Sex { get; set; } = string.Empty;
+
}
diff --git a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
index 77955e5a6..0bbc41335 100644
--- a/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/QC/_MapConfig.cs
@@ -129,7 +129,8 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.TrialSiteCode, u => u.MapFrom(s => s.TrialSite.TrialSiteCode))
.ForMember(d => d.QCProcessEnum, u => u.MapFrom(s => s.Trial.QCProcessEnum))
.ForMember(d => d.SubjectId, u => u.MapFrom(t => t.Subject.Id))
-
+ .ForMember(d => d.Sex, u=> u.MapFrom(s => s.Subject.Sex))
+ .ForMember(d => d.Age, u => u.MapFrom(t => t.Subject.Age))
.ForMember(d => d.IsHaveClinicalData, u => u.MapFrom(t=> t.IsBaseLine? t.PreviousHistoryList.Any() || t.PreviousOtherList.Any() || t.PreviousPDFList.Any() || t.PreviousSurgeryList.Any() :false))
//.ForMember(d => d.VisitName, u => u.MapFrom(t =>t.InPlan? t.VisitStage.VisitName : t.VisitName))
diff --git a/IRaCIS.Core.Domain/Common/JsonConvert.cs b/IRaCIS.Core.Domain/Common/JsonConvert.cs
index 81a9a6345..0480f393e 100644
--- a/IRaCIS.Core.Domain/Common/JsonConvert.cs
+++ b/IRaCIS.Core.Domain/Common/JsonConvert.cs
@@ -13,8 +13,6 @@ namespace IRaCIS.Core.Domain.Common
/// 将对象序列化成稽查需要的Json字符串
///
/// 需要序列化的对象
- ///
- /// 是否忽略值未null的字段
///
public static string ToJcJson(this object obj)
{