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

Uat_IRC_Net8
hang 2024-12-23 15:47:41 +08:00
parent c1a58401eb e0cf5f804e
commit a2809dc15a
14 changed files with 55136 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -17325,6 +17325,36 @@
工作兼职En
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.DoctorBasicInfo.UniversityAffiliated">
<summary>
大学
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.DoctorBasicInfo.UniversityAffiliatedCN">
<summary>
大学
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.DoctorBasicInfo.City">
<summary>
城市
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.DoctorBasicInfo.CityCN">
<summary>
城市
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.DoctorBasicInfo.HospitalName">
<summary>
医院
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.DoctorBasicInfo.HospitalNameCN">
<summary>
医院
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.PaymentModeDto.BankNum">
<summary>
银行卡号
@ -17410,6 +17440,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>
文件名称

64
IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs
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

36
IRaCIS.Core.Application/Service/Doctor/DoctorService.cs
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);

17
IRaCIS.Core.Application/Service/Doctor/EducationService.cs
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);
}

6
IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
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>();

30
IRaCIS.Core.Domain/Dcotor/Doctor.cs
View File

@ -247,4 +247,34 @@ public class Doctor : BaseFullAuditEntity
/// ÏîÄ¿Id
/// </summary>
public Guid? TrialId { get; set; }
/// <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;
}

4
IRaCIS.Core.Domain/Institution/Hospital.cs
View File

@ -24,10 +24,6 @@ public class Hospital : BaseFullAuditEntity
public string ProvinceCN { get; set; } = string.Empty;
public string CityCN { get; set; } = string.Empty;
/// <summary>
/// 是否确认
/// </summary>
public bool IsConfirm { get; set; } = true;
[Comment("中心Id")]
public Guid? SiteId { get; set; } = Guid.Empty;
}

18243
IRaCIS.Core.Infra.EFCore/Migrations/20241220091022_DoctorHospital.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

149
IRaCIS.Core.Infra.EFCore/Migrations/20241220091022_DoctorHospital.cs Normal file
View File

@ -0,0 +1,149 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class DoctorHospital : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_SCPInstance_SCPStudy_StudyId",
table: "SCPInstance");
migrationBuilder.DropForeignKey(
name: "FK_TaskInstance_TaskStudy_StudyId",
table: "TaskInstance");
migrationBuilder.DropColumn(
name: "IsConfirm",
table: "Hospital");
migrationBuilder.AddColumn<string>(
name: "City",
table: "Doctor",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "CityCN",
table: "Doctor",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "HospitalCN",
table: "Doctor",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "HospitalEn",
table: "Doctor",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "University",
table: "Doctor",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "UniversityCN",
table: "Doctor",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddForeignKey(
name: "FK_SCPInstance_SCPStudy_StudyId",
table: "SCPInstance",
column: "StudyId",
principalTable: "SCPStudy",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_TaskInstance_TaskStudy_StudyId",
table: "TaskInstance",
column: "StudyId",
principalTable: "TaskStudy",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_SCPInstance_SCPStudy_StudyId",
table: "SCPInstance");
migrationBuilder.DropForeignKey(
name: "FK_TaskInstance_TaskStudy_StudyId",
table: "TaskInstance");
migrationBuilder.DropColumn(
name: "City",
table: "Doctor");
migrationBuilder.DropColumn(
name: "CityCN",
table: "Doctor");
migrationBuilder.DropColumn(
name: "HospitalCN",
table: "Doctor");
migrationBuilder.DropColumn(
name: "HospitalEn",
table: "Doctor");
migrationBuilder.DropColumn(
name: "University",
table: "Doctor");
migrationBuilder.DropColumn(
name: "UniversityCN",
table: "Doctor");
migrationBuilder.AddColumn<bool>(
name: "IsConfirm",
table: "Hospital",
type: "bit",
nullable: false,
defaultValue: false);
migrationBuilder.AddForeignKey(
name: "FK_SCPInstance_SCPStudy_StudyId",
table: "SCPInstance",
column: "StudyId",
principalTable: "SCPStudy",
principalColumn: "SeqId",
onDelete: ReferentialAction.Cascade);
migrationBuilder.AddForeignKey(
name: "FK_TaskInstance_TaskStudy_StudyId",
table: "TaskInstance",
column: "StudyId",
principalTable: "TaskStudy",
principalColumn: "SeqId",
onDelete: ReferentialAction.Cascade);
}
}
}

18243
IRaCIS.Core.Infra.EFCore/Migrations/20241220091507_Doctord.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

38
IRaCIS.Core.Infra.EFCore/Migrations/20241220091507_Doctord.cs Normal file
View File

@ -0,0 +1,38 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class Doctord : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "HospitalEn",
table: "Doctor",
newName: "HospitalNameCN");
migrationBuilder.RenameColumn(
name: "HospitalCN",
table: "Doctor",
newName: "HospitalName");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "HospitalNameCN",
table: "Doctor",
newName: "HospitalEn");
migrationBuilder.RenameColumn(
name: "HospitalName",
table: "Doctor",
newName: "HospitalCN");
}
}
}

18243
IRaCIS.Core.Infra.EFCore/Migrations/20241220094746_doctorf.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

38
IRaCIS.Core.Infra.EFCore/Migrations/20241220094746_doctorf.cs Normal file
View File

@ -0,0 +1,38 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class doctorf : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "UniversityCN",
table: "Doctor",
newName: "UniversityAffiliatedCN");
migrationBuilder.RenameColumn(
name: "University",
table: "Doctor",
newName: "UniversityAffiliated");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "UniversityAffiliatedCN",
table: "Doctor",
newName: "UniversityCN");
migrationBuilder.RenameColumn(
name: "UniversityAffiliated",
table: "Doctor",
newName: "University");
}
}
}

33
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -1355,6 +1355,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("City")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("CityCN")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<int>("Code")
.HasColumnType("int");
@ -1409,6 +1419,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid?>("HospitalId")
.HasColumnType("uniqueidentifier");
b.Property<string>("HospitalName")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("HospitalNameCN")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("HospitalOther")
.IsRequired()
.HasMaxLength(400)
@ -1569,6 +1589,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid?>("TrialId")
.HasColumnType("uniqueidentifier");
b.Property<string>("UniversityAffiliated")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("UniversityAffiliatedCN")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<DateTime>("UpdateTime")
.HasColumnType("datetime2");
@ -2625,9 +2655,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<bool>("IsConfirm")
.HasColumnType("bit");
b.Property<string>("Province")
.IsRequired()
.HasMaxLength(400)