jiangjiazhi / regional-platform

Download as
Browse Code »

Commit bb415f722eceb1728ca038c2be866fbe4cfa2dde

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

处方报表

Showing 2 changed files with 23 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ bb415f7
... ... @@ -1281,7 +1281,9 @@
1281 1281 if (StringUtils.isNotEmpty(card)) {
1282 1282 MongoCondition con1 = MongoCondition.newInstance("vcCardNo", card, MongoOper.IS);
1283 1283 MongoCondition con = MongoCondition.newInstance("sINCard", card, MongoOper.IS);
1284   - condition = condition.orCondition(new MongoCondition[]{con1, con});
  1284 + MongoCondition con2 = MongoCondition.newInstance("mphone", card, MongoOper.IS);
  1285 + MongoCondition con3 = MongoCondition.newInstance("encoded", card, MongoOper.IS);
  1286 + condition = condition.orCondition(new MongoCondition[]{con1, con, con2, con3});
1285 1287 }
1286 1288  
1287 1289 if (null != hospitalIdList) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ bb415f7
... ... @@ -28,6 +28,7 @@
28 28 import com.lyms.platform.permission.service.impl.MeasureDataInfoServiceImpl;
29 29 import com.lyms.platform.pojo.*;
30 30 import com.lyms.platform.query.*;
  31 +import com.mongodb.BasicDBObject;
31 32 import net.sourceforge.pinyin4j.PinyinHelper;
32 33 import org.apache.commons.collections.CollectionUtils;
33 34 import org.apache.commons.lang.math.NumberUtils;
... ... @@ -35,6 +36,8 @@
35 36 import org.springframework.beans.factory.annotation.Qualifier;
36 37 import org.springframework.data.domain.Sort;
37 38 import org.springframework.data.mongodb.core.MongoTemplate;
  39 +import org.springframework.data.mongodb.core.aggregation.Aggregation;
  40 +import org.springframework.data.mongodb.core.aggregation.AggregationResults;
38 41 import org.springframework.data.mongodb.core.query.Criteria;
39 42 import org.springframework.data.mongodb.core.query.Query;
40 43 import org.springframework.data.mongodb.core.query.Update;
... ... @@ -1957,8 +1960,8 @@
1957 1960 String[] arrs = orderTime.split(" - ");
1958 1961 Date start = DateUtil.parseYMD(arrs[0]);
1959 1962 Date end = DateUtil.parseYMD(arrs[1]);
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);
  1963 +
  1964 + int count = getCount(hospitalId, start, end);
1962 1965 data.put("allCount", String.valueOf(count));
1963 1966  
1964 1967 Map param = new HashMap();
... ... @@ -1985,6 +1988,19 @@
1985 1988 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setErrormsg("成功");
1986 1989 }
1987 1990  
  1991 + private int getCount(String hospitalId,Date start,Date end)
  1992 + {
  1993 + Aggregation aggregation4 =
  1994 + Aggregation.newAggregation(
  1995 + Aggregation.match(Criteria.where("hospitalId").is(hospitalId).and("type")
  1996 + .is(1).and("nextCheckTime").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))),
  1997 + Aggregation.group("patientId").count().as("总人数"));
  1998 + AggregationResults<BasicDBObject> outputTypeCount4 =
  1999 + mongoTemplate.aggregate(aggregation4, "lyms_check_item_order", BasicDBObject.class);
  2000 + return outputTypeCount4.getMappedResults().size();
  2001 + }
  2002 +
  2003 +
1988 2004 public BaseResponse getActualReport(String checkTime, Integer userId) {
1989 2005  
1990 2006 Map<String, Object> data = new HashMap<>();
... ... @@ -1993,8 +2009,8 @@
1993 2009 String[] arrs = checkTime.split(" - ");
1994 2010 Date start = DateUtil.parseYMD(arrs[0]);
1995 2011 Date end = DateUtil.parseYMD(arrs[1]);
1996   - 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);
1997   - data.put("allCount", String.valueOf(count));
  2012 + long count = 0; //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);
  2013 + data.put("allCount", count);
1998 2014  
1999 2015 Map param = new HashMap();
2000 2016 param.put("type",null);