Commit fa412a3243c170911eaa2845d9a385003a81f8ac
1 parent
686e137c6b
Exists in
master
and in
6 other branches
产后访视查询
Showing 2 changed files with 8 additions and 7 deletions
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
View file @
fa412a3
| ... | ... | @@ -509,8 +509,12 @@ |
| 509 | 509 | condition = condition.and("cityPostRestId", cityPostRestId, MongoOper.IS); |
| 510 | 510 | if (null != areaPostRestId) { |
| 511 | 511 | condition = condition.and("areaPostRestId", areaPostRestId, MongoOper.IS); |
| 512 | - if (streetPostRestId != null && !streetPostRestId.equals("")) { | |
| 513 | - condition = condition.and("streetRegisterId", streetPostRestId, MongoOper.IS); | |
| 512 | + if (StringUtils.isNotEmpty(streetPostRestId)) { | |
| 513 | + System.out.println(":::::::::StringUtils.isNotEmpty(streetPostRestId)::::::::::"); | |
| 514 | + if (!streetPostRestId.trim().equals("")) { | |
| 515 | + System.out.println(":::::::::streetPostRestId.trim().equals(\"\")::::::::::"); | |
| 516 | + condition = condition.and("streetPostRestId", streetPostRestId, MongoOper.IS); | |
| 517 | + } | |
| 514 | 518 | } |
| 515 | 519 | } |
| 516 | 520 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
fa412a3
| ... | ... | @@ -6,7 +6,6 @@ |
| 6 | 6 | import com.lyms.hospitalapi.pojo.WhfyHisModel; |
| 7 | 7 | import com.lyms.hospitalapi.whfy.WhfyHisService; |
| 8 | 8 | import com.lyms.platform.biz.service.*; |
| 9 | -import com.lyms.platform.common.base.LoginContext; | |
| 10 | 9 | import com.lyms.platform.common.base.PageInfo; |
| 11 | 10 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
| 12 | 11 | import com.lyms.platform.common.enums.*; |
| 13 | 12 | |
| ... | ... | @@ -31,14 +30,12 @@ |
| 31 | 30 | import com.lyms.platform.permission.service.UsersService; |
| 32 | 31 | import com.lyms.platform.pojo.*; |
| 33 | 32 | import com.lyms.platform.query.*; |
| 34 | -import com.mchange.lang.IntegerUtils; | |
| 35 | 33 | import org.apache.commons.collections.CollectionUtils; |
| 36 | 34 | import org.apache.commons.collections.MapUtils; |
| 37 | 35 | import org.apache.commons.collections.Transformer; |
| 38 | 36 | import org.apache.commons.collections.map.HashedMap; |
| 39 | 37 | import org.apache.commons.lang.StringUtils; |
| 40 | 38 | import org.apache.commons.lang.math.NumberUtils; |
| 41 | -import org.apache.tools.ant.util.DateUtils; | |
| 42 | 39 | import org.slf4j.Logger; |
| 43 | 40 | import org.slf4j.LoggerFactory; |
| 44 | 41 | import org.springframework.beans.factory.annotation.Autowired; |
| 45 | 42 | |
| ... | ... | @@ -2292,12 +2289,12 @@ |
| 2292 | 2289 | matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit()); |
| 2293 | 2290 | matDeliverQuery.setPage(matdeliverFollowRequest.getPage()); |
| 2294 | 2291 | |
| 2295 | - System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); | |
| 2292 | + System.out.println("::::::::产后访视：：：："+matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); | |
| 2296 | 2293 | maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery); |
| 2297 | 2294 | } else { |
| 2298 | 2295 | maternalDeliverModelList = matDeliverService.query(matDeliverQuery); |
| 2299 | 2296 | } |
| 2300 | - | |
| 2297 | + System.out.println("::::::::产后访视：：：："+matDeliverQuery.convertToQuery().convertToMongoQuery().toString()); | |
| 2301 | 2298 | if (CollectionUtils.isEmpty(maternalDeliverModelList)) { |
| 2302 | 2299 | |
| 2303 | 2300 | HashMap <String, Object> map = new HashMap <>(); |