From 8bed20e070356d9c669578a757792f402ac43b0f Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 19 Jul 2018 09:53:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BF=E8=AE=BF=E8=A7=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java  | 6 ++++--
 .../lyms/platform/operate/web/service/impl/NewbornServiceImpl.java  | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
index b58c095..0d037e8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
@@ -762,7 +762,8 @@ public class BabyCheckFacade {
         if (!StringUtils.isEmpty(id)) {
             BabyModelQuery babyQuery = new BabyModelQuery();
             babyQuery.setId(id);
-            babyQuery.setYn(YnEnums.YES.getId());
+            babyQuery.setDataStatus(false);
+            // babyQuery.setYn(YnEnums.YES.getId());
             //查询儿童的基本信息
             List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
             if (models != null && models.size() > 0) {
@@ -989,7 +990,8 @@ public class BabyCheckFacade {
             BabyModelQuery babyQuery = new BabyModelQuery();
             babyQuery.setPhoneOrcardNo(StringUtils.isEmpty(cardNo) ? null : cardNo); //手机号码或者身份证号码
             babyQuery.setVcCardNo(StringUtils.isEmpty(vcCardNo) ? null : vcCardNo);
-            babyQuery.setYn(YnEnums.YES.getId());
+            // babyQuery.setYn(YnEnums.YES.getId());
+            babyQuery.setDataStatus(false);
 
             /** 处理优惠券查询 */
             if (StringUtils.isNotEmpty(coupon)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
index 5d0f844..16a8a01 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
@@ -173,14 +173,13 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
     @Override
     public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
-        Criteria criteria = Criteria.where("hospitalId").is(hospitalId);
+        Criteria criteria = Criteria.where("hospitalId").is(hospitalId).and("yn").ne("0");
         if(startDate != null && endDate != null) {
            criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1));
         }
         if(StringUtils.isNotBlank(doctor)) {
             criteria.and("doctor").is(doctor);
         }
-        criteria.andOperator(new Criteria().orOperator(Criteria.where("yn").is(1),Criteria.where("dataStatus").is(1).andOperator(Criteria.where("yn").is(0))));
         if(StringUtils.isNotBlank(key)) {
             Criteria c = new Criteria();
             // c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0);
-- 
1.8.3.1