修改接口
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
8b72566b91
commit
659aadbc7f
|
|
@ -71,6 +71,8 @@ namespace IRaCIS.Application.Contracts
|
||||||
public int? UnSubmitCount { get; set; }
|
public int? UnSubmitCount { get; set; }
|
||||||
|
|
||||||
public int? UnReadCount { get; set; }
|
public int? UnReadCount { get; set; }
|
||||||
|
|
||||||
|
public string HospitalGroupName { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class NewTrialQuery : PageInput
|
public class NewTrialQuery : PageInput
|
||||||
|
|
|
||||||
|
|
@ -111,7 +111,7 @@ public class HospitalGroupService(IRepository<HospitalGroup> _hospitalGroupRepos
|
||||||
var adminUserList = addOrEditHospitalGroup.IdentityUserIdList.Select(t => new HospitalGroupIdentityUser() { IdentityUserId = t, HospitalGroupId = (Guid)addOrEditHospitalGroup.Id, IsManager = true }).ToList();
|
var adminUserList = addOrEditHospitalGroup.IdentityUserIdList.Select(t => new HospitalGroupIdentityUser() { IdentityUserId = t, HospitalGroupId = (Guid)addOrEditHospitalGroup.Id, IsManager = true }).ToList();
|
||||||
|
|
||||||
await _hospitalGroupIdentityUserRepository.AddRangeAsync(adminUserList);
|
await _hospitalGroupIdentityUserRepository.AddRangeAsync(adminUserList);
|
||||||
var entity = await _hospitalGroupRepository.UpdateFromDTOAsync(addOrEditHospitalGroup, false, false, verifyExp1);
|
var entity = await _hospitalGroupRepository.UpdateFromDTOAsync(addOrEditHospitalGroup, true, false, verifyExp1);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -136,6 +136,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
CreateMap<Trial, NewTrialView>()
|
CreateMap<Trial, NewTrialView>()
|
||||||
.ForMember(d => d.TrialId, u => u.MapFrom(s => s.Id))
|
.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.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)))
|
.ForMember(d => d.UnReadCount, u => u.MapFrom(s => s.VisitTaskList.Count(t => t.TaskState == TaskState.Effect && t.SignTime == null)))
|
||||||
;
|
;
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,10 @@ public partial class Trial : BaseFullDeleteAuditEntity
|
||||||
//[JsonIgnore]
|
//[JsonIgnore]
|
||||||
//[ForeignKey("CROId")]
|
//[ForeignKey("CROId")]
|
||||||
//public CRO CRO { get; set; }
|
//public CRO CRO { get; set; }
|
||||||
|
|
||||||
|
[JsonIgnore]
|
||||||
|
public HospitalGroup HospitalGroup { get; set; }
|
||||||
|
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
public List<TrialBodyPart> TrialBodyPartList { get; set; }
|
public List<TrialBodyPart> TrialBodyPartList { get; set; }
|
||||||
[JsonIgnore]
|
[JsonIgnore]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue