diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java
index 5a88cc230..f3d4e6927 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtReportMealsDao.java
@@ -125,4 +125,12 @@ public class FtReportMealsDao implements Serializable {
* 当前报餐总价
*/
private BigDecimal totalPrice;
+
+ private Boolean vegetables;
+
+ private Boolean meat;
+
+ private Boolean rice;
+
+ private Integer egg;
}
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml
index c2db65ee7..dce1d010f 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml
@@ -28,7 +28,11 @@
c.nutrition_food_flag,
c.is_replace_food,
c.nutrition_food_price,
- c.total_price
+ c.total_price,
+ c.vegetables,
+ c.meat,
+ c.rice,
+ c.egg
from ft_patient a
LEFT JOIN ft_depart b on a.depart_id = b.depart_id
RIGHT JOIN ft_report_meals c on a.patient_id = c.patient_id
@@ -51,6 +55,10 @@
+
+
+
+
@@ -69,7 +77,11 @@
c.nutrition_food_flag,
c.is_replace_food,
c.nutrition_food_price,
- c.total_price
+ c.total_price,
+ c.vegetables,
+ c.meat,
+ c.rice,
+ c.egg
from ft_patient a
LEFT JOIN ft_depart b on a.depart_id = b.depart_id
RIGHT JOIN ft_report_meals c on a.patient_id = c.patient_id
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml
index 93ec67e35..46ff48780 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtReportMealsDaoMapper.xml
@@ -21,6 +21,10 @@
+
+
+
+