jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 844416eb6d32fed7cb0fab01c238e8df437e7f6f

Authored by liquanyu
1 parent aacbda92eb
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

处方报表

Showing 2 changed files with 8 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 844416e
... ... @@ -1957,7 +1957,7 @@
1957 1957 String[] arrs = orderTime.split(" - ");
1958 1958 Date start = DateUtil.parseYMD(arrs[0]);
1959 1959 Date end = DateUtil.parseYMD(arrs[1]);
1960   - long count = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), CheckItemOrder.class);
  1960 + 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);
1961 1961 data.put("allCount", String.valueOf(count));
1962 1962  
1963 1963 Map param = new HashMap();
... ... @@ -1967,7 +1967,7 @@
1967 1967 if (CollectionUtils.isNotEmpty(checkItems)) {
1968 1968 List<Map> list = new ArrayList<>();
1969 1969 for (CheckItem item : checkItems) {
1970   - long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").and("type").is(2).is(hospitalId).and("nextCheckTime")
  1970 + long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(1).and("nextCheckTime")
1971 1971 .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class);
1972 1972 if (itemCount == 0)
1973 1973 {
... ... @@ -1992,7 +1992,7 @@
1992 1992 String[] arrs = checkTime.split(" - ");
1993 1993 Date start = DateUtil.parseYMD(arrs[0]);
1994 1994 Date end = DateUtil.parseYMD(arrs[1]);
1995   - long count = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), CheckItemOrder.class);
  1995 + 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);
1996 1996 data.put("allCount", String.valueOf(count));
1997 1997  
1998 1998 Map param = new HashMap();
... ... @@ -2002,7 +2002,7 @@
2002 2002 if (CollectionUtils.isNotEmpty(checkItems)) {
2003 2003 List<Map> list = new ArrayList<>();
2004 2004 for (CheckItem item : checkItems) {
2005   - long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime")
  2005 + long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(1).and("nextCheckTime")
2006 2006 .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class);
2007 2007 if (itemCount == 0)
2008 2008 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 844416e
... ... @@ -3260,7 +3260,7 @@
3260 3260 String[] arrs = orderTime.split(" - ");
3261 3261 Date start = DateUtil.parseYMD(arrs[0]);
3262 3262 Date end = DateUtil.parseYMD(arrs[1]);
3263   - 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);
  3263 + long count = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), CheckItemOrder.class);
3264 3264 data.put("allCount", String.valueOf(count));
3265 3265  
3266 3266 Map param = new HashMap();
... ... @@ -3270,7 +3270,7 @@
3270 3270 if (CollectionUtils.isNotEmpty(checkItems)) {
3271 3271 List<Map> list = new ArrayList<>();
3272 3272 for (CheckItem item : checkItems) {
3273   - long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(1).and("nextCheckTime")
  3273 + long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime")
3274 3274 .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class);
3275 3275 if (itemCount == 0)
3276 3276 {
... ... @@ -3295,7 +3295,7 @@
3295 3295 String[] arrs = checkTime.split(" - ");
3296 3296 Date start = DateUtil.parseYMD(arrs[0]);
3297 3297 Date end = DateUtil.parseYMD(arrs[1]);
3298   - 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);
  3298 + long count = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), CheckItemOrder.class);
3299 3299 data.put("allCount", String.valueOf(count));
3300 3300  
3301 3301 Map param = new HashMap();
... ... @@ -3305,7 +3305,7 @@
3305 3305 if (CollectionUtils.isNotEmpty(checkItems)) {
3306 3306 List<Map> list = new ArrayList<>();
3307 3307 for (CheckItem item : checkItems) {
3308   - long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(1).and("nextCheckTime")
  3308 + long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime")
3309 3309 .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class);
3310 3310 if (itemCount == 0)
3311 3311 {