Upload db.py with huggingface_hub

db.py

@@ -383,47 +383,72 @@ def get_patient_reports(chart_no):
 def get_mfi_comparison(chart_no, pra_class=None):
     """
     取得同一病人跨日期的 MFI 比較資料。
+    同一天有多筆 report 時，label 加上 (A)/(B)/... 後綴（按 report_id 升冪）。
     回傳:
-        dates: [date1, date2, ...]
-        antigens: [{antigen, allele, mfi_by_date: {date: max_mfi, ...}}, ...]
+        dates: [label1, label2, ...]   # 顯示用字串，同日多筆會帶後綴
+        antigens: [{antigen, allele, mfi_by_date: {label: {...}, ...}}, ...]
+        pra_by_date: {label: pra_percent}
     """
     conn = get_conn()
     patient = conn.execute('SELECT id FROM patients WHERE chart_no=?', (chart_no,)).fetchone()
     if not patient:
         conn.close()
-        return [], []
+        return [], [], {}
 
-    query = '''
-        SELECT r.report_date, r.pra_class, r.pra_percent,
-               a.antigen, a.allele, a.max_mfi, a.mean_mfi, a.no_of_beads
-        FROM reports r
-        JOIN antibody_strength a ON a.report_id = r.id
-        WHERE r.patient_id = ? AND COALESCE(r.is_deleted, 0) = 0
+    rep_query = '''
+        SELECT id, report_date, pra_percent
+        FROM reports
+        WHERE patient_id = ? AND COALESCE(is_deleted, 0) = 0
     '''
-    params = [patient['id']]
+    rep_params = [patient['id']]
     if pra_class:
-        query += ' AND r.pra_class = ?'
-        params.append(pra_class)
-    query += ' ORDER BY r.report_date, a.antigen'
+        rep_query += ' AND pra_class = ?'
+        rep_params.append(pra_class)
+    rep_query += ' ORDER BY report_date, id'
+    reports = conn.execute(rep_query, rep_params).fetchall()
 
-    rows = conn.execute(query, params).fetchall()
-    conn.close()
+    from collections import defaultdict
+    date_count = defaultdict(int)
+    for r in reports:
+        date_count[r['report_date']] += 1
 
-    # 組裝比較資料
+    date_seen = defaultdict(int)
+    labels_by_rid = {}
     dates = []
     pra_by_date = {}
-    antigen_data = {}  # antigen -> {allele, mfi_by_date}
-
-    for r in rows:
+    for r in reports:
         d = r['report_date']
-        if d not in dates:
-            dates.append(d)
-        pra_by_date[d] = r['pra_percent']
+        if date_count[d] == 1:
+            label = d
+        else:
+            suffix = chr(ord('A') + date_seen[d])
+            label = f'{d} ({suffix})'
+            date_seen[d] += 1
+        labels_by_rid[r['id']] = label
+        dates.append(label)
+        pra_by_date[label] = r['pra_percent']
+
+    if not reports:
+        conn.close()
+        return [], [], {}
+
+    rep_ids = [r['id'] for r in reports]
+    placeholders = ','.join('?' * len(rep_ids))
+    ab_rows = conn.execute(f'''
+        SELECT report_id, antigen, allele, max_mfi, mean_mfi, no_of_beads
+        FROM antibody_strength
+        WHERE report_id IN ({placeholders})
+        ORDER BY antigen
+    ''', rep_ids).fetchall()
+    conn.close()
 
+    antigen_data = {}
+    for r in ab_rows:
+        label = labels_by_rid[r['report_id']]
         ag = r['antigen']
         if ag not in antigen_data:
             antigen_data[ag] = {'antigen': ag, 'allele': r['allele'], 'mfi_by_date': {}}
-        antigen_data[ag]['mfi_by_date'][d] = {
+        antigen_data[ag]['mfi_by_date'][label] = {
             'max_mfi': r['max_mfi'],
             'mean_mfi': r['mean_mfi'],
             'no_of_beads': r['no_of_beads'],