diff --git a/module/story/test/lib/story.unittest.class.php b/module/story/test/lib/story.unittest.class.php
index ba93f714ac..7688ae5954 100755
--- a/module/story/test/lib/story.unittest.class.php
+++ b/module/story/test/lib/story.unittest.class.php
@@ -52,6 +52,21 @@ class storyTest
         return $result;
     }
 
+    /**
+     * Test getDataOfStoriesPerEstimate method.
+     *
+     * @param  string $storyType
+     * @access public
+     * @return array
+     */
+    public function getDataOfStoriesPerEstimateTest($storyType = 'story')
+    {
+        $result = $this->objectModel->getDataOfStoriesPerEstimate($storyType);
+        if(dao::isError()) return dao::getError();
+
+        return $result;
+    }
+
     /**
      * Test removeFormFieldsForCreate method.
      *
diff --git a/module/story/test/model/getdataofstoriesperestimate.php b/module/story/test/model/getdataofstoriesperestimate.php
index db1d7bc3a9..fb0702f990 100755
--- a/module/story/test/model/getdataofstoriesperestimate.php
+++ b/module/story/test/model/getdataofstoriesperestimate.php
@@ -3,33 +3,52 @@
 
 /**
 
-title=测试 storyModel->getDataOfStoriesPerEstimate();
+title=测试 storyModel::getDataOfStoriesPerEstimate();
 timeout=0
 cid=0
 
-- 按照需求预计工时分组，获取分组后的需求数量 @4
-- 按照需求预计工时分组，获取各个工时的需求数量，查看工时为19的数据
- - 第0条的name属性 @4
- - 第0条的value属性 @4
-- 按照需求预计工时分组，获取各个工时的需求数量，查看工时为20的数据第1条的value属性 @5
+- 测试默认story类型的预计工时统计 @6
+- 测试返回的工时分组数据结构
+ - 第0条的name属性 @2
+ - 第0条的value属性 @3
+- 测试requirement类型的预计工时统计 @6
+- 测试空数据集的预计工时统计 @0
+- 测试特定工时值的查询 @1
 
 */
 include dirname(__FILE__, 5) . '/test/lib/init.php';
+include dirname(__FILE__, 2) . '/lib/story.unittest.class.php';
 
+// 清理数据并准备测试数据
 $story = zenData('story');
-$story->estimate->range('1-4');
-$story->gen(20);
+$story->id->range('1-30');
+$story->type->range('story{20},requirement{10}');
+$story->estimate->range('1{5},2{3},5{4},8{3},0{5},20{10}');
+$story->status->range('active,closed{2},draft{1}');
+$story->deleted->range('0{25},1{5}');
+$story->gen(30);
 
 su('admin');
 
-global $tester;
-$tester->loadModel('story');
+$storyTest = new storyTest();
 
-$_SESSION['storyOnlyCondition']  = true;
-$_SESSION['storyQueryCondition'] = "`id` < 20";
+// 测试步骤1：测试默认story类型的预计工时统计
+unset($_SESSION['storyOnlyCondition']);
+unset($_SESSION['storyQueryCondition']);
+r(count($storyTest->getDataOfStoriesPerEstimateTest('story'))) && p() && e('6'); // 测试默认story类型的预计工时统计
 
-$data = $tester->story->getDataOfStoriesPerEstimate();
+// 测试步骤2：测试返回的工时分组数据结构
+$result = $storyTest->getDataOfStoriesPerEstimateTest('story');
+r($result) && p('0:name,value') && e('2,3'); // 测试返回的工时分组数据结构
 
-r(count($data)) && p()               && e('4');    // 按照需求预计工时分组，获取分组后的需求数量
-r($data)        && p('0:name,value') && e('4,4');  // 按照需求预计工时分组，获取各个工时的需求数量，查看工时为19的数据
-r($data)        && p('1:value')      && e('5');    // 按照需求预计工时分组，获取各个工时的需求数量，查看工时为20的数据
\ No newline at end of file
+// 测试步骤3：测试requirement类型的预计工时统计
+r(count($storyTest->getDataOfStoriesPerEstimateTest('requirement'))) && p() && e('6'); // 测试requirement类型的预计工时统计
+
+// 测试步骤4：测试空数据集的预计工时统计
+$_SESSION['storyOnlyCondition'] = true;
+$_SESSION['storyQueryCondition'] = "id = 999";
+r(count($storyTest->getDataOfStoriesPerEstimateTest('story'))) && p() && e('0'); // 测试空数据集的预计工时统计
+
+// 测试步骤5：测试特定工时值的查询
+$_SESSION['storyQueryCondition'] = "estimate = 0 AND type = 'story' AND deleted = '0'";
+r(count($storyTest->getDataOfStoriesPerEstimateTest('story'))) && p() && e('1'); // 测试特定工时值的查询
\ No newline at end of file