abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配餐功能营养配餐显示

Browse Source
This commit is contained in:
ryoeiken 2020-12-08 11:48:31 +08:00
parent 33fe8c08bb
commit e2fa131cf9
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/java/com/ruoyi/system/fantang/vo/FtCateringVo.java
View File

@ -29,4 +29,7 @@ public class FtCateringVo {
@TableField(exist = false)
private String hospitalId;
@TableField(exist = false)
private String foodName;
}

8
ruoyi-system/src/main/resources/mapper/fantang/FtCateringDaoMapper.xml
View File

@ -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

2
ruoyi-ui/src/views/fantang/catering/index.vue
View File

@ -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"/>