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

Browse Source
This commit is contained in:
hang
2024-12-23 15:47:41 +08:00
parent c1a58401eb e0cf5f804e
commit a2809dc15a
14 changed files with 55136 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs
+59 -5
View File
@@ -322,6 +322,35 @@ namespace IRaCIS.Application.Contracts
/// </summary>
public string WorkPartTimeEn { get; set; } = string.Empty;
/// <summary>
/// 大学
/// </summary>
public string UniversityAffiliated { get; set; } = string.Empty;
/// <summary>
/// 大学
/// </summary>
public string UniversityAffiliatedCN { get; set; } = string.Empty;
/// <summary>
/// 城市
/// </summary>
public string City { get; set; } = string.Empty;
/// <summary>
/// 城市
/// </summary>
public string CityCN { get; set; } = string.Empty;
/// <summary>
/// 医院
/// </summary>
public string HospitalName { get; set; } = string.Empty;
/// <summary>
/// 医院
/// </summary>
public string HospitalNameCN { get; set; } = string.Empty;
}
@@ -445,9 +474,6 @@ namespace IRaCIS.Application.Contracts
public class BasicInfoAndEmploymentDto: DoctorBasicInfoCommand
{
public string HospitalName { get; set; } = string.Empty;
//部门
public Guid? DepartmentId { get; set; }
public string DepartmentOther { get; set; } = string.Empty;
@@ -640,8 +666,6 @@ namespace IRaCIS.Application.Contracts
public class EmploymentInfo
{
public Guid Id { get; set; }
public string HospitalName { get; set; } = string.Empty;
//部门
public Guid? DepartmentId { get; set; }
public string DepartmentOther { get; set; } = string.Empty;
@@ -671,6 +695,36 @@ namespace IRaCIS.Application.Contracts
/// </summary>
public string WorkPartTimeEn { get; set; } = string.Empty;
/// <summary>
/// 大学
/// </summary>
public string University { get; set; } = string.Empty;
/// <summary>
/// 大学
/// </summary>
public string UniversityCN { get; set; } = string.Empty;
/// <summary>
/// 城市
/// </summary>
public string City { get; set; } = string.Empty;
/// <summary>
/// 城市
/// </summary>
public string CityCN { get; set; } = string.Empty;
/// <summary>
/// 医院
/// </summary>
public string HospitalEn { get; set; } = string.Empty;
/// <summary>
/// 医院
/// </summary>
public string HospitalCN { get; set; } = string.Empty;
}
#endregion
IRaCIS.Core.Application/Service/Doctor/DoctorService.cs
-36
View File
@@ -144,24 +144,6 @@ namespace IRaCIS.Core.Application.Service
//---current phone or email number already existed
var verifyPair = new KeyValuePair<Expression<Func<Doctor, bool>>, string>(verifyExp, _localizer["Doctor_DupPhoneOrEmail"]);
if (indto.HospitalName != string.Empty)
{
var hospital = await _hospitalRepository.Where(x => x.HospitalName == indto.HospitalName && x.SiteId == null).FirstOrDefaultAsync();
if (hospital != null)
{
indto.HospitalId = hospital.Id;
}
else
{
var newHospital = await _hospitalRepository.AddAsync(new Hospital()
{
HospitalName = indto.HospitalName,
IsConfirm = false,
}, true);
indto.HospitalId = newHospital.Id;
}
}
if (indto.Id == Guid.Empty || indto.Id == null)
{
@@ -630,24 +612,6 @@ namespace IRaCIS.Core.Application.Service
//var success = _doctorRepository.SaveChanges();
#endregion
if (inDto.HospitalName != string.Empty)
{
var hospital = await _hospitalRepository.Where(x => x.HospitalName == inDto.HospitalName && x.SiteId == null).FirstOrDefaultAsync();
if (hospital != null)
{
inDto.HospitalId = hospital.Id;
}
else
{
var newHospital = await _hospitalRepository.AddAsync(new Hospital()
{
HospitalName = inDto.HospitalName,
IsConfirm=false,
}, true);
inDto.HospitalId = newHospital.Id;
}
}
var entity = await _doctorRepository.InsertOrUpdateAsync(inDto, true);
IRaCIS.Core.Application/Service/Doctor/EducationService.cs
-17
View File
@@ -110,23 +110,6 @@ namespace IRaCIS.Core.Application.Service
//}
#endregion
if (inDto.Hospital != string.Empty)
{
var hospital = await _hospitalRepository.Where(x => x.HospitalName == inDto.Hospital && x.SiteId == null).FirstOrDefaultAsync();
if (hospital != null)
{
inDto.HospitalId = hospital.Id;
}
else
{
var newHospital = await _hospitalRepository.AddAsync(new Hospital()
{
HospitalName = inDto.Hospital,
IsConfirm = false,
}, true);
inDto.HospitalId = newHospital.Id;
}
}
var entity = await _postgraduateRepository.InsertOrUpdateAsync(inDto, true);
return ResponseOutput.Ok(entity.Id);
}
IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
+3 -3
View File
@@ -67,9 +67,9 @@ namespace IRaCIS.Core.Application.Service
CreateMap<Vacation, VacationCommand>();
CreateMap<ResearchPublication, ResearchPublicationDTO>();
CreateMap<Postgraduate, PostgraduateViewModel>()
.ForMember(t => t.Hospital, c => c.MapFrom(d => d.HospitalEnt.HospitalName))
.ForMember(t => t.HospitalCN, c => c.MapFrom(d => d.HospitalEnt.HospitalNameCN));
CreateMap<Postgraduate, PostgraduateViewModel>();
// .ForMember(t => t.Hospital, c => c.MapFrom(d => d.HospitalEnt.HospitalName))
//.ForMember(t => t.HospitalCN, c => c.MapFrom(d => d.HospitalEnt.HospitalNameCN));
CreateMap<Attachment, AttachmentDTO>();
CreateMap<Doctor, ResumeConfirmDTO>();