From a4c4f065a84b916bd5f8bde7afa753ede30e7f98 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Sat, 23 Nov 2024 16:01:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PrintReports/MedicalReportDto.cs          | 20 +++++++++++++++++++
 .../PrintReports/PrintReportAppService.cs     |  4 ++++
 src/Shentun.Peis.Domain/CacheService.cs       | 14 +++++++++++++
 3 files changed, 38 insertions(+)

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
         /// 总检医生
         /// </summary>
         public string SummaryDoctorName { get; set; }
+
+        /// <summary>
+        /// 总检医生签名
+        /// </summary>
+        public string SummaryDoctorSignUrl { get; set; }
+
         /// <summary>
         /// 总检日期
         /// </summary>
@@ -110,6 +116,10 @@ namespace Shentun.Peis.PrintReports
         /// </summary>
         public string AuditDoctorName { get; set; }
         /// <summary>
+        /// 审核医生签名
+        /// </summary>
+        public string AuditDoctorSignUrl { get; set; }
+        /// <summary>
         /// 审核日期
         /// </summary>
         public DateTime? AuditDate { get; set; }
@@ -267,6 +277,11 @@ namespace Shentun.Peis.PrintReports
         /// </summary>
         public string CheckDoctorName { get; set; }
 
+        /// <summary>
+        /// 检查医生签名
+        /// </summary>
+        public string CheckDoctorSignUrl { get; set; }
+
         /// <summary>
         /// 检查日期
         /// </summary>
@@ -277,6 +292,11 @@ namespace Shentun.Peis.PrintReports
         /// </summary>
         public string LisAuditorDoctorName { get; set; }
 
+        /// <summary>
+        /// lis审核医生签名
+        /// </summary>
+        public string LisAuditorDoctorSignUrl { get; set; }
+
         /// <summary>
         /// lis标本号
         /// </summary>
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<string> GetUserSignAsync(Guid? id)
+        {
+            if (id == null || id == default(Guid) || !id.HasValue)
+            {
+                return "";
+            }
+            var entity = await GetUserAsync((Guid)id);
+            if (entity != null)
+                return entity.GetProperty<string>("user_sign");
+            else
+                return "";
+        }
         private async Task<Sex> GetSexAsync(char id)
         {