Update app.py

app.py

@@ -83,6 +83,39 @@ def download_one(session: requests.Session, url: str, outdir: str, pref: str) ->
                 if chunk:
                     f.write(chunk)
     return path
+    
+def choose_names_from_multiindex(mi: pd.MultiIndex) -> list[str]:
+    """
+    3段ヘッダ(MultiIndex: 大,中,小)から列名を選ぶ。
+    優先順: 中分類(第2段) → 小分類(第3段) → 大分類(第1段)。
+    空/NaN/空白は無視。重複は .1, .2… を付与。
+    """
+    def clean(x) -> str:
+        if x is None:
+            return ""
+        s = str(x).strip()
+        return "" if s.lower() == "nan" else s
+
+    # 優先で選択
+    picked = []
+    for tpl in mi:
+        a = clean(tpl[0]) if len(tpl) >= 1 else ""  # 大
+        b = clean(tpl[1]) if len(tpl) >= 2 else ""  # 中
+        c = clean(tpl[2]) if len(tpl) >= 3 else ""  # 小
+        name = b or c or a or "col"                # ★ 中 > 小 > 大
+        picked.append(name)
+
+    # 重複解消
+    seen = {}
+    uniq = []
+    for n in picked:
+        if n not in seen:
+            seen[n] = 0
+            uniq.append(n)
+        else:
+            seen[n] += 1
+            uniq.append(f"{n}.{seen[n]}")
+    return uniq
 
 
 # ---- 3段ヘッダ → 1枚目のみ採用／他はスキップ行数で読込 ----------------------
@@ -108,10 +141,29 @@ def load_excel_first(xls_path: str, sheet_pref: str | None) -> tuple[pd.DataFram
     )
     # 左端の余計な列を削除
     df = df.iloc[:, 1:]
-    # 前後空白トリム
-    for c in df.select_dtypes(include=["object"]).columns:
-        df[c] = df[c].str.strip()
-    cols = list(df.columns)  # MultiIndex のまま保持
+    # 列名を選択（中 > 小 > 大）
+    if isinstance(df.columns, pd.MultiIndex):
+        chosen = choose_names_from_multiindex(df.columns)
+    else:
+        # 単層ヘッダの場合のフォールバック
+        raw = []
+        for c in df.columns:
+            s = "" if c is None else str(c).strip()
+            raw.append("" if s.lower() == "nan" else s)
+        raw = [r if r else "col" for r in raw]
+        seen = {}
+        chosen = []
+        for n in raw:
+            if n in seen:
+                seen[n] += 1
+                chosen.append(f"{n}.{seen[n]}")
+            else:
+                seen[n] = 0
+                chosen.append(n)
+
+    df.columns = chosen
+
+
     return df, cols
 
 def load_excel_other(xls_path: str, sheet_pref: str | None, target_cols: list) -> pd.DataFrame | None: