diff --git a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs index 1b51a0bb8..5d6765990 100644 --- a/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs +++ b/IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs @@ -71,6 +71,8 @@ namespace IRaCIS.Application.Contracts public int? UnSubmitCount { get; set; } public int? UnReadCount { get; set; } + + public string HospitalGroupName { get; set; } } public class NewTrialQuery : PageInput diff --git a/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs b/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs index 365688032..0a84cf4e1 100644 --- a/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs +++ b/IRaCIS.Core.Application/Service/Visit/HospitalGroupService.cs @@ -111,7 +111,7 @@ public class HospitalGroupService(IRepository _hospitalGroupRepos var adminUserList = addOrEditHospitalGroup.IdentityUserIdList.Select(t => new HospitalGroupIdentityUser() { IdentityUserId = t, HospitalGroupId = (Guid)addOrEditHospitalGroup.Id, IsManager = true }).ToList(); await _hospitalGroupIdentityUserRepository.AddRangeAsync(adminUserList); - var entity = await _hospitalGroupRepository.UpdateFromDTOAsync(addOrEditHospitalGroup, false, false, verifyExp1); + var entity = await _hospitalGroupRepository.UpdateFromDTOAsync(addOrEditHospitalGroup, true, false, verifyExp1); } diff --git a/IRaCIS.Core.Application/Service/Visit/_MapConfig.cs b/IRaCIS.Core.Application/Service/Visit/_MapConfig.cs index 120ec68fb..ef404bca4 100644 --- a/IRaCIS.Core.Application/Service/Visit/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Visit/_MapConfig.cs @@ -136,6 +136,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() .ForMember(d => d.TrialId, u => u.MapFrom(s => s.Id)) + .ForMember(d => d.HospitalGroupName, u => u.MapFrom(s => s.HospitalGroup.Name)) .ForMember(d => d.UnSubmitCount, u => u.MapFrom(s => s.SubjectVisitList.Count(t => t.SubmitState == SubmitStateEnum.ToSubmit))) .ForMember(d => d.UnReadCount, u => u.MapFrom(s => s.VisitTaskList.Count(t => t.TaskState == TaskState.Effect && t.SignTime == null))) ; diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index 95a5b18be..7dfbafe92 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -15,6 +15,10 @@ public partial class Trial : BaseFullDeleteAuditEntity //[JsonIgnore] //[ForeignKey("CROId")] //public CRO CRO { get; set; } + + [JsonIgnore] + public HospitalGroup HospitalGroup { get; set; } + [JsonIgnore] public List TrialBodyPartList { get; set; } [JsonIgnore]