Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Application/CustomerReports/CustomerReportAppService.cs

@@ -873,7 +873,8 @@ namespace Shentun.Peis.CustomerReports
 
             if (input.CustomerOrgs.Any())
             {
-                query = query.Where(m => input.CustomerOrgs.Where(m => m.CustomerOrgRegisterId != null && m.CustomerOrgRegisterId != Guid.Empty).Select(s => s.CustomerOrgRegisterId).Contains(m.a.Id));
+                var customerOrgRegisterIds = input.CustomerOrgs.Where(mm => mm.CustomerOrgRegisterId != null && mm.CustomerOrgRegisterId != GuidFlag.PersonCustomerOrgRegisterId).Select(s => s.CustomerOrgRegisterId.Value).ToList();
+                query = query.Where(m => customerOrgRegisterIds.Contains(m.a.Id));
             }
 
             var entlist = new GetUnitPhysicalExaminationReportStandardDto
@@ -924,7 +925,8 @@ namespace Shentun.Peis.CustomerReports
 
             if (input.CustomerOrgs.Any())
             {
-                query = query.Where(m => input.CustomerOrgs.Where(m => m.CustomerOrgRegisterId != null && m.CustomerOrgRegisterId != Guid.Empty).Select(s => s.CustomerOrgRegisterId).Contains(m.a.Id));
+                var customerOrgRegisterIds = input.CustomerOrgs.Where(mm => mm.CustomerOrgRegisterId != null && mm.CustomerOrgRegisterId != GuidFlag.PersonCustomerOrgRegisterId).Select(s => s.CustomerOrgRegisterId.Value).ToList();
+                query = query.Where(m => customerOrgRegisterIds.Contains(m.a.Id));
             }
 
             var entlist = new GetUnitPhysicalExaminationReportReduceDto
@@ -2061,7 +2063,7 @@ namespace Shentun.Peis.CustomerReports
                     var CustomerOrgIds = await _customerOrgManager.GetCustomerOrgChildrenId(item.CustomerOrgId.Value);
                     sumquery = sumquery.Where(m => CustomerOrgIds.Contains(m.a.CustomerOrgId));
                 }
-                if ( !string.IsNullOrEmpty(item.StartDate) && !string.IsNullOrEmpty(item.EndDate))
+                if (!string.IsNullOrEmpty(item.StartDate) && !string.IsNullOrEmpty(item.EndDate))
                 {
                     if (item.DateType == '1')
                     {
@@ -2175,7 +2177,7 @@ namespace Shentun.Peis.CustomerReports
                     var CustomerOrgIds = await _customerOrgManager.GetCustomerOrgChildrenId(item.CustomerOrgId.Value);
                     sumquery = sumquery.Where(m => CustomerOrgIds.Contains(m.a.CustomerOrgId));
                 }
-                if ( !string.IsNullOrEmpty(item.StartDate) && !string.IsNullOrEmpty(item.EndDate))
+                if (!string.IsNullOrEmpty(item.StartDate) && !string.IsNullOrEmpty(item.EndDate))
                 {
                     if (item.DateType == '1')
                     {