From 6d70f1253c39d4527f20872c682bf8c953a786e8 Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Fri, 12 Apr 2024 11:16:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeAsbitems/ChargeAsbitemAppService.cs | 2 +- .../ChargeReports/ChargeReportAppService.cs | 10 +++++----- .../SumSummaryReports/SumSummaryReportAppService.cs | 2 +- .../PrintReports/ChargeReportRepository.cs | 2 +- .../SumSummaryReports/SumSummaryReportRepository.cs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Shentun.Peis.Application/ChargeAsbitems/ChargeAsbitemAppService.cs b/src/Shentun.Peis.Application/ChargeAsbitems/ChargeAsbitemAppService.cs index c1a7087..63f5749 100644 --- a/src/Shentun.Peis.Application/ChargeAsbitems/ChargeAsbitemAppService.cs +++ b/src/Shentun.Peis.Application/ChargeAsbitems/ChargeAsbitemAppService.cs @@ -101,7 +101,7 @@ namespace Shentun.Peis.ChargeAsbitems LastModifierName = s.LastModifierName, RegisterAsbitemId = s.a.RegisterAsbitemId, RegisterAsbitemChargePrice = s.RegisterAsbitemChargePrice, - RegisterAsbitemCreationTime = s.RegisterAsbitemCreationTime != null ? s.RegisterAsbitemCreationTime.Value.ToString("dd/MM/yyyy") : "", + RegisterAsbitemCreationTime =DataHelper.ConversionDateToString( s.RegisterAsbitemCreationTime), RegisterAsbitemCreatorName = s.RegisterAsbitemCreatorName, RegisterAsbitemPayTypeFlag = s.RegisterAsbitemPayTypeFlag, RegisterCheckCompleteFlag = s.RegisterCheckCompleteFlag != null ? s.RegisterCheckCompleteFlag.Value : null diff --git a/src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs b/src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs index f180854..8683719 100644 --- a/src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs +++ b/src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs @@ -485,7 +485,7 @@ namespace Shentun.Peis.ChargeReports Age = s.c.Age, AsbitemName = s.AsbitemName, BookKeepingName = s.BookKeepingName, - BookkeepingTiem = s.a.CreationTime.ToString("yyyy-MM-dd HH:mm"), + BookkeepingTiem = DataHelper.ConversionDateToString(s.a.CreationTime), CharePrice = DataHelper.DecimalRetainDecimals(s.b.ChargePrice * s.b.Amount, 2), MedicalTimes = s.c.MedicalTimes, PatientName = s.c.PatientName, @@ -558,7 +558,7 @@ namespace Shentun.Peis.ChargeReports Age = s.c.Age, AsbitemName = s.AsbitemName, BookKeepingName = s.BookKeepingName, - BookkeepingTiem = s.a.CreationTime.ToString("yyyy-MM-dd HH:mm"), + BookkeepingTiem = DataHelper.ConversionDateToString(s.a.CreationTime), CharePrice = DataHelper.DecimalRetainDecimals(s.b.ChargePrice * s.b.Amount, 2), MedicalTimes = s.c.MedicalTimes, PatientName = s.c.PatientName, @@ -668,13 +668,13 @@ namespace Shentun.Peis.ChargeReports query = query.Where(m => m.PatientNo == input.PatientNo); } - + var personalFeeDetailsReportInFeeSummary_Details = query.GroupBy(g => g.b.ChargeId).Select(s => new GetPersonalFeeDetailsReportInFeeSummary_Detail { ChargeId = s.Key, Age = s.FirstOrDefault().Age, BookKeepingName = s.FirstOrDefault().BookKeepingName, - BookkeepingTiem = s.FirstOrDefault().a.CreationTime.ToString("yyyy-MM-dd HH:mm"), + BookkeepingTiem = DataHelper.ConversionDateToString(s.FirstOrDefault().a.CreationTime), ChargeFlagName = s.FirstOrDefault().a.ChargeFlag == ChargeFlag.Charge ? "收费" : "退费", PatientName = s.FirstOrDefault().PatientName, PatientNo = s.FirstOrDefault().PatientNo, @@ -727,7 +727,7 @@ namespace Shentun.Peis.ChargeReports DiscountMoney = item.DiscountMoney, PayModeName = payMode.PayModeName, ReceivedChargeMoney = payMode.ReceivedChargeMoney, - + }; personalFeeDetailsReportInFeeSummary_Details_new.Add(temp); diff --git a/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs b/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs index 8724111..3b94dab 100644 --- a/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs +++ b/src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs @@ -152,7 +152,7 @@ namespace Shentun.Peis.SumSummaryReports var registercheckList = entlist.Select(s => new ItemTypeContrastList_Result { ItemTypeName = string.Join("|", s.RegisterCheckAsbitems.Select(rs => rs.Asbitem.ItemType.DisplayName).ToList()), - RegisterDate = s.RegisterCheckAsbitems.First().PatientRegister.CreationTime.ToString("yyyy-MM-dd"), + RegisterDate = DataHelper.ConversionDateToString(s.RegisterCheckAsbitems.First().PatientRegister.CreationTime), PatientRegisterId = s.RegisterCheckAsbitems.First().PatientRegisterId, Summarys = string.Join("|", s.RegisterCheckAsbitems.Select(rs => rs.Asbitem.DisplayName).ToList()) + ":" + string.Join(",", s.RegisterCheckSummaries.Select(sb => sb.Summary).ToList()) }).ToList(); diff --git a/src/Shentun.Peis.EntityFrameworkCore/PrintReports/ChargeReportRepository.cs b/src/Shentun.Peis.EntityFrameworkCore/PrintReports/ChargeReportRepository.cs index 63ac84c..d12a38e 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/PrintReports/ChargeReportRepository.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/PrintReports/ChargeReportRepository.cs @@ -32,7 +32,7 @@ namespace Shentun.Peis.PrintReports where (a.Id == ChargeId) select new ChargeReportDto { - CreationTime = a.CreationTime.ToString("MM/dd/yyyy"), + CreationTime = DataHelper.ConversionDateToString(a.CreationTime), CreatorName = ad.UserName, InvoiceNo = a.InvoiceNo, InvoiceOrgName = a.InvoiceOrgName, diff --git a/src/Shentun.Peis.EntityFrameworkCore/SumSummaryReports/SumSummaryReportRepository.cs b/src/Shentun.Peis.EntityFrameworkCore/SumSummaryReports/SumSummaryReportRepository.cs index 3d5456f..1e5b39c 100644 --- a/src/Shentun.Peis.EntityFrameworkCore/SumSummaryReports/SumSummaryReportRepository.cs +++ b/src/Shentun.Peis.EntityFrameworkCore/SumSummaryReports/SumSummaryReportRepository.cs @@ -47,7 +47,7 @@ namespace Shentun.Peis.SumSummaryReports where (g.PatientId == PatientId && f.AsbitemId == AsbitemId) select new HorizontalComparisonListEntity { - CheckDate = g.CreationTime.ToString("yyyy-MM-dd"), + CheckDate = DataHelper.ConversionDateToString(g.CreationTime), ItemName = b.DisplayName, ReferenceRangeValue = GetReferenceRangeValue(_referenceRangeList, a.ItemId, b.ReferenceRangeTypeFlag, g.SexId, g.Age), ResultValue = a.Result,