zhengcaioa/Services/CooperVisitService.cs
@@ -131,19 +131,35 @@
            var query = (from a in _context.CooperVisits
                         join b in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "visType")
                         on a.VisType equals b.CodeSn
                            into bzsssss
                         from bzzzzz in bzsssss.DefaultIfEmpty()
                         join c in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jtype")
                         on a.Jtype equals c.CodeSn
                           into czsssss
                         from czzzzz in czsssss.DefaultIfEmpty()
                         join d in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "zw")
                          on a.Zw equals d.CodeSn
                            into dzsssss
                         from dzzzzz in dzsssss.DefaultIfEmpty()
                         join e in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "yx")
                         on a.Yx equals e.CodeSn
                           into ezsssss
                         from ezzzzz in ezsssss.DefaultIfEmpty()
                         join f in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jy")
                          on a.Jy equals f.CodeSn
                         join zz in _context.CooperatecustomCustomers.Where(x => x.RecStatus == "A")
                            into fzsssss
                         from fzzzzz in fzsssss.DefaultIfEmpty()
                         join zz in _context.CooperatecustomCustomers
                         on a.Viscustomer equals zz.Id
                         join g in _context.Areas on zz.Sheng equals g.CodeId
                         join h in _context.Areas on zz.City equals h.CodeId
                         join i in _context.Areas on zz.AreaId equals i.CodeId
                             //join g in _context.Areas on zz.Sheng equals g.CodeId
                             //join h in _context.Areas on zz.City equals h.CodeId
                             //join i in _context.Areas on zz.AreaId equals i.CodeId
@@ -158,7 +174,7 @@
                              && (string.IsNullOrWhiteSpace(searchEntity.Sheng) || zz.Sheng == searchEntity.Sheng.Trim())
                               && (string.IsNullOrWhiteSpace(searchEntity.City) || zz.City == searchEntity.City.Trim())
                                && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || zz.AreaId == searchEntity.AreaId.Trim())
                                 && (string.IsNullOrWhiteSpace(searchEntity.Viscustomer) || a.Viscustomer == searchEntity.Viscustomer.Trim())
                         select new CooperVisitDTO
                         {
                             Id = a.Id,
@@ -168,12 +184,12 @@
                             Name = zz.Name,
                             Jtype = a.Jtype,
                             Jdr = a.Jdr,
                             ShengName = g.Name + "-" + h.Name + "-" + i.Name,
                             VisTypeName = b.Comments,
                             JtypeName = c.Comments,
                             ZwName = d.Comments,
                             YxName = e.Comments,
                             JyName = f.Comments,
                             //ShengName = g.Name + "-" + h.Name + "-" + i.Name,
                             VisTypeName = bzzzzz.Comments,
                             JtypeName = czzzzz.Comments,
                             ZwName = dzzzzz.Comments,
                             YxName = ezzzzz.Comments,
                             JyName = fzzzzz.Comments,
                             Zw = a.Zw,
                             Talk = a.Talk,
                             Khfk = a.Khfk,