Browse Source

【指挥调度】疫苗接种点的查询,不根据组织查询,只根据客户查询

dev
wangxianzhang 3 years ago
parent
commit
5c5f0904f7
  1. 12
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

12
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@ -932,9 +932,9 @@ public class EpmetUserServiceImpl implements EpmetUserService {
public Integer countVaccinePoint(String customerId, String agencyId, String staffOrgIds, String search) {
LambdaQueryWrapper<IcPointVaccinesInoculationEntity> query = new LambdaQueryWrapper<>();
query.eq(IcPointVaccinesInoculationEntity::getCustomerId, customerId);
query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds)
.or()
.eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId));
//query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds)
// .or()
// .eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId));
query.like(StringUtils.isNotBlank(search), IcPointVaccinesInoculationEntity::getName, search);
return pointVaccinesInoculationDao.selectCount(query);
}
@ -954,9 +954,9 @@ public class EpmetUserServiceImpl implements EpmetUserService {
public List<IcPointVaccinesInoculationEntity> listVaccinePoints(String customerId, String agencyId, String staffOrgIds, String search) {
LambdaQueryWrapper<IcPointVaccinesInoculationEntity> query = new LambdaQueryWrapper<>();
query.eq(IcPointVaccinesInoculationEntity::getCustomerId, customerId);
query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds)
.or()
.eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId));
//query.and(w -> w.likeRight(IcPointVaccinesInoculationEntity::getPids, staffOrgIds)
// .or()
// .eq(IcPointVaccinesInoculationEntity::getOrgId, agencyId));
query.like(StringUtils.isNotBlank(search), IcPointVaccinesInoculationEntity::getName, search);
return pointVaccinesInoculationDao.selectList(query);
}

Loading…
Cancel
Save