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

修改

Browse Source
This commit is contained in:
he
2024-12-20 17:10:49 +08:00
parent 3e9221b39c
commit a001db2da5
9 changed files with 18514 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+30
View File
@@ -17401,6 +17401,36 @@
工作兼职En
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.EmploymentInfo.University">
<summary>
大学
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.EmploymentInfo.UniversityCN">
<summary>
大学
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.EmploymentInfo.City">
<summary>
城市
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.EmploymentInfo.CityCN">
<summary>
城市
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.EmploymentInfo.HospitalEn">
<summary>
医院
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.EmploymentInfo.HospitalCN">
<summary>
医院
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.AddDoctorCriterionFileDto.FileName">
<summary>
文件名称
IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs
+30 -5
View File
@@ -445,9 +445,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 +637,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 +666,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);
}