From 7fa51afba9d4c5543e03533bb644c05cf1264a9f Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Tue, 21 Apr 2026 10:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E6=A3=80=E6=93=8D=E4=BD=9C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatientRegisters/PatientRegisterOrNoDto.cs      | 10 ++++++++++
 .../PatientRegisters/PatientRegisterAppService.cs   | 13 ++++++++++++-
 .../PatientRegisters/PatientRegisterManager.cs      | 12 ++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/Shentun.Peis.Application.Contracts/PatientRegisters/PatientRegisterOrNoDto.cs b/src/Shentun.Peis.Application.Contracts/PatientRegisters/PatientRegisterOrNoDto.cs
index 5ae240cd..14288fb6 100644
--- a/src/Shentun.Peis.Application.Contracts/PatientRegisters/PatientRegisterOrNoDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PatientRegisters/PatientRegisterOrNoDto.cs
@@ -358,5 +358,15 @@ namespace Shentun.Peis.PatientRegisters
         /// </summary>
         public string AuditDoctorName { get; set; }
 
+        /// <summary>
+        /// 总检操作时间
+        /// </summary>
+        public string SumCheckOperatingTime { get; set; }
+
+        /// <summary>
+        /// 总检操作人
+        /// </summary>
+        public string SumCheckOperatingUserName { get; set; }
+
     }
 }
diff --git a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
index f03a725c..e72f674a 100644
--- a/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
+++ b/src/Shentun.Peis.Application/PatientRegisters/PatientRegisterAppService.cs
@@ -1411,7 +1411,9 @@ namespace Shentun.Peis.PatientRegisters
                 CustomerOrgName = _cacheService.GetCustomerOrgNameAsync(ent.CustomerOrgId).GetAwaiter().GetResult(),
                 CustomerOrgParentId = _cacheService.GetTopCustomerOrgAsync(ent.CustomerOrgId).GetAwaiter().GetResult().Id,
                 CustomerOrgParentName = _cacheService.GetTopCustomerOrgAsync(ent.CustomerOrgId).GetAwaiter().GetResult().DisplayName,
-                IsPatientOccupationalDisease = _patientOccupationalDiseaseManager.GetPatientRegisterIsOccupationalDisease(ent.Id).GetAwaiter().GetResult()
+                IsPatientOccupationalDisease = _patientOccupationalDiseaseManager.GetPatientRegisterIsOccupationalDisease(ent.Id).GetAwaiter().GetResult(),
+                SumCheckOperatingTime = DataHelper.ConversionDateToString(ent.SumCheckOperatingTime),
+                SumCheckOperatingUserName = _cacheService.GetSurnameAsync(ent.SumCheckOperatingUser).GetAwaiter().GetResult()
                 // SummaryHistoricalReview = ent.SummaryHistoricalReview
             };
             return entdto;
@@ -3119,6 +3121,13 @@ namespace Shentun.Peis.PatientRegisters
                 entity.SummaryDate = null;
             }
 
+            //更新总检操作人
+            if (_currentUser.Id != null)
+            {
+                entity.SumCheckOperatingUser = _currentUser.Id;
+                entity.SumCheckOperatingTime = DateTime.Now;
+            }
+
             var newentity = await _repository.UpdateAsync(entity);
             return ObjectMapper.Map<PatientRegister, PatientRegisterDto>(newentity);
         }
@@ -3142,6 +3151,7 @@ namespace Shentun.Peis.PatientRegisters
             var entity = await _repository.GetAsync(input.PatientRegisterId);
             var entitydto = ObjectMapper.Map<UpdatePatientRegisterSummarySuggestionDto, PatientRegister>(input);
             var newentity = await _manager.UpdatePatientRegisterSummaryDoctorAsync(entitydto, entity);
+
             //删除综述题头时通过级联关系删除相应的综述内容
             await _sumSummaryHeaderRepository.DeleteAsync(m => m.PatientRegisterId == input.PatientRegisterId, true);
             //先删除建议内容
@@ -5305,5 +5315,6 @@ namespace Shentun.Peis.PatientRegisters
             return null;
 
         }
+
     }
 }
diff --git a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs
index e0965fdd..a70fe672 100644
--- a/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs
+++ b/src/Shentun.Peis.Domain/PatientRegisters/PatientRegisterManager.cs
@@ -1499,6 +1499,13 @@ namespace Shentun.Peis.PatientRegisters
             }
             entity.IsAudit = entitydto.IsAudit;
 
+
+            if (_currentUser.Id != null)
+            {
+                entity.SumCheckOperatingUser = _currentUser.Id;
+                entity.SumCheckOperatingTime = DateTime.Now;
+            }
+
             return await _repository.UpdateAsync(entity);
         }
 
@@ -1536,6 +1543,11 @@ namespace Shentun.Peis.PatientRegisters
             entity.MedicalConclusionId = entitydto.MedicalConclusionId;
             entity.SummaryHistoricalReview = entitydto.SummaryHistoricalReview;
 
+            if (_currentUser.Id != null)
+            {
+                entity.SumCheckOperatingTime = DateTime.Now;
+                entity.SumCheckOperatingUser = _currentUser.Id;
+            }
             return await _repository.UpdateAsync(entity);
         }