jiangjiazhi / regional-platform

Authored by liquanyu over 3 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 13 additions and 3 deletions

...	...	@@ -68,8 +68,9 @@
68	68
69	69	@Autowired
70	70	private MongoTemplate mongoTemplate;
	71	+ @Autowired
	72	+ private DepartmentsService departmentsService;
71	73
72		-
73	74	@Autowired
74	75	private BasicConfigService basicConfigService;
75	76
76	77
77	78
78	79
...	...	@@ -4568,13 +4569,21 @@
4568	4569
4569	4570	public BaseResponse getBabyDoctorCount(String checkTime, Integer userId) {
4570	4571
	4572	+ String hospialId = autoMatchFacade.getHospitalId(userId);
4571	4573
4572		- String hospialId = autoMatchFacade.getHospitalId(userId);
4573	4574	UsersQuery query = new UsersQuery();
4574	4575	query.setOrgId(Integer.parseInt(hospialId));
4575	4576	query.setYn(YnEnums.YES.getId());
	4577	+ DepartmentsQuery departmentsQuery = new DepartmentsQuery();
	4578	+ departmentsQuery.setYn(YnEnums.YES.getId());
	4579	+ departmentsQuery.setOrgId(Integer.parseInt(hospialId));
	4580	+ departmentsQuery.setKeyword("儿科");
	4581	+ List<Departments> departments = departmentsService.queryDepartments(departmentsQuery);
	4582	+ if (CollectionUtils.isNotEmpty(departments))
	4583	+ {
	4584	+ query.setDeptId(departments.get(0).getId());
	4585	+ }
4576	4586	List<Users> users = usersService.queryUsers(query);
4577		-
4578	4587	Date startDate = null;
4579	4588	Date endDate = null;
4580	4589	if (StringUtils.isNotEmpty(checkTime))

...	...	@@ -807,6 +807,7 @@
807	807	}
808	808
809	809	Query query = Query.query(criteria);
	810	+ System.out.println("------"+query.toString());
810	811	String formatBmi = "";
811	812	if ("1".equals(riskPatientsQueryRequest.getBmi())) {
812	813	formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "25", "28");