From 3aa39849044b4902b3160fb3d82ba51c2edb7fdc Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 10 Aug 2020 16:06:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E6=96=B9=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/AntExRecordFacade.java | 9 +++++---- .../com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 4 ++-- 2 files changed, 7 insertions(+), 6 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 0a2619b..b36af14 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 @@ -1957,18 +1957,19 @@ public class AntExRecordFacade { String[] arrs = orderTime.split(" - "); Date start = DateUtil.parseYMD(arrs[0]); Date end = DateUtil.parseYMD(arrs[1]); - long count = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(1).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), CheckItemOrder.class); + long count = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type") + .is(1).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), CheckItemOrder.class); data.put("allCount", String.valueOf(count)); Map param = new HashMap(); - param.put("type",null); + param.put("type",1); param.put("hospitalId",hospitalId); List checkItems = checkItemService.getCheckItemList(param); if (CollectionUtils.isNotEmpty(checkItems)) { List list = new ArrayList<>(); for (CheckItem item : checkItems) { long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(1).and("nextCheckTime") - .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class); + .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(String.valueOf(item.getId()))), CheckItemOrder.class); if (itemCount == 0) { continue; @@ -2003,7 +2004,7 @@ public class AntExRecordFacade { List list = new ArrayList<>(); for (CheckItem item : checkItems) { long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(1).and("nextCheckTime") - .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class); + .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(String.valueOf(item.getId()))), CheckItemOrder.class); if (itemCount == 0) { continue; 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 698df5e..cb40097 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 @@ -3273,7 +3273,7 @@ public class BabyCheckFacade extends BaseServiceImpl { List list = new ArrayList<>(); for (CheckItem item : checkItems) { long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime") - .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class); + .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(String.valueOf(item.getId()))), CheckItemOrder.class); if (itemCount == 0) { continue; @@ -3308,7 +3308,7 @@ public class BabyCheckFacade extends BaseServiceImpl { List list = new ArrayList<>(); for (CheckItem item : checkItems) { long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime") - .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class); + .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(String.valueOf(item.getId()))), CheckItemOrder.class); if (itemCount == 0) { continue; -- 1.8.3.1