IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -17316,36 +17316,6 @@
             工作兼职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>
             银行卡号

IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -322,35 +322,6 @@ 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;
 
     }
 

IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs

@@ -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>();
 

IRaCIS.Core.Domain/Dcotor/Doctor.cs

@@ -251,12 +251,12 @@ public class Doctor : BaseFullAuditEntity
     /// <summary>
     /// 大学
     /// </summary>
-    public string UniversityAffiliated { get; set; } = string.Empty;
+    public string University { get; set; } = string.Empty;
 
     /// <summary>
     /// 大学
     /// </summary>
-    public string UniversityAffiliatedCN { get; set; } = string.Empty;
+    public string UniversityCN { get; set; } = string.Empty;
 
     /// <summary>
     /// 城市
@@ -271,10 +271,10 @@ public class Doctor : BaseFullAuditEntity
     /// <summary>
     /// 医院
     /// </summary>
-    public string HospitalName { get; set; } = string.Empty;
+    public string HospitalEn { get; set; } = string.Empty;
 
     /// <summary>
     /// 医院
     /// </summary>
-    public string HospitalNameCN { get; set; } = string.Empty;
+    public string HospitalCN { get; set; } = string.Empty;
 }

IRaCIS.Core.Infra.EFCore/Migrations/20241220091507_Doctord.cs

@@ -1,38 +0,0 @@
-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");
-        }
-    }
-}

IRaCIS.Core.Infra.EFCore/Migrations/20241220094746_doctorf.cs

@@ -1,38 +0,0 @@
-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");
-        }
-    }
-}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -1416,19 +1416,19 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<DateTime?>("GCPTime")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("HospitalCN")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
+                    b.Property<string>("HospitalEn")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)");
+
                     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)
@@ -1589,12 +1589,12 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<Guid?>("TrialId")
                         .HasColumnType("uniqueidentifier");
 
-                    b.Property<string>("UniversityAffiliated")
+                    b.Property<string>("University")
                         .IsRequired()
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");
 
-                    b.Property<string>("UniversityAffiliatedCN")
+                    b.Property<string>("UniversityCN")
                         .IsRequired()
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");