Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-10-21 14:20:10 +08:00
commit 8bd82ed409
6 changed files with 17983 additions and 1 deletions

View File

@ -1164,6 +1164,13 @@
添加/更新 医生基本信息 BasicInfo
</summary>
</member>
<member name="M:IRaCIS.Core.Application.Service.DoctorService.AddOrUpdateDoctorBasicInfoAndEmployment(IRaCIS.Application.Contracts.BasicInfoAndEmploymentDto)">
<summary>
新增修改 医生基本信息和工作
</summary>
<param name="indto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.DoctorService.GetBasicInfo(System.Guid)">
<summary>
详情、编辑-获取 医生基本信息 BasicInfo
@ -16799,6 +16806,26 @@
入组 Selection 列表查询参数
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.BasicInfoAndEmploymentDto.WorkPartTime">
<summary>
工作兼职
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.BasicInfoAndEmploymentDto.WorkPartTimeEn">
<summary>
工作兼职En
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.EmploymentInfo.WorkPartTime">
<summary>
工作兼职
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.EmploymentInfo.WorkPartTimeEn">
<summary>
工作兼职En
</summary>
</member>
<member name="P:IRaCIS.Application.Contracts.AddDoctorCriterionFileDto.FileName">
<summary>
文件名称

View File

@ -321,6 +321,16 @@ namespace IRaCIS.Application.Contracts
public Guid? PhysicianId { get; set; }
public string Physician { get; set; } = string.Empty;
public string PhysicianCN { get; set; } = string.Empty;
/// <summary>
/// 工作兼职
/// </summary>
public string WorkPartTime { get; set; } = string.Empty;
/// <summary>
/// 工作兼职En
/// </summary>
public string WorkPartTimeEn { get; set; } = string.Empty;
}
public class DoctorBasicInfoCommand : DoctorBasicInfo
{
@ -514,6 +524,16 @@ namespace IRaCIS.Application.Contracts
public string Physician { get; set; } = string.Empty;
public string PhysicianCN { get; set; } = string.Empty;
/// <summary>
/// 工作兼职
/// </summary>
public string WorkPartTime { get; set; } = string.Empty;
/// <summary>
/// 工作兼职En
/// </summary>
public string WorkPartTimeEn { get; set; } = string.Empty;
}
#endregion

View File

@ -172,6 +172,16 @@ public class Doctor : BaseFullAuditEntity
public string WeChat { get; set; } = null!;
/// <summary>
/// ¹¤×÷¼æÖ°
/// </summary>
public string WorkPartTime { get; set; } = string.Empty;
/// <summary>
/// ¹¤×÷¼æÖ°En
/// </summary>
public string WorkPartTimeEn { get; set; } = string.Empty;
[NotMapped]
public string FullName => LastName + " / " + FirstName;
}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,42 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class DoctorInfo : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "WorkPartTime",
table: "Doctor",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<string>(
name: "WorkPartTimeEn",
table: "Doctor",
type: "nvarchar(400)",
maxLength: 400,
nullable: false,
defaultValue: "");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "WorkPartTime",
table: "Doctor");
migrationBuilder.DropColumn(
name: "WorkPartTimeEn",
table: "Doctor");
}
}
}

View File

@ -17,7 +17,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.8")
.HasAnnotation("ProductVersion", "8.0.10")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
@ -1539,6 +1539,16 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("WorkPartTime")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.Property<string>("WorkPartTimeEn")
.IsRequired()
.HasMaxLength(400)
.HasColumnType("nvarchar(400)");
b.HasKey("Id");
b.HasIndex("CreateUserId");