diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java index 766b21d..2652355 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java @@ -314,6 +314,8 @@ public class LivelihoodProjectsFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setTypeList(Arrays.asList(1,3));//孕妇,产妇 + patientsQuery.setExtEnable(false); + patientsQuery.setBuildTypeNot(1); if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) { patientsQuery.setBookbuildingDateStart(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate))); patientsQuery.setBookbuildingDateEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate))); @@ -764,6 +766,9 @@ public class LivelihoodProjectsFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setTypeList(Arrays.asList(1,3));//孕妇,产妇 + patientsQuery.setExtEnable(false); + patientsQuery.setBuildTypeNot(1); + if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) { patientsQuery.setBookbuildingDateStart(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate))); patientsQuery.setBookbuildingDateEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate)));