clinic-v2
/
server
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev

This commit is contained in:
LiJianZhao 2025-05-21 11:23:58 +08:00
parent 4010dc24b4
commit 154ab7386b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/syjiaer/clinic/server/service/organization/OrganizationMemberService.java
View File

@ -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);

2
src/main/java/com/syjiaer/clinic/server/service/patient/PatientInfoService.java
View File

@ -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);