diff --git a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java index 2831d45..879cc8b 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java @@ -220,8 +220,8 @@ public class OrganizationMemberService extends BaseService { queryWrapper.eq("del_flag", false); if (dockerSearchQuery.getKeyword() != null && !dockerSearchQuery.getKeyword().isEmpty()){ queryWrapper.and(wrapper -> wrapper - .like("name", dockerSearchQuery.getKeyword()) - .like("section_names", dockerSearchQuery.getKeyword())); + .or().like("name", dockerSearchQuery.getKeyword()) + .or().like("section_names", dockerSearchQuery.getKeyword())); } return organizationMemberMapper.selectList(queryWrapper); diff --git a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java index 145dd86..a28864c 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java @@ -44,7 +44,7 @@ public class PatientInfoService extends BaseService { public PatientInfo save(PatientInfo patientInfo){ patientInfo.setCreateDatetime(LocalDateTime.now()); - if (patientInfo.getBirthday() != null) { + if (patientInfo.getBirthday() != null && patientInfo.getAge() == null) { int currentYear = LocalDate.now().getYear(); int birthYear = patientInfo.getBirthday().getYear(); patientInfo.setAge(currentYear - birthYear);