Commit 6f52924d92d255b1f68dd3aaaf78807a84904e03

Authored by liquanyu
1 parent 0c7f82e86a

update

Showing 2 changed files with 3 additions and 1 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ 6f52924
... ... @@ -31,7 +31,7 @@
31 31  
32 32 String key1 = "Lymsh@2020";
33 33  
34   - String d = aesEncrypt("2020-04-30",key1);
  34 + String d = aesEncrypt("2020-05-30",key1);
35 35 System.out.println("加密:" + d);
36 36 }
37 37  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 6f52924
... ... @@ -628,11 +628,13 @@
628 628 yquery.addCriteria(Criteria.where("fillDate").gte(start).lte(end));
629 629  
630 630 yquery.addCriteria(Criteria.where("hyj").is(0));
  631 + yquery.addCriteria(Criteria.where("hospitalId").is(hospitalId));
631 632 long yjCount = mongoTemplate.count(yquery, PreEugenicsBaseModel.class);
632 633 yjAllCount += yjCount;
633 634  
634 635  
635 636 Query tquery = new Query();
  637 + tquery.addCriteria(Criteria.where("hospitalId").is(hospitalId));
636 638 tquery.addCriteria(Criteria.where("fillDate").gte(start).lte(end));
637 639 tquery.addCriteria(Criteria.where("hyj").is(1));
638 640 long tcCount = mongoTemplate.count(tquery, PreEugenicsBaseModel.class);