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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
he 2024-06-06 17:20:01 +08:00
parent 09e388b01a e5fcb75b9f
commit bbc8859a16
4 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialSiteViewModel.cs
View File

@ -113,6 +113,14 @@ namespace IRaCIS.Core.Application.Contracts.DTO
}
public class TrialSiteSelect
{
public Guid SiteId { get; set; }
public string SiteName { get; set; } = String.Empty;
public string AliasName { get; set; } = string.Empty;
}
public class TrialSiteScreeningDTO
{
public Guid Id { get; set; }

27
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
View File

@ -234,6 +234,8 @@ namespace IRaCIS.Application.Contracts
public int? UserCount { get; set; }
public string TrialSiteCode { get; set; } = String.Empty;
public string TrialSiteName { get; set; } = String.Empty;
public string TrialSiteAliasName { get; set; } = String.Empty;
public bool IsDeleted { get; set; }
@ -246,21 +248,16 @@ namespace IRaCIS.Application.Contracts
public DateTime CreateTime { get; set; }
public string Site { get; set; } = String.Empty;
public string SiteCode { get; set; } = String.Empty;
public string Hospital { get; set; } = String.Empty;
public string City { get; set; } = String.Empty;
public string Country { get; set; } = String.Empty;
public string DirectorName { get; set; } = String.Empty;
public string DirectorPhone { get; set; } = String.Empty;
public string ContactName { get; set; } = String.Empty;
public string ContactPhone { get; set; } = String.Empty;
public string Address { get; set; } = String.Empty;
//public string Site { get; set; } = String.Empty;
//public string SiteCode { get; set; } = String.Empty;
//public string Hospital { get; set; } = String.Empty;
//public string City { get; set; } = String.Empty;
//public string Country { get; set; } = String.Empty;
//public string DirectorName { get; set; } = String.Empty;
//public string DirectorPhone { get; set; } = String.Empty;
//public string ContactName { get; set; } = String.Empty;
//public string ContactPhone { get; set; } = String.Empty;
//public string Address { get; set; } = String.Empty;
public List<string> UserNameList { get; set; } = new List<string>();

10
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
View File

@ -9,6 +9,7 @@ using IRaCIS.Core.Application.Service;
using Microsoft.AspNetCore.Authorization;
using IRaCIS.Core.Application.Auth;
using IRaCIS.Application.Interfaces;
using System.Linq;
namespace IRaCIS.Core.Application.Services
{
@ -110,6 +111,15 @@ namespace IRaCIS.Core.Application.Services
}
public async Task<List<TrialSiteSelect>> GetTrialSiteSelectList(string siteName)
{
var list= _siteRepository
.WhereIf(!string.IsNullOrWhiteSpace(siteName), t => t.SiteName.Contains(siteName) || t.SiteNameCN.Contains(siteName) || t.AliasName.Contains(siteName))
.Select(t => new TrialSiteSelect() { SiteId = t.Id, SiteName = t.SiteName, AliasName = t.AliasName }).ToList();
return list;
}
/// <summary>Setting页面 Site批量添加</summary>

22
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
View File

@ -120,17 +120,17 @@ namespace IRaCIS.Core.Application.Service
#region site 也有country hospital 也有 注意区分
CreateMap<TrialSite, SiteStatDTO>()
.ForMember(d => d.SiteCode, u => u.MapFrom(s => s.Site.SiteCode))
.ForMember(d => d.City, u => u.MapFrom(s => s.Site.City))
.ForMember(d => d.Country, u => u.MapFrom(s => s.Site.Country))
.ForMember(d => d.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName))
//.ForMember(d => d.SiteCode, u => u.MapFrom(s => s.Site.SiteCode))
//.ForMember(d => d.City, u => u.MapFrom(s => s.Site.City))
//.ForMember(d => d.Country, u => u.MapFrom(s => s.Site.Country))
//.ForMember(d => d.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName))
.ForMember(d => d.DirectorName, u => u.MapFrom(s => s.Site.DirectorName))
.ForMember(d => d.DirectorPhone, u => u.MapFrom(s => s.Site.DirectorPhone))
.ForMember(d => d.ContactPhone, u => u.MapFrom(s => s.Site.ContactPhone))
.ForMember(d => d.Address, u => u.MapFrom(s => s.Site.Address))
.ForMember(d => d.Site, u => u.MapFrom(s => s.Site.SiteName))
//.ForMember(d => d.DirectorName, u => u.MapFrom(s => s.Site.DirectorName))
//.ForMember(d => d.DirectorPhone, u => u.MapFrom(s => s.Site.DirectorPhone))
//.ForMember(d => d.ContactPhone, u => u.MapFrom(s => s.Site.ContactPhone))
//.ForMember(d => d.Address, u => u.MapFrom(s => s.Site.Address))
//.ForMember(d => d.Site, u => u.MapFrom(s => s.Site.SiteName))
@ -148,8 +148,8 @@ namespace IRaCIS.Core.Application.Service
.ForMember(d => d.Id, u => u.MapFrom(s => s.Id))
.ForMember(d => d.TrialSiteId, u => u.MapFrom(s => s.Id))
.ForMember(d => d.UpdateTime, u => u.MapFrom(s => s.UpdateTime))
.ForMember(d => d.Site, u => u.MapFrom(s => isEn_Us ?s.Site.SiteName:s.Site.SiteNameCN))
.ForMember(d => d.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName))
//.ForMember(d => d.Site, u => u.MapFrom(s => isEn_Us ?s.Site.SiteName:s.Site.SiteNameCN))
//.ForMember(d => d.Hospital, u => u.MapFrom(s => s.Site.Hospital.HospitalName))
.ForMember(d => d.UserCount, u => u.MapFrom(s => s.CRCUserList.Count()))
.ForMember(d => d.VisitCount, u => u.MapFrom(s => s.SubjectVisitList.Count()))
.ForMember(d => d.SubjectCount, u => u.MapFrom(s => s.SubjectList.Count()))