bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-06-05 13:46:26 +08:00
parent 83bb3f0d38 6bceddc8de
commit f563492a17
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java
View File

@ -45,6 +45,7 @@ public class HealthPersonInfoController extends BaseController {
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(HealthPersonInfo healthPersonInfo) { public TableDataInfo list(HealthPersonInfo healthPersonInfo) {
startPage(); startPage();
System.out.println(healthPersonInfo.getPlaceIds());
List<HealthPersonInfo> list = healthPersonInfoService.selectHealthPersonInfoList(healthPersonInfo); List<HealthPersonInfo> list = healthPersonInfoService.selectHealthPersonInfoList(healthPersonInfo);
return getDataTable(list); return getDataTable(list);
} }

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java
View File

@ -172,4 +172,6 @@ public class HealthPersonInfo extends BaseEntity {
private String updateBy; private String updateBy;
@ApiModelProperty("更新时间") @ApiModelProperty("更新时间")
private Date updateTime; private Date updateTime;
private String doctorAdvices;
private String placeIds;
} }

6
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml
View File

@ -76,6 +76,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="articleTitle != null and articleTitle != ''"> <if test="articleTitle != null and articleTitle != ''">
and(a.nick_name like concat('%', #{articleTitle}, '%') or a.phonenumber like concat('%', #{articleTitle}, '%') or b.doctor_num like concat('%', #{articleTitle}, '%')) and(a.nick_name like concat('%', #{articleTitle}, '%') or a.phonenumber like concat('%', #{articleTitle}, '%') or b.doctor_num like concat('%', #{articleTitle}, '%'))
</if> </if>
<if test="chronicIds != null and chronicIds != ''">
and c.chronic_id in (${chronicIds})
</if>
<if test="doctorAdvices != null and doctorAdvices != ''">
and b.doctor_advice in (${doctorAdvices})
</if>
group by a.user_id, group by a.user_id,
a.nick_name, a.nick_name,
a.dept_id, a.dept_id,