|
|
@@ -1641,14 +1641,14 @@ namespace Hotline.Application.StatisticalReport
|
|
|
.Includes(x => x.OrderVisit)
|
|
|
.LeftJoin<SystemOrganize>((x, org) => x.VisitOrgCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")) == org.Id)
|
|
|
.Where(x => x.VisitTarget == Share.Enums.Order.EVisitTarget.Org)
|
|
|
- .Where(x => x.OrgNoSatisfiedReason != null && SqlFunc.JsonListObjectAny(x.OrgNoSatisfiedReason, "Key", item.DicDataValue))
|
|
|
+ .Where(x => x.OrgNoSatisfiedReason != null)
|
|
|
.Where(x => x.OrderVisit.VisitState == EVisitState.Visited)
|
|
|
.Where(x => !string.IsNullOrEmpty(x.VisitOrgName))
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.OrgName), x => x.VisitOrgName.Contains(dto.OrgName))
|
|
|
.WhereIF(dto.StartTime.HasValue, x => x.OrderVisit.VisitTime >= dto.StartTime.Value)
|
|
|
.WhereIF(dto.EndTime.HasValue, x => x.OrderVisit.VisitTime <= dto.EndTime.Value)
|
|
|
.WhereIF(isCenter == false, x => x.VisitOrgCode.StartsWith(_sessionContext.RequiredOrgId))
|
|
|
- // .WhereIF(dto.OrgProcessingResults == "-1", x => SqlFunc.JsonArrayLength(x.OrgNoSatisfiedReason) > 1 && x.OrgNoSatisfiedReason != null)
|
|
|
+ .WhereIF(dto.OrgProcessingResults == "-1", x => SqlFunc.JsonField(x.OrgNoSatisfiedReason, "Key") != null)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.OrgProcessingResults), x => SqlFunc.JsonField(x.OrgProcessingResults, "Key") == dto.OrgProcessingResults)
|
|
|
.GroupBy((x, org) => new { VisitOrgName = org.Name, VisitOrgCode = x.VisitOrgCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")) })
|
|
|
.Select((x, org) => new BiVisitNoSatisfiedDto
|
tangjiang