医生签名+对照+报告转换

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)
                 {

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;