From 02a52806a2304ee8c87d2b9ca5575d93e05b11ff Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Sat, 23 Nov 2024 17:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=AD=BE=E5=90=8D+=E5=AF=B9?=
 =?UTF-8?q?=E7=85=A7+=E6=8A=A5=E5=91=8A=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportLisResultAppService.cs              | 15 ++++++++++++-
 .../PrintReports/PrintReportAppService.cs     | 22 +++++++++++++++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs b/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs
index 310b283..2dc9837 100644
--- a/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs
+++ b/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs
@@ -471,7 +471,7 @@ namespace Shentun.Peis.ImportLisResults
             var config = configurationBuilder.Build();
             Guid execOrganizationUnitId = Guid.Parse(config.GetSection("Interface").GetSection("ExecOrganizationUnitId").Value);
             Guid columnReferenId = Guid.Parse(config.GetSection("Interface").GetSection("ColumnReferenId").Value);
-
+            Guid userColumnReferenId= Guid.Parse(config.GetSection("Interface").GetSection("UserColumnReferenId").Value);
 
             List<CreateImportLisResultDto> inputDtoList = new List<CreateImportLisResultDto>();
 
@@ -483,6 +483,19 @@ namespace Shentun.Peis.ImportLisResults
                     throw new UserFriendlyException($"项目编号:{item.ItemId}没有对照");
                 }
 
+                //转换检查医生ID
+                var checkDoctorUserId = (await _columnReferenceCodeManager.GetColumnReferenCodeValueAsync(userColumnReferenId, item.CheckDoctorName)).FirstOrDefault();
+                if (!string.IsNullOrWhiteSpace(checkDoctorUserId))
+                {
+                    item.CheckDoctorName = checkDoctorUserId;
+                }
+
+                //转换审核医生ID
+                var lisAuditorDoctorUserId = (await _columnReferenceCodeManager.GetColumnReferenCodeValueAsync(userColumnReferenId, item.LisAuditorDoctorName)).FirstOrDefault();
+                if (!string.IsNullOrWhiteSpace(lisAuditorDoctorUserId))
+                {
+                    item.LisAuditorDoctorName = lisAuditorDoctorUserId;
+                }
 
                 foreach (var codeValue in codeValues)
                 {
diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
index 486da7c..b1968c0 100644
--- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
+++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
@@ -1219,13 +1219,31 @@ namespace Shentun.Peis.PrintReports
                     else
                     {
                         medicalReportRegisterCheckDto.CheckDoctorName = checkDoctorId;
+                        medicalReportRegisterCheckDto.CheckDoctorSignUrl = "";
                     }
                 }
 
                 //lis审核医生+标本号
                 medicalReportRegisterCheckDto.LisSampleNo = registerCheckRow.registerCheck.LisSampleNo;
-                medicalReportRegisterCheckDto.LisAuditorDoctorName = registerCheckRow.registerCheck.LisAuditorDoctorName;
-               
+               // medicalReportRegisterCheckDto.LisAuditorDoctorName = registerCheckRow.registerCheck.LisAuditorDoctorName;
+
+                //lis审核医生
+                var lisAuditorDoctorId = registerCheckRow.registerCheck.LisAuditorDoctorName;
+                if (!string.IsNullOrWhiteSpace(lisAuditorDoctorId))
+                {
+                    if (Guid.TryParse(lisAuditorDoctorId, out var lisAuditorDoctorIdGuid))
+                    {
+                        medicalReportRegisterCheckDto.LisAuditorDoctorName = _cacheService.GetSurnameAsync(lisAuditorDoctorIdGuid).Result;
+                        medicalReportRegisterCheckDto.LisAuditorDoctorSignUrl = _cacheService.GetUserSignAsync(lisAuditorDoctorIdGuid).Result;
+                    }
+                    else
+                    {
+                        medicalReportRegisterCheckDto.LisAuditorDoctorName = lisAuditorDoctorId;
+                        medicalReportRegisterCheckDto.LisAuditorDoctorSignUrl = "";
+                    }
+                }
+
+
 
                 //显示顺序
                 medicalReportRegisterCheckDto.DisplayOrder = registerCheckRow.asbitem.DisplayOrder;