jiangjiazhi / regional-platform | GitLab

Commit 695ea3470f9125f9121767ff2f8d72679af27336

Authored by liquanyu over 3 years ago

1 parent 2fd3a227f4

Exists in master and in 6 other branches

区域建档统计修改

Showing 2 changed files with 2 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java

...	...	@@ -2684,6 +2684,7 @@
2684	2684	//分娩状态
2685	2685	patientsQuery.setDueStatus(null==patientManagerRequest.getDueStatus() ? null : patientManagerRequest.getDueStatus());
2686	2686
	2687	+ System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
2687	2688	List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
2688	2689	List <PatientManagerQueryModel> patientManagerQueryModelList = new ArrayList <>();
2689	2690	if (CollectionUtils.isNotEmpty(patientsList)) {

...	...	@@ -1271,7 +1271,7 @@
1271	1271	List<Map<String, Object>> hospitalInfos = mongoUtil.getHospitals(userId, provinceId, cityId, aredId, streetId);
1272	1272	List<String> hospitalIds = CollectionUtils.getListByKey(hospitalInfos, "id");
1273	1273	Criteria c = new Criteria();
1274		- c.and("hospitalId").in(hospitalIds).and("yn").is(1).and("enable").ne("2").and("buildType").ne(1);
	1274	+ c.and("hospitalId").in(hospitalIds).and("yn").is(1).and("enable").nin(Arrays.asList("1","2")).and("buildType").ne(1);
1275	1275	if (startDate != null && endDate != null) {
1276	1276	c.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1));
1277	1277	}