From 2eff99e3c092a37b04f60623d83c873d7cbd5a2c Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Thu, 31 Dec 2020 13:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=A4=90=E8=A1=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/fantang/domain/FtReportMealsDao.java  |  8 ++++++++
 .../mapper/fantang/FtPatientDaoMapper.xml        | 16 ++++++++++++++--
 .../mapper/fantang/FtReportMealsDaoMapper.xml    |  4 ++++
 3 files changed, 26 insertions(+), 2 deletions(-)

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 @@
             <result property="isReplaceFood" column="is_replace_food"></result>
             <result property="nutritionFoodPrice" column="nutrition_food_price"></result>
             <result property="totalPrice" column="total_price"></result>
+            <result property="vegetables" column="vegetables"></result>
+            <result property="meat" column="meat"></result>
+            <result property="rice" column="rice"></result>
+            <result property="egg" column="egg"></result>
         </collection>
     </resultMap>
 
@@ -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 @@
         <result property="isReplaceFood" column="is_replace_food"/>
         <result property="nutritionFoodPrice" column="nutrition_food_price"/>
         <result property="totalPrice" column="total_price"/>
+        <result property="vegetables" column="vegetables"/>
+        <result property="meat" column="meat"/>
+        <result property="rice" column="rice"/>
+        <result property="egg" column="egg"/>
     </resultMap>
 
     <select id="listMealsWithInSettle" resultType="com.ruoyi.system.fantang.domain.FtReportMealsDao">