diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java
index c5af0953b..242aa81ce 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/FtFoodDemandDaoController.java
@@ -40,10 +40,8 @@ public class FtFoodDemandDaoController extends BaseController {
     public TableDataInfo list(FtFoodDemandDao ftFoodDemandDao) {
         startPage();
         LambdaQueryWrapper<FtFoodDemandDao> lqw = Wrappers.lambdaQuery(ftFoodDemandDao);
-        if (ftFoodDemandDao.getFlag() != null) {
-            lqw.eq(FtFoodDemandDao::getFlag, ftFoodDemandDao.getFlag());
-        }
-        List<FtFoodDemandDao> list = iFtFoodDemandDaoService.list(lqw);
+//        List<FtFoodDemandDao> list = iFtFoodDemandDaoService.list(lqw);
+        List<FtFoodDemandDao> list = iFtFoodDemandDaoService.listNewFormatter(ftFoodDemandDao);
         return getDataTable(list);
     }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java
index bf56e3372..e459f24e1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtFoodDemandDao.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.system.fantang.entity.BasePatient;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -25,7 +26,7 @@ import java.util.Date;
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("ft_food_demand")
-public class FtFoodDemandDao implements Serializable {
+public class FtFoodDemandDao  extends BasePatient implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java
new file mode 100644
index 000000000..3f765205a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/entity/BasePatient.java
@@ -0,0 +1,15 @@
+package com.ruoyi.system.fantang.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BasePatient {
+    public String hospitalId;
+    public String bedId;
+    public String name;
+    public String departName;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java
index 7f9769061..dd9d52631 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtFoodDemandDaoMapper.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.fantang.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.system.fantang.domain.FtFoodDemandDao;
 import org.apache.ibatis.annotations.Insert;
@@ -20,4 +21,6 @@ public interface FtFoodDemandDaoMapper extends BaseMapper<FtFoodDemandDao> {
 
     @Select("select a.patient_id  from ft_patient a where a.patient_id not in (select patient_id from ft_food_demand c )")
     public List<Long> getNewPatientNotDemand();
+
+    List<FtFoodDemandDao> listNewFormatter(FtFoodDemandDao ftFoodDemandDao);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java
index 0e48aee4c..0ceec0a8c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtFoodDemandDaoService.java
@@ -1,8 +1,11 @@
 package com.ruoyi.system.fantang.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.system.fantang.domain.FtFoodDemandDao;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * 病人报餐Service接口
  *
@@ -14,4 +17,5 @@ public interface IFtFoodDemandDaoService extends IService<FtFoodDemandDao> {
 
     public Integer GenerateOrderForNewPatient() ;
 
+    List<FtFoodDemandDao> listNewFormatter(FtFoodDemandDao ftFoodDemandDao);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java
index 7226cf359..93630c556 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtFoodDemandDaoServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.system.fantang.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.system.fantang.domain.FtFoodDemandDao;
 import com.ruoyi.system.fantang.mapper.FtFoodDemandDaoMapper;
@@ -32,4 +33,9 @@ public class FtFoodDemandDaoServiceImpl extends ServiceImpl<FtFoodDemandDaoMappe
         }
         return newPatients.size();
     }
+
+    @Override
+    public List<FtFoodDemandDao> listNewFormatter(FtFoodDemandDao ftFoodDemandDao) {
+        return this.baseMapper.listNewFormatter(ftFoodDemandDao);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
index a1476df64..ad95b99e4 100644
--- a/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/fantang/FtFoodDemandDaoMapper.xml
@@ -22,5 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="flag"    column="flag"    />
     </resultMap>
 
-
+    <select id="listNewFormatter" resultType="com.ruoyi.system.fantang.domain.FtFoodDemandDao">
+        select a.*, b.name, b.bed_id, c.depart_name, b.hospital_id  from ft_food_demand 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
+        <if test="name != null">and b.name = #{name}</if>
+        <if test="hospitalId != null">and b.hospital_id = #{hospitalId}</if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/fantang/foodDemand/index.vue b/ruoyi-ui/src/views/fantang/foodDemand/index.vue
index 89f914de9..56c53d56f 100644
--- a/ruoyi-ui/src/views/fantang/foodDemand/index.vue
+++ b/ruoyi-ui/src/views/fantang/foodDemand/index.vue
@@ -65,7 +65,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['fantang:foodDemand:add']"
-        >自动生成
+        >导入新入院配置数据
         </el-button>
       </el-col>
       <el-col :span="1.5">