diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 7aa09cb..4aff5ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -68,7 +68,8 @@ public class BabyCheckFacade extends BaseServiceImpl { @Autowired private MongoTemplate mongoTemplate; - + @Autowired + private DepartmentsService departmentsService; @Autowired private BasicConfigService basicConfigService; @@ -4568,13 +4569,21 @@ public class BabyCheckFacade extends BaseServiceImpl { public BaseResponse getBabyDoctorCount(String checkTime, Integer userId) { + String hospialId = autoMatchFacade.getHospitalId(userId); - String hospialId = autoMatchFacade.getHospitalId(userId); UsersQuery query = new UsersQuery(); query.setOrgId(Integer.parseInt(hospialId)); query.setYn(YnEnums.YES.getId()); + DepartmentsQuery departmentsQuery = new DepartmentsQuery(); + departmentsQuery.setYn(YnEnums.YES.getId()); + departmentsQuery.setOrgId(Integer.parseInt(hospialId)); + departmentsQuery.setKeyword("儿科"); + List departments = departmentsService.queryDepartments(departmentsQuery); + if (CollectionUtils.isNotEmpty(departments)) + { + query.setDeptId(departments.get(0).getId()); + } List users = usersService.queryUsers(query); - Date startDate = null; Date endDate = null; if (StringUtils.isNotEmpty(checkTime)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 5a2c221..ed5896a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -807,6 +807,7 @@ public class PatientFacade extends BaseServiceImpl { } Query query = Query.query(criteria); + System.out.println("------"+query.toString()); String formatBmi = ""; if ("1".equals(riskPatientsQueryRequest.getBmi())) { formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "25", "28");