修改

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

@@ -4195,6 +4195,56 @@
             <param name="digitPlaces"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRIPDFFCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
+            <summary>
+            获取阅片的计算数据
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRIPDFFCalculateService.GetDeleteLesionStatrIndex(IRaCIS.Core.Application.Service.Reading.Dto.DeleteReadingRowAnswerInDto)">
+            <summary>
+            删除病灶获取起始病灶序号
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRIPDFFCalculateService.GetReadingReportEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingReportEvaluationInDto)">
+            <summary>
+            获取阅片报告
+            </summary>
+            <param name="indto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRIPDFFCalculateService.AddTaskLesionAnswerFromLastTask(IRaCIS.Core.Application.ViewModel.AddTaskLesionAnswerFromLastTaskInDto)">
+            <summary>
+            将上一次的访视病灶添加到这一次
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRIPDFFCalculateService.TestCalculate(System.Guid,IRaCIS.Core.Domain.Share.QuestionType)">
+            <summary>
+            测试计算
+            </summary>
+            <param name="visitTaskId"></param>
+            <param name="type"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRIPDFFCalculateService.CalculateTask(IRaCIS.Core.Application.Service.Reading.Dto.CalculateTaskInDto)">
+            <summary>
+            计算任务
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.MRIPDFFCalculateService.ReadingCalculate(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto,System.Collections.Generic.List{IRaCIS.Core.Domain.Share.QuestionType})">
+            <summary>
+            自动计算
+            </summary>
+            <param name="inDto"></param>
+            <param name="calculateType"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.OCTCalculateService.GetReadingCalculationData(IRaCIS.Core.Application.Service.Reading.Dto.GetReadingCalculationDataInDto)">
             <summary>
             获取阅片的计算数据

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

@@ -637,6 +637,8 @@ 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;

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

@@ -17,6 +17,7 @@ namespace IRaCIS.Core.Application.Service
         IRepository<DoctorDictionary> _doctorDictionaryRepository,
            IRepository<DoctorSummarize> _doctorSummarizeRepository,
         IRepository<Enroll> _enrollRepository,
+           IRepository<Hospital> _hospitalRepository,
           IRepository<Dictionary> _dictionaryRepository,
         IRepository<Attachment> _attachmentRepository,
              IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
@@ -581,7 +582,7 @@ namespace IRaCIS.Core.Application.Service
 
         [HttpPost]
 
-        public async Task<IResponseOutput> UpdateEmploymentInfo(EmploymentCommand doctorWorkInfoModel)
+        public async Task<IResponseOutput> UpdateEmploymentInfo(EmploymentCommand inDto)
         {
             #region 废弃
             //var success = _doctorRepository.Update(d => d.Id == doctorWorkInfoModel.Id, u => new Doctor()
@@ -611,8 +612,25 @@ 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(doctorWorkInfoModel, true);
+            var entity = await _doctorRepository.InsertOrUpdateAsync(inDto, true);
 
 
             return ResponseOutput.Ok();

IRaCIS.Core.Domain/Institution/Hospital.cs

@@ -23,6 +23,11 @@ public class Hospital : BaseFullAuditEntity
     public string CountryCN { get; set; } = string.Empty;
     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;
 }

IRaCIS.Core.Infra.EFCore/Migrations/20241220052713_Hospital.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class Hospital : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsConfirm",
+                table: "Hospital",
+                type: "bit",
+                nullable: false,
+                defaultValue: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IsConfirm",
+                table: "Hospital");
+        }
+    }
+}

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

@@ -2625,6 +2625,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasMaxLength(400)
                         .HasColumnType("nvarchar(400)");
 
+                    b.Property<bool>("IsConfirm")
+                        .HasColumnType("bit");
+
                     b.Property<string>("Province")
                         .IsRequired()
                         .HasMaxLength(400)