From 6f52924d92d255b1f68dd3aaaf78807a84904e03 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 3 Apr 2020 08:38:21 +0800 Subject: [PATCH] update --- .../src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java | 2 +- .../lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java index 8c4b1bd..d0df24a 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java @@ -31,7 +31,7 @@ public class LymsEncodeUtil { String key1 = "Lymsh@2020"; - String d = aesEncrypt("2020-04-30",key1); + String d = aesEncrypt("2020-05-30",key1); System.out.println("加密：" + d); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 01a5daf..b45e86c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -628,11 +628,13 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen yquery.addCriteria(Criteria.where("fillDate").gte(start).lte(end)); yquery.addCriteria(Criteria.where("hyj").is(0)); + yquery.addCriteria(Criteria.where("hospitalId").is(hospitalId)); long yjCount = mongoTemplate.count(yquery, PreEugenicsBaseModel.class); yjAllCount += yjCount; Query tquery = new Query(); + tquery.addCriteria(Criteria.where("hospitalId").is(hospitalId)); tquery.addCriteria(Criteria.where("fillDate").gte(start).lte(end)); tquery.addCriteria(Criteria.where("hyj").is(1)); long tcCount = mongoTemplate.count(tquery, PreEugenicsBaseModel.class); -- 1.8.3.1