diff --git a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
index 77a3280..8681234 100644
--- a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
@@ -101,6 +101,12 @@ namespace Shentun.Peis.PrintReports
/// 总检医生
///
public string SummaryDoctorName { get; set; }
+
+ ///
+ /// 总检医生签名
+ ///
+ public string SummaryDoctorSignUrl { get; set; }
+
///
/// 总检日期
///
@@ -110,6 +116,10 @@ namespace Shentun.Peis.PrintReports
///
public string AuditDoctorName { get; set; }
///
+ /// 审核医生签名
+ ///
+ public string AuditDoctorSignUrl { get; set; }
+ ///
/// 审核日期
///
public DateTime? AuditDate { get; set; }
@@ -267,6 +277,11 @@ namespace Shentun.Peis.PrintReports
///
public string CheckDoctorName { get; set; }
+ ///
+ /// 检查医生签名
+ ///
+ public string CheckDoctorSignUrl { get; set; }
+
///
/// 检查日期
///
@@ -277,6 +292,11 @@ namespace Shentun.Peis.PrintReports
///
public string LisAuditorDoctorName { get; set; }
+ ///
+ /// lis审核医生签名
+ ///
+ public string LisAuditorDoctorSignUrl { get; set; }
+
///
/// lis标本号
///
diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
index 326760a..486da7c 100644
--- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
+++ b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
@@ -1024,8 +1024,10 @@ namespace Shentun.Peis.PrintReports
PersonnelTypeName = _cacheService.GetPersonnelTypeNameAsync(patientRegister.PersonnelTypeId).Result,
MedicalStartDate = patientRegister.MedicalStartDate,
SummaryDoctorName = _cacheService.GetSurnameAsync(patientRegister.SummaryDoctorId).Result,
+ SummaryDoctorSignUrl = _cacheService.GetUserSignAsync(patientRegister.SummaryDoctorId).GetAwaiter().GetResult(),
SummaryDate = patientRegister.SummaryDate,
AuditDoctorName = _cacheService.GetSurnameAsync(patientRegister.AuditDoctorId).Result,
+ AuditDoctorSignUrl = _cacheService.GetUserSignAsync(patientRegister.AuditDoctorId).GetAwaiter().GetResult(),
AuditDate = patientRegister.AuditDate,
//体检中心信息
MedicalCenterTelphone = medicalCenterTelphone,
@@ -1212,6 +1214,7 @@ namespace Shentun.Peis.PrintReports
if (Guid.TryParse(checkDoctorId, out var checkDoctorIdGuid))
{
medicalReportRegisterCheckDto.CheckDoctorName = _cacheService.GetSurnameAsync(checkDoctorIdGuid).Result;
+ medicalReportRegisterCheckDto.CheckDoctorSignUrl = _cacheService.GetUserSignAsync(checkDoctorIdGuid).Result;
}
else
{
@@ -1222,6 +1225,7 @@ namespace Shentun.Peis.PrintReports
//lis审核医生+标本号
medicalReportRegisterCheckDto.LisSampleNo = registerCheckRow.registerCheck.LisSampleNo;
medicalReportRegisterCheckDto.LisAuditorDoctorName = registerCheckRow.registerCheck.LisAuditorDoctorName;
+
//显示顺序
medicalReportRegisterCheckDto.DisplayOrder = registerCheckRow.asbitem.DisplayOrder;
diff --git a/src/Shentun.Peis.Domain/CacheService.cs b/src/Shentun.Peis.Domain/CacheService.cs
index 213f2fb..d38a4fe 100644
--- a/src/Shentun.Peis.Domain/CacheService.cs
+++ b/src/Shentun.Peis.Domain/CacheService.cs
@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Distributed;
using Microsoft.Extensions.Caching.Memory;
+using NPOI.SS.Formula.Functions;
using Shentun.Peis.Enums;
using Shentun.Peis.Models;
using Shentun.Peis.SysParmValues;
@@ -10,6 +11,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp.Caching;
+using Volo.Abp.Data;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Domain.Repositories;
@@ -145,6 +147,18 @@ namespace Shentun.Peis
return "";
}
+ public async Task GetUserSignAsync(Guid? id)
+ {
+ if (id == null || id == default(Guid) || !id.HasValue)
+ {
+ return "";
+ }
+ var entity = await GetUserAsync((Guid)id);
+ if (entity != null)
+ return entity.GetProperty("user_sign");
+ else
+ return "";
+ }
private async Task GetSexAsync(char id)
{