XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
he 2022-03-30 15:20:12 +08:00
parent 1c41cca8c4
commit e2d548c2c9
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.API/Controllers/InspectionController.cs
View File

@ -137,7 +137,8 @@ namespace IRaCIS.Core.API.Controllers
public async Task<IResponseOutput> AddOrUpdateSubject(InsSubjectCommand opt) public async Task<IResponseOutput> AddOrUpdateSubject(InsSubjectCommand opt)
{ {
opt.AuditInfo.SubjectName = opt.OptCommand.ShortName; opt.AuditInfo.SubjectCode = opt.OptCommand.Code;
var fun = await _subjectService.AddOrUpdateSubject(opt.OptCommand); var fun = await _subjectService.AddOrUpdateSubject(opt.OptCommand);
opt.AuditInfo.SubjectId = Guid.Parse(fun.Data); opt.AuditInfo.SubjectId = Guid.Parse(fun.Data);

4
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -51,9 +51,9 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public string SiteName { get; set; } = string.Empty; public string SiteName { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 受试者名称 /// 受试者Code
/// </summary> /// </summary>
public string SubjectName { get; set; } = string.Empty; public string SubjectCode { get; set; } = string.Empty;
/// <summary> /// <summary>
/// 访视名称 /// 访视名称

20
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -57,18 +57,18 @@ namespace IRaCIS.Core.Application.Service.Inspection
ParentId = data.ParentId, ParentId = data.ParentId,
ChildrenType = data.ChildrenType, ChildrenType = data.ChildrenType,
JsonDetail = data.JsonDetail, JsonDetail = data.JsonDetail,
SiteName = leftsite.SiteName, SiteName = data.SiteName,
ExperimentName = leftrial.ExperimentName, ExperimentName = data.TrialName,
FirstName = leftsubject.FirstName, FirstName = leftsubject.FirstName,
LastName = leftsubject.LastName, LastName = leftsubject.LastName,
Id = data.Id, Id = data.Id,
ParentJson = leftparent.JsonDetail, ParentJson = leftparent.JsonDetail,
VisitName = leftsubjectVisit.VisitName, VisitName = data.SubjectVisitName,
CreateUser = leftuser.UserName, CreateUser = leftuser.UserName,
UserFirstName = leftuser.FirstName, UserFirstName = leftuser.FirstName,
UserLastName = leftuser.LastName, UserLastName = leftuser.LastName,
SubjectCode=leftsubject.Code, //SubjectCode=leftsubject.Code,
SubjectName=data.SubjectName, SubjectCode =data.SubjectCode,
SubjectVisitName=data.SubjectVisitName, SubjectVisitName=data.SubjectVisitName,
CreateUserName = data.CreateUserName, CreateUserName = data.CreateUserName,
RoleName=data.RoleName, RoleName=data.RoleName,
@ -274,7 +274,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
JsonDetail = JsonConvert.SerializeObject(Statusdata), JsonDetail = JsonConvert.SerializeObject(Statusdata),
TrialName=add.TrialName, TrialName=add.TrialName,
SiteName=add.SiteName, SiteName=add.SiteName,
SubjectName=add.SubjectName, SubjectCode = add.SubjectCode,
SubjectVisitName=add.SubjectVisitName, SubjectVisitName=add.SubjectVisitName,
CreateUserName=add.CreateUserName, CreateUserName=add.CreateUserName,
RoleName=add.RoleName, RoleName=add.RoleName,
@ -311,13 +311,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
#endregion #endregion
#region 受试者 #region 受试者
if (Data.SubjectName.IsNullOrEmpty()) if (Data.SubjectCode.IsNullOrEmpty())
{ {
var subjectdata = await _repository.GetQueryable<Subject>().FirstOrDefaultAsync(x => x.Id == Data.SubjectId); Data.SubjectCode = (await _repository.GetQueryable<Subject>().FirstOrDefaultAsync(x => x.Id == Data.SubjectId))?.Code;
if (subjectdata != null)
{
Data.SubjectName = subjectdata.FirstName + subjectdata.LastName;
}
} }
#endregion #endregion

2
IRaCIS.Core.Application/Service/Visit/DTO/ClinicalStudySubjects.cs
View File

@ -29,6 +29,8 @@ namespace IRaCIS.Application.Contracts
public DateTime? FirstGiveMedicineTime { get; set; } public DateTime? FirstGiveMedicineTime { get; set; }
public int? Status { get; set; }

2
IRaCIS.Core.Domain/Trial/DataInspection.cs
View File

@ -117,7 +117,7 @@ namespace IRaCIS.Core.Domain.Models
/// <summary> /// <summary>
/// 受试者名称 /// 受试者名称
/// </summary> /// </summary>
public string SubjectName { get; set; } public string SubjectCode { get; set; }
/// <summary> /// <summary>
/// 访视名称 /// 访视名称