diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py
index f00b95d..8e5eb53 100644
--- a/hb_server/apps/mtm/serializers.py
+++ b/hb_server/apps/mtm/serializers.py
@@ -208,7 +208,7 @@ class RecordFormDetailSerializer(serializers.ModelSerializer):
         return queryset
     
     def get_form_fields(self, obj):
-        serializer = RecordFormFieldSerializer(instance=RecordFormField.objects.filter(form=obj, is_deleted=False), many=True)
+        serializer = RecordFormFieldSerializer(instance=RecordFormField.objects.filter(form=obj, is_deleted=False).order_by('sort'), many=True)
         data = serializer.data
         if obj.type == RecordForm.RF_TYPE_TEST:
             for i in data:
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index b34415f..b14872d 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -208,7 +208,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
                 for i in origin_test['record_data_']:
                     o_dict[i['field_key']] = i['field_value']
                 for i in data['form_fields']:
-                    i['origin_value'] = o_dict[i['field_key']]
+                    i['origin_value'] = o_dict[i['field_key']] if i['field_key'] in o_dict else None
             else:
                 raise exceptions.APIException('原工序检验记录不存在')
         else: