Browse Source

其他格式

bjmzak
wxd 2 years ago
parent
commit
6d70f1253c
  1. 2
      src/Shentun.Peis.Application/ChargeAsbitems/ChargeAsbitemAppService.cs
  2. 6
      src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs
  3. 2
      src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs
  4. 2
      src/Shentun.Peis.EntityFrameworkCore/PrintReports/ChargeReportRepository.cs
  5. 2
      src/Shentun.Peis.EntityFrameworkCore/SumSummaryReports/SumSummaryReportRepository.cs

2
src/Shentun.Peis.Application/ChargeAsbitems/ChargeAsbitemAppService.cs

@ -101,7 +101,7 @@ namespace Shentun.Peis.ChargeAsbitems
LastModifierName = s.LastModifierName, LastModifierName = s.LastModifierName,
RegisterAsbitemId = s.a.RegisterAsbitemId, RegisterAsbitemId = s.a.RegisterAsbitemId,
RegisterAsbitemChargePrice = s.RegisterAsbitemChargePrice, RegisterAsbitemChargePrice = s.RegisterAsbitemChargePrice,
RegisterAsbitemCreationTime = s.RegisterAsbitemCreationTime != null ? s.RegisterAsbitemCreationTime.Value.ToString("dd/MM/yyyy") : "",
RegisterAsbitemCreationTime =DataHelper.ConversionDateToString( s.RegisterAsbitemCreationTime),
RegisterAsbitemCreatorName = s.RegisterAsbitemCreatorName, RegisterAsbitemCreatorName = s.RegisterAsbitemCreatorName,
RegisterAsbitemPayTypeFlag = s.RegisterAsbitemPayTypeFlag, RegisterAsbitemPayTypeFlag = s.RegisterAsbitemPayTypeFlag,
RegisterCheckCompleteFlag = s.RegisterCheckCompleteFlag != null ? s.RegisterCheckCompleteFlag.Value : null RegisterCheckCompleteFlag = s.RegisterCheckCompleteFlag != null ? s.RegisterCheckCompleteFlag.Value : null

6
src/Shentun.Peis.Application/ChargeReports/ChargeReportAppService.cs

@ -485,7 +485,7 @@ namespace Shentun.Peis.ChargeReports
Age = s.c.Age, Age = s.c.Age,
AsbitemName = s.AsbitemName, AsbitemName = s.AsbitemName,
BookKeepingName = s.BookKeepingName, 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), CharePrice = DataHelper.DecimalRetainDecimals(s.b.ChargePrice * s.b.Amount, 2),
MedicalTimes = s.c.MedicalTimes, MedicalTimes = s.c.MedicalTimes,
PatientName = s.c.PatientName, PatientName = s.c.PatientName,
@ -558,7 +558,7 @@ namespace Shentun.Peis.ChargeReports
Age = s.c.Age, Age = s.c.Age,
AsbitemName = s.AsbitemName, AsbitemName = s.AsbitemName,
BookKeepingName = s.BookKeepingName, 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), CharePrice = DataHelper.DecimalRetainDecimals(s.b.ChargePrice * s.b.Amount, 2),
MedicalTimes = s.c.MedicalTimes, MedicalTimes = s.c.MedicalTimes,
PatientName = s.c.PatientName, PatientName = s.c.PatientName,
@ -674,7 +674,7 @@ namespace Shentun.Peis.ChargeReports
ChargeId = s.Key, ChargeId = s.Key,
Age = s.FirstOrDefault().Age, Age = s.FirstOrDefault().Age,
BookKeepingName = s.FirstOrDefault().BookKeepingName, 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 ? "收费" : "退费", ChargeFlagName = s.FirstOrDefault().a.ChargeFlag == ChargeFlag.Charge ? "收费" : "退费",
PatientName = s.FirstOrDefault().PatientName, PatientName = s.FirstOrDefault().PatientName,
PatientNo = s.FirstOrDefault().PatientNo, PatientNo = s.FirstOrDefault().PatientNo,

2
src/Shentun.Peis.Application/SumSummaryReports/SumSummaryReportAppService.cs

@ -152,7 +152,7 @@ namespace Shentun.Peis.SumSummaryReports
var registercheckList = entlist.Select(s => new ItemTypeContrastList_Result var registercheckList = entlist.Select(s => new ItemTypeContrastList_Result
{ {
ItemTypeName = string.Join("|", s.RegisterCheckAsbitems.Select(rs => rs.Asbitem.ItemType.DisplayName).ToList()), 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, 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()) Summarys = string.Join("|", s.RegisterCheckAsbitems.Select(rs => rs.Asbitem.DisplayName).ToList()) + ":" + string.Join(",", s.RegisterCheckSummaries.Select(sb => sb.Summary).ToList())
}).ToList(); }).ToList();

2
src/Shentun.Peis.EntityFrameworkCore/PrintReports/ChargeReportRepository.cs

@ -32,7 +32,7 @@ namespace Shentun.Peis.PrintReports
where (a.Id == ChargeId) where (a.Id == ChargeId)
select new ChargeReportDto select new ChargeReportDto
{ {
CreationTime = a.CreationTime.ToString("MM/dd/yyyy"),
CreationTime = DataHelper.ConversionDateToString(a.CreationTime),
CreatorName = ad.UserName, CreatorName = ad.UserName,
InvoiceNo = a.InvoiceNo, InvoiceNo = a.InvoiceNo,
InvoiceOrgName = a.InvoiceOrgName, InvoiceOrgName = a.InvoiceOrgName,

2
src/Shentun.Peis.EntityFrameworkCore/SumSummaryReports/SumSummaryReportRepository.cs

@ -47,7 +47,7 @@ namespace Shentun.Peis.SumSummaryReports
where (g.PatientId == PatientId && f.AsbitemId == AsbitemId) where (g.PatientId == PatientId && f.AsbitemId == AsbitemId)
select new HorizontalComparisonListEntity select new HorizontalComparisonListEntity
{ {
CheckDate = g.CreationTime.ToString("yyyy-MM-dd"),
CheckDate = DataHelper.ConversionDateToString(g.CreationTime),
ItemName = b.DisplayName, ItemName = b.DisplayName,
ReferenceRangeValue = GetReferenceRangeValue(_referenceRangeList, a.ItemId, b.ReferenceRangeTypeFlag, g.SexId, g.Age), ReferenceRangeValue = GetReferenceRangeValue(_referenceRangeList, a.ItemId, b.ReferenceRangeTypeFlag, g.SexId, g.Age),
ResultValue = a.Result, ResultValue = a.Result,

Loading…
Cancel
Save