shentun
/
peis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

客户报表

master
wxd 5 months ago
parent
2d7f70eaeb
commit
5218807bd9
1 changed files with 9 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs

36
src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs
View File

@ -215,7 +215,7 @@ namespace Shentun.Peis.CustomerReports
var entlist = sumquery.GroupBy(g => g.c.PatientRegisterId).Select(s => new GetPatientRegisterPositiveReportDto
var entlist = sumquery.ToList().GroupBy(g => g.c.PatientRegisterId).Select(s => new GetPatientRegisterPositiveReportDto
{
PatientName = s.FirstOrDefault().a.PatientName,
Age = s.FirstOrDefault().a.Age,
@ -314,7 +314,7 @@ namespace Shentun.Peis.CustomerReports
var CustomerOrgIds = await _customerOrgManager.GetCustomerOrgChildrenId(item2.CustomerOrgId.Value);
newquery = newquery.Where(m => CustomerOrgIds.Contains(m.a.CustomerOrgId));
}
if (item2.DateType != null && !string.IsNullOrEmpty(item2.StartDate) && !string.IsNullOrEmpty(item2.EndDate))
if (!string.IsNullOrEmpty(item2.StartDate) && !string.IsNullOrEmpty(item2.EndDate))
{
if (item2.DateType == '1')
{
@ -355,24 +355,6 @@ namespace Shentun.Peis.CustomerReports
sumquery = sumquery.Where(m => input.DiagnosisIds.Contains(m.c.DiagnosisId));
}
//var entlist = sumquery.ToList().GroupBy(g => g.c.DiagnosisId).Select(s => new GetPositivePatientRegisterReportStandardDto
//{
// DiagnosisName = s.FirstOrDefault().ad != null ? s.FirstOrDefault().ad.DisplayName : "",
// PatientRegisters = s.Select(sa => new GetPositivePatientRegisterReportStandard_PatientRegister
// {
// PatientName = sa.a.PatientName,
// Age = sa.a.Age,
// PatientNo = sa.ab.PatientNo,
// DepartmentName = EntityHelper.GetCustomerOrgNameNoSql(customerOrgList, s.FirstOrDefault().a.CustomerOrgId),
// MedicalTimes = sa.a.MedicalTimes,
// MobileTelephone = sa.ab.MobileTelephone,
// PatientRegisterNo = sa.a.PatientRegisterNo,
// Telephone = sa.ab.Telephone,
// SexName = sa.ae != null ? sa.ae.DisplayName : ""
// }).ToList()
//}).ToList();
var entlist = sumquery.ToList().GroupBy(g => g.c.DiagnosisId).Select(s => new GetPositivePatientRegisterReportStandardDto
{
DiagnosisName = s.FirstOrDefault().ad != null ? s.FirstOrDefault().ad.DisplayName : "",
@ -381,7 +363,7 @@ namespace Shentun.Peis.CustomerReports
PatientName = sa.a.PatientName,
Age = sa.a.Age,
PatientNo = sa.ab.PatientNo,
DepartmentName = _cacheService.GetCustomerOrgNameAsync(s.FirstOrDefault().a.CustomerOrgId).GetAwaiter().GetResult(),
DepartmentName = _cacheService.GetCustomerOrgNameAsync(sa.a.CustomerOrgId).GetAwaiter().GetResult(),
MedicalTimes = sa.a.MedicalTimes,
MobileTelephone = sa.ab.MobileTelephone,
PatientRegisterNo = sa.a.PatientRegisterNo,
@ -622,7 +604,7 @@ namespace Shentun.Peis.CustomerReports
}
#endregion
var entlist = sumquery.GroupBy(g => g.c.DiagnosisId).Select(s => new GetPositivePatientRegisterReportReduceDto
var entlist = sumquery.ToList().GroupBy(g => g.c.DiagnosisId).Select(s => new GetPositivePatientRegisterReportReduceDto
{
DiagnosisName = s.FirstOrDefault().ad != null ? s.FirstOrDefault().ad.DisplayName : "",
PatientCount = s.Count(),
@ -1516,7 +1498,7 @@ namespace Shentun.Peis.CustomerReports
var queryGroup = sumquery.GroupBy(g => g.d.PatientRegisterId);
var queryGroup = sumquery.ToList().GroupBy(g => g.d.PatientRegisterId);
//var entlist = queryGroup.Select(s => new GetItemSpecificResultReportStandardDto
//{
// PatientName = s.FirstOrDefault().a.PatientName,
@ -1671,7 +1653,7 @@ namespace Shentun.Peis.CustomerReports
var sumSuggestionHeaderList = await _sumSuggestionHeaderRepository.GetListAsync();
var sumSuggestionContentList = await _sumSuggestionContentRepository.GetListAsync();
var entlist = sumquery.GroupBy(g => g.a.Id).Select(s => new GetItemSpecificResultReportOrDiagnosisDto
var entlist = sumquery.ToList().GroupBy(g => g.a.Id).Select(s => new GetItemSpecificResultReportOrDiagnosisDto
{
PatientName = s.FirstOrDefault().a.PatientName,
Age = s.FirstOrDefault().a.Age,
@ -1760,7 +1742,7 @@ namespace Shentun.Peis.CustomerReports
}
// 分组数据
var groupDetails = sumquery.GroupBy(g => g.a.CustomerOrgGroupId).Select(s => new GetCustomerOrgFeeSettlementInGroupReportReduce_GroupDetail
var groupDetails = sumquery.ToList().GroupBy(g => g.a.CustomerOrgGroupId).Select(s => new GetCustomerOrgFeeSettlementInGroupReportReduce_GroupDetail
{
CustomerOrgGroupName = s.FirstOrDefault().ac != null ? s.FirstOrDefault().ac.DisplayName : "",
CustomerOrgGroupPrice = s.FirstOrDefault().ac != null ? Math.Round(s.FirstOrDefault().ac.Price, 2).ToString() : "0",
@ -2029,7 +2011,7 @@ namespace Shentun.Peis.CustomerReports
}
// 组合项目分组
var groupDetails = sumquery.GroupBy(g => g.c.AsbitemId).Select(s => new GetCustomerOrgFeeSettlementInAsbitemReportReduce_Asbtiem
var groupDetails = sumquery.ToList().GroupBy(g => g.c.AsbitemId).Select(s => new GetCustomerOrgFeeSettlementInAsbitemReportReduce_Asbtiem
{
AsbitemName = s.FirstOrDefault().d.DisplayName,
StandardPrice = s.FirstOrDefault().c.StandardPrice.ToString(),
@ -2145,7 +2127,7 @@ namespace Shentun.Peis.CustomerReports
// 组合项目分组
var groupDetails = sumquery.GroupBy(g => g.c.AsbitemId).Select(s => new GetCustomerOrgFeeSettlementInAsbitemReportDetail_Asbtiem
var groupDetails = sumquery.ToList().GroupBy(g => g.c.AsbitemId).Select(s => new GetCustomerOrgFeeSettlementInAsbitemReportDetail_Asbtiem
{
AsbitemName = s.FirstOrDefault().d.DisplayName,
PatientCount = s.Count(),

Write Preview
Loading…
Cancel
Save