diff --git a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs index 6c3b94f..d40a003 100644 --- a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs +++ b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs @@ -287,19 +287,37 @@ namespace Shentun.Peis.PrintReports /// public DateTime CheckDate { get; set; } + /// + /// 体检审核医生签名 + /// + public string AuditorUserSignUrl { get; set; } + + /// + /// 是否审核 + /// + public char IsAudit { get; set; } + /// + /// 体检审核医生名称 + /// + public string AuditorUserName { get; set; } + /// + /// 体检审核时间 + /// + public string AuditTime { get; set; } + /// /// lis审核医生 为了不报错,暂时保留 /// public string LisAuditorDoctorName { get; set; } /// - /// 审核医生签名 + /// 第三方审核医生签名 /// public string AuditorNameSignUrl { get; set; } /// - /// 审核医生 + /// 第三方审核医生 /// public string AuditorName { get; set; } diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs index f85bd2f..fb3d859 100644 --- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs +++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Authorization; +using IdentityModel.Client; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; @@ -1363,6 +1364,24 @@ namespace Shentun.Peis.PrintReports } } + + #region 体检审核信息 + + medicalReportRegisterCheckDto.IsAudit = registerCheckRow.registerCheck.IsAudit; + medicalReportRegisterCheckDto.AuditTime = DataHelper.ConversionDateToString(registerCheckRow.registerCheck.AuditTime); + + var auditorUserId = registerCheckRow.registerCheck.AuditorUserId; + if (auditorUserId != null && auditorUserId != Guid.Empty) + { + medicalReportRegisterCheckDto.AuditorUserName = _cacheService.GetSurnameAsync(auditorUserId).GetAwaiter().GetResult(); + medicalReportRegisterCheckDto.AuditorUserSignUrl = _cacheService.GetUserSignAsync(auditorUserId).GetAwaiter().GetResult(); + } + + #endregion + + + + #region 第三方传过来的审核信息 //lis审核医生+标本号 medicalReportRegisterCheckDto.LisSampleNo = registerCheckRow.registerCheck.LisSampleNo; // medicalReportRegisterCheckDto.LisAuditorDoctorName = registerCheckRow.registerCheck.LisAuditorDoctorName; @@ -1383,6 +1402,7 @@ namespace Shentun.Peis.PrintReports } } + #endregion //显示顺序