jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3aa39849044b4902b3160fb3d82ba51c2edb7fdc

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

处方报表

Showing 2 changed files with 7 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 3aa3984
... ... @@ -1957,18 +1957,19 @@
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(1).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")
  1961 + .is(1).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))), CheckItemOrder.class);
1961 1962 data.put("allCount", String.valueOf(count));
1962 1963  
1963 1964 Map param = new HashMap();
1964   - param.put("type",null);
  1965 + param.put("type",1);
1965 1966 param.put("hospitalId",hospitalId);
1966 1967 List<CheckItem> checkItems = checkItemService.getCheckItemList(param);
1967 1968 if (CollectionUtils.isNotEmpty(checkItems)) {
1968 1969 List<Map> list = new ArrayList<>();
1969 1970 for (CheckItem item : checkItems) {
1970 1971 long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(1).and("nextCheckTime")
1971   - .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class);
  1972 + .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(String.valueOf(item.getId()))), CheckItemOrder.class);
1972 1973 if (itemCount == 0)
1973 1974 {
1974 1975 continue;
... ... @@ -2003,7 +2004,7 @@
2003 2004 List<Map> list = new ArrayList<>();
2004 2005 for (CheckItem item : checkItems) {
2005 2006 long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(1).and("nextCheckTime")
2006   - .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class);
  2007 + .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(String.valueOf(item.getId()))), CheckItemOrder.class);
2007 2008 if (itemCount == 0)
2008 2009 {
2009 2010 continue;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 3aa3984
... ... @@ -3273,7 +3273,7 @@
3273 3273 List<Map> list = new ArrayList<>();
3274 3274 for (CheckItem item : checkItems) {
3275 3275 long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime")
3276   - .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class);
  3276 + .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(String.valueOf(item.getId()))), CheckItemOrder.class);
3277 3277 if (itemCount == 0)
3278 3278 {
3279 3279 continue;
... ... @@ -3308,7 +3308,7 @@
3308 3308 List<Map> list = new ArrayList<>();
3309 3309 for (CheckItem item : checkItems) {
3310 3310 long itemCount = mongoTemplate.count(Query.query(Criteria.where("hospitalId").is(hospitalId).and("type").is(2).and("nextCheckTime")
3311   - .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(item.getId())), CheckItemOrder.class);
  3311 + .gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end)).and("itemId").is(String.valueOf(item.getId()))), CheckItemOrder.class);
3312 3312 if (itemCount == 0)
3313 3313 {
3314 3314 continue;