diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index 8d2df1464..488fe588c 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -137,7 +137,8 @@ namespace IRaCIS.Core.API.Controllers public async Task AddOrUpdateSubject(InsSubjectCommand opt) { - opt.AuditInfo.SubjectName = opt.OptCommand.ShortName; + opt.AuditInfo.SubjectCode = opt.OptCommand.Code; + var fun = await _subjectService.AddOrUpdateSubject(opt.OptCommand); opt.AuditInfo.SubjectId = Guid.Parse(fun.Data); diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs index e7098a26b..5fed7c769 100644 --- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs +++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs @@ -51,9 +51,9 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO public string SiteName { get; set; } = string.Empty; /// - /// 受试者名称 + /// 受试者Code /// - public string SubjectName { get; set; } = string.Empty; + public string SubjectCode { get; set; } = string.Empty; /// /// 访视名称 diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index 538f7f39d..8bfc9613f 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -57,18 +57,18 @@ namespace IRaCIS.Core.Application.Service.Inspection ParentId = data.ParentId, ChildrenType = data.ChildrenType, JsonDetail = data.JsonDetail, - SiteName = leftsite.SiteName, - ExperimentName = leftrial.ExperimentName, + SiteName = data.SiteName, + ExperimentName = data.TrialName, FirstName = leftsubject.FirstName, LastName = leftsubject.LastName, Id = data.Id, ParentJson = leftparent.JsonDetail, - VisitName = leftsubjectVisit.VisitName, + VisitName = data.SubjectVisitName, CreateUser = leftuser.UserName, UserFirstName = leftuser.FirstName, UserLastName = leftuser.LastName, - SubjectCode=leftsubject.Code, - SubjectName=data.SubjectName, + //SubjectCode=leftsubject.Code, + SubjectCode =data.SubjectCode, SubjectVisitName=data.SubjectVisitName, CreateUserName = data.CreateUserName, RoleName=data.RoleName, @@ -274,7 +274,7 @@ namespace IRaCIS.Core.Application.Service.Inspection JsonDetail = JsonConvert.SerializeObject(Statusdata), TrialName=add.TrialName, SiteName=add.SiteName, - SubjectName=add.SubjectName, + SubjectCode = add.SubjectCode, SubjectVisitName=add.SubjectVisitName, CreateUserName=add.CreateUserName, RoleName=add.RoleName, @@ -311,13 +311,9 @@ namespace IRaCIS.Core.Application.Service.Inspection #endregion #region 受试者 - if (Data.SubjectName.IsNullOrEmpty()) + if (Data.SubjectCode.IsNullOrEmpty()) { - var subjectdata = await _repository.GetQueryable().FirstOrDefaultAsync(x => x.Id == Data.SubjectId); - if (subjectdata != null) - { - Data.SubjectName = subjectdata.FirstName + subjectdata.LastName; - } + Data.SubjectCode = (await _repository.GetQueryable().FirstOrDefaultAsync(x => x.Id == Data.SubjectId))?.Code; } #endregion diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs b/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs index 44f84ad60..44ddbcef4 100644 --- a/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs +++ b/IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs @@ -29,6 +29,8 @@ namespace IRaCIS.Application.Contracts public DateTime? FirstGiveMedicineTime { get; set; } + public int? Status { get; set; } + diff --git a/IRaCIS.Core.Domain/Trial/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs index 54d9c1a12..36c85d26b 100644 --- a/IRaCIS.Core.Domain/Trial/DataInspection.cs +++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs @@ -117,7 +117,7 @@ namespace IRaCIS.Core.Domain.Models /// /// 受试者名称 /// - public string SubjectName { get; set; } + public string SubjectCode { get; set; } /// /// 访视名称