From e2fa131cf9e00ddd3e2678c7db33e1cd97ce269a Mon Sep 17 00:00:00 2001
From: ryoeiken <754264374@qq.com>
Date: Tue, 8 Dec 2020 11:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=A4=90=E5=8A=9F=E8=83=BD=E8=90=A5?=
 =?UTF-8?q?=E5=85=BB=E9=85=8D=E9=A4=90=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/system/fantang/vo/FtCateringVo.java    | 3 +++
 .../main/resources/mapper/fantang/FtCateringDaoMapper.xml | 8 +++++---
 ruoyi-ui/src/views/fantang/catering/index.vue             | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtCateringVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtCateringVo.java
index c20fb7c61..71fae9bc3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtCateringVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtCateringVo.java
@@ -29,4 +29,7 @@ public class FtCateringVo {
 
     @TableField(exist = false)
     private String hospitalId;
+
+    @TableField(exist = false)
+    private String foodName;
 }
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml
index 00f8f1c31..9960af70b 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml
@@ -21,8 +21,10 @@
     </resultMap>
 
     <select id="listNewFormatter" resultType="com.ruoyi.system.fantang.domain.FtCateringDao">
-        select a.*, b.name, b.bed_id, c.depart_name, b.hospital_id from ft_catering a LEFT JOIN ft_patient b LEFT
-        JOIN ft_depart c on b.depart_id = c.depart_id on a.patient_id = b.patient_id where b.off_flag = 0
+        select a.*, b.name, b.bed_id, c.depart_name, b.hospital_id, d.name as food_name from ft_catering a
+        LEFT JOIN ft_nutrition_food d ON d.id = a.number
+        LEFT JOIN ft_patient b
+        LEFT JOIN ft_depart c on b.depart_id = c.depart_id on a.patient_id = b.patient_id where b.off_flag = 0
         <if test="name != null and name !=''">and b.name = #{name}</if>
         <if test="bedId != null">and b.bed_id = #{bedId}</if>
         <if test="departId != null">and b.depart_id = #{departId}</if>
@@ -31,7 +33,7 @@
     </select>
 
     <select id="getByIdNewFormatter" resultType="com.ruoyi.system.fantang.domain.FtCateringDao">
-        select a.*, b.name, b.bed_id, b.patient_id,c.depart_name, b.hospital_id, c.depart_id
+        select a.*, b.name, b.bed_id, b.patient_id, c.depart_name, b.hospital_id, c.depart_id
         from ft_catering a
                  LEFT JOIN ft_patient b
                  LEFT JOIN ft_depart c on b.depart_id = c.depart_id on a.patient_id = b.patient_id
diff --git a/ruoyi-ui/src/views/fantang/catering/index.vue b/ruoyi-ui/src/views/fantang/catering/index.vue
index ed7cb0abf..d4f3b888b 100644
--- a/ruoyi-ui/src/views/fantang/catering/index.vue
+++ b/ruoyi-ui/src/views/fantang/catering/index.vue
@@ -182,7 +182,7 @@
       <el-table-column label="姓名" align="center" prop="name"/>
       <el-table-column label="床号" align="center" prop="bedId"/>
       <el-table-column label="正餐类型" align="center" prop="type" :formatter="typeFormat" v-if="false"/>
-      <el-table-column label="配餐号" align="center" prop="number"/>
+      <el-table-column label="营养配餐" align="center" prop="foodName"/>
       <el-table-column label="配餐频次" align="center" prop="frequency"/>
       <el-table-column label="用法" align="center" prop="cateringUsage"/>
       <el-table-column label="描述" align="center" prop="cateringDescribe"/>