diff --git a/app/components/rules/new/BasicInfo.tsx b/app/components/rules/new/BasicInfo.tsx
index 3afd207..d77274a 100644
--- a/app/components/rules/new/BasicInfo.tsx
+++ b/app/components/rules/new/BasicInfo.tsx
@@ -1,49 +1,105 @@
-import { useState } from 'react';
+import React, { useState } from 'react';
 
 interface BasicInfoProps {
   onChange?: (data: Record<string, unknown>) => void;
 }
 
+// 定义表单数据类型
+interface FormDataType {
+  name: string;
+  code: string;
+  risk: string;
+  is_enabled: boolean;
+  description: string;
+  references_laws: {
+    name: string;
+    articles: string[];
+    content: string;
+  };
+  evaluation_point_groups_id: number | null;
+  type: string;
+}
+
 export function BasicInfo({ onChange }: BasicInfoProps) {
-  const [isDescriptionExpanded, setIsDescriptionExpanded] = useState(false);
-  const [formData, setFormData] = useState({
+  const [formData, setFormData] = useState<FormDataType>({
     name: '',
     code: '',
-    riskLevel: 'medium',
-    type: '',
-    group: 'contract-base',
-    enabled: true,
+    risk: 'medium',
+    is_enabled: true,
     description: '',
-    lawName: '',
-    lawArticles: '',
-    lawContent: ''
+    references_laws: {
+      name: '',
+      articles: [],
+      content: ''
+    },
+    evaluation_point_groups_id: null,
+    type: ''
   });
 
-  const toggleDescription = () => {
-    setIsDescriptionExpanded(!isDescriptionExpanded);
+  const [isDescExpanded, setIsDescExpanded] = useState(false);
+  const [lawArticlesInput, setLawArticlesInput] = useState('');
+
+  const handleToggleDescription = () => {
+    setIsDescExpanded(!isDescExpanded);
   };
 
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>) => {
     const { id, value } = e.target;
-    let fieldName = id;
+    const newData = { ...formData };
     
     // 映射id到表单字段名
     switch(id) {
-      case 'checkpoint-name': fieldName = 'name'; break;
-      case 'checkpoint-code': fieldName = 'code'; break;
-      case 'risk-level': fieldName = 'riskLevel'; break;
-      case 'checkpointType': fieldName = 'type'; break;
-      case 'rule-group': fieldName = 'group'; break;
-      case 'is-enabled': fieldName = 'enabled'; break;
-      case 'checkpoint-description': fieldName = 'description'; break;
-      case 'law-name': fieldName = 'lawName'; break;
-      case 'law-articles': fieldName = 'lawArticles'; break;
-      case 'law-content': fieldName = 'lawContent'; break;
+      case 'rule-name': 
+        newData.name = value;
+        break;
+      case 'rule-code': 
+        newData.code = value;
+        break;
+      case 'risk-level': 
+        newData.risk = value;
+        break;
+      case 'is-enabled': 
+        newData.is_enabled = value === 'true';
+        break;
+      case 'rule-description': 
+        newData.description = value;
+        break;
+      case 'law-name': 
+        newData.references_laws.name = value;
+        break;
+      case 'law-content': 
+        newData.references_laws.content = value;
+        break;
+      case 'law-articles':
+        setLawArticlesInput(value);
+        break;
+      case 'evaluation-point-group':
+        newData.evaluation_point_groups_id = value ? parseInt(value) : null;
+        break;
+      case 'checkpoint-type':
+        newData.type = value;
+        break;
     }
     
+    setFormData(newData);
+    
+    if (onChange) {
+      onChange(newData);
+    }
+  };
+
+  const handleLawArticlesChange = (value: string) => {
+    setLawArticlesInput(value);
+    const articles = value.split(',')
+      .map(article => article.trim())
+      .filter(article => article !== '');
+      
     const newData = {
       ...formData,
-      [fieldName]: id === 'is-enabled' ? value === 'true' : value
+      references_laws: {
+        ...formData.references_laws,
+        articles
+      }
     };
     
     setFormData(newData);
@@ -61,28 +117,28 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
       <div className="ant-card-body">
         <div className="grid grid-cols-1 md:grid-cols-3 gap-6">
           <div>
-            <label className="form-label" htmlFor="checkpoint-name">
+            <label className="form-label" htmlFor="rule-name">
               评查点名称 <span className="required-mark">*</span>
             </label>
-            <input 
-              id="checkpoint-name" 
-              type="text" 
-              className="form-input" 
-              placeholder="请输入评查点名称" 
+            <input
+              type="text"
+              id="rule-name"
+              className="form-input"
+              placeholder="请输入评查点名称，简洁明了"
               value={formData.name}
               onChange={handleInputChange}
             />
             <div className="form-tip">请使用简洁明了的名称，不超过30个字符</div>
           </div>
           <div>
-            <label className="form-label" htmlFor="checkpoint-code">
+            <label className="form-label" htmlFor="rule-code">
               评查点编码 <span className="required-mark">*</span>
             </label>
-            <input 
-              id="checkpoint-code" 
-              type="text" 
-              className="form-input" 
-              placeholder="请输入评查点编码" 
+            <input
+              type="text"
+              id="rule-code"
+              className="form-input"
+              placeholder="请输入评查点编码"
               value={formData.code}
               onChange={handleInputChange}
             />
@@ -95,7 +151,7 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
             <select 
               id="risk-level" 
               className="form-select"
-              value={formData.riskLevel}
+              value={formData.risk}
               onChange={handleInputChange}
             >
               <option value="high">高风险</option>
@@ -105,12 +161,12 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
             <div className="form-tip">请定义评查点的风险等级</div>
           </div>
           <div>
-            <label className="form-label" htmlFor="checkpointType">
+            <label className="form-label" htmlFor="checkpoint-type">
               评查点类型 <span className="required-mark">*</span>
             </label>
             <select 
-              className="form-select" 
-              id="checkpointType"
+              id="checkpoint-type" 
+              className="form-select"
               value={formData.type}
               onChange={handleInputChange}
             >
@@ -124,18 +180,21 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
             <div className="form-tip">评查点类型用于分类管理，便于规则统一调用</div>
           </div>
           <div>
-            <label className="form-label" htmlFor="rule-group">所属规则组</label>
+            <label className="form-label" htmlFor="evaluation-point-group">
+              所属规则组
+            </label>
             <select 
-              id="rule-group" 
+              id="evaluation-point-group" 
               className="form-select"
-              value={formData.group}
+              value={formData.evaluation_point_groups_id?.toString() || ""}
               onChange={handleInputChange}
             >
-              <option value="contract-base">合同基本要素检查</option>
-              <option value="contract-sales">销售合同专项检查</option>
-              <option value="contract-purchase">采购合同专项检查</option>
-              <option value="license">专卖许可证审核规则</option>
-              <option value="punishment">行政处罚规范性检查</option>
+              <option value="">请选择规则组</option>
+              <option value="1">合同基本要素检查</option>
+              <option value="2">销售合同专项检查</option>
+              <option value="3">采购合同专项检查</option>
+              <option value="4">专卖许可证审核规则</option>
+              <option value="5">行政处罚规范性检查</option>
             </select>
           </div>
           <div>
@@ -143,7 +202,7 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
             <select 
               id="is-enabled" 
               className="form-select"
-              value={formData.enabled ? 'true' : 'false'}
+              value={formData.is_enabled ? 'true' : 'false'}
               onChange={handleInputChange}
             >
               <option value="true">是</option>
@@ -151,38 +210,36 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
             </select>
             <div className="form-tip">创建后是否立即启用此评查点</div>
           </div>
+          
           <div className="col-span-1 md:col-span-3">
             <div 
-              className={`flex justify-between items-center cursor-pointer ${isDescriptionExpanded ? 'expanded' : ''}`}
-              onClick={toggleDescription}
-              role="button"
-              tabIndex={0}
+              className={`flex justify-between items-center cursor-pointer ${isDescExpanded ? 'expanded' : ''}`}
+              onClick={handleToggleDescription}
               onKeyDown={(e) => {
                 if (e.key === 'Enter' || e.key === ' ') {
-                  toggleDescription();
+                  handleToggleDescription();
                 }
               }}
-              aria-expanded={isDescriptionExpanded}
-              aria-controls="description-section"
+              tabIndex={0}
+              role="button"
             >
-              <h4 className="form-label mb-0">评查点描述与法律依据</h4>
+              <label className="form-label mb-0" htmlFor="description-section">评查点描述与法律依据</label>
               <i className="ri-arrow-down-s-line text-lg expand-icon"></i>
             </div>
             
-            <div id="description-section" className={`mt-2 ${isDescriptionExpanded ? '' : 'hidden'}`}>
+            <div className={`mt-2 ${isDescExpanded ? '' : 'hidden'}`} id="description-section">
               <div className="mb-4">
-                <label className="form-label" htmlFor="checkpoint-description">评查点描述</label>
-                <textarea 
-                  id="checkpoint-description"
-                  className="form-textarea" 
-                  style={{ minHeight: '80px' }} 
-                  placeholder="请输入评查点描述，包括适用场景、评查目的等"
+                <textarea
+                  id="rule-description"
+                  className="form-textarea"
+                  placeholder="请输入评查点的详细描述"
+                  style={{ minHeight: '80px' }}
                   value={formData.description}
                   onChange={handleInputChange}
                 ></textarea>
                 <div className="form-tip">详细描述有助于其他用户了解该评查点的用途</div>
               </div>
-              
+
               {/* 引用法典输入区域 */}
               <div className="border-t border-gray-100 pt-4 mb-4">
                 <label className="form-label" htmlFor="law-section">引用法典</label>
@@ -194,7 +251,7 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
                     className="form-input" 
                     placeholder="例如：《中华人民共和国民法典》" 
                     id="law-name" 
-                    value={formData.lawName}
+                    value={formData.references_laws.name}
                     onChange={handleInputChange}
                   />
                 </div>
@@ -206,8 +263,8 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
                     className="form-input" 
                     placeholder="例如：第五百八十五条,第五百八十六条" 
                     id="law-articles" 
-                    value={formData.lawArticles}
-                    onChange={handleInputChange}
+                    value={lawArticlesInput}
+                    onChange={(e) => handleLawArticlesChange(e.target.value)}
                   />
                   <div className="form-tip">多个条款用逗号分隔，将自动转换为数组格式</div>
                 </div>
@@ -219,7 +276,7 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
                     style={{ minHeight: '60px' }} 
                     placeholder="例如：当事人应当按照约定全面履行自己的义务。" 
                     id="law-content"
-                    value={formData.lawContent}
+                    value={formData.references_laws.content}
                     onChange={handleInputChange}
                   ></textarea>
                 </div>
@@ -233,12 +290,13 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
                   <div className="text-sm font-medium mb-2">预览效果</div>
                   <div className="law-reference">
                     <div className="law-reference-title" id="preview-law-name">
-                      {formData.lawName || '《中华人民共和国民法典》'}
+                      {formData.references_laws.name || '《中华人民共和国民法典》'}
                     </div>
                     <div className="law-reference-articles" id="preview-law-articles">
-                      {formData.lawArticles ? formData.lawArticles.split(',').map((article, index) => (
-                        <span key={index} className="law-article">{article.trim()}</span>
-                      )) : (
+                      {formData.references_laws.articles.length > 0 ? 
+                        formData.references_laws.articles.map((article, index) => (
+                          <span key={index} className="law-article">{article}</span>
+                        )) : (
                         <>
                           <span className="law-article">第五百八十五条</span>
                           <span className="law-article">第五百八十六条</span>
@@ -246,7 +304,7 @@ export function BasicInfo({ onChange }: BasicInfoProps) {
                       )}
                     </div>
                     <div className="law-reference-content" id="preview-law-content">
-                      {formData.lawContent || '当事人应当按照约定全面履行自己的义务。'}
+                      {formData.references_laws.content || '当事人应当按照约定全面履行自己的义务。'}
                     </div>
                   </div>
                 </div>
diff --git a/app/components/rules/new/ExtractionSettings.tsx b/app/components/rules/new/ExtractionSettings.tsx
index a6fc131..26c3d64 100644
--- a/app/components/rules/new/ExtractionSettings.tsx
+++ b/app/components/rules/new/ExtractionSettings.tsx
@@ -84,7 +84,7 @@ export function ExtractionSettings({ onChange }: ExtractionSettingsProps) {
     
     // 更新全局Context中的字段
     if (ruleContext) {
-      ruleContext.updateExtractionFields(allFields);
+      ruleContext.updateFields(allFields);
     }
     
     // 触发自定义事件，通知字段已更新（兼容非Context的实现）
diff --git a/app/components/rules/new/PageHeader.tsx b/app/components/rules/new/PageHeader.tsx
index f1b907e..37b342a 100644
--- a/app/components/rules/new/PageHeader.tsx
+++ b/app/components/rules/new/PageHeader.tsx
@@ -1,6 +1,3 @@
-import React from 'react';
-import { Link } from '@remix-run/react';
-
 interface PageHeaderProps {
   title: string;
   onSave?: () => void;
@@ -8,7 +5,7 @@ interface PageHeaderProps {
 
 export function PageHeader({ title, onSave }: PageHeaderProps) {
   return (
-    <div className="flex justify-between items-center">
+    <div className="flex justify-between items-center pb-2">
       <h1 className="text-xl font-medium text-gray-800">{title}</h1>
       <div>
         <button 
diff --git a/app/components/rules/new/ReviewSettings.tsx b/app/components/rules/new/ReviewSettings.tsx
index eaaeb2e..2023881 100644
--- a/app/components/rules/new/ReviewSettings.tsx
+++ b/app/components/rules/new/ReviewSettings.tsx
@@ -21,13 +21,13 @@ interface ReviewSettingsProps {
 // 创建全局上下文以便在不同组件间共享数据
 interface RuleContextType {
   extractionFields: string[];
-  updateExtractionFields: (fields: string[]) => void;
+  updateFields: (fields: string[]) => void;
 }
 
 // 创建全局Context对象
 export const RuleContext = createContext<RuleContextType>({
   extractionFields: [],
-  updateExtractionFields: () => {}
+  updateFields: () => {}
 });
 
 export function ReviewSettings({ onChange }: ReviewSettingsProps) {
@@ -38,19 +38,19 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
   const [customLogic, setCustomLogic] = useState<string>('');
   const [showCustomLogic, setShowCustomLogic] = useState<boolean>(false);
   // 添加评查后动作相关状态
-  const [actionType, setActionType] = useState<string>('none');
-  const [actionDescription, setActionDescription] = useState<string>('');
+  const [post_action, setPostAction] = useState<string>('none');
+  const [action_config, setActionConfig] = useState<string>('');
   
   // 获取抽取字段的上下文  
   const { extractionFields } = useContext(RuleContext);
   
   // 初始化评查通过/不通过/建议信息
-  const [passMessage, setPassMessage] = useState('文档检查通过，符合规范要求。');
-  const [failMessage, setFailMessage] = useState('文档存在以下问题，请修改后重新提交。');
-  const [suggestMessage, setSuggestMessage] = useState('');
+  const [pass_message, setPassMessage] = useState('文档检查通过，符合规范要求。');
+  const [fail_message, setFailMessage] = useState('文档存在以下问题，请修改后重新提交。');
+  const [suggestion_message, setSuggestMessage] = useState('');
   
-  // 错误严重程度
-  const [errorSeverity, setErrorSeverity] = useState('error');
+  // 提示类型
+  const [suggestion_message_type, setSuggestionMessageType] = useState('warning');
   
   // 保存最近一次可用的字段列表
   const [availableFields, setAvailableFields] = useState<string[]>(extractionFields || []);
@@ -114,6 +114,12 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
     };
   }, [extractionFields, availableFields]);
 
+  // 初始化评查配置
+  useEffect(() => {
+    // 生成并更新评查配置
+    generateEvaluationConfig();
+  }, []);
+
   // 处理已删除字段的函数
   const handleDeletedFields = (deletedFields: string[]) => {
     setRules(prevRules => {
@@ -141,7 +147,7 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
             }
             break;
             
-          case 'format':
+            case 'format':
             // 如果判断字段被删除，则清空字段
             if (updatedConfig.checkField && deletedFields.includes(updatedConfig.checkField as string)) {
               updatedConfig.checkField = '';
@@ -220,30 +226,20 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
 
   const handleLogicChange = (logic: string) => {
     setCombinationLogic(logic);
-    if (logic === 'custom') {
-      setShowCustomLogic(true);
-    } else {
-      setShowCustomLogic(false);
-    }
+    setShowCustomLogic(logic === 'custom');
     
     if (onChange) {
-      onChange({ combinationLogic: logic, showCustomLogic: logic === 'custom', customLogic });
+      const updatedData: Record<string, unknown> = { logicType: logic };
+      onChange(updatedData);
     }
   };
 
   const handleCustomLogicChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
-    setCustomLogic(e.target.value);
+    const value = e.target.value;
+    setCustomLogic(value);
     
     if (onChange) {
-      onChange({ customLogic: e.target.value });
-    }
-  };
-
-  const handleActionTypeChange = (type: string) => {
-    setActionType(type);
-    
-    if (onChange) {
-      onChange({ actionType: type });
+      onChange({ customLogic: value });
     }
   };
 
@@ -279,42 +275,76 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
     }
   };
 
+  // 处理规则类型变更
   const handleRuleTypeChange = (id: string, type: string) => {
-    // 更新规则类型
-    const updatedRules = rules.map(rule => {
+    const newRules = rules.map(rule => {
       if (rule.id === id) {
         // 为新类型初始化配置
         let initialConfig: Record<string, unknown> = {};
         
-        // 根据类型设置初始配置
-        switch(type) {
-          case 'exists':
-          case 'logic':
-          case 'regex':
-            initialConfig = {
-              selectedFields: [],
-              availableFields: availableFields // 使用当前最新的可用字段列表
-            };
-            break;
-          case 'consistency':
-            initialConfig = {
-              pairs: [],
-              availableFields: availableFields // 使用当前最新的可用字段列表
-            };
-            break;
-          case 'format':
-            initialConfig = {
-              formatType: '',
-              formatParams: '',
-              availableFields: availableFields // 使用当前最新的可用字段列表
-            };
-            break;
-          default:
-            // 确保所有规则类型都包含availableFields
-            initialConfig = {
-              availableFields: availableFields
-            };
-            break;
+        // 如果类型没变，保留原配置
+        if (type === rule.type) {
+          initialConfig = { ...rule.config };
+        } else {
+          // 根据类型设置初始配置
+          switch(type) {
+            case 'exists':
+              initialConfig = {
+                fields: [],
+                logic: 'and',
+                availableFields: availableFields
+              };
+              break;
+            case 'consistency':
+              initialConfig = {
+                pairs: [],
+                logic: 'and',
+                availableFields: availableFields
+              };
+              break;
+            case 'format':
+              initialConfig = {
+                field: '',
+                formatType: '',
+                parameters: '',
+                availableFields: availableFields
+              };
+              break;
+            case 'logic':
+              initialConfig = {
+                conditions: [],
+                logic: 'and',
+                availableFields: availableFields
+              };
+              break;
+            case 'regex':
+              initialConfig = {
+                field: '',
+                pattern: '',
+                matchType: 'match',
+                availableFields: availableFields
+              };
+              break;
+            case 'ai':
+              initialConfig = {
+                model: 'qwen14b',
+                temperature: 0.1,
+                prompt: '',
+                availableFields: availableFields
+              };
+              break;
+            case 'code':
+              initialConfig = {
+                language: 'javascript',
+                code: '',
+                availableFields: availableFields
+              };
+              break;
+            default:
+              initialConfig = {
+                availableFields: availableFields
+              };
+          }
         }
         
         return {
@@ -326,37 +356,33 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
       return rule;
     });
     
-    setRules(updatedRules);
+    setRules(newRules);
     
     if (onChange) {
-      onChange({ rules: updatedRules });
+      onChange({ rules: newRules });
     }
+    
+    // 更新评查配置
+    generateEvaluationConfig();
   };
-
+  
+  // 处理规则配置变更
   const handleRuleConfigChange = (id: string, configChanges: Record<string, unknown>) => {
-    const updatedRules = rules.map(rule => {
+    const newRules = rules.map(rule => {
       if (rule.id === id) {
-        // 合并现有配置和变更
-        const updatedConfig = { ...rule.config, ...configChanges };
-        
-        // 确保availableFields字段存在
-        if (!updatedConfig.availableFields) {
-          updatedConfig.availableFields = availableFields;
-        }
-        
-        return {
-          ...rule,
-          config: updatedConfig
-        };
+        return { ...rule, config: { ...rule.config, ...configChanges } };
       }
       return rule;
     });
     
-    setRules(updatedRules);
+    setRules(newRules);
     
     if (onChange) {
-      onChange({ rules: updatedRules });
+      onChange({ rules: newRules });
     }
+    
+    // 更新评查配置
+    generateEvaluationConfig();
   };
 
   // 渲染字段标签，确保已选择的字段即使在新的字段列表中不存在也会显示
@@ -1014,6 +1040,25 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
     }
   };
 
+  // 生成完整的评查配置数据并在提交保存时使用
+  const generateEvaluationConfig = () => {
+    const config = {
+      logicType: combinationLogic,
+      customLogic: combinationLogic === 'custom' ? customLogic : '',
+      rules: rules.map(rule => ({
+        id: rule.id,
+        type: rule.type,
+        config: rule.config
+      }))
+    };
+    
+    if (onChange) {
+      onChange({ evaluation_config: config });
+    }
+    
+    return config;
+  };
+
   // 处理评查结果消息变更
   const handleMessageChange = (type: string, value: string) => {
     switch(type) {
@@ -1029,16 +1074,16 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
     }
     
     if (onChange) {
-      onChange({ [`${type}Message`]: value });
+      onChange({ [`${type}_message`]: value });
     }
   };
 
   // 处理严重程度变更
   const handleSeverityChange = (value: string) => {
-    setErrorSeverity(value);
+    setSuggestionMessageType(value);
     
     if (onChange) {
-      onChange({ errorSeverity: value });
+      onChange({ suggestion_message_type: value });
     }
   };
 
@@ -1112,7 +1157,6 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
             <div id="rules-container">
               <div className="flex items-center justify-between mb-2">
                 <div>已添加 <span className="text-blue-600 font-medium">{rules.length}</span> 条规则</div>
-                
               </div>
               
               {rules.length === 0 ? (
@@ -1198,7 +1242,7 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
                   className="form-textarea" 
                   style={{ height: '80px', minHeight: '60px' }} 
                   placeholder="请输入评查通过时的提示信息"
-                  value={passMessage}
+                  value={pass_message}
                   onChange={(e) => handleMessageChange('pass', e.target.value)}
                 ></textarea>
               </div>
@@ -1209,7 +1253,7 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
                   className="form-textarea" 
                   style={{ height: '80px', minHeight: '60px' }} 
                   placeholder="请输入评查不通过时的提示信息"
-                  value={failMessage}
+                  value={fail_message}
                   onChange={(e) => handleMessageChange('fail', e.target.value)}
                 ></textarea>
               </div>
@@ -1220,19 +1264,19 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
                   className="form-textarea" 
                   style={{ height: '80px', minHeight: '60px' }} 
                   placeholder="请输入对用户的建议信息"
-                  value={suggestMessage}
+                  value={suggestion_message}
                   onChange={(e) => handleMessageChange('suggest', e.target.value)}
                 ></textarea>
               </div>
             </div>
           </div>
           
-          {/* 不通过提示类别 */}
+          {/* 建议信息类别 */}
           <div className="mb-4">
             <h4 className="form-label">建议信息类别</h4>
-            <div className="grid grid-cols-1 md:grid-cols-3 gap-4" role="radiogroup" aria-label="建议信息类别">
+            <div className="grid grid-cols-1 sm:grid-cols-3 gap-3 mt-2">
               <div 
-                className={`flex items-center cursor-pointer border-l-4 border-blue-500 ${errorSeverity === 'info' 
+                className={`flex items-center cursor-pointer border-l-4 border-blue-500 ${suggestion_message_type === 'info' 
                   ? 'bg-blue-100 shadow-md ring-2 ring-blue-200' 
                   : 'bg-blue-50 hover:bg-blue-100'} p-3 rounded-r-md transition-all duration-200`}
                 onClick={() => handleSeverityChange('info')}
@@ -1242,24 +1286,24 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
                   }
                 }}
                 role="radio"
-                aria-checked={errorSeverity === 'info'}
+                aria-checked={suggestion_message_type === 'info'}
                 tabIndex={0}
               >
                 <input 
                   type="radio" 
-                  name="errorSeverity"
+                  name="suggestion_message_type"
                   id="severity-info" 
                   className="severity-radio hidden" 
                   value="info"
-                  checked={errorSeverity === 'info'}
+                  checked={suggestion_message_type === 'info'}
                   onChange={() => handleSeverityChange('info')}
                 />
-                <i className={`ri-information-line text-blue-500 text-xl mr-3 ${errorSeverity === 'info' ? 'animate-pulse' : ''}`}></i>
+                <i className={`ri-information-line text-blue-500 text-xl mr-3 ${suggestion_message_type === 'info' ? 'animate-pulse' : ''}`}></i>
                 <div>
                   <div className="font-medium">提示 (Info)</div>
-                  <div className="text-sm text-gray-500">提示性信息，不影响</div>
+                  <div className="text-sm text-gray-500">建议性提示，不影响评查结果</div>
                 </div>
-                {errorSeverity === 'info' && (
+                {suggestion_message_type === 'info' && (
                   <div className="ml-auto">
                     <i className="ri-check-line text-blue-500 text-lg"></i>
                   </div>
@@ -1267,7 +1311,7 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
               </div>
               
               <div 
-                className={`flex items-center cursor-pointer border-l-4 border-yellow-500 ${errorSeverity === 'warning' 
+                className={`flex items-center cursor-pointer border-l-4 border-yellow-500 ${suggestion_message_type === 'warning' 
                   ? 'bg-yellow-100 shadow-md ring-2 ring-yellow-200' 
                   : 'bg-yellow-50 hover:bg-yellow-100'} p-3 rounded-r-md transition-all duration-200`}
                 onClick={() => handleSeverityChange('warning')}
@@ -1277,24 +1321,24 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
                   }
                 }}
                 role="radio"
-                aria-checked={errorSeverity === 'warning'}
+                aria-checked={suggestion_message_type === 'warning'}
                 tabIndex={0}
               >
                 <input 
                   type="radio" 
-                  name="errorSeverity"
+                  name="suggestion_message_type"
                   id="severity-warning" 
                   className="severity-radio hidden" 
                   value="warning"
-                  checked={errorSeverity === 'warning'}
+                  checked={suggestion_message_type === 'warning'}
                   onChange={() => handleSeverityChange('warning')}
                 />
-                <i className={`ri-alert-line text-yellow-500 text-xl mr-3 ${errorSeverity === 'warning' ? 'animate-pulse' : ''}`}></i>
+                <i className={`ri-alert-line text-yellow-500 text-xl mr-3 ${suggestion_message_type === 'warning' ? 'animate-pulse' : ''}`}></i>
                 <div>
                   <div className="font-medium">警告 (Warning)</div>
-                  <div className="text-sm text-gray-500">警告信息，建议修改但不强制</div>
+                  <div className="text-sm text-gray-500">需引起注意的问题</div>
                 </div>
-                {errorSeverity === 'warning' && (
+                {suggestion_message_type === 'warning' && (
                   <div className="ml-auto">
                     <i className="ri-check-line text-yellow-500 text-lg"></i>
                   </div>
@@ -1302,7 +1346,7 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
               </div>
               
               <div 
-                className={`flex items-center cursor-pointer border-l-4 border-red-500 ${errorSeverity === 'error' 
+                className={`flex items-center cursor-pointer border-l-4 border-red-500 ${suggestion_message_type === 'error' 
                   ? 'bg-red-100 shadow-md ring-2 ring-red-200' 
                   : 'bg-red-50 hover:bg-red-100'} p-3 rounded-r-md transition-all duration-200`}
                 onClick={() => handleSeverityChange('error')}
@@ -1312,24 +1356,24 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
                   }
                 }}
                 role="radio"
-                aria-checked={errorSeverity === 'error'}
+                aria-checked={suggestion_message_type === 'error'}
                 tabIndex={0}
               >
                 <input 
                   type="radio" 
-                  name="errorSeverity"
+                  name="suggestion_message_type"
                   id="severity-error" 
                   className="severity-radio hidden" 
                   value="error"
-                  checked={errorSeverity === 'error'}
+                  checked={suggestion_message_type === 'error'}
                   onChange={() => handleSeverityChange('error')}
                 />
-                <i className={`ri-error-warning-line text-red-500 text-xl mr-3 ${errorSeverity === 'error' ? 'animate-pulse' : ''}`}></i>
+                <i className={`ri-error-warning-line text-red-500 text-xl mr-3 ${suggestion_message_type === 'error' ? 'animate-pulse' : ''}`}></i>
                 <div>
                   <div className="font-medium">错误 (Error)</div>
                   <div className="text-sm text-gray-500">严重错误，必须修正</div>
                 </div>
-                {errorSeverity === 'error' && (
+                {suggestion_message_type === 'error' && (
                   <div className="ml-auto">
                     <i className="ri-check-line text-red-500 text-lg"></i>
                   </div>
@@ -1341,17 +1385,17 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
           
           {/* 评查后动作 */}
           <div className="mb-4">
-            <label className="form-label" htmlFor="action-type">
+            <label className="form-label" htmlFor="post-action">
               评查后动作 <span className="required-mark">*</span>
             </label>
             <select 
               className="form-select" 
-              id="action-type" 
-              value={actionType || 'none'}
+              id="post-action" 
+              value={post_action || 'none'}
               onChange={(e) => {
-                setActionType(e.target.value);
+                setPostAction(e.target.value);
                 if (onChange) {
-                  onChange({ actionType: e.target.value });
+                  onChange({ post_action: e.target.value });
                 }
               }}
             >
@@ -1362,18 +1406,18 @@ export function ReviewSettings({ onChange }: ReviewSettingsProps) {
           </div>
           
           {/* 动作描述区域 */}
-          {actionType && actionType !== 'none' && (
-            <div className="mb-4" id="action-description-container">
-              <label className="form-label" htmlFor="action-description">动作描述</label>
+          {post_action && post_action !== 'none' && (
+            <div className="mb-4" id="action-config-container">
+              <label className="form-label" htmlFor="action-config">动作描述</label>
               <textarea 
                 className="form-textarea" 
-                id="action-description" 
+                id="action-config" 
                 placeholder="请输入动作描述，说明评查通过或未通过时的处理方式"
-                value={actionDescription}
+                value={action_config}
                 onChange={(e) => {
-                  setActionDescription(e.target.value);
+                  setActionConfig(e.target.value);
                   if (onChange) {
-                    onChange({ actionDescription: e.target.value });
+                    onChange({ action_config: e.target.value });
                   }
                 }}
               ></textarea>
diff --git a/app/routes/rules.new.tsx b/app/routes/rules.new.tsx
index ad065f7..db76e8c 100644
--- a/app/routes/rules.new.tsx
+++ b/app/routes/rules.new.tsx
@@ -1,10 +1,12 @@
 import { type MetaFunction } from "@remix-run/node";
+import { useState } from "react";
 import { BasicInfo } from "~/components/rules/new/BasicInfo";
 import { ExtractionSettings } from "~/components/rules/new/ExtractionSettings";
-import { ReviewSettings } from "~/components/rules/new/ReviewSettings";
+import { ReviewSettings, RuleContext } from "~/components/rules/new/ReviewSettings";
 import { ActionButtons } from "~/components/rules/new/ActionButtons";
 import { PageHeader } from "~/components/rules/new/PageHeader";
 import rulesStyles from "~/styles/rules.css?url";
+import { useNavigate } from "@remix-run/react";
 
 export const meta: MetaFunction = () => {
   return [
@@ -25,14 +27,168 @@ export const handle = {
 };
 
 export default function RuleNew() {
-  const handleSave = () => {
-    // 实现保存逻辑
-    console.log('保存评查点');
+  const navigate = useNavigate();
+  const [extractionFields, setExtractionFields] = useState<string[]>([]);
+  const [formData, setFormData] = useState({
+    // 基本信息字段
+    name: '',
+    code: '',
+    risk: 'medium',
+    is_enabled: true,
+    description: '',
+    references_laws: {
+      name: '',
+      articles: [],
+      content: ''
+    },
+    evaluation_point_groups_id: null,
+    
+    // 抽取设置
+    extraction_config: {
+      llm_ocr: {
+        fields: [],
+        prompt_setting: {
+          type: 'system',
+          template: ''
+        }
+      },
+      llm_vl: {
+        fields: [],
+        prompt_setting: {
+          type: 'system',
+          template: ''
+        }
+      },
+      ocr_regex: {
+        fields: []
+      }
+    },
+    
+    // 评查设置
+    evaluation_config: {
+      logicType: 'and',
+      customLogic: '',
+      rules: []
+    },
+    
+    // 评查结果消息
+    pass_message: '文档检查通过，符合规范要求。',
+    fail_message: '文档存在以下问题，请修改后重新提交。',
+    suggestion_message: '',
+    suggestion_message_type: 'warning',
+    
+    // 评查后动作
+    post_action: 'none',
+    action_config: ''
+  });
+
+  // 更新抽取字段列表，用于在评查规则中选择
+  const updateExtractionFields = (fields: string[]) => {
+    setExtractionFields(fields);
+  };
+
+  // 处理BasicInfo组件数据变更
+  const handleBasicInfoChange = (data: Record<string, unknown>) => {
+    setFormData(prevData => ({
+      ...prevData,
+      ...data
+    }));
+  };
+
+  // 处理ExtractionSettings组件数据变更
+  const handleExtractionSettingsChange = (data: Record<string, unknown>) => {
+    setFormData(prevData => ({
+      ...prevData,
+      ...data
+    }));
+  };
+
+  // 处理ReviewSettings组件数据变更
+  const handleReviewSettingsChange = (data: Record<string, unknown>) => {
+    setFormData(prevData => ({
+      ...prevData,
+      ...data
+    }));
+  };
+
+  // 保存评查点
+  const handleSave = async () => {
+    try {
+      // 构建完整的评查点数据
+      const evaluationPointData = {
+        code: formData.code,
+        name: formData.name,
+        evaluation_point_groups_id: formData.evaluation_point_groups_id,
+        risk: formData.risk,
+        description: formData.description,
+        is_enabled: formData.is_enabled,
+        references_laws: formData.references_laws,
+        extraction_config: formData.extraction_config,
+        evaluation_config: formData.evaluation_config,
+        pass_message: formData.pass_message,
+        fail_message: formData.fail_message,
+        suggestion_message: formData.suggestion_message,
+        suggestion_message_type: formData.suggestion_message_type,
+        post_action: formData.post_action,
+        action_config: formData.action_config
+      };
+      
+      // 发送数据到API
+      const response = await fetch('/api/evaluation-points', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(evaluationPointData)
+      });
+      
+      if (!response.ok) {
+        throw new Error(`API响应错误: ${response.status}`);
+      }
+      
+      const result = await response.json();
+      console.log('保存成功:', result);
+      
+      // 保存成功后跳转到评查点列表页面
+      navigate('/rules');
+    } catch (error) {
+      console.error('保存失败:', error);
+      alert(`保存失败: ${error instanceof Error ? error.message : '未知错误'}`);
+    }
   };
   
-  const handleSaveDraft = () => {
-    // 实现保存草稿逻辑
-    console.log('保存为草稿');
+  // 保存为草稿
+  const handleSaveDraft = async () => {
+    try {
+      // 构建带草稿标记的评查点数据
+      const draftData = {
+        ...formData,
+        is_enabled: false, // 草稿默认不启用
+        is_draft: true // 标记为草稿
+      };
+      
+      // 发送数据到API
+      const response = await fetch('/api/evaluation-points/draft', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(draftData)
+      });
+      
+      if (!response.ok) {
+        throw new Error(`API响应错误: ${response.status}`);
+      }
+      
+      const result = await response.json();
+      console.log('保存草稿成功:', result);
+      
+      // 保存成功后跳转到评查点列表页面
+      navigate('/rules');
+    } catch (error) {
+      console.error('保存草稿失败:', error);
+      alert(`保存草稿失败: ${error instanceof Error ? error.message : '未知错误'}`);
+    }
   };
 
   return (
@@ -42,11 +198,21 @@ export default function RuleNew() {
         onSave={handleSave} 
       />
       
-      <BasicInfo />
+      <div className="mb-8">
+        <BasicInfo onChange={handleBasicInfoChange} />
+      </div>
       
-      <ExtractionSettings />
+      <div className="mb-8">
+        <RuleContext.Provider value={{ extractionFields, updateFields: updateExtractionFields }}>
+          <ExtractionSettings onChange={handleExtractionSettingsChange} />
+        </RuleContext.Provider>
+      </div>
       
-      <ReviewSettings />
+      <div className="mb-8">
+        <RuleContext.Provider value={{ extractionFields, updateFields: updateExtractionFields }}>
+          <ReviewSettings onChange={handleReviewSettingsChange} />
+        </RuleContext.Provider>
+      </div>
       
       <ActionButtons 
         onSave={handleSave}