diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtDepartDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtDepartDao.java index 55fca0a2f..7e87280db 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtDepartDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtDepartDao.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,4 +44,11 @@ private static final long serialVersionUID=1L; /** 科室编号 */ @Excel(name = "科室编号") private String departCode; + + @TableField(exist = false) + private Long patientId; + @TableField(exist = false) + private String bedId; + @TableField(exist = false) + private String name; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtDepartVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtDepartVo.java index 140e6827c..244ec0a82 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtDepartVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtDepartVo.java @@ -15,5 +15,6 @@ import java.util.List; @AllArgsConstructor public class FtDepartVo extends FtDepartDao { + List reportMealsList; } diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml index 5c7edb0af..d5d30b8c6 100644 --- a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml @@ -45,7 +45,10 @@ WHERE a.patient_id = #{patientId} and c.create_at = #{createAt} c.foods, c.id, c.nutrition_food_id, - c.type + c.type, + b.patient_id, + b.name, + b.bed_id FROM ft_depart a LEFT JOIN ft_patient b ON a.depart_id = b.depart_id @@ -58,6 +61,9 @@ WHERE a.patient_id = #{patientId} and c.create_at = #{createAt} + + +