|
|
@ -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, |
|
|
@ -668,13 +668,13 @@ namespace Shentun.Peis.ChargeReports |
|
|
query = query.Where(m => m.PatientNo == input.PatientNo); |
|
|
query = query.Where(m => m.PatientNo == input.PatientNo); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var personalFeeDetailsReportInFeeSummary_Details = query.GroupBy(g => g.b.ChargeId).Select(s => new GetPersonalFeeDetailsReportInFeeSummary_Detail |
|
|
var personalFeeDetailsReportInFeeSummary_Details = query.GroupBy(g => g.b.ChargeId).Select(s => new GetPersonalFeeDetailsReportInFeeSummary_Detail |
|
|
{ |
|
|
{ |
|
|
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, |
|
|
@ -727,7 +727,7 @@ namespace Shentun.Peis.ChargeReports |
|
|
DiscountMoney = item.DiscountMoney, |
|
|
DiscountMoney = item.DiscountMoney, |
|
|
PayModeName = payMode.PayModeName, |
|
|
PayModeName = payMode.PayModeName, |
|
|
ReceivedChargeMoney = payMode.ReceivedChargeMoney, |
|
|
ReceivedChargeMoney = payMode.ReceivedChargeMoney, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
personalFeeDetailsReportInFeeSummary_Details_new.Add(temp); |
|
|
personalFeeDetailsReportInFeeSummary_Details_new.Add(temp); |
|
|
|