diff --git a/XLBJJXDRService.cs b/XLBJJXDRService.cs
index 169ad5a..1359101 100644
--- a/XLBJJXDRService.cs
+++ b/XLBJJXDRService.cs
@@ -411,31 +411,7 @@ namespace GThinking.S_XLXSBJ
                 {
                     foreach (DataRow row in ds.Tables[0].Rows)
                     {
-                        // 使用传统赋值方式（避免对象初始化器）
-                        XLJXMX item = new XLJXMX();
-                        item.XLJXDJ = SafeTrim(row["XLJXMX_XLJXDJ"]);
-                        item.XLJXDH = SafeTrim(row["XLJXMX_XLJXDH"]);
-                        item.XLJXMXH = SafeTrim(row["XLJXMX_XLJXMXH"]);
-                        item.XLBSC = SafeTrim(row["XLJXMX_XLBSC"]);
-                        item.XLJXGZXH = SafeTrim(row["XLJXMX_XLJXGZXH"]);
-                        item.JXXLXHID = SafeTrim(row["XLJXMX_JXXLXHID"]);
-                        item.XLXHID = SafeTrim(row["XLJXMX_XLXHID"]);
-                        item.JXXLGGID = SafeTrim(row["XLJXMX_JXXLGGID"]);
-                        item.XLGGID = SafeTrim(row["XLJXMX_XLGGID"]);
-                        item.JXDYDJID = SafeTrim(row["XLJXMX_JXDYDJID"]);
-                        item.DYDJID = SafeTrim(row["XLJXMX_DYDJID"]);
-                        item.XLBZID = SafeTrim(row["XLJXMX_XLBZID"]);
-                        item.JXXLBZID = SafeTrim(row["XLJXMX_JXXLBZID"]);
-                        item.XLYSID = SafeTrim(row["XLJXMX_XLYSID"]);
-                        item.JXXLYSID = SafeTrim(row["XLJXMX_JXXLYSID"]);
-                        item.WHR = SafeTrim(row["XLJXMX_WHR"]);
-                        item.WHRID = SafeTrim(row["XLJXMX_WHRID"]);
-                        item.WHSJ = SafeTrim(row["XLJXMX_WHSJ"]);
-                        item.DCZT = SafeTrim(row["XLJXMX_DCZT"]);
-                        item.JLDW = SafeTrim(row["XLJXMX_JLDW"]);
-                        item.SL = SafeTrim(row["XLJXMX_SL"]);
-                        item.FBH = SafeTrim(row["XLJXMX_FBH"]);
-                        item.JSGFID = SafeTrim(row["XLJXMX_JSGFSID"]);
+                        XLJXMX item = ParseXLJXMXFromDataRow(row);
 
                         if (!string.IsNullOrEmpty(item.XLXHID) && !string.IsNullOrEmpty(item.JXXLXHID))
                         {
@@ -578,19 +554,7 @@ namespace GThinking.S_XLXSBJ
                     foreach (DataRow row in ds.Tables[0].Rows)
                     {
                         // 使用传统赋值方式（避免对象初始化器）
-                        XLJXGZ item = new XLJXGZ();
-                        item.XLJXDJ = SafeTrim(row["XLJXGZ_XLJXDJ"]);
-                        item.XLJXDH = SafeTrim(row["XLJXGZ_XLJXDH"]);
-                        item.XLJXGZXH = SafeTrim(row["XLJXGZ_XLJXGZXH"]);
-                        item.XLJXGZC = SafeTrim(row["XLJXGZ_XLJXGZC"]);
-                        item.WHRID = SafeTrim(row["XLJXGZ_WHRID"]);
-                        item.WHR = SafeTrim(row["XLJXGZ_WHR"]);
-                        item.WHSJ = SafeTrim(row["XLJXGZ_WHSJ"]);
-                        item.XLXHYFC = SafeTrim(row["XLJXGZ_XLXHYFC"]);
-                        item.XLGGYFC = SafeTrim(row["XLJXGZ_XLGGYFC"]);
-                        item.DYDJYFC = SafeTrim(row["XLJXGZ_DYDJYFC"]);
-                        item.XLBZYFC = SafeTrim(row["XLJXGZ_XLBZYFC"]);
-                        item.XLYSYFC = SafeTrim(row["XLJXGZ_XLYSYFC"]);
+                        XLJXGZ item = ParseXLJXGZFromDataRow(row);
 
                         resultList.Add(item);
                     }
@@ -646,19 +610,7 @@ namespace GThinking.S_XLXSBJ
                     foreach (DataRow row in ds.Tables[0].Rows)
                     {
                         // 使用传统赋值方式（避免对象初始化器）
-                        XLJXGZ item = new XLJXGZ();
-                        item.XLJXDJ = SafeTrim(row["XLJXGZ_XLJXDJ"]);
-                        item.XLJXDH = SafeTrim(row["XLJXGZ_XLJXDH"]);
-                        item.XLJXGZXH = SafeTrim(row["XLJXGZ_XLJXGZXH"]);
-                        item.XLJXGZC = SafeTrim(row["XLJXGZ_XLJXGZC"]);
-                        item.WHRID = SafeTrim(row["XLJXGZ_WHRID"]);
-                        item.WHR = SafeTrim(row["XLJXGZ_WHR"]);
-                        item.WHSJ = SafeTrim(row["XLJXGZ_WHSJ"]);
-                        item.XLXHYFC = SafeTrim(row["XLJXGZ_XLXHYFC"]);
-                        item.XLGGYFC = SafeTrim(row["XLJXGZ_XLGGYFC"]);
-                        item.DYDJYFC = SafeTrim(row["XLJXGZ_DYDJYFC"]);
-                        item.XLBZYFC = SafeTrim(row["XLJXGZ_XLBZYFC"]);
-                        item.XLYSYFC = SafeTrim(row["XLJXGZ_XLYSYFC"]);
+                        XLJXGZ item = ParseXLJXGZFromDataRow(row);
 
                         resultList.Add(item);
                     }
@@ -732,21 +684,8 @@ namespace GThinking.S_XLXSBJ
                 if (ds != null && ds.Tables.Count > 0 && ds.Tables[0].Rows.Count > 0)
                 {
                     foreach (DataRow row in ds.Tables[0].Rows)
-                    {
-                        // 使用传统赋值方式（避免对象初始化器）
-                        
-                        item.XLJXDJ = SafeTrim(row["XLJXGZ_XLJXDJ"]);
-                        item.XLJXDH = SafeTrim(row["XLJXGZ_XLJXDH"]);
-                        item.XLJXGZXH = SafeTrim(row["XLJXGZ_XLJXGZXH"]);
-                        item.XLJXGZC = SafeTrim(row["XLJXGZ_XLJXGZC"]);
-                        item.WHRID = SafeTrim(row["XLJXGZ_WHRID"]);
-                        item.WHR = SafeTrim(row["XLJXGZ_WHR"]);
-                        item.WHSJ = SafeTrim(row["XLJXGZ_WHSJ"]);
-                        item.XLXHYFC = SafeTrim(row["XLJXGZ_XLXHYFC"]);
-                        item.XLGGYFC = SafeTrim(row["XLJXGZ_XLGGYFC"]);
-                        item.DYDJYFC = SafeTrim(row["XLJXGZ_DYDJYFC"]);
-                        item.XLBZYFC = SafeTrim(row["XLJXGZ_XLBZYFC"]);
-                        item.XLYSYFC = SafeTrim(row["XLJXGZ_XLYSYFC"]);
+                        {
+                            item = ParseXLJXGZFromDataRow(row);
 
                      
                     }
@@ -761,20 +700,7 @@ namespace GThinking.S_XLXSBJ
                     {
                         foreach (DataRow row in ds.Tables[0].Rows)
                         {
-                            // 使用传统赋值方式（避免对象初始化器）
-
-                            item.XLJXDJ = SafeTrim(row["XLJXGZ_XLJXDJ"]);
-                            item.XLJXDH = SafeTrim(row["XLJXGZ_XLJXDH"]);
-                            item.XLJXGZXH = SafeTrim(row["XLJXGZ_XLJXGZXH"]);
-                            item.XLJXGZC = SafeTrim(row["XLJXGZ_XLJXGZC"]);
-                            item.WHRID = SafeTrim(row["XLJXGZ_WHRID"]);
-                            item.WHR = SafeTrim(row["XLJXGZ_WHR"]);
-                            item.WHSJ = SafeTrim(row["XLJXGZ_WHSJ"]);
-                            item.XLXHYFC = SafeTrim(row["XLJXGZ_XLXHYFC"]);
-                            item.XLGGYFC = SafeTrim(row["XLJXGZ_XLGGYFC"]);
-                            item.DYDJYFC = SafeTrim(row["XLJXGZ_DYDJYFC"]);
-                            item.XLBZYFC = SafeTrim(row["XLJXGZ_XLBZYFC"]);
-                            item.XLYSYFC = SafeTrim(row["XLJXGZ_XLYSYFC"]);
+                                item = ParseXLJXGZFromDataRow(row);
 
 
                         }
@@ -2390,6 +2316,58 @@ namespace GThinking.S_XLXSBJ
 
 
         #region 辅助方法
+        /// <summary>
+        /// 从 DataRow 解析 XLJXMX 实体。
+        /// </summary>
+        private static XLJXMX ParseXLJXMXFromDataRow(DataRow row)
+        {
+            XLJXMX item = new XLJXMX();
+            item.XLJXDJ = SafeTrim(row["XLJXMX_XLJXDJ"]);
+            item.XLJXDH = SafeTrim(row["XLJXMX_XLJXDH"]);
+            item.XLJXMXH = SafeTrim(row["XLJXMX_XLJXMXH"]);
+            item.XLBSC = SafeTrim(row["XLJXMX_XLBSC"]);
+            item.XLJXGZXH = SafeTrim(row["XLJXMX_XLJXGZXH"]);
+            item.JXXLXHID = SafeTrim(row["XLJXMX_JXXLXHID"]);
+            item.XLXHID = SafeTrim(row["XLJXMX_XLXHID"]);
+            item.JXXLGGID = SafeTrim(row["XLJXMX_JXXLGGID"]);
+            item.XLGGID = SafeTrim(row["XLJXMX_XLGGID"]);
+            item.JXDYDJID = SafeTrim(row["XLJXMX_JXDYDJID"]);
+            item.DYDJID = SafeTrim(row["XLJXMX_DYDJID"]);
+            item.XLBZID = SafeTrim(row["XLJXMX_XLBZID"]);
+            item.JXXLBZID = SafeTrim(row["XLJXMX_JXXLBZID"]);
+            item.XLYSID = SafeTrim(row["XLJXMX_XLYSID"]);
+            item.JXXLYSID = SafeTrim(row["XLJXMX_JXXLYSID"]);
+            item.WHR = SafeTrim(row["XLJXMX_WHR"]);
+            item.WHRID = SafeTrim(row["XLJXMX_WHRID"]);
+            item.WHSJ = SafeTrim(row["XLJXMX_WHSJ"]);
+            item.DCZT = SafeTrim(row["XLJXMX_DCZT"]);
+            item.JLDW = SafeTrim(row["XLJXMX_JLDW"]);
+            item.SL = SafeTrim(row["XLJXMX_SL"]);
+            item.FBH = SafeTrim(row["XLJXMX_FBH"]);
+            item.JSGFID = SafeTrim(row["XLJXMX_JSGFSID"]);
+            return item;
+        }
+
+        /// <summary>
+        /// 从 DataRow 解析 XLJXGZ 实体。
+        /// </summary>
+        private static XLJXGZ ParseXLJXGZFromDataRow(DataRow row)
+        {
+            XLJXGZ item = new XLJXGZ();
+            item.XLJXDJ = SafeTrim(row["XLJXGZ_XLJXDJ"]);
+            item.XLJXDH = SafeTrim(row["XLJXGZ_XLJXDH"]);
+            item.XLJXGZXH = SafeTrim(row["XLJXGZ_XLJXGZXH"]);
+            item.XLJXGZC = SafeTrim(row["XLJXGZ_XLJXGZC"]);
+            item.WHRID = SafeTrim(row["XLJXGZ_WHRID"]);
+            item.WHR = SafeTrim(row["XLJXGZ_WHR"]);
+            item.WHSJ = SafeTrim(row["XLJXGZ_WHSJ"]);
+            item.XLXHYFC = SafeTrim(row["XLJXGZ_XLXHYFC"]);
+            item.XLGGYFC = SafeTrim(row["XLJXGZ_XLGGYFC"]);
+            item.DYDJYFC = SafeTrim(row["XLJXGZ_DYDJYFC"]);
+            item.XLBZYFC = SafeTrim(row["XLJXGZ_XLBZYFC"]);
+            item.XLYSYFC = SafeTrim(row["XLJXGZ_XLYSYFC"]);
+            return item;
+        }
 
 
         public static string GetDefaultYSID(string sXLXHID, string sXLGGID, string sXLYSID)
@@ -2465,6 +2443,7 @@ namespace GThinking.S_XLXSBJ
             if (string.IsNullOrEmpty(input))
                 return "";
 
+
             StringBuilder result = new StringBuilder();
             string pattern = @"\[([^\]=]+)=[^\]]+\]";