From d5195dfe9eb78b04c73679b1600b1998765151ed Mon Sep 17 00:00:00 2001 From: "28353131@qq.com" <28353131@qq.com> Date: Tue, 29 Dec 2020 22:08:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E5=AF=B9=E5=A4=9Abu?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/fantang/controller/ClientPatientController.java | 2 +- .../java/com/ruoyi/system/fantang/domain/FtPatientDao.java | 4 ++++ .../src/main/resources/mapper/fantang/FtPatientDaoMapper.xml | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java index 0469c5e21..534dcb227 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientPatientController.java @@ -28,6 +28,6 @@ public class ClientPatientController extends BaseController { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); String createAt = sdf.format(new Date()); - return AjaxResult.success(iFtPatientDaoService.getReportMealsToday("2020-12-29", patientId)); + return AjaxResult.success(iFtPatientDaoService.getReportMealsToday(createAt, patientId)); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPatientDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPatientDao.java index 586a8059c..93343180e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPatientDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtPatientDao.java @@ -1,5 +1,6 @@ package com.ruoyi.system.fantang.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -43,6 +44,9 @@ private static final long serialVersionUID=1L; /** 所属部门id */ private Long departId; + @TableField(exist = false) + private String departName; + /** 床号 */ @Excel(name = "床号") private String bedId; diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml index 62b99a957..83d84f23b 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml @@ -21,6 +21,11 @@ RIGHT JOIN ft_report_meals c on a.patient_id = c.patient_id WHERE a.patient_id = #{patientId} and c.create_at = #{createAt} + + + + +