diff --git a/src/Shentun.Peis.Application.Contracts/PacsBusiness/GetPatientRegisterPacsCheckDto.cs b/src/Shentun.Peis.Application.Contracts/PacsBusiness/GetPatientRegisterPacsCheckDto.cs index df47304..010e2e1 100644 --- a/src/Shentun.Peis.Application.Contracts/PacsBusiness/GetPatientRegisterPacsCheckDto.cs +++ b/src/Shentun.Peis.Application.Contracts/PacsBusiness/GetPatientRegisterPacsCheckDto.cs @@ -16,6 +16,11 @@ namespace Shentun.Peis.PacsBusiness /// public string CheckRequestNo { get; set; } + /// + /// 检查ID + /// + public Guid RegisterCheckId { get; set; } + /// /// 组合项目 /// diff --git a/src/Shentun.Peis.Application.Contracts/PhoneFollowUps/GetAsbitemOrItemCriticalByPatientRegisterIdDto.cs b/src/Shentun.Peis.Application.Contracts/PhoneFollowUps/GetAsbitemOrItemCriticalByPatientRegisterIdDto.cs index 4a09a22..8a9de64 100644 --- a/src/Shentun.Peis.Application.Contracts/PhoneFollowUps/GetAsbitemOrItemCriticalByPatientRegisterIdDto.cs +++ b/src/Shentun.Peis.Application.Contracts/PhoneFollowUps/GetAsbitemOrItemCriticalByPatientRegisterIdDto.cs @@ -8,6 +8,12 @@ namespace Shentun.Peis.PhoneFollowUps { public class GetAsbitemOrItemCriticalByPatientRegisterIdDto { + + /// + /// 检查ID + /// + public Guid RegisterCheckId { get; set; } + /// /// 组合项目名称 /// @@ -53,15 +59,12 @@ namespace Shentun.Peis.PhoneFollowUps public char? IsFollowUp { get; set; } - /// - /// 项目明细数据 - /// - public List ItemDetails { get; set; } - } + ///// + ///// 项目明细数据 + ///// + //public List ItemDetails { get; set; } - public class GetAsbitemOrItemCriticalByPatientRegisterIdItemDetail - { /// /// 项目名称 /// @@ -83,36 +86,93 @@ namespace Shentun.Peis.PhoneFollowUps public string ReferenceRangeValue { get; set; } /// - /// 危急值范围 + ///明细项目 危急值范围 /// - public string CriticalRangeValue { get; set; } + public string ItemCriticalRangeValue { get; set; } /// - /// 危急值标志 + ///明细项目 危急值标志 /// - public char? IsCriticalValue { get; set; } + public char? ItemIsCriticalValue { get; set; } /// - /// 危急值处理内容 + ///明细项目 危急值处理内容 /// - public string CriticalValueContent { get; set; } + public string ItemCriticalValueContent { get; set; } /// - /// 危急值是否审核 Y-N + ///明细项目 危急值是否审核 Y-N /// - public char? IsCriticalValueAudit { get; set; } + public char? ItemIsCriticalValueAudit { get; set; } /// - /// 该项目要否要复查 Y-N + ///明细项目 该项目要否要复查 Y-N /// - public char? IsReview { get; set; } + public char? ItemIsReview { get; set; } /// - /// 随访标志 Y-N + ///明细项目 随访标志 Y-N /// - public char? IsFollowUp { get; set; } + public char? ItemIsFollowUp { get; set; } + } + + //public class GetAsbitemOrItemCriticalByPatientRegisterIdItemDetail + //{ + // /// + // /// 项目名称 + // /// + // public string ItemName { get; set; } + + // /// + // /// 项目结果 + // /// + // public string ItemResult { get; set; } + + // /// + // /// 单位 + // /// + // public string Unit { get; set; } + + // /// + // /// 参考范围 + // /// + // public string ReferenceRangeValue { get; set; } + + // /// + // /// 危急值范围 + // /// + // public string CriticalRangeValue { get; set; } + + // /// + // /// 危急值标志 + // /// + // public char? IsCriticalValue { get; set; } + + // /// + // /// 危急值处理内容 + // /// + // public string CriticalValueContent { get; set; } + + + // /// + // /// 危急值是否审核 Y-N + // /// + // public char? IsCriticalValueAudit { get; set; } + + + // /// + // /// 该项目要否要复查 Y-N + // /// + // public char? IsReview { get; set; } + + + // /// + // /// 随访标志 Y-N + // /// + // public char? IsFollowUp { get; set; } + //} } diff --git a/src/Shentun.Peis.Application.Contracts/PhoneFollowUps/PhoneFollowUpWithCriticalItemDto.cs b/src/Shentun.Peis.Application.Contracts/PhoneFollowUps/PhoneFollowUpWithCriticalItemDto.cs index 9d16571..b216dec 100644 --- a/src/Shentun.Peis.Application.Contracts/PhoneFollowUps/PhoneFollowUpWithCriticalItemDto.cs +++ b/src/Shentun.Peis.Application.Contracts/PhoneFollowUps/PhoneFollowUpWithCriticalItemDto.cs @@ -21,6 +21,11 @@ namespace Shentun.Peis.PhoneFollowUps /// public string IdNo { get; set; } + /// + /// 人员ID + /// + public Guid PatientRegisterId { get; set; } + /// /// 人员条码号 /// diff --git a/src/Shentun.Peis.Application/PhoneFollowUps/PhoneFollowUpAppService.cs b/src/Shentun.Peis.Application/PhoneFollowUps/PhoneFollowUpAppService.cs index 37c804f..7dda602 100644 --- a/src/Shentun.Peis.Application/PhoneFollowUps/PhoneFollowUpAppService.cs +++ b/src/Shentun.Peis.Application/PhoneFollowUps/PhoneFollowUpAppService.cs @@ -259,6 +259,7 @@ namespace Shentun.Peis.PhoneFollowUps PatientName = s.FirstOrDefault().patientRegister.PatientName, IdNo = s.FirstOrDefault().patient.IdNo, PatientRegisterNo = s.FirstOrDefault().patientRegister.PatientRegisterNo, + PatientRegisterId = s.FirstOrDefault().patientRegister.Id, Age = s.FirstOrDefault().patientRegister.Age, BirthDate = DataHelper.ConversionDateShortToString(s.FirstOrDefault().patientRegister.BirthDate), CompleteFlag = s.FirstOrDefault().patientRegister.CompleteFlag, @@ -394,34 +395,57 @@ namespace Shentun.Peis.PhoneFollowUps - var registerCheckGroup = query.ToList().GroupBy(g => g.registerCheck); + var registerCheckGroup = query.ToList().GroupBy(g => new { g.registerCheck, g.registerCheckItem }); var entListDto = registerCheckGroup.Select(s => new GetAsbitemOrItemCriticalByPatientRegisterIdDto { + RegisterCheckId = s.Key.registerCheck.Id, AsbitemName = string.Join(",", s.Select(ss => ss.asbitem.DisplayName).Distinct()), - CriticalRangeValue = s.Key.CriticalRangeValue, - CriticalValueContent = s.Key.CriticalValueContent, - IsCriticalValue = s.Key.IsCriticalValue, - IsCriticalValueAudit = s.Key.IsCriticalValueAudit, - IsFollowUp = s.Key.IsFollowUp, - IsReview = s.Key.IsReview, + CriticalRangeValue = s.Key.registerCheck.CriticalRangeValue, + CriticalValueContent = s.Key.registerCheck.CriticalValueContent, + IsCriticalValue = s.Key.registerCheck.IsCriticalValue, + IsCriticalValueAudit = s.Key.registerCheck.IsCriticalValueAudit, + IsFollowUp = s.Key.registerCheck.IsFollowUp, + IsReview = s.Key.registerCheck.IsReview, SummaryDetail = string.Join("
", s.Where(m => m.registerCheckSummaryHaveEmpty != null).Select(ss => ss.registerCheckSummaryHaveEmpty.Summary).Distinct()), - ItemDetails = s.GroupBy(g => g.registerCheckItem).ToList() - .Select(ss => new GetAsbitemOrItemCriticalByPatientRegisterIdItemDetail - { - CriticalRangeValue = ss.Key.CriticalRangeValue, - CriticalValueContent = ss.Key.CriticalValueContent, - IsCriticalValue = ss.Key.IsCriticalValue, - IsCriticalValueAudit = ss.Key.IsCriticalValueAudit, - IsFollowUp = ss.Key.IsFollowUp, - IsReview = ss.Key.IsReview, - ItemName = ss.FirstOrDefault().item.DisplayName, - ItemResult = ss.Key.Result, - ReferenceRangeValue = ss.Key.ReferenceRangeValue, - Unit = ss.Key.Unit - }).ToList() + ItemCriticalRangeValue = s.Key.registerCheckItem.CriticalRangeValue, + ItemCriticalValueContent = s.Key.registerCheckItem.CriticalValueContent, + ItemIsCriticalValue = s.Key.registerCheckItem.IsCriticalValue, + ItemIsCriticalValueAudit = s.Key.registerCheckItem.IsCriticalValueAudit, + ItemIsFollowUp = s.Key.registerCheckItem.IsFollowUp, + ItemIsReview = s.Key.registerCheckItem.IsReview, + ItemName = s.FirstOrDefault().item.DisplayName, + ItemResult = s.Key.registerCheckItem.Result, + ReferenceRangeValue = s.Key.registerCheckItem.ReferenceRangeValue, + Unit = s.Key.registerCheckItem.Unit }).ToList(); + //var entListDto = registerCheckGroup.Select(s => new GetAsbitemOrItemCriticalByPatientRegisterIdDto + //{ + // AsbitemName = string.Join(",", s.Select(ss => ss.asbitem.DisplayName).Distinct()), + // CriticalRangeValue = s.Key.CriticalRangeValue, + // CriticalValueContent = s.Key.CriticalValueContent, + // IsCriticalValue = s.Key.IsCriticalValue, + // IsCriticalValueAudit = s.Key.IsCriticalValueAudit, + // IsFollowUp = s.Key.IsFollowUp, + // IsReview = s.Key.IsReview, + // SummaryDetail = string.Join("
", s.Where(m => m.registerCheckSummaryHaveEmpty != null).Select(ss => ss.registerCheckSummaryHaveEmpty.Summary).Distinct()), + // ItemDetails = s.GroupBy(g => g.registerCheckItem).ToList() + // .Select(ss => new GetAsbitemOrItemCriticalByPatientRegisterIdItemDetail + // { + // CriticalRangeValue = ss.Key.CriticalRangeValue, + // CriticalValueContent = ss.Key.CriticalValueContent, + // IsCriticalValue = ss.Key.IsCriticalValue, + // IsCriticalValueAudit = ss.Key.IsCriticalValueAudit, + // IsFollowUp = ss.Key.IsFollowUp, + // IsReview = ss.Key.IsReview, + // ItemName = ss.FirstOrDefault().item.DisplayName, + // ItemResult = ss.Key.Result, + // ReferenceRangeValue = ss.Key.ReferenceRangeValue, + // Unit = ss.Key.Unit + // }).ToList() + //}).ToList(); + return entListDto;