From baf88a0ea491f944cdf97e7aa0e6769ed169b7c7 Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Thu, 31 Dec 2020 11:42:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A0=B9=E6=8D=AE=E7=A7=91?=
 =?UTF-8?q?=E5=AE=A4=E8=8E=B7=E5=8F=96=E6=AC=A1=E6=97=A5=E6=8A=A5=E9=A4=90?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/fantang/FtPatientDaoMapper.xml        | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml
index a0c562c54..c2db65ee7 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtPatientDaoMapper.xml
@@ -24,7 +24,11 @@
                c.foods,
                c.id,
                c.nutrition_food_id,
-               c.type
+               c.type c.type,
+               c.nutrition_food_flag,
+               c.is_replace_food,
+               c.nutrition_food_price,
+               c.total_price
         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
@@ -43,6 +47,10 @@
             <result property="type" column="type"></result>
             <result property="foods" column="foods"></result>
             <result property="nutritionFoodId" column="nutrition_food_id"></result>
+            <result property="nutritionFoodFlag" column="nutrition_food_flag"></result>
+            <result property="isReplaceFood" column="is_replace_food"></result>
+            <result property="nutritionFoodPrice" column="nutrition_food_price"></result>
+            <result property="totalPrice" column="total_price"></result>
         </collection>
     </resultMap>
 
@@ -57,7 +65,11 @@
                c.foods,
                c.id,
                c.nutrition_food_id,
-               c.type
+               c.type,
+               c.nutrition_food_flag,
+               c.is_replace_food,
+               c.nutrition_food_price,
+               c.total_price
         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