lis导入结果增加标本号+审核医生

src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs

@@ -53,6 +53,17 @@ namespace Shentun.Peis.ImportLisResults
 
         public DateTime? CheckDate { get; set; }
 
-         
+
+        /// <summary>
+        /// lis审核医生
+        /// </summary>
+        public string LisAuditorDoctorName { get; set; }
+
+        /// <summary>
+        /// lis标本号
+        /// </summary>
+        public string LisSampleNo { get; set; }
+
+
     }
 }

src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs

@@ -264,7 +264,17 @@ namespace Shentun.Peis.PrintReports
         /// 检查日期
         /// </summary>
         public DateTime CheckDate { get; set; }
-        
+
+        /// <summary>
+        /// lis审核医生
+        /// </summary>
+        public string LisAuditorDoctorName { get; set; }
+
+        /// <summary>
+        /// lis标本号
+        /// </summary>
+        public string LisSampleNo { get; set; }
+
         /// <summary>
         /// 项目类别下的组合项目列表
         /// </summary>

src/Shentun.Peis.Application.Contracts/RegisterChecks/UpdateCheckResultDto.cs

@@ -27,7 +27,16 @@ namespace Shentun.Peis.RegisterChecks
         public List<UpdateRegisterCheckSummaryDetail> Summarys { get; set; } = new List<UpdateRegisterCheckSummaryDetail>();
         public List<UpdateRegisterCheckSuggestionDetail> Suggestions { get; set; } = new List<UpdateRegisterCheckSuggestionDetail>();
 
-      
+        /// <summary>
+        /// lis审核医生
+        /// </summary>
+        public string LisAuditorDoctorName { get; set; }
+
+        /// <summary>
+        /// lis标本号
+        /// </summary>
+        public string LisSampleNo { get; set; }
+
     }
 
     public class UpdateRegisterCheckItemDetail

src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs

@@ -197,6 +197,8 @@ namespace Shentun.Peis.ImportLisResults
                         lisRequestItem.registerCheck.CheckDoctorId = inputItem.CheckDoctorName;
                         lisRequestItem.registerCheck.CheckDate = inputItem.CheckDate;
                         lisRequestItem.registerCheck.ExecOrganizationUnitId = inputItem.ExecOrganizationUnitId;
+                        lisRequestItem.registerCheck.LisAuditorDoctorName = inputItem.LisAuditorDoctorName;
+                        lisRequestItem.registerCheck.LisSampleNo = inputItem.LisSampleNo;
                         registerChecks.Add(lisRequestItem.registerCheck);
                     }
                 }
@@ -204,6 +206,7 @@ namespace Shentun.Peis.ImportLisResults
 
             }
 
+            List<RegisterCheckAsbitem> updateRegisterCheckAsbitem = new List<RegisterCheckAsbitem>();
 
             //更新参考范围和单位
             foreach (var registerCheck in registerChecks)
@@ -253,7 +256,9 @@ namespace Shentun.Peis.ImportLisResults
                         ItemId = o.registerCheckItem.ItemId,
                         Result = o.registerCheckItem.Result,
 
-                    }).ToList()
+                    }).ToList(),
+                    LisSampleNo = registerCheck.LisSampleNo,
+                    LisAuditorDoctorName = registerCheck.LisAuditorDoctorName
 
                 };
 
@@ -282,7 +287,6 @@ namespace Shentun.Peis.ImportLisResults
                 await _registerCheckAppService.UpdateCheckResult(updateCheckResultDto);
             }
 
-
         }
         /// <summary>
         /// 导入某个人的结果
@@ -477,7 +481,9 @@ namespace Shentun.Peis.ImportLisResults
                     ReportPrompt = "",
                     ResultStatusId = null,
                     Result = item.Result,
-                    Unit = item.Unit
+                    Unit = item.Unit,
+                    LisAuditorDoctorName = item.LisAuditorDoctorName,
+                    LisSampleNo = item.LisSampleNo
                 };
 
                 inputDtoList.Add(inputDto);

src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs

@@ -1157,6 +1157,11 @@ namespace Shentun.Peis.PrintReports
                         medicalReportRegisterCheckDto.CheckDoctorName = checkDoctorId;
                     }
                 }
+
+                //lis审核医生+标本号
+                medicalReportRegisterCheckDto.LisSampleNo= registerCheckRow.registerCheck.LisSampleNo;
+                medicalReportRegisterCheckDto.LisAuditorDoctorName = registerCheckRow.registerCheck.LisAuditorDoctorName;
+
                 //显示顺序
                 medicalReportRegisterCheckDto.DisplayOrder = registerCheckRow.asbitem.DisplayOrder;
                 //明细结果

src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs

@@ -299,6 +299,8 @@ namespace Shentun.Peis.RegisterChecks
                 input.CheckDoctorId = CurrentUser.Id.ToString();
             }
             _registerCheckManager.UpdateCheckDoctorAndDateAsync(patientRegister, registerCheck, input.CheckDoctorId, input.CheckDate, input.ExecOrganizationUnitId);
+            registerCheck.LisAuditorDoctorName = input.LisAuditorDoctorName;
+            registerCheck.LisSampleNo = input.LisSampleNo;
             //更新人员登记信息完成标志
             patientRegister.CompleteFlag = PatientRegisterCompleteFlag.PartCheck;
             await _patientRegisterRepository.UpdateAsync(patientRegister);

src/Shentun.Peis.Domain/RegisterCheckAsbitems/RegisterCheckAsbitem.cs

@@ -92,6 +92,9 @@ namespace Shentun.Peis.Models
 
 
 
+
+     
+
         /// <summary>
         /// 分组或者套餐ID
         /// </summary>

src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs

@@ -169,6 +169,18 @@ namespace Shentun.Peis.Models
         //[Column("register_asbitem_id")]
         //public Guid RegisterAsbitemId { get; set; }
 
+        /// <summary>
+        /// lis审核医生
+        /// </summary>
+        [Column("lis_auditor_doctor_name")]
+        public string LisAuditorDoctorName { get; set; }
+
+        /// <summary>
+        /// lis标本号
+        /// </summary>
+        [Column("lis_sample_no")]
+        public string LisSampleNo { get; set; }
+
         [Column("concurrency_stamp")]
         public string ConcurrencyStamp { get; set; }
 

src/Shentun.Peis.EntityFrameworkCore/Migrations/20240718094353_register_check_addlis.cs

@@ -0,0 +1,35 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Shentun.Peis.Migrations
+{
+    public partial class register_check_addlis : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "lis_auditor_doctor_name",
+                table: "register_check",
+                type: "text",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "lis_sample_no",
+                table: "register_check",
+                type: "text",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "lis_auditor_doctor_name",
+                table: "register_check");
+
+            migrationBuilder.DropColumn(
+                name: "lis_sample_no",
+                table: "register_check");
+        }
+    }
+}

src/Shentun.Peis.EntityFrameworkCore/Migrations/PeisDbContextModelSnapshot.cs

@@ -8319,6 +8319,14 @@ namespace Shentun.Peis.Migrations
                         .HasColumnType("uuid")
                         .HasColumnName("last_modifier_id");
 
+                    b.Property<string>("LisAuditorDoctorName")
+                        .HasColumnType("text")
+                        .HasColumnName("lis_auditor_doctor_name");
+
+                    b.Property<string>("LisSampleNo")
+                        .HasColumnType("text")
+                        .HasColumnName("lis_sample_no");
+
                     b.Property<Guid>("PatientRegisterId")
                         .HasColumnType("uuid")
                         .HasColumnName("patient_register_id");