jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 883ea704154aaee4659be334b765ea904cccdced

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

update

Showing 1 changed file with 3 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 883ea70
... ... @@ -4417,7 +4417,7 @@
4417 4417 for (Patients patients : patientsList) {
4418 4418 filingPids.add(patients.getPid());
4419 4419 }
4420   - Criteria criteria3 = Criteria.where("pid").in(CollectionUtils.isNotEmpty(filingPids)?filingPids:"")
  4420 + Criteria criteria3 = Criteria.where("pid").in(filingPids)
4421 4421 .and("hospitalId").is(hospitalId)
4422 4422 .and("yn").is(YnEnums.YES.getId())
4423 4423 .and("checkTime").gte(startDate).lte(endDate);
4424 4424  
... ... @@ -4430,13 +4430,13 @@
4430 4430 for (Patients patients : antExChuNotList) {
4431 4431 antExChuNotPids.add(patients.getPid());
4432 4432 }
4433   - Criteria criteria4 = Criteria.where("pid").in(CollectionUtils.isNotEmpty(antExChuNotPids)?antExChuNotPids:"")
  4433 + Criteria criteria4 = Criteria.where("pid").in(antExChuNotPids)
4434 4434 .and("hospitalId").is(hospitalId)
4435 4435 .and("yn").is(YnEnums.YES.getId())
4436 4436 .and("checkTime").gte(DateUtil.getMonthDay(startDate,1,1)).lte(DateUtil.getMonthDay(startDate,1,0));
4437 4437 long antExChuNext = mongoTemplate.count(Query.query(criteria4), AntExChuModel.class);
4438 4438 //建档未初诊-外院初诊
4439   - Criteria criteria5= Criteria.where("pid").in(CollectionUtils.isNotEmpty(antExChuNotPids)?antExChuNotPids:"")
  4439 + Criteria criteria5= Criteria.where("pid").in(antExChuNotPids)
4440 4440 .and("hospitalId").ne(hospitalId)
4441 4441 .and("yn").is(YnEnums.YES.getId())
4442 4442 .and("checkTime").gte(startDate);