From d0ba4aaf20aa5b39bd0d1901f22885d9d2236602 Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Thu, 5 Jun 2025 13:08:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?jsk=20=20=E5=81=A5=E5=BA=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/health/controller/HealthPersonInfoController.java | 1 + .../bonus/canteen/core/health/domain/HealthPersonInfo.java | 1 + .../main/resources/mapper/health/HealthPersonInfoMapper.xml | 6 ++++++ 3 files changed, 8 insertions(+) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java index 9959c85..de61199 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java @@ -45,6 +45,7 @@ public class HealthPersonInfoController extends BaseController { @GetMapping("/list") public TableDataInfo list(HealthPersonInfo healthPersonInfo) { startPage(); + System.out.println(healthPersonInfo.getChronicIds()); List list = healthPersonInfoService.selectHealthPersonInfoList(healthPersonInfo); return getDataTable(list); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java index 799f6fa..02b108d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java @@ -172,4 +172,5 @@ public class HealthPersonInfo extends BaseEntity { private String updateBy; @ApiModelProperty("更新时间") private Date updateTime; + private String doctorAdvices; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml index 0978a4a..66e8357 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/health/HealthPersonInfoMapper.xml @@ -76,6 +76,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and(a.nick_name like concat('%', #{articleTitle}, '%') or a.phonenumber like concat('%', #{articleTitle}, '%') or b.doctor_num like concat('%', #{articleTitle}, '%')) + + and c.chronic_id in (${chronicIds}) + + + and b.doctor_advice in (${doctorAdvices}) + group by a.user_id, a.nick_name, a.dept_id, From 6bceddc8deab3eaf7f1e8fde2670cdab75ff41d2 Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Thu, 5 Jun 2025 13:45:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?jsk=20=20=E5=81=A5=E5=BA=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/health/controller/HealthPersonInfoController.java | 2 +- .../com/bonus/canteen/core/health/domain/HealthPersonInfo.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java index de61199..a6cdce1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/controller/HealthPersonInfoController.java @@ -45,7 +45,7 @@ public class HealthPersonInfoController extends BaseController { @GetMapping("/list") public TableDataInfo list(HealthPersonInfo healthPersonInfo) { startPage(); - System.out.println(healthPersonInfo.getChronicIds()); + System.out.println(healthPersonInfo.getPlaceIds()); List list = healthPersonInfoService.selectHealthPersonInfoList(healthPersonInfo); return getDataTable(list); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java index 02b108d..ce76ed0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/health/domain/HealthPersonInfo.java @@ -173,4 +173,5 @@ public class HealthPersonInfo extends BaseEntity { @ApiModelProperty("更新时间") private Date updateTime; private String doctorAdvices; + private String placeIds; }