diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index e71fd5e29..951abfdec 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -209,7 +209,7 @@ class HomeworkCommonController < ApplicationController
     end
 
     if @homework.homework_type == 2 && @homework_detail_programing #编程作业
-      @homework_detail_programing.language = "C++"
+      @homework_detail_programing.language = params[:language]
       @homework_detail_programing.standard_code = params[:standard_code]
       @homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
       homework_tests = @homework.homework_tests
diff --git a/app/models/homework_test.rb b/app/models/homework_test.rb
index 7c477bfaf..4ed290ecd 100644
--- a/app/models/homework_test.rb
+++ b/app/models/homework_test.rb
@@ -2,5 +2,5 @@ class HomeworkTest < ActiveRecord::Base
   attr_accessible :input, :output, :homework_common_id
 
   belongs_to :homework_common
-  has_one :student_work_test
+  has_many :student_work_test
 end
diff --git a/app/views/homework_common/_homework_detail_programing_form.html.erb b/app/views/homework_common/_homework_detail_programing_form.html.erb
index 5d1d5ce88..be08dd107 100644
--- a/app/views/homework_common/_homework_detail_programing_form.html.erb
+++ b/app/views/homework_common/_homework_detail_programing_form.html.erb
@@ -56,7 +56,7 @@
   <ul>
     <li >
       <label class="label02">&nbsp;开发语言：&nbsp;</label>
-      <%= select_tag :language,options_for_select(programing_languages_options,homework.homework_detail_programing.language), {:class => "fl mb10 h26 w70"}  %>
+      <%= select_tag :language,options_for_select(programing_languages_options,homework.homework_detail_programing.language.to_i), {:class => "fl mb10 h26 w70"}  %>
       <div class="cl"></div>
     </li>
 
diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index eab8313bc..9b5035a04 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -47,8 +47,9 @@
               <td  class="td_tit">
                 <%= test.output%>
               </td>
-              <td class="td_50 c_red"><%= test.student_work_test.nil? ? "正在编译" : test.student_work_test.status_to_s%></td>
-              <input type="hidden" value="<%= test.student_work_test.result if test.student_work_test%>">
+              <% student_work_test = StudentWorkTest.where(:homework_test_id => test.id,:student_work_id => @work.id).first%>
+              <td class="td_50 c_red"><%= student_work_test.nil? ? "正在编译" : student_work_test.status_to_s%></td>
+              <input type="hidden" value="<%= student_work_test.result if student_work_test%>">
             </tr>
         <% end%>