diff --git a/IRaCIS.Core.Application/Service/Doctor/DTO/TrialExperienceModel.cs b/IRaCIS.Core.Application/Service/Doctor/DTO/TrialExperienceModel.cs
index d8bd3e174..463f47cce 100644
--- a/IRaCIS.Core.Application/Service/Doctor/DTO/TrialExperienceModel.cs
+++ b/IRaCIS.Core.Application/Service/Doctor/DTO/TrialExperienceModel.cs
@@ -16,6 +16,16 @@
public int VisitReadingCount { get; set; }
+ ///
+ /// 其他分期
+ ///
+ public string OtherStages { get; set; } = string.Empty;
+
+ ///
+ /// 其他标准
+ ///
+ public string OtherCriterion { get; set; } = string.Empty;
+
//public string Term { get; set; }
//public string EvaluationCriteria { get; set; }
@@ -58,6 +68,16 @@
public Guid? GCPId { get; set; }
+ ///
+ /// GCP证书的时间
+ ///
+ public DateTime? GCPTime { get; set; }
+
+ ///
+ /// GCP机构
+ ///
+ public string GCPAgencies { get; set; }
+
public string OtherClinicalExperience { get; set; } = String.Empty;
public string OtherClinicalExperienceCN { get; set; } = String.Empty;
@@ -75,6 +95,16 @@
public int GCP { get; set; }
public Guid? GCPId { get; set; }
+
+ ///
+ /// GCP证书的时间
+ ///
+ public DateTime? GCPTime { get; set; }
+
+ ///
+ /// GCP机构
+ ///
+ public string GCPAgencies { get; set; }
}
public class ClinicalExperienceCommand
diff --git a/IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs b/IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs
index 5587e7be5..4038f9d9a 100644
--- a/IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs
+++ b/IRaCIS.Core.Application/Service/Doctor/TrialExperienceService.cs
@@ -30,6 +30,8 @@ namespace IRaCIS.Core.Application.Service
{
trialExperience.GCP = doctor.GCP;
trialExperience.Id = doctor.Id;
+ trialExperience.GCPTime = doctor.GCPTime;
+ trialExperience.GCPAgencies = doctor.GCPAgencies;
trialExperience.OtherClinicalExperience = doctor.OtherClinicalExperience ?? "";
trialExperience.OtherClinicalExperienceCN = doctor.OtherClinicalExperienceCN ?? "";
var attachment = await _attachmentRepository.FirstOrDefaultAsync(t => t.Id == doctor.GCPId);
@@ -38,6 +40,7 @@ namespace IRaCIS.Core.Application.Service
trialExperience.ExpiryDateStr = attachment.ExpiryDate == null ? "" : attachment.ExpiryDate.Value.ToString("yyyy-MM-dd HH:mm");
trialExperience.Path = attachment.Path;
+
trialExperience.GCPFullPath = attachment.Path + "?access_token=" + _userInfo.UserToken;
trialExperience.Type = attachment.Type;
trialExperience.FileName = attachment.FileName;
@@ -133,6 +136,8 @@ namespace IRaCIS.Core.Application.Service
var successs = await _doctorRepository.BatchUpdateNoTrackingAsync(o => o.Id == updateGCPExperienceParam.Id, u => new Doctor()
{
GCP = updateGCPExperienceParam.GCP,
+ GCPAgencies= updateGCPExperienceParam.GCPAgencies,
+ GCPTime= updateGCPExperienceParam.GCPTime,
GCPId = (updateGCPExperienceParam.GCP == 0 || updateGCPExperienceParam.GCPId == null) ? Guid.Empty : updateGCPExperienceParam.GCPId!.Value
});
diff --git a/IRaCIS.Core.Domain/Dcotor/Doctor.cs b/IRaCIS.Core.Domain/Dcotor/Doctor.cs
index 87e89ee80..97d11708b 100644
--- a/IRaCIS.Core.Domain/Dcotor/Doctor.cs
+++ b/IRaCIS.Core.Domain/Dcotor/Doctor.cs
@@ -81,6 +81,16 @@ public class Doctor : BaseFullAuditEntity
public int GCP { get; set; }
+ ///
+ /// GCP֤ʱ
+ ///
+ public DateTime? GCPTime { get; set; }
+
+ ///
+ /// GCP
+ ///
+ public string GCPAgencies { get; set; }
+
public Guid GCPId { get; set; }
public Guid? HospitalId { get; set; }
diff --git a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs
index aaefe5b86..88aaea914 100644
--- a/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs
+++ b/IRaCIS.Core.Domain/Dcotor/TrialExperience.cs
@@ -21,4 +21,14 @@ public partial class TrialExperience : BaseFullAuditEntity
public DateTime? StartTime { get; set; }
public DateTime? EndTime { get; set; }
+
+ ///
+ ///
+ ///
+ public string OtherStages { get; set; } = string.Empty;
+
+ ///
+ ///
+ ///
+ public string OtherCriterion { get; set; } = string.Empty;
}