From fa412a3243c170911eaa2845d9a385003a81f8ac Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 28 Mar 2023 09:17:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=90=8E=E8=AE=BF=E8=A7=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/query/MatDeliverQuery.java | 8 ++++++-- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 7 ++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java index e3fc6ce..6aabfb6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java @@ -509,8 +509,12 @@ public class MatDeliverQuery extends BaseQuery implements IConvertToNativeQuery condition = condition.and("cityPostRestId", cityPostRestId, MongoOper.IS); if (null != areaPostRestId) { condition = condition.and("areaPostRestId", areaPostRestId, MongoOper.IS); - if (streetPostRestId != null && !streetPostRestId.equals("")) { - condition = condition.and("streetRegisterId", streetPostRestId, MongoOper.IS); + if (StringUtils.isNotEmpty(streetPostRestId)) { + System.out.println(":::::::::StringUtils.isNotEmpty(streetPostRestId)::::::::::"); + if (!streetPostRestId.trim().equals("")) { + System.out.println(":::::::::streetPostRestId.trim().equals(\"\")::::::::::"); + condition = condition.and("streetPostRestId", streetPostRestId, MongoOper.IS); + } } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 841a2c7..a59a477 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -6,7 +6,6 @@ import com.lyms.hospitalapi.lcdcf.LcdcfHisService; import com.lyms.hospitalapi.pojo.WhfyHisModel; import com.lyms.hospitalapi.whfy.WhfyHisService; import com.lyms.platform.biz.service.*; -import com.lyms.platform.common.base.LoginContext; import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; @@ -31,14 +30,12 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; -import com.mchange.lang.IntegerUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.Transformer; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; -import org.apache.tools.ant.util.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -2292,12 +2289,12 @@ public class MatDeliverFacade { matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit()); matDeliverQuery.setPage(matdeliverFollowRequest.getPage()); - System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); + System.out.println("::::::::产后访视：：：："+matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); } else { maternalDeliverModelList = matDeliverService.query(matDeliverQuery); } - + System.out.println("::::::::产后访视：：：："+matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); if (CollectionUtils.isEmpty(maternalDeliverModelList)) { HashMap map = new HashMap <>(); -- 1.8.3.1