From 443ae729212b552f458f323a51644281239f549d Mon Sep 17 00:00:00 2001 From: wtt Date: Tue, 6 Apr 2021 12:14:06 +0800 Subject: [PATCH] update --- .../com/lyms/platform/operate/web/facade/AntExRecordFacade.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index afcc91e..1e9fbb0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -315,8 +315,9 @@ public class AntExRecordFacade { List orgId = new ArrayList<>(); orgId.add(antExManagerQueryRequest.getCzhospitalId()); hospitalList.retainAll(orgId); - antExRecordQuery.setType(2);//查询初诊数据 - + if(CollectionUtils.isNotEmpty(orgId)){ + antExRecordQuery.setType(2);//查询初诊数据 + } } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExManagerQueryRequest.getCzprovinceId())&& ( StringUtils.isEmpty(antExManagerQueryRequest.gethId()) || StringUtils.isEmpty(antExManagerQueryRequest.getCprovinceId()) || StringUtils.isEmpty(antExManagerQueryRequest.getCcityId()) || StringUtils.isEmpty(antExManagerQueryRequest.getCareaId()) )) { @@ -339,7 +340,9 @@ public class AntExRecordFacade { } } hospitalList.retainAll(orgId); - antExRecordQuery.setType(2);//查询初诊数据 + if(CollectionUtils.isNotEmpty(orgId)){ + antExRecordQuery.setType(2);//查询初诊数据 + } } // 产检医院,初诊医院只能选择其中一个查询 antExRecordQuery.setHospitalList(hospitalList); -- 1.8.3.1