diff --git a/das/src/main/java/com/das/modules/curve/controller/TheoreticalPowerCurveController.java b/das/src/main/java/com/das/modules/curve/controller/TheoreticalPowerCurveController.java
index cab347ec..2e95ea58 100644
--- a/das/src/main/java/com/das/modules/curve/controller/TheoreticalPowerCurveController.java
+++ b/das/src/main/java/com/das/modules/curve/controller/TheoreticalPowerCurveController.java
@@ -123,8 +123,8 @@ public class TheoreticalPowerCurveController {
      * @return 速度功率曲线
      */
     @GetMapping("/queryItemByParent")
-    public R<List<CurveItemEntity>> queryAllCurve(String id) {
-        List<CurveItemEntity> curveItemEntityList = theoreticalPowerCurveService.queryCurveItemByParent(id);
+    public R<List<CurveItemEntity>> queryAllCurve(String madeinfactory,String model) {
+        List<CurveItemEntity> curveItemEntityList = theoreticalPowerCurveService.queryCurveItemByParent(madeinfactory,model);
         return R.success(curveItemEntityList);
     }
 }
diff --git a/das/src/main/java/com/das/modules/curve/service/TheoreticalPowerCurveService.java b/das/src/main/java/com/das/modules/curve/service/TheoreticalPowerCurveService.java
index bea33046..5d85a76b 100644
--- a/das/src/main/java/com/das/modules/curve/service/TheoreticalPowerCurveService.java
+++ b/das/src/main/java/com/das/modules/curve/service/TheoreticalPowerCurveService.java
@@ -23,7 +23,7 @@ public interface TheoreticalPowerCurveService {
 
     void exportTheoreticalPowerCurve(TheoreticalPowerCurveDto theoreticalPowerCurveDto, HttpServletRequest request, HttpServletResponse response);
 
-    List<CurveItemEntity> queryCurveItemByParent(String id);
+    List<CurveItemEntity> queryCurveItemByParent(String madeinfactory,String model);
 
 
 }
diff --git a/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java b/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java
index 8293511e..856bddab 100644
--- a/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java
+++ b/das/src/main/java/com/das/modules/curve/service/impl/TheoreticalPowerCurveServiceImpl.java
@@ -126,12 +126,15 @@ public class TheoreticalPowerCurveServiceImpl implements TheoreticalPowerCurveSe
     }
 
     @Override
-    public List<CurveItemEntity> queryCurveItemByParent(String id) {
-        QueryWrapper<CurveItemEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("PARENT",Long.valueOf(id));
+    public List<CurveItemEntity> queryCurveItemByParent(String madeinfactory,String model) {
+        QueryWrapper<TheoreticalPowerCurveEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("madeinfactory",madeinfactory);
+        queryWrapper.eq("MODEL",model);
+        TheoreticalPowerCurveEntity theoreticalPowerCurveEntity = theoreticalPowerCurveMapper.selectOne(queryWrapper);
+        QueryWrapper<CurveItemEntity> itemEntityQueryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("PARENT",theoreticalPowerCurveEntity.getId());
         queryWrapper.orderByAsc("SPEED");
-        List<CurveItemEntity> curveItemEntityList = curveItemMapper.selectList(queryWrapper);
-        return curveItemEntityList;
+        return curveItemMapper.selectList(itemEntityQueryWrapper);
     }
 
     public void batchProcessing(List<CurveItemEntity> curveItemList, Long parent){
diff --git a/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java b/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java
index b6629105..76b83e08 100644
--- a/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java
+++ b/das/src/main/java/com/das/modules/page/domian/WindTurbinesPageVo.java
@@ -19,6 +19,8 @@ public class WindTurbinesPageVo {
 
     private String model;
 
+    private String madeinfactory;
+
     private String belongLine;
 
     private Map<String,Object> attributeMap;
diff --git a/das/src/main/java/com/das/modules/page/service/impl/WindTurbinesPageServiceImpl.java b/das/src/main/java/com/das/modules/page/service/impl/WindTurbinesPageServiceImpl.java
index 76eb01a0..cf133802 100644
--- a/das/src/main/java/com/das/modules/page/service/impl/WindTurbinesPageServiceImpl.java
+++ b/das/src/main/java/com/das/modules/page/service/impl/WindTurbinesPageServiceImpl.java
@@ -104,6 +104,7 @@ public class WindTurbinesPageServiceImpl implements WindTurbinesPageService {
             windTurbinesPageVo.setIrn(item.getId());
             windTurbinesPageVo.setName(item.getName());
             windTurbinesPageVo.setModel(item.getModel());
+            windTurbinesPageVo.setMadeinfactory(item.getMadeinFactory());
             windTurbinesPageVo.setModelId(item.getIotModelId());
             windTurbinesPageVo.setBelongLine(item.getBelongLine());
             windTurbinesPageVos.add(windTurbinesPageVo);